diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:32:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:32:06 +0000 |
| commit | cce301dabd992b5df48ce589b86def65104c070a (patch) | |
| tree | d7f9363766828d14f6f4fa6e255e2f04f1210c47 /vcl/source/gdi/impimage.cxx | |
| parent | 734f4375243d0f6c5e947f7a50fdf50960c059b6 (diff) | |
INTEGRATION: CWS aw003 (1.10.202); FILE MERGED
2003/08/07 08:07:38 thb 1.10.202.1: #110958# Had to intercept some more map mode changes (this time direct mbMap manipulations), and inverted the alpha compositing calculations to actually match Porter/Duff
Diffstat (limited to 'vcl/source/gdi/impimage.cxx')
| -rw-r--r-- | vcl/source/gdi/impimage.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index dba58b643b5c..f08fe1554974 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impimage.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sb $ $Date: 2002-08-22 13:57:18 $ + * last change: $Author: rt $ $Date: 2003-11-24 17:32:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -466,14 +466,14 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev, Point aOutPos = pOutDev->LogicToPixel( rPos ); Size aOutSize; - BOOL bOldMap = pOutDev->mbMap; + BOOL bOldMap = pOutDev->IsMapModeEnabled(); if( pSize ) aOutSize = pOutDev->LogicToPixel( *pSize ); else aOutSize = aSize; - pOutDev->mbMap = FALSE; + pOutDev->EnableMapMode( FALSE ); if ( nStyle & IMAGE_DRAW_DISABLE ) { @@ -621,7 +621,7 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev, pOutDev->DrawBitmapEx( aOutPos, aOutSize, aPos, aSize, aBmpEx ); } - pOutDev->mbMap = bOldMap; + pOutDev->EnableMapMode( bOldMap ); #ifdef FASTTRANSPARENT bFastTransparent = bTmp; |