You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/09/06 13:06:39 UTC
svn commit: r1381556 - /incubator/ooo/trunk/main/vcl/source/gdi/bitmapex.cxx
Author: alg
Date: Thu Sep 6 11:06:38 2012
New Revision: 1381556
URL: http://svn.apache.org/viewvc?rev=1381556&view=rev
Log:
assertion removed: allow BitmapEx constructors with empty Mask or AlphaMask
Modified:
incubator/ooo/trunk/main/vcl/source/gdi/bitmapex.cxx
Modified: incubator/ooo/trunk/main/vcl/source/gdi/bitmapex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/gdi/bitmapex.cxx?rev=1381556&r1=1381555&r2=1381556&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/gdi/bitmapex.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/gdi/bitmapex.cxx Thu Sep 6 11:06:38 2012
@@ -131,11 +131,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp,
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,
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());