diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 06:47:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 06:47:44 +0000 |
| commit | 69a90f324770c5e054bfb130b7cdb3cf6b8634be (patch) | |
| tree | ead9cbad774a86b0d3f293e0185ad5337321fe95 /goodies | |
| parent | bfd61ef81b21a5fcf418bac3894a568e2b007dcc (diff) | |
INTEGRATION: CWS presfixes02 (1.18.6); FILE MERGED
2005/03/22 00:09:09 thb 1.18.6.1: #i40115# Copying source mask palette, when copying mask data without color mapping
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/graphic/grfmgr2.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/goodies/source/graphic/grfmgr2.cxx b/goodies/source/graphic/grfmgr2.cxx index 2937e89ff798..c8ba5058a23a 100644 --- a/goodies/source/graphic/grfmgr2.cxx +++ b/goodies/source/graphic/grfmgr2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: grfmgr2.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: vg $ $Date: 2005-03-08 13:38:48 $ + * last change: $Author: rt $ $Date: 2005-03-30 07:47:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -945,7 +945,16 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, if( pAcc ) { - aOutMsk = Bitmap( Size( nDstW, nDstH ), 1 ); + // #i40115# Use the same palette for destination + // bitmap. Otherwise, we'd have to color-map even the + // case below, when both masks are one bit deep. + if( pAcc->HasPalette() ) + aOutMsk = Bitmap( Size( nDstW, nDstH ), + 1, + &pAcc->GetPalette() ); + else + aOutMsk = Bitmap( Size( nDstW, nDstH ), 1 ); + pWAcc = aOutMsk.AcquireWriteAccess(); if( pWAcc ) |