summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-09-06 10:06:38 +0000
committerArmin Le Grand <alg@apache.org>2012-09-06 10:06:38 +0000
commitc66db94a90efe954691da4ac6bb1ce82ff99e22f (patch)
treeaf394d4229833547fa5b8c91b52c40ba62cb4d34 /vcl/source/gdi
parent6be608912b995eb1372f738f893c953298236b75 (diff)
assertion removed: allow BitmapEx constructors with empty Mask or AlphaMask
Notes
Notes: merged as: e52f636aa44615b180bf799b2d664de9244c3138
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/bitmapex.cxx12
1 files changed, 2 insertions, 10 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 64afe23d9291..b6ca1b76a21a 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -131,11 +131,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) :
eTransparent ( !rMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
bAlpha ( sal_False )
{
- if(!rMask)
- {
- OSL_ENSURE(false, "Empty mask given (!)");
- }
- else if(rBmp.GetSizePixel() != rMask.GetSizePixel())
+ if(rBmp.GetSizePixel() != rMask.GetSizePixel())
{
OSL_ENSURE(false, "Mask size differs from Bitmap size, corrected Mask (!)");
aMask.Scale(rBmp.GetSizePixel());
@@ -158,11 +154,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) :
eTransparent ( !rAlphaMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
bAlpha ( !rAlphaMask ? sal_False : sal_True )
{
- if(!rAlphaMask)
- {
- OSL_ENSURE(false, "Empty alpha given (!)");
- }
- else if(rBmp.GetSizePixel() != rAlphaMask.GetSizePixel())
+ if(rBmp.GetSizePixel() != rAlphaMask.GetSizePixel())
{
OSL_ENSURE(false, "Alpha size differs from Bitmap size, corrected Mask (!)");
aMask.Scale(rBmp.GetSizePixel());