Skip to content

Commit

Permalink
Merge pull request #7233 from radarhere/libtiff
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk authored Jun 29, 2023
2 parents 0aaa5e0 + 1756f04 commit b2387f9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Many of Pillow's features require external libraries:

* **libtiff** provides compressed TIFF functionality

* Pillow has been tested with libtiff versions **3.x** and **4.0-4.5**
* Pillow has been tested with libtiff versions **3.x** and **4.0-4.5.1**

* **libfreetype** provides type related services

Expand Down
12 changes: 9 additions & 3 deletions winbuild/build_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ def cmd_msbuild(
"libs": [r"output\release-static\{architecture}\lib\*.lib"],
},
"libtiff": {
"url": "https://download.osgeo.org/libtiff/tiff-4.5.0.tar.gz",
"filename": "tiff-4.5.0.tar.gz",
"dir": "tiff-4.5.0",
"url": "https://download.osgeo.org/libtiff/tiff-4.5.1.tar.gz",
"filename": "tiff-4.5.1.tar.gz",
"dir": "tiff-4.5.1",
"license": "LICENSE.md",
"patch": {
r"libtiff\tif_lzma.c": {
Expand All @@ -201,6 +201,12 @@ def cmd_msbuild(
# link against webp.lib
"#ifdef WEBP_SUPPORT": '#ifdef WEBP_SUPPORT\n#pragma comment(lib, "webp.lib")', # noqa: E501
},
r"test\CMakeLists.txt": {
"add_executable(test_write_read_tags ../placeholder.h)": "",
"target_sources(test_write_read_tags PRIVATE test_write_read_tags.c)": "", # noqa: E501
"target_link_libraries(test_write_read_tags PRIVATE tiff)": "",
"list(APPEND simple_tests test_write_read_tags)": "",
},
},
"build": [
*cmds_cmake(
Expand Down

0 comments on commit b2387f9

Please sign in to comment.