diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-05-21 13:38:06 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-21 13:38:06 +0000 |
commit | 312887adb87cb7ea9f83ebc35bd103ca35a4a1ed (patch) | |
tree | 038e8ef0ee1ea99b033a5023bb4f133966e75cd9 | |
parent | e8f6cf2ae4ccab40db406399b45a1ee3dc6279f5 (diff) |
INTEGRATION: CWS bmpres01 (1.3.34); FILE MERGED
2004/02/11 16:15:08 ka 1.3.34.1: #i22149#: added alpha mask support for Images/ImageLists
-rw-r--r-- | vcl/source/gdi/bmpacc.cxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 30608edf7892..b507544eb05d 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bmpacc.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2004-01-06 13:31:03 $ + * last change: $Author: rt $ $Date: 2004-05-21 14:38:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -327,22 +327,19 @@ USHORT BitmapReadAccess::GetBestPaletteIndex( const BitmapColor& rBitmapColor ) // - BitmapWriteAccess - // --------------------- -BitmapWriteAccess::~BitmapWriteAccess() +BitmapWriteAccess::BitmapWriteAccess( Bitmap& rBitmap ) : + BitmapReadAccess( rBitmap, TRUE ), + mpLineColor ( NULL ), + mpFillColor ( NULL ) { } // ------------------------------------------------------------------ -void BitmapWriteAccess::ImplInitDraw() +BitmapWriteAccess::~BitmapWriteAccess() { - if( HasPalette() ) - { - if( !maLineColor.IsIndex() ) - maLineColor = (BYTE) GetBestPaletteIndex( maLineColor ); - - if( !maFillColor.IsIndex() ) - maFillColor = (BYTE) GetBestPaletteIndex( maFillColor ); - } + delete mpLineColor; + delete mpFillColor; } // ------------------------------------------------------------------ |