cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'issue-220' into 'master'

Browse Source 
tiff2pdf.c: properly calculate datasize when saving to JPEG YCbCr

Closes #220

See merge request libtiff/libtiff!159
This commit is contained in:
Even Rouault 2020-11-14 12:53:01 +00:00
commit dadd8c7dce
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/tiff2pdf.c
View File

@ -2087,10 +2087,18 @@ void t2p_read_tiff_size(T2P* t2p, TIFF* input){
#endif #endif
(void) 0; (void) 0;
} }
#ifdef JPEG_SUPPORT
if(t2p->pdf_compression == T2P_COMPRESS_JPEG
&& t2p->tiff_photometric == PHOTOMETRIC_YCBCR) {
k = checkMultiply64(TIFFNumberOfStrips(input), TIFFStripSize(input), t2p);
} else
#endif
{
k = checkMultiply64(TIFFScanlineSize(input), t2p->tiff_length, t2p); k = checkMultiply64(TIFFScanlineSize(input), t2p->tiff_length, t2p);
if(t2p->tiff_planar==PLANARCONFIG_SEPARATE){ if(t2p->tiff_planar==PLANARCONFIG_SEPARATE){
k = checkMultiply64(k, t2p->tiff_samplesperpixel, t2p); k = checkMultiply64(k, t2p->tiff_samplesperpixel, t2p);
} }
}
if (k == 0) { if (k == 0) {
/* Assume we had overflow inside TIFFScanlineSize */ /* Assume we had overflow inside TIFFScanlineSize */
t2p->t2p_error = T2P_ERR_ERROR; t2p->t2p_error = T2P_ERR_ERROR;