Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix creation of bitmap from image with requested depth 32

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-10-31 16:09:47 +00:00
parent 898c3e88e9
commit e503ef07d5
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/bitmap.cpp
View File

@@ -324,13 +324,11 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
UnRef(); UnRef();
wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") ); wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );
wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
if (image.GetWidth() <= 0 || image.GetHeight() <= 0) if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
return false; return false;
// create pixbuf if image has alpha and requested depth is compatible if (depth == 32 || (depth == -1 && image.HasAlpha()))
if (image.HasAlpha() && (depth == -1 || depth == 32))
return CreateFromImageAsPixbuf(image); return CreateFromImageAsPixbuf(image);
// otherwise create pixmap, if alpha is present it will be converted to mask // otherwise create pixmap, if alpha is present it will be converted to mask
@@ -422,8 +420,6 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
{ {
wxASSERT(image.HasAlpha());
int width = image.GetWidth(); int width = image.GetWidth();
int height = image.GetHeight(); int height = image.GetHeight();
@@ -441,12 +437,13 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
for (int y = 0; y < height; y++, out += rowpad) for (int y = 0; y < height; y++, out += rowpad)
{ {
for (int x = 0; x < width; x++, alpha++, out += 4, in += 3) for (int x = 0; x < width; x++, out += 4, in += 3)
{ {
out[0] = in[0]; out[0] = in[0];
out[1] = in[1]; out[1] = in[1];
out[2] = in[2]; out[2] = in[2];
out[3] = *alpha; if (alpha)
out[3] = *alpha++;
} }
} }