diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 13:37:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 13:37:15 +0000 |
| commit | 3cefc95972eb4c95fd608ae2b3c79dabac88e096 (patch) | |
| tree | 96e3181da70e784060762f90aa4d1d13573fd091 /vcl | |
| parent | 0edd1fa7471d3eeb23600fc1d704e8c7d2b2954f (diff) | |
INTEGRATION: CWS perform02 (1.13.48); FILE MERGED
2005/02/14 16:22:00 ssa 1.13.48.1: #i42762# improve and use AlphaMask::CopyPixel() to avoid palette lookups
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 829f6b4b40f1..709233ac0ca2 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bitmapex.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2005-01-03 17:40:57 $ + * last change: $Author: rt $ $Date: 2005-03-29 14:37:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #include <ctype.h> #ifndef _RTL_CRC_H_ @@ -601,7 +600,8 @@ BOOL BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, if( pBmpExSrc->IsAlpha() ) { if( IsAlpha() ) - aMask.CopyPixel( rRectDst, rRectSrc, &pBmpExSrc->aMask ); + // cast to use the optimized AlphaMask::CopyPixel + ((AlphaMask*) &aMask)->CopyPixel( rRectDst, rRectSrc, (AlphaMask*)&pBmpExSrc->aMask ); else if( IsTransparent() ) { AlphaMask* pAlpha = new AlphaMask( aMask ); |