[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

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

New commits:
commit 5184506ffddca982f22eede24cffad64ff3576e3
Author: Caolán McNamara <caolanm at 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/49187
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 570c036b3b3a..059ec200540e 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;