From cd855591f49d688e116c3da63d913315c62028c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 3 Feb 2018 16:39:12 +0000 Subject: tdf#115416 allow build with classic libjpeg Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6 Reviewed-on: https://gerrit.libreoffice.org/49205 Tested-by: Jenkins Reviewed-by: Michael Stahl --- vcl/source/filter/jpeg/jpegc.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vcl/source/filter') 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; -- cgit v1.2.1