diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-03 16:39:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-04 16:45:00 +0100 |
| commit | 5184506ffddca982f22eede24cffad64ff3576e3 (patch) | |
| tree | d6eab32ff712c4b3622dc2ccc4730c2b76def269 | |
| parent | 7c14272de352287ced0e6f586653e3943dd57812 (diff) | |
tdf#115416 allow build with classic libjpeg
Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6
Reviewed-on: https://gerrit.libreoffice.org/49187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@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 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; |