Skip to content

Updated libtiff to 4.2.0 #5153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radarhere merged 2 commits into from
Dec 30, 2020
Merged

Updated libtiff to 4.2.0 #5153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dd5913
Updated libtiff to 4.2.0
radarhere Dec 30, 2020
6b21a96
Changed readcount so that _TIFFSetGetType can identify the type
radarhere Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libImaging/TiffDecode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ int ImagingLibTiffDecode(Imaging im, ImagingCodecState state, UINT8* buffer, Py_
TIFFClose(tiff);
return -1;
}

state->bytes = row_byte_size * tile_length;

if (TIFFTileSize(tiff) > state->bytes) {
Expand Down Expand Up @@ -578,7 +578,7 @@ int ImagingLibTiffMergeFieldInfo(ImagingCodecState state, TIFFDataType field_typ

// custom fields added with ImagingLibTiffMergeFieldInfo are only used for
// decoding, ignore readcount;
int readcount = 0;
int readcount = 1;
// we support writing a single value, or a variable number of values
int writecount = 1;
// whether the first value should encode the number of values.
Expand Down
6 changes: 3 additions & 3 deletions winbuild/build_prepare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ def cmd_msbuild(
"libs": [r"*.lib"],
},
"libtiff": {
"url": "https://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz",
"filename": "tiff-4.1.0.tar.gz",
"dir": "tiff-4.1.0",
"url": "https://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz",
"filename": "tiff-4.2.0.tar.gz",
"dir": "tiff-4.2.0",
"build": [
cmd_copy(r"{winbuild_dir}\tiff.opt", "nmake.opt"),
cmd_nmake("makefile.vc", "clean"),
Expand Down
4 changes: 4 additions & 0 deletions winbuild/tiff.opt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ ZIP_SUPPORT = 1
ZLIB_INCLUDE = -I$(INCLIB)
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
#
Expand Down