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
This commit is contained in:
Kurt Zenker 2008-04-04 10:01:39 +00:00
parent 872782b2dc
commit f0b5ab48b3

View file

@ -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 )