From 054a3586bb4808728a5cd58ea8a867539c08e55c Mon Sep 17 00:00:00 2001 From: Bartosz Kosiorek Date: Thu, 28 Jun 2018 09:52:50 +0200 Subject: tdf#117335 Fix displaying GIF images To fix regression the sal_uInt16 was used instead of sal_uInt8. Verified on macOS High Sierra 10.13.5. I also checked if with this fix, there is no issue with displaying EMF (tdf#113197) Sample document from tdf#113197 is displaying correctly. Change-Id: I6504717d831a193b0a878ced2f335d34a993aed6 Reviewed-on: https://gerrit.libreoffice.org/56578 Tested-by: Jenkins Reviewed-by: Armin Le Grand Reviewed-by: Bartosz Kosiorek --- vcl/quartz/salbmp.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vcl/quartz') diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 7146461c7af1..d7de93591f8a 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -438,13 +438,13 @@ class ImplPixelFormat8 : public ImplPixelFormat private: sal_uInt8* pData; const BitmapPalette& mrPalette; - const sal_uInt8 mnPaletteCount; + const sal_uInt16 mnPaletteCount; public: explicit ImplPixelFormat8( const BitmapPalette& rPalette ) : pData(nullptr) , mrPalette(rPalette) - , mnPaletteCount(static_cast< sal_uInt8 >(rPalette.GetEntryCount())) + , mnPaletteCount(rPalette.GetEntryCount()) { } virtual void StartLine( sal_uInt8* pLine ) override { pData = pLine; } @@ -473,7 +473,7 @@ class ImplPixelFormat4 : public ImplPixelFormat private: sal_uInt8* pData; const BitmapPalette& mrPalette; - const sal_uInt8 mnPaletteCount; + const sal_uInt16 mnPaletteCount; sal_uInt32 mnX; sal_uInt32 mnShift; @@ -481,7 +481,7 @@ public: explicit ImplPixelFormat4( const BitmapPalette& rPalette ) : pData(nullptr) , mrPalette(rPalette) - , mnPaletteCount(static_cast< sal_uInt8 >(rPalette.GetEntryCount())) + , mnPaletteCount(rPalette.GetEntryCount()) , mnX(0) , mnShift(0) { @@ -526,14 +526,14 @@ class ImplPixelFormat1 : public ImplPixelFormat private: sal_uInt8* pData; const BitmapPalette& mrPalette; - const sal_uInt8 mnPaletteCount; + const sal_uInt16 mnPaletteCount; sal_uInt32 mnX; public: explicit ImplPixelFormat1( const BitmapPalette& rPalette ) : pData(nullptr) , mrPalette(rPalette) - , mnPaletteCount(static_cast< sal_uInt8 >(rPalette.GetEntryCount())) + , mnPaletteCount(rPalette.GetEntryCount()) , mnX(0) { } -- cgit v1.2.3