[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source

[Caolán McNamara]

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

New commits:
commit fe8b83f06fdc93ac06f4035c3ea50c51d0e3d026
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Sep 11 15:11:05 2014 +0100

    Resolves: fdo#82552 we only check pAlphaW on one branch
    
    Change-Id: Ib2c5a0d751050af77f267edbb7a5a0fe57494622
    (cherry picked from commit fee95be5b637dbfbdbe78426c02240b1dc90e1f2)
    Reviewed-on: https://gerrit.libreoffice.org/11404
    Reviewed-by: Thomas Arnhold <tho...@arnhold.org>
    Tested-by: Thomas Arnhold <tho...@arnhold.org>

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++ )
             {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits