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

Store alpha channel in the output wxImage only if internal GDI+ bitmap contains it.

Browse Source 
When converting internal bitmap to wxImage in wxGDIPlusBitmapData::ConvertToImage set up output alpha channel buffer only if source bitmap contains alpha channel values.
This commit is contained in:
Artur Wieczorek
2016-01-04 22:59:44 +01:00
parent ca52d09a03
commit 527c25b898
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/graphics.cpp
View File

@@ -1112,7 +1112,12 @@ wxImage wxGDIPlusBitmapData::ConvertToImage() const
const UINT h = m_bitmap->GetHeight(); const UINT h = m_bitmap->GetHeight();
wxImage img(w, h); wxImage img(w, h);
img.InitAlpha(); // Set up wxImage buffer for alpha channel values
// only if bitmap contains alpha channel.
if ( IsAlphaPixelFormat(m_bitmap->GetPixelFormat()) )
{
img.InitAlpha();
}
BitmapData bitmapData; BitmapData bitmapData;
Rect rect(0, 0, w, h); Rect rect(0, 0, w, h);
@@ -1129,7 +1134,8 @@ wxImage wxGDIPlusBitmapData::ConvertToImage() const
*imgRGB++ = (c >> 16) & 0xFF; // R *imgRGB++ = (c >> 16) & 0xFF; // R
*imgRGB++ = (c >> 8) & 0xFF; // G *imgRGB++ = (c >> 8) & 0xFF; // G
*imgRGB++ = (c >> 0) & 0xFF; // B *imgRGB++ = (c >> 0) & 0xFF; // B
*imgAlpha++ = (c >> 24) & 0xFF; if ( imgAlpha )
*imgAlpha++ = (c >> 24) & 0xFF;
} }
pixels += bitmapData.Stride; pixels += bitmapData.Stride;