summaryrefslogtreecommitdiff
path: root/sfx2
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 20:27:21 +0100
commit8fa3aae7b302d3c9846bfa352c1db619a5b05ca0 (patch)
treeae7637243b8254a5783cf341cc51ce1ece05c100 /sfx2
parentc730a9de1b40d0e731f2ca8621aa7864452a9a7a (diff)
fdo#34324 - fix colorspace conversion for greyscale bitmaps
Diffstat (limited to 'sfx2')
-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 b2495449d61e..8aad0f63a4e2 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);