[Libreoffice-commits] core.git: vcl/source

Caolán McNamara caolanm at redhat.com
Sun Jun 19 16:10:33 UTC 2016


 vcl/source/gdi/bitmapex.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3b81f3df69cdbc086f2960e1fb00d17b8c90178
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 19 17:08:54 2016 +0100

    bogus warning
    
    since...
    
    commit 9c79945ca62b18213728cdd23d9f390304aee1de
    Date:   Sun Jun 12 20:11:20 2016 +0200
    
        convert DBG_ASSERT in vcl
    
    Change-Id: I67b2f0d21965a70980c4f0c522a0431107216a27

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 611c420..7030f8e 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -380,7 +380,7 @@ bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag
 
         aBitmapSize = aBitmap.GetSizePixel();
 
-        SAL_WARN_IF( !aMask || aBitmap.GetSizePixel() == aMask.GetSizePixel(), "vcl",
+        SAL_WARN_IF( !!aMask && aBitmap.GetSizePixel() != aMask.GetSizePixel(), "vcl",
                     "BitmapEx::Scale(): size mismatch for bitmap and alpha mask." );
     }
 


More information about the Libreoffice-commits mailing list