[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source

[Michael Meeks]

 sfx2/source/appl/shutdowniconunx.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 33894f76b4555e2261cd723fd5fc93998b42aae1
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Apr 2 20:26:24 2012 +0100

    fdo#34324 - fix colorspace conversion for greyscale bitmaps
    
    Signed-off-by: Andras Timar <timar74 at gmail.com>

diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 9ce5ff0..d65765d 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -90,6 +90,9 @@ static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId )
     Bitmap pInSalBitmap = aIcon.GetBitmap();
     AlphaMask pInSalAlpha = aIcon.GetAlpha();
 
+    if( pInSalBitmap.GetBitCount() != 24 )
+        pInSalBitmap.Convert( BMP_CONVERSION_24BIT );
+
     Bitmap::ScopedReadAccess pSalBitmap(pInSalBitmap);
     AlphaMask::ScopedReadAccess pSalAlpha(pInSalAlpha);