Skip to content
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

Jump to bottom

Updated openjpeg to 2.4.0 #5151

Merged
merged 1 commit into from Dec 29, 2020
Merged

Updated openjpeg to 2.4.0 #5151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion depends/install_openjpeg.sh
View file
Open in desktop
@@ -1,7 +1,7 @@
#!/bin/bash
# install openjpeg

archive=openjpeg-2.3.1
archive=openjpeg-2.4.0

./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/master/$archive.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
View file
Open in desktop
Expand Up @@ -171,7 +171,7 @@ Many of Pillow's features require external libraries:

* **openjpeg** provides JPEG 2000 functionality.

* Pillow has been tested with openjpeg **2.0.0**, **2.1.0** and **2.3.1**.
* Pillow has been tested with openjpeg **2.0.0**, **2.1.0**, **2.3.1** and **2.4.0**.
* Pillow does **not** support the earlier **1.5** series which ships
with Debian Jessie.

Expand Down
10 changes: 5 additions & 5 deletions winbuild/build_prepare.py
View file
Open in desktop
Expand Up @@ -242,15 +242,15 @@ def cmd_msbuild(
"libs": [r"Lib\MS\*.lib"],
},
"openjpeg": {
"url": "https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz",
"filename": "openjpeg-2.3.1.tar.gz",
"dir": "openjpeg-2.3.1",
"url": "https://github.com/uclouvain/openjpeg/archive/v2.4.0.tar.gz",
"filename": "openjpeg-2.4.0.tar.gz",
"dir": "openjpeg-2.4.0",
"build": [
cmd_cmake(("-DBUILD_THIRDPARTY:BOOL=OFF", "-DBUILD_SHARED_LIBS:BOOL=OFF")),
cmd_nmake(target="clean"),
cmd_nmake(target="openjp2"),
cmd_mkdir(r"{inc_dir}\openjpeg-2.3.1"),
cmd_copy(r"src\lib\openjp2\*.h", r"{inc_dir}\openjpeg-2.3.1"),
cmd_mkdir(r"{inc_dir}\openjpeg-2.4.0"),
cmd_copy(r"src\lib\openjp2\*.h", r"{inc_dir}\openjpeg-2.4.0"),
],
"libs": [r"bin\*.lib"],
},
Expand Down