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

mask access row bytes fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-28 17:28:43 +00:00
parent 1a6255e664
commit 7e7f40ed5f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mac/carbon/bitmap.cpp
View File

@@ -1016,6 +1016,7 @@ wxImage wxBitmap::ConvertToImage() const
bool hasAlpha = false ; bool hasAlpha = false ;
bool hasMask = false ; bool hasMask = false ;
int maskBytesPerRow = 0 ;
unsigned char *alpha = NULL ; unsigned char *alpha = NULL ;
unsigned char *mask = NULL ; unsigned char *mask = NULL ;
if ( HasAlpha() ) if ( HasAlpha() )
@@ -1027,6 +1028,7 @@ wxImage wxBitmap::ConvertToImage() const
{ {
hasMask = true ; hasMask = true ;
mask = (unsigned char*) GetMask()->GetRawAccess() ; mask = (unsigned char*) GetMask()->GetRawAccess() ;
maskBytesPerRow = GetMask()->GetBytesPerRow() ;
} }
if ( hasAlpha ) if ( hasAlpha )
@@ -1044,8 +1046,9 @@ wxImage wxBitmap::ConvertToImage() const
static const int MASK_BLUE = 3; static const int MASK_BLUE = 3;
static const int MASK_BLUE_REPLACEMENT = 2; static const int MASK_BLUE_REPLACEMENT = 2;
for (int yy = 0; yy < height; yy++) for (int yy = 0; yy < height; yy++ , mask += maskBytesPerRow )
{ {
unsigned char * maskp = mask ;
for (int xx = 0; xx < width; xx++) for (int xx = 0; xx < width; xx++)
{ {
long color = *((long*) source) ; long color = *((long*) source) ;
@@ -1055,7 +1058,7 @@ wxImage wxBitmap::ConvertToImage() const
unsigned char b = (color&0x000000FF); unsigned char b = (color&0x000000FF);
if ( hasMask ) if ( hasMask )
{ {
if ( *mask++ == 0 ) if ( *maskp++ == 0 )
{ {
if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE ) if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
b = MASK_BLUE_REPLACEMENT ; b = MASK_BLUE_REPLACEMENT ;