Kaydet (Commit) 2314f95e authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

don't crash with unknown out color space

Change-Id: Ib066ff1fad686d611a86510e768b1109ef7a5e75
(cherry picked from commit 7aa2f8c7)
Reviewed-on: https://gerrit.libreoffice.org/18640Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 4daac4f7
...@@ -103,7 +103,13 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines, ...@@ -103,7 +103,13 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
else if ( cinfo.jpeg_color_space == JCS_YCCK ) else if ( cinfo.jpeg_color_space == JCS_YCCK )
cinfo.out_color_space = JCS_CMYK; 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 */ /* change scale for preview import */
long nPreviewWidth = previewSize.Width(); long nPreviewWidth = previewSize.Width();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment