diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-16 13:20:41 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-16 13:20:41 +0000 |
| commit | 3c9f7bd9c61115e2d1177aa2cd27f2435d2339fd (patch) | |
| tree | 1ed6b8e7913da4fdea92bd36658118c9aeed6079 /vcl/source/gdi/bitmapex.cxx | |
| parent | b1c591fd961e57f1c56e285cbb0b190afdbd610b (diff) | |
INTEGRATION: CWS vcl77 (1.22.192); FILE MERGED
2007/03/23 13:31:11 hdu 1.22.192.1: #i75531# workaround BitmapEx mask/bitmap depth mismatch
Diffstat (limited to 'vcl/source/gdi/bitmapex.cxx')
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index dd22bdf95246..ab4f444d5e28 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmapex.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2006-09-17 11:57:54 $ + * last change: $Author: ihi $ $Date: 2007-04-16 14:20:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -162,6 +162,12 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) : { DBG_ASSERT( !rAlphaMask || rBmp.GetSizePixel() == rAlphaMask.GetSizePixel(), "BitmapEx::BitmapEx(): size mismatch for bitmap and alpha mask." ); + + // #i75531# the workaround below can go when + // X11SalGraphics::drawAlphaBitmap()'s render acceleration + // can handle the bitmap depth mismatch directly + if( aBitmap.GetBitCount() < aMask.GetBitCount() ) + aBitmap.Convert( BMP_CONVERSION_24BIT ); } // ------------------------------------------------------------------ |