Simplify condition in wxCairoBitmapData ctor

Don't test for "bufferFormat == CAIRO_FORMAT_ARGB32" which will be
always true in this branch if hasAlpha is true anyhow.

No real changes.

See #18570.
This commit is contained in:
Vadim Zeitlin
2019-11-10 17:44:48 +01:00
parent 5646ba7261
commit c81021e850

View File

@@ -1530,7 +1530,7 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
// with alpha in the upper 8 bits, then red, then green, then
// blue. The 32-bit quantities are stored native-endian.
// Pre-multiplied alpha is used.
unsigned char alpha = (bufferFormat == CAIRO_FORMAT_ARGB32 && hasAlpha) ? p.Alpha() : 255;
unsigned char alpha = hasAlpha ? p.Alpha() : 255;
#if defined (__WXMSW__) || defined(__WXOSX__)
// MSW and OSX bitmap pixel bits are already premultiplied.
*data = (alpha << 24 | p.Red() << 16 | p.Green() << 8 | p.Blue());