summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-04-02 20:26:24 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-04-02 21:07:26 +0100
commit33894f76b4555e2261cd723fd5fc93998b42aae1 (patch)
tree55e7afc8dda70f64098f57d597a0bc4c9356b147
parentc775526bd26647b1ec44aeef155a50aa306914fa (diff)
fdo#34324 - fix colorspace conversion for greyscale bitmaps
Signed-off-by: Andras Timar <timar74@gmail.com>
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 9ce5ff0de697..d65765dfaa6c 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);