diff options
author | Sven Jacobi <sj@openoffice.org> | 2001-01-30 15:25:09 +0000 |
---|---|---|
committer | Sven Jacobi <sj@openoffice.org> | 2001-01-30 15:25:09 +0000 |
commit | 0d9b5945384599cb8759b35a4b42d0c7905b84b6 (patch) | |
tree | 5e460cf38763a4358842ea4f273b5625485d631a /svtools | |
parent | b3e39225a3a60aa2184744243a4b3025552541db (diff) |
not inverting bitmask if rasteroperation is SRCAND, optimzing wasn't executed
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/filter.vcl/wmf/winmtf.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx index 29662ba83828..c7ad4ee31306 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.cxx +++ b/svtools/source/filter.vcl/wmf/winmtf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: winmtf.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sj $ $Date: 2001-01-15 18:26:11 $ + * last change: $Author: sj $ $Date: 2001-01-30 16:25:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1307,7 +1307,8 @@ void WinMtfMetaOutput::ResolveBitmapActions( List& rSaveList ) BSaveStruct* pSave2 = (BSaveStruct*)rSaveList.GetObject( i + 1 ); if ( ( nWinRop == SRCPAINT ) && ( pSave2->nWinRop == SRCAND ) ) { - if ( pSave->aBmp.IsEqual( pSave2->aBmp ) ) + if ( ( pSave->aBmp.GetPrefSize() == pSave2->aBmp.GetPrefSize() ) && + ( pSave->aBmp.GetPrefMapMode() == pSave2->aBmp.GetPrefMapMode() ) ) { Bitmap aMask( pSave->aBmp ); aMask.Invert(); BitmapEx aBmpEx( pSave2->aBmp, aMask ); @@ -1348,7 +1349,6 @@ void WinMtfMetaOutput::ResolveBitmapActions( List& rSaveList ) case 0x8 : { Bitmap aMask( aBitmap ); - aMask.Invert(); BitmapEx aBmpEx( aBitmap, aMask ); mpGDIMetaFile->AddAction( new MetaBmpExScaleAction( aPos, aSize, aBmpEx ) ); if ( nOperation == 0x7 ) |