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

Fix colours of mask bitmap

Browse Source 
Monochrome mask bitmap should have white pixels in the unmasked area and black pixels in the masked area, quite the opposite to what is implemented now.

Closes #10098.
This commit is contained in:
Artur Wieczorek
2019-08-29 20:00:03 +02:00
parent 0522587bcb
commit 8403b79ad7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1621,10 +1621,9 @@ bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap)
unsigned char *destdata = destdatabase ; unsigned char *destdata = destdatabase ;
for ( int x = 0 ; x < m_width ; ++x, ++p ) for ( int x = 0 ; x < m_width ; ++x, ++p )
{ {
if ( ( p.Red() + p.Green() + p.Blue() ) > 0x10 ) int v = p.Red() + p.Green() + p.Blue();
*destdata++ = 0xFF ; wxASSERT_MSG( v == 0 || v == 3*0xFF, "Non-monochrome bitmap supplied" );
else *destdata++ = v < (3 * 0xFF) / 2 ? 0xFF : 0;
*destdata++ = 0x00 ;
} }
p = rowStart; p = rowStart;
p.OffsetY(data, 1); p.OffsetY(data, 1);
@@ -1698,7 +1697,7 @@ wxBitmap wxMask::GetBitmap() const
{ {
const unsigned char byte = *src; const unsigned char byte = *src;
wxASSERT( byte == 0 || byte == 0xFF ); wxASSERT( byte == 0 || byte == 0xFF );
p.Red() = p.Green() = p.Blue() = byte; p.Red() = p.Green() = p.Blue() = ~byte;
} }
p = rowStart; p = rowStart;
p.OffsetY(data, 1); p.OffsetY(data, 1);