summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-11 15:11:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-09-11 15:13:45 +0100
commitfee95be5b637dbfbdbe78426c02240b1dc90e1f2 (patch)
tree208be97b439d433393b4d0bba6ef8a4103cabfe0
parent(Rudimentary) C++11 support is a hard requirement now (diff)
downloadcore-fee95be5b637dbfbdbe78426c02240b1dc90e1f2.tar.gz
core-fee95be5b637dbfbdbe78426c02240b1dc90e1f2.zip
Resolves: fdo#82552 we only check pAlphaW on one branch
Change-Id: Ib2c5a0d751050af77f267edbb7a5a0fe57494622
-rw-r--r--vcl/source/outdev/bitmap.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 56c503358337..cd555f7feb67 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++ )
{