diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-11 15:11:05 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-09-12 08:50:06 +0000 |
| commit | fe8b83f06fdc93ac06f4035c3ea50c51d0e3d026 (patch) | |
| tree | 5725750977e51a7ff185eb493423c7ed6e12dfa9 | |
| parent | 1d3a8908fe8a441469ffd336a445c2b361db5d7f (diff) | |
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 <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 4 |
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++ ) { |