diff options
Diffstat (limited to 'vcl/source/filter/jpeg')
| -rw-r--r-- | vcl/source/filter/jpeg/jpegc.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index 411b17bd1644..25b98fb36df2 100644 --- a/vcl/source/filter/jpeg/jpegc.cxx +++ b/vcl/source/filter/jpeg/jpegc.cxx @@ -94,7 +94,13 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines, else if ( cinfo.jpeg_color_space == JCS_YCCK ) cinfo.out_color_space = JCS_CMYK; - OSL_ASSERT(cinfo.out_color_space == JCS_CMYK || cinfo.out_color_space == JCS_GRAYSCALE || cinfo.out_color_space == JCS_RGB); + if (cinfo.out_color_space != JCS_CMYK && + cinfo.out_color_space != JCS_GRAYSCALE && + cinfo.out_color_space != JCS_RGB) + { + SAL_WARN("vcl.filter", "jpg with unknown out color space, forcing to rgb"); + cinfo.out_color_space = JCS_RGB; + } /* change scale for preview import */ long nPreviewWidth = previewSize.Width(); |