diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-03 16:39:12 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-02-05 12:01:08 +0100 |
| commit | cd855591f49d688e116c3da63d913315c62028c1 (patch) | |
| tree | 2f1b601c54937332eb6f8127991f0e55f1f5ff43 | |
| parent | 6ff4bf9a2720b504e5134f5b34ac6c3b51fefd1f (diff) | |
tdf#115416 allow build with classic libjpeg
Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6
Reviewed-on: https://gerrit.libreoffice.org/49205
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/source/filter/jpeg/jpegc.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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; |