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

Merge branch 'issue-158-no-predictor-in-webp' into 'master'

Browse Source 
TIFFTAG_PREDICTOR is not supported for WebP

Closes #158

See merge request libtiff/libtiff!119
This commit is contained in:
Even Rouault 2020-03-08 22:21:33 +00:00
commit 84b8b9a3e7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtiff/tif_dirinfo.c
View File

@ -1236,10 +1236,6 @@ _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag)
if (tag == TIFFTAG_LERC_PARAMETERS) if (tag == TIFFTAG_LERC_PARAMETERS)
return 1; return 1;
break; break;
case COMPRESSION_WEBP:
if (tag == TIFFTAG_PREDICTOR)
return 1;
break;
} }
return 0; return 0;
} }

3
tools/tiffcp.c
View File

@ -741,11 +741,12 @@ tiffcp(TIFF* in, TIFF* out)
case COMPRESSION_DEFLATE: case COMPRESSION_DEFLATE:
case COMPRESSION_LZMA: case COMPRESSION_LZMA:
case COMPRESSION_ZSTD: case COMPRESSION_ZSTD:
case COMPRESSION_WEBP:
if (predictor != (uint16)-1) if (predictor != (uint16)-1)
TIFFSetField(out, TIFFTAG_PREDICTOR, predictor); TIFFSetField(out, TIFFTAG_PREDICTOR, predictor);
else else
CopyField(TIFFTAG_PREDICTOR, predictor); CopyField(TIFFTAG_PREDICTOR, predictor);
/*fallthrough*/
case COMPRESSION_WEBP:
if (preset != -1) { if (preset != -1) {
if (compression == COMPRESSION_ADOBE_DEFLATE if (compression == COMPRESSION_ADOBE_DEFLATE
|| compression == COMPRESSION_DEFLATE) || compression == COMPRESSION_DEFLATE)