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

Don't convert mask to alpha values while converting wxImage to wxBitmap (wxOSX)

Browse Source 
wxImage with mask should be converted to wxBitmap with mask and not to
wxBitmap with alpha channel values. Converting wxImage mask to wxBitmap
alpha is not implemented under wxMSW and wxGTK and wxOSX implementation
should adhere to this convention.
This commit is contained in:
Artur Wieczorek
2021-01-18 22:29:40 +01:00
parent 6b572bf694
commit 79be42122f
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osx/core/bitmap.cpp
View File

@@ -1131,10 +1131,9 @@ wxBitmap::wxBitmap(const wxImage& image, int depth, double scale)
{
bool hasMask = image.HasMask();
bool hasAlpha = image.HasAlpha();
bool wantsAlpha = hasMask || hasAlpha ;
// convert this bitmap to use its alpha channel
if ( wantsAlpha )
if ( hasAlpha )
UseAlpha();
const unsigned char *sourcePixels = image.GetData();
@@ -1169,22 +1168,15 @@ wxBitmap::wxBitmap(const wxImage& image, int depth, double scale)
unsigned char * destinationMask = destinationMaskRowStart;
for (int x = 0; x < width; x++)
{
bool isMasked = false;
if ( hasMask )
{
if ( sourcePixels[0] == mr && sourcePixels[1] == mg && sourcePixels[2] == mb )
isMasked = true;
bool isMasked = sourcePixels[0] == mr && sourcePixels[1] == mg && sourcePixels[2] == mb;
*destinationMask++ = isMasked ? wxIMAGE_ALPHA_TRANSPARENT : wxIMAGE_ALPHA_OPAQUE ;
}
if ( wantsAlpha )
if ( hasAlpha )
{
unsigned char a;
if ( hasAlpha )
a = *sourceAlpha++;
else
a = isMasked ? wxIMAGE_ALPHA_TRANSPARENT : wxIMAGE_ALPHA_OPAQUE;
unsigned char a = *sourceAlpha++;
*destination++ = a ;
#if wxOSX_USE_PREMULTIPLIED_ALPHA