python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-28 02:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6339 from radarhere/libtiff

Browse Source 
Updated libtiff to 4.4.0
This commit is contained in:
mergify[bot] 2022-05-28 11:15:39 +00:00 committed by GitHub
commit a50addb8e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/installation.rst
View File

@ -162,7 +162,7 @@ Many of Pillow's features require external libraries:
* **libtiff** provides compressed TIFF functionality * **libtiff** provides compressed TIFF functionality
* Pillow has been tested with libtiff versions **3.x** and **4.0-4.3** * Pillow has been tested with libtiff versions **3.x** and **4.0-4.4**
* **libfreetype** provides type related services * **libfreetype** provides type related services

14
src/libImaging/TiffDecode.c
View File

@ -815,11 +815,11 @@ ImagingLibTiffMergeFieldInfo(
// custom fields added with ImagingLibTiffMergeFieldInfo are only used for // custom fields added with ImagingLibTiffMergeFieldInfo are only used for
// decoding, ignore readcount; // 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 // 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. // 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[] = { TIFFFieldInfo info[] = {
{key, {key,
@ -831,14 +831,6 @@ ImagingLibTiffMergeFieldInfo(
passcount, passcount,
"CustomField"}}; "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]); n = sizeof(info) / sizeof(info[0]);
// Test for libtiff 4.0 or later, excluding libtiff 3.9.6 and 3.9.7 // Test for libtiff 4.0 or later, excluding libtiff 3.9.6 and 3.9.7

6
winbuild/build_prepare.py
View File

@ -143,9 +143,9 @@ deps = {
"libs": [r"*.lib"], "libs": [r"*.lib"],
}, },
"libtiff": { "libtiff": {
"url": "https://download.osgeo.org/libtiff/tiff-4.3.0.tar.gz", "url": "https://download.osgeo.org/libtiff/tiff-4.4.0.tar.gz",
"filename": "tiff-4.3.0.tar.gz", "filename": "tiff-4.4.0.tar.gz",
"dir": "tiff-4.3.0", "dir": "tiff-4.4.0",
"build": [ "build": [
cmd_cmake("-DBUILD_SHARED_LIBS:BOOL=OFF"), cmd_cmake("-DBUILD_SHARED_LIBS:BOOL=OFF"),
cmd_nmake(target="clean"), cmd_nmake(target="clean"),