diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index b89719c70b42..ccf70a6c4dca 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -187,13 +187,17 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const if (GetSizePixel() != rBitmapEx.GetSizePixel()) return false; - if (meTransparent == TransparentType::NONE) - return true; + if (meTransparent != rBitmapEx.meTransparent) + return false; - if (meTransparent == TransparentType::Color) - return maTransparentColor == rBitmapEx.maTransparentColor; + if (meTransparent == TransparentType::Color + && maTransparentColor != rBitmapEx.maTransparentColor) + return false; + + if (mbAlpha != rBitmapEx.mbAlpha) + return false; - return maMask.ShallowEquals(rBitmapEx.maMask) && mbAlpha == rBitmapEx.mbAlpha; + return maMask.ShallowEquals(rBitmapEx.maMask); } bool BitmapEx::IsEmpty() const |