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

[Caolán McNamara]

 vcl/source/outdev/bitmap.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fee95be5b637dbfbdbe78426c02240b1dc90e1f2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 11 15:11:05 2014 +0100

    Resolves: fdo#82552 we only check pAlphaW on one branch
    
    Change-Id: Ib2c5a0d751050af77f267edbb7a5a0fe57494622

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 56c5033..cd555f7 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1249,7 +1249,7 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
         BitmapReadAccess*   pB = aBmp.AcquireReadAccess();
         BitmapWriteAccess*  pW = aDither.AcquireWriteAccess();
 
-        if( pB && pP && pA && pW && pAlphaW )
+        if (pB && pP && pA && pW && pAlphaW)
         {
             int nOutY;
 
@@ -1286,7 +1286,7 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
     else
     {
         BitmapWriteAccess*  pB = aBmp.AcquireWriteAccess();
-        if( pP && pA && pB )
+        if (pB && pP && pA && pAlphaW)
         {
             for( nY = 0; nY < nDstHeight; nY++ )
             {