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

Convert wxImage with mask to wxBitmap with alpha channel

Browse Source 
Since we always convert wxImage to 32 bpp wxBitmap, there is no reason to keep a separate mask for wxBitmap because alpha channel can be used directly.
This commit is contained in:
Artur Wieczorek
2019-09-01 10:58:32 +02:00
parent 9404dc2f9a
commit 991f11707f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1202,23 +1202,30 @@ wxBitmap::wxBitmap(const wxImage& image, int depth, double scale)
bool hasAlpha = false ; bool hasAlpha = false ;
wxImage img;
if ( image.HasMask() ) if ( image.HasMask() )
{ {
// takes precedence, don't mix with alpha info // takes precedence
// Since we already use 32 bpp bitmap here, we can use alpha channel
// directly and there is no reason to keep a separate mask.
img = image.Copy();
img.InitAlpha();
} }
else else
{ {
hasAlpha = image.HasAlpha() ; img = image;
} }
wxASSERT( !img.HasMask() );
hasAlpha = img.HasAlpha() ;
if ( hasAlpha ) if ( hasAlpha )
UseAlpha() ; UseAlpha() ;
unsigned char* destinationstart = (unsigned char*) GetBitmapData()->BeginRawAccess() ; unsigned char* destinationstart = (unsigned char*) GetBitmapData()->BeginRawAccess() ;
unsigned char* data = image.GetData(); const unsigned char* data = img.GetData();
if ( destinationstart != NULL && data != NULL ) if ( destinationstart != NULL && data != NULL )
{ {
const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ; const unsigned char *alpha = hasAlpha ? img.GetAlpha() : NULL ;
for (int y = 0; y < height; destinationstart += GetBitmapData()->GetBytesPerRow(), y++) for (int y = 0; y < height; destinationstart += GetBitmapData()->GetBytesPerRow(), y++)
{ {
unsigned char * destination = destinationstart; unsigned char * destination = destinationstart;
@@ -1251,8 +1258,6 @@ wxBitmap::wxBitmap(const wxImage& image, int depth, double scale)
GetBitmapData()->EndRawAccess() ; GetBitmapData()->EndRawAccess() ;
} }
if ( image.HasMask() )
SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ;
} }
} }