python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 10:46:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5153 from radarhere/tiff_wheels

Browse Source 
Updated libtiff to 4.2.0
This commit is contained in:
Andrew Murray 2020-12-31 10:01:19 +11:00 committed by GitHub
commit 01cee38b9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libImaging/TiffDecode.c
View File

@ -378,7 +378,7 @@ int ImagingLibTiffDecode(Imaging im, ImagingCodecState state, UINT8* buffer, Py_
TIFFClose(tiff); TIFFClose(tiff);
return -1; return -1;
} }
state->bytes = row_byte_size * tile_length; state->bytes = row_byte_size * tile_length;
if (TIFFTileSize(tiff) > state->bytes) { if (TIFFTileSize(tiff) > state->bytes) {
@ -578,7 +578,7 @@ int ImagingLibTiffMergeFieldInfo(ImagingCodecState state, TIFFDataType field_typ
// 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 = 0; int readcount = 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 = 1;
// whether the first value should encode the number of values. // whether the first value should encode the number of values.

6
winbuild/build_prepare.py
View File

@ -141,9 +141,9 @@ deps = {
"libs": [r"*.lib"], "libs": [r"*.lib"],
}, },
"libtiff": { "libtiff": {
"url": "https://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz", "url": "https://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz",
"filename": "tiff-4.1.0.tar.gz", "filename": "tiff-4.2.0.tar.gz",
"dir": "tiff-4.1.0", "dir": "tiff-4.2.0",
"build": [ "build": [
cmd_copy(r"{winbuild_dir}\tiff.opt", "nmake.opt"), cmd_copy(r"{winbuild_dir}\tiff.opt", "nmake.opt"),
cmd_nmake("makefile.vc", "clean"), cmd_nmake("makefile.vc", "clean"),

4
winbuild/tiff.opt
View File

@ -66,6 +66,10 @@ ZIP_SUPPORT = 1
ZLIB_INCLUDE = -I$(INCLIB) ZLIB_INCLUDE = -I$(INCLIB)
ZLIB_LIB = $(INCLIB)/zlib.lib ZLIB_LIB = $(INCLIB)/zlib.lib
# Indicate if the compiler provides strtoll/strtoull (default 1)
# Users of MSVC++ 14.0 ("Visual Studio 2015") and later should set this to 1
HAVE_STRTOLL = 1
# #
# Uncomment and edit following lines to enable ISO JBIG support # Uncomment and edit following lines to enable ISO JBIG support
# #