[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

 vcl/source/filter/jpeg/jpegc.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cd855591f49d688e116c3da63d913315c62028c1
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sat Feb 3 16:39:12 2018 +0000

    tdf#115416 allow build with classic libjpeg
    
    Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6
    Reviewed-on: https://gerrit.libreoffice.org/49205
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index e120fc304228..1210cb34ad53 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -244,6 +244,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, 
void* pInputStream,
                 eScanlineFormat = ScanlineFormat::N8BitPal;
                 nPixelSize = 1;
             }
+#if defined(JCS_EXTENSIONS)
             else if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
             {
                 best_out_color_space = JCS_EXT_BGRA;
@@ -262,7 +263,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, 
void* pInputStream,
                 eScanlineFormat = eFinalFormat;
                 nPixelSize = 4;
             }
-
+#endif
             if (rContext.cinfo.jpeg_color_space == JCS_YCCK)
                 rContext.cinfo.out_color_space = JCS_CMYK;
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits