diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-04 10:01:39 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-04 10:01:39 +0000 |
| commit | f0b5ab48b3a15817d1ae97d97a8641327ea7917a (patch) | |
| tree | 48bc7b941de63af3b9269154955792b25f7128da | |
| parent | 872782b2dc546e837730d961ed77ed11a90a264c (diff) | |
INTEGRATION: CWS aquavcl06 (1.10.214); FILE MERGED
2008/04/01 16:09:48 pl 1.10.214.1: #i87702# fix conversion issue 4bit to 8bit
| -rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 9738bf6a351c..74141cf66b53 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmap3.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2007-07-24 10:07:24 $ + * last change: $Author: kz $ $Date: 2008-04-04 11:01:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -655,7 +655,7 @@ BOOL Bitmap::ImplConvertUp( USHORT nBitCount, Color* pExtColor ) if( pReadAcc ) { BitmapPalette aPal; - Bitmap aNewBmp( GetSizePixel(), nBitCount, &aPal ); + Bitmap aNewBmp( GetSizePixel(), nBitCount, pReadAcc->HasPalette() ? &pReadAcc->GetPalette() : &aPal ); BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess(); if( pWriteAcc ) |