ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When tjDecodeYUV() is used with a "fresh" decompressor instance (one that hasn't been previously used to decompress a JPEG image), then it needs comps_in_scan, data_precision, and the quantization tables to be defined. This patch also extends TJUnitTest to check for this error.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1143 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2014-03-10 09:34:04 +00:00
parent bb70930aa8
commit c33bc1dab0
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
turbojpeg.c
View File

@@ -1242,12 +1242,12 @@ static int setDecodeDefaults(struct jpeg_decompress_struct *dinfo,
if(subsamp==TJSAMP_GRAY)
{
dinfo->num_components=1;
dinfo->num_components=dinfo->comps_in_scan=1;
dinfo->jpeg_color_space=JCS_GRAYSCALE;
}
else
{
dinfo->num_components=3;
dinfo->num_components=dinfo->comps_in_scan=3;
dinfo->jpeg_color_space=JCS_YCbCr;
}
@@ -1265,6 +1265,12 @@ static int setDecodeDefaults(struct jpeg_decompress_struct *dinfo,
(i==0)? 0:1;
dinfo->cur_comp_info[i]=compptr;
}
dinfo->data_precision=8;
for(i=0; i<2; i++)
{
if(dinfo->quant_tbl_ptrs[i]==NULL)
dinfo->quant_tbl_ptrs[i]=jpeg_alloc_quant_table((j_common_ptr)dinfo);
}
return 0;
}