summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorVasily Melenchuk <Vasily.Melenchuk@cib.de>2018-02-27 19:08:35 +0300
committerKatarina Behrens <Katarina.Behrens@cib.de>2018-03-01 22:04:05 +0100
commit532cca2cedea9a9c9184685e35bdd22f0b522437 (patch)
tree4be9d61ef2df46a3e58b0aa1e5647189a0f7b028 /vcl/source
parent0809eac4baddd02c3f4405148269f877c0f56c3f (diff)
tdf#115297: alternative fix for displaying 1bit images
Previous fixes for 1bit monochrome / paletted images produced some regressions, so here is attempt to fix problem at the root. Partially reverted 66dbd4da3afcadb1393daf9be9cecff71b86509a and fixed in a different way without tdf#115297, tdf#114726 and related. Change-Id: I6849ed5ac41770ba905c930065c80e58509dba2e Reviewed-on: https://gerrit.libreoffice.org/50454 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 25cd843664919974f0d21ca7a0b02cc43e9eeabb) Reviewed-on: https://gerrit.libreoffice.org/50540 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/gdi/pngread.cxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 2458d0269e76..0b6946712bc2 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -534,19 +534,11 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
{
switch ( mnPngDepth )
{
- case 1 :
-#if defined(UNX) && !defined(MACOSX)
- // 1bpp indexed images are so badly mishandled by rest of LO on X11 that we
- // don't even bother, and turn them into 8bpp indexed ones with just two palette
- // entries instead.
- mnTargetDepth = 8; // we have to expand the bitmap
-#endif
- mbPalette = false;
- break;
case 2 :
mnTargetDepth = 4; // we have to expand the bitmap
mbPalette = false;
break;
+ case 1 :
case 4 :
case 8 :
mbPalette = false;