[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Luboš Luňák (via logerrit)]

 vcl/source/filter/jpeg/JpegWriter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fdd7c8cadad0a86bdc6349a9c967c99fc247005a
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Mar 25 16:58:25 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jan 17 19:02:08 2020 +0100

    8bit image is "native" only if it has grey palette (tdf#116888)
    
    The image in the bugreport apparently has a different palette even
    thought it seems to be a grayscale image.
    
    (cherry picked from commit f8dbee4d860b95717fa906935a8162c7edcd5973)
    
    Change-Id: I3b442b7e2529a60493b64761eb1c537ee9f05a10
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86989
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 64a8149194f6..870b1e1abbcc 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -229,7 +229,7 @@ bool JPEGWriter::Write( const Graphic& rGraphic )
             *mpExpWasGrey = mbGreys;
 
         if ( mbGreys )
-            mbNative = ( mpReadAccess->GetScanlineFormat() == ScanlineFormat::N8BitPal );
+            mbNative = ( mpReadAccess->GetScanlineFormat() == ScanlineFormat::N8BitPal && aGraphicBmp.HasGreyPalette());
         else
             mbNative = ( mpReadAccess->GetScanlineFormat() == ScanlineFormat::N24BitTcRgb );