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

Use wxALPHA_XXX constants instead of 0 and 255

Browse Source 
No real changes, just try to improve the code clarity.
This commit is contained in:
Vadim Zeitlin
2019-11-10 17:56:44 +01:00
parent d6d5375fe9
commit c433d3d0fd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/graphicc.cpp
View File

@@ -1529,13 +1529,13 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
// blue. The 32-bit quantities are stored native-endian. // blue. The 32-bit quantities are stored native-endian.
// Pre-multiplied alpha is used. // Pre-multiplied alpha is used.
#if defined (__WXMSW__) || defined(__WXOSX__) #if defined (__WXMSW__) || defined(__WXOSX__)
unsigned char alpha = hasAlpha ? p.Alpha() : 255; unsigned char alpha = hasAlpha ? p.Alpha() : wxALPHA_OPAQUE;
// MSW and OSX bitmap pixel bits are already premultiplied. // MSW and OSX bitmap pixel bits are already premultiplied.
*data = (alpha << 24 | p.Red() << 16 | p.Green() << 8 | p.Blue()); *data = (alpha << 24 | p.Red() << 16 | p.Green() << 8 | p.Blue());
#else // !__WXMSW__ , !__WXOSX__ #else // !__WXMSW__ , !__WXOSX__
// We always have alpha, but we need to premultiply it. // We always have alpha, but we need to premultiply it.
unsigned char alpha = p.Alpha(); unsigned char alpha = p.Alpha();
if (alpha == 0) if (alpha == wxALPHA_TRANSPARENT)
*data = 0; *data = 0;
else else
*data = (alpha << 24 *data = (alpha << 24