mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#889 readjust jpeg import

Browse Source 
Change-Id: I4e25db429b8dee9265ab2ad468c21cc34a50df6c
Reviewed-on: https://gerrit.libreoffice.org/35325
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-03-17 10:57:03 +00:00
parent 2f1045a859
commit 6e6e54f944
5 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2004-0200-1.jpg → vcl/qa/cppunit/graphicfilter/data/jpg/pass/CVE-2004-0200-1.jpg
View File

0
vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2004-0200-4.jpg → vcl/qa/cppunit/graphicfilter/data/jpg/pass/CVE-2004-0200-4.jpg
View File

0
vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-2.jpg → vcl/qa/cppunit/graphicfilter/data/jpg/pass/EDB-24743-2.jpg
View File

0
vcl/qa/cppunit/graphicfilter/data/jpg/fail/EDB-24743-3.jpg → vcl/qa/cppunit/graphicfilter/data/jpg/pass/EDB-24743-3.jpg
View File

7
vcl/source/filter/jpeg/jpegc.cxx
View File

@@ -132,7 +132,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
} }
} }
jpeg_start_decompress( &cinfo ); jpeg_calc_output_dimensions(&cinfo);
long nWidth = cinfo.output_width; long nWidth = cinfo.output_width;
long nHeight = cinfo.output_height; long nHeight = cinfo.output_height;
@@ -161,7 +161,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
J_COLOR_SPACE best_out_color_space = JCS_RGB; J_COLOR_SPACE best_out_color_space = JCS_RGB;
ScanlineFormat eScanlineFormat = ScanlineFormat::N24BitTcRgb; ScanlineFormat eScanlineFormat = ScanlineFormat::N24BitTcRgb;
ScanlineFormat eFinalFormat = pAccess->GetScanlineFormat(); ScanlineFormat eFinalFormat = pAccess->GetScanlineFormat();
if (eFinalFormat == ScanlineFormat::N32BitTcBgra) if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
{ {
best_out_color_space = JCS_EXT_BGRA; best_out_color_space = JCS_EXT_BGRA;
@@ -190,10 +189,12 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
cinfo.out_color_space != JCS_GRAYSCALE && cinfo.out_color_space != JCS_GRAYSCALE &&
cinfo.out_color_space != best_out_color_space) cinfo.out_color_space != best_out_color_space)
{ {
SAL_WARN("vcl.filter", "jpg with unknown out color space, forcing to :" << best_out_color_space); SAL_WARN("vcl.filter", "jpg with unknown out color space, forcing to :" << best_out_color_space << " gray ");
cinfo.out_color_space = best_out_color_space; cinfo.out_color_space = best_out_color_space;
} }
jpeg_start_decompress(&cinfo);
JSAMPLE* aRangeLimit = cinfo.sample_range_limit; JSAMPLE* aRangeLimit = cinfo.sample_range_limit;
std::vector<sal_uInt8> pScanLineBuffer(nWidth * (bGray ? 1 : nPixelSize)); std::vector<sal_uInt8> pScanLineBuffer(nWidth * (bGray ? 1 : nPixelSize));