diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-04 21:03:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-04 21:04:40 +0100 |
| commit | 81894a5f7200b4c4233e407163b7f1b00256dccb (patch) | |
| tree | c4d6578305247b2c10e65e3dace5590abd0b45c4 /vcl/source/gdi/dibtools.cxx | |
| parent | 98151bf95bda8d647310bdba6936dc6b388b05de (diff) | |
ofz#984 better match post-creation aBitmap.HasGreyPalette() logic
i.e. Bitmap::HsGreyPalette checks that the palette has entries before calling
Palette::IsGreyPalette
Change-Id: I287647869ad615327f3119b7798f410e22140302
Diffstat (limited to 'vcl/source/gdi/dibtools.cxx')
| -rw-r--r-- | vcl/source/gdi/dibtools.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 4cd7c5419199..123d8ce62181 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -946,7 +946,7 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL const BitmapPalette* pPal = &aPalette; //ofz#948 match the surrounding logic of case TransparentType::Bitmap of //ReadDIBBitmapEx but do it while reading for performance - const bool bIsAlpha = (nBitCount == 8 && aPalette.IsGreyPalette()); + const bool bIsAlpha = (nBitCount == 8 && !!aPalette && aPalette.IsGreyPalette()); const bool bForceToMonoWhileReading = (bIsMask && !bIsAlpha && nBitCount != 1); if (bForceToMonoWhileReading) { |