diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:04:20 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:04:20 +0000 |
| commit | bc584ddc617f1b6be2cd3b330c2b999ec8f376a4 (patch) | |
| tree | 601b129eefded4031c9cf30a23255e836ba9db87 /vcl/source | |
| parent | 9479aa5be6b36c3ddfb031c02bdf9ed3e2362f56 (diff) | |
INTEGRATION: CWS thbpp10 (1.38.86); FILE MERGED
2008/01/14 14:42:38 thb 1.38.86.1: #i83087# Don't use native alpha for emulated alpha vdev cases
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/outdev2.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index da159b8d7447..c5074b101d32 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: outdev2.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: hr $ $Date: 2007-11-01 14:48:01 $ + * last change: $Author: vg $ $Date: 2008-01-29 08:04:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2003,8 +2003,11 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha, { bool bNativeAlpha = false; static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA"); - if( !pDisableNative && !bHMirr && !bVMirr ) { - Point aRelPt = aOutPt + Point( mnOutOffX, mnOutOffY ); + // #i83087# Naturally, system alpha blending cannot work with + // separate alpha VDev + if( !mpAlphaVDev && !pDisableNative && !bHMirr && !bVMirr ) + { + Point aRelPt = aOutPt + Point( mnOutOffX, mnOutOffY ); SalTwoRect aTR = { rSrcPtPixel.X(), rSrcPtPixel.Y(), rSrcSizePixel.Width(), rSrcSizePixel.Height(), |