python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-10 19:56:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set readcount to TIFF_VARIABLE for a variable number of values

Browse Source
This commit is contained in:
Andrew Murray 2022-05-28 20:14:05 +10:00
parent 0a4a7722b5
commit 40a918d274
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libImaging/TiffDecode.c
View File

@ -815,11 +815,11 @@ ImagingLibTiffMergeFieldInfo(
// custom fields added with ImagingLibTiffMergeFieldInfo are only used for
// decoding, ignore readcount;
int readcount = 1;
int readcount = is_var_length ? TIFF_VARIABLE : 1;
// we support writing a single value, or a variable number of values
int writecount = 1;
int writecount = is_var_length ? TIFF_VARIABLE : 1;
// whether the first value should encode the number of values.
int passcount = 0;
int passcount = (is_var_length && field_type != TIFF_ASCII) ? 1 : 0;
TIFFFieldInfo info[] = {
{key,
@ -831,14 +831,6 @@ ImagingLibTiffMergeFieldInfo(
passcount,
"CustomField"}};
if (is_var_length) {
info[0].field_writecount = -1;
}
if (is_var_length && field_type != TIFF_ASCII) {
info[0].field_passcount = 1;
}
n = sizeof(info) / sizeof(info[0]);
// Test for libtiff 4.0 or later, excluding libtiff 3.9.6 and 3.9.7