mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-08-01 19:10:10 +03:00
Compare commits
80 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
98d6c3bf88 | ||
|
162836a004 | ||
|
9a37051bc6 | ||
|
54de16836b | ||
|
ba5f81fb6b | ||
|
bae97e1a2b | ||
|
8ec31431cb | ||
|
98d38a3bff | ||
|
53b6d57b73 | ||
|
7dbcb32cbe | ||
|
ec6d5efe4d | ||
|
63163d065d | ||
|
640f55a655 | ||
|
f4d86e4f44 | ||
|
a39d14648b | ||
|
a426eb55af | ||
|
91bbeb5dcb | ||
|
d56032047d | ||
|
5e26d2fa2c | ||
|
638eb1b999 | ||
|
71d495add8 | ||
|
7516805121 | ||
|
d85fa7a247 | ||
|
d80cf0ee1b | ||
|
a8bb7579dc | ||
|
7b1ba29b5b | ||
|
3c4fe62c1e | ||
|
985544d557 | ||
|
722c130b31 | ||
|
d88986a184 | ||
|
50dde1c125 | ||
|
6c12d188db | ||
|
d74fdc4b5d | ||
|
2af930b2f7 | ||
|
31e6c716ac | ||
|
329d6a6a62 | ||
|
3e5df07b34 | ||
|
d58f4d5f1f | ||
|
cbd47d8609 | ||
|
c9cf688ee7 | ||
|
2195faf0dc | ||
|
06f5cd1dde | ||
|
27d47b3abf | ||
|
dc7d646db0 | ||
|
e88f312029 | ||
|
4cfef00574 | ||
|
14b0cebfc1 | ||
|
44a553a0a2 | ||
|
ef129003d9 | ||
|
756dd04705 | ||
|
a84458ffbd | ||
|
dcd202568a | ||
|
dc9e0cf326 | ||
|
1ee91f22ba | ||
|
77f3a091b8 | ||
|
f2417d8b39 | ||
|
0e3aac1ed1 | ||
|
92bafe6b88 | ||
|
aaf217cea0 | ||
|
9fbc255ce5 | ||
|
b4bc43fed2 | ||
|
4301c1fde6 | ||
|
0a29d6392a | ||
|
9c9449af34 | ||
|
a7e00fba8b | ||
|
88018c1c2d | ||
|
cce39084f5 | ||
|
b72b8dd84d | ||
|
1800e580d2 | ||
|
5d4a05465d | ||
|
583f0a50d5 | ||
|
d4ef93150f | ||
|
0cd2d3b24b | ||
|
37cd041e5e | ||
|
23ed906b62 | ||
|
ecd264fffc | ||
|
a549c5528a | ||
|
2316c930f9 | ||
|
b931402046 | ||
|
2059e06005 |
|
@ -1 +1 @@
|
||||||
cibuildwheel==3.0.0
|
cibuildwheel==3.1.2
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
mypy==1.16.1
|
mypy==1.17.0
|
||||||
IceSpringPySideStubs-PyQt6
|
IceSpringPySideStubs-PyQt6
|
||||||
IceSpringPySideStubs-PySide6
|
IceSpringPySideStubs-PySide6
|
||||||
ipython
|
ipython
|
||||||
numpy
|
numpy
|
||||||
packaging
|
packaging
|
||||||
pyarrow-stubs
|
pyarrow-stubs
|
||||||
|
pybind11
|
||||||
pytest
|
pytest
|
||||||
sphinx
|
sphinx
|
||||||
types-atheris
|
types-atheris
|
||||||
|
|
6
.github/workflows/test-cygwin.yml
vendored
6
.github/workflows/test-cygwin.yml
vendored
|
@ -52,7 +52,7 @@ jobs:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
|
|
||||||
- name: Install Cygwin
|
- name: Install Cygwin
|
||||||
uses: cygwin/cygwin-install-action@v5
|
uses: cygwin/cygwin-install-action@v6
|
||||||
with:
|
with:
|
||||||
packages: >
|
packages: >
|
||||||
gcc-g++
|
gcc-g++
|
||||||
|
@ -89,10 +89,6 @@ jobs:
|
||||||
with:
|
with:
|
||||||
dirs: 'C:\cygwin\bin;C:\cygwin\lib\lapack'
|
dirs: 'C:\cygwin\bin;C:\cygwin\lib\lapack'
|
||||||
|
|
||||||
- name: Select Python version
|
|
||||||
run: |
|
|
||||||
ln -sf c:/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/cygwin/bin/python3
|
|
||||||
|
|
||||||
- name: pip cache
|
- name: pip cache
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
|
|
2
.github/workflows/test-windows.yml
vendored
2
.github/workflows/test-windows.yml
vendored
|
@ -35,7 +35,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["pypy3.11", "pypy3.10", "3.10", "3.11", "3.12", ">=3.13.5", "3.14"]
|
python-version: ["pypy3.11", "3.10", "3.11", "3.12", ">=3.13.5", "3.14"]
|
||||||
architecture: ["x64"]
|
architecture: ["x64"]
|
||||||
include:
|
include:
|
||||||
# Test the oldest Python on 32-bit
|
# Test the oldest Python on 32-bit
|
||||||
|
|
1
.github/workflows/test.yml
vendored
1
.github/workflows/test.yml
vendored
|
@ -42,7 +42,6 @@ jobs:
|
||||||
]
|
]
|
||||||
python-version: [
|
python-version: [
|
||||||
"pypy3.11",
|
"pypy3.11",
|
||||||
"pypy3.10",
|
|
||||||
"3.14t",
|
"3.14t",
|
||||||
"3.14",
|
"3.14",
|
||||||
"3.13t",
|
"3.13t",
|
||||||
|
|
21
.github/workflows/wheels-dependencies.sh
vendored
21
.github/workflows/wheels-dependencies.sh
vendored
|
@ -60,7 +60,7 @@ if [[ "$CIBW_PLATFORM" == "ios" ]]; then
|
||||||
# on using the Xcode builder, which isn't very helpful for most of Pillow's
|
# on using the Xcode builder, which isn't very helpful for most of Pillow's
|
||||||
# dependencies. Therefore, we lean on the OSX configurations, plus CC, CFLAGS
|
# dependencies. Therefore, we lean on the OSX configurations, plus CC, CFLAGS
|
||||||
# etc. to ensure the right sysroot is selected.
|
# etc. to ensure the right sysroot is selected.
|
||||||
HOST_CMAKE_FLAGS="-DCMAKE_SYSTEM_NAME=$CMAKE_SYSTEM_NAME -DCMAKE_SYSTEM_PROCESSOR=$GNU_ARCH -DCMAKE_OSX_DEPLOYMENT_TARGET=$IPHONEOS_DEPLOYMENT_TARGET -DCMAKE_OSX_SYSROOT=$IOS_SDK_PATH -DBUILD_SHARED_LIBS=NO"
|
HOST_CMAKE_FLAGS="-DCMAKE_SYSTEM_NAME=$CMAKE_SYSTEM_NAME -DCMAKE_SYSTEM_PROCESSOR=$GNU_ARCH -DCMAKE_OSX_DEPLOYMENT_TARGET=$IPHONEOS_DEPLOYMENT_TARGET -DCMAKE_OSX_SYSROOT=$IOS_SDK_PATH -DBUILD_SHARED_LIBS=NO -DENABLE_SHARED=NO"
|
||||||
|
|
||||||
# Meson needs to be pointed at a cross-platform configuration file
|
# Meson needs to be pointed at a cross-platform configuration file
|
||||||
# This will be generated once CC etc. have been evaluated.
|
# This will be generated once CC etc. have been evaluated.
|
||||||
|
@ -95,7 +95,7 @@ ARCHIVE_SDIR=pillow-depends-main
|
||||||
# you change those versions, ensure the patch is also updated.
|
# you change those versions, ensure the patch is also updated.
|
||||||
FREETYPE_VERSION=2.13.3
|
FREETYPE_VERSION=2.13.3
|
||||||
HARFBUZZ_VERSION=11.2.1
|
HARFBUZZ_VERSION=11.2.1
|
||||||
LIBPNG_VERSION=1.6.49
|
LIBPNG_VERSION=1.6.50
|
||||||
JPEGTURBO_VERSION=3.1.1
|
JPEGTURBO_VERSION=3.1.1
|
||||||
OPENJPEG_VERSION=2.5.3
|
OPENJPEG_VERSION=2.5.3
|
||||||
XZ_VERSION=5.8.1
|
XZ_VERSION=5.8.1
|
||||||
|
@ -103,7 +103,7 @@ TIFF_VERSION=4.7.0
|
||||||
LCMS2_VERSION=2.17
|
LCMS2_VERSION=2.17
|
||||||
ZLIB_VERSION=1.3.1
|
ZLIB_VERSION=1.3.1
|
||||||
ZLIB_NG_VERSION=2.2.4
|
ZLIB_NG_VERSION=2.2.4
|
||||||
LIBWEBP_VERSION=1.5.0 # Patched; next release won't need patching. See patch file.
|
LIBWEBP_VERSION=1.6.0
|
||||||
BZIP2_VERSION=1.0.8
|
BZIP2_VERSION=1.0.8
|
||||||
LIBXCB_VERSION=1.17.0
|
LIBXCB_VERSION=1.17.0
|
||||||
BROTLI_VERSION=1.1.0 # Patched; next release won't need patching. See patch file.
|
BROTLI_VERSION=1.1.0 # Patched; next release won't need patching. See patch file.
|
||||||
|
@ -280,7 +280,11 @@ function build {
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
if [[ -n "$IS_MACOS" ]]; then
|
||||||
webp_cflags="$webp_cflags -Wl,-headerpad_max_install_names"
|
webp_cflags="$webp_cflags -Wl,-headerpad_max_install_names"
|
||||||
fi
|
fi
|
||||||
CFLAGS="$CFLAGS $webp_cflags" build_simple libwebp $LIBWEBP_VERSION \
|
webp_ldflags=""
|
||||||
|
if [[ -n "$IOS_SDK" ]]; then
|
||||||
|
webp_ldflags="$webp_ldflags -llzma -lz"
|
||||||
|
fi
|
||||||
|
CFLAGS="$CFLAGS $webp_cflags" LDFLAGS="$LDFLAGS $webp_ldflags" build_simple libwebp $LIBWEBP_VERSION \
|
||||||
https://storage.googleapis.com/downloads.webmproject.org/releases/webp tar.gz \
|
https://storage.googleapis.com/downloads.webmproject.org/releases/webp tar.gz \
|
||||||
--enable-libwebpmux --enable-libwebpdemux
|
--enable-libwebpmux --enable-libwebpdemux
|
||||||
|
|
||||||
|
@ -380,6 +384,15 @@ fi
|
||||||
|
|
||||||
wrap_wheel_builder build
|
wrap_wheel_builder build
|
||||||
|
|
||||||
|
# A safety catch for iOS. iOS can't use dynamic libraries, but clang will prefer
|
||||||
|
# to link dynamic libraries to static libraries. The only way to reliably
|
||||||
|
# prevent this is to not have dynamic libraries available in the first place.
|
||||||
|
# The build process *shouldn't* generate any dylibs... but just in case, purge
|
||||||
|
# any dylibs that *have* been installed into the build prefix directory.
|
||||||
|
if [[ -n "$IOS_SDK" ]]; then
|
||||||
|
find "$BUILD_PREFIX" -name "*.dylib" -exec rm -rf {} \;
|
||||||
|
fi
|
||||||
|
|
||||||
# Return to the project root to finish the build
|
# Return to the project root to finish the build
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
|
|
||||||
|
|
4
.github/workflows/wheels.yml
vendored
4
.github/workflows/wheels.yml
vendored
|
@ -77,22 +77,22 @@ jobs:
|
||||||
platform: linux
|
platform: linux
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
cibw_arch: x86_64
|
cibw_arch: x86_64
|
||||||
|
manylinux: "manylinux2014"
|
||||||
- name: "manylinux_2_28 x86_64"
|
- name: "manylinux_2_28 x86_64"
|
||||||
platform: linux
|
platform: linux
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
cibw_arch: x86_64
|
cibw_arch: x86_64
|
||||||
build: "*manylinux*"
|
build: "*manylinux*"
|
||||||
manylinux: "manylinux_2_28"
|
|
||||||
- name: "manylinux2014 and musllinux aarch64"
|
- name: "manylinux2014 and musllinux aarch64"
|
||||||
platform: linux
|
platform: linux
|
||||||
os: ubuntu-24.04-arm
|
os: ubuntu-24.04-arm
|
||||||
cibw_arch: aarch64
|
cibw_arch: aarch64
|
||||||
|
manylinux: "manylinux2014"
|
||||||
- name: "manylinux_2_28 aarch64"
|
- name: "manylinux_2_28 aarch64"
|
||||||
platform: linux
|
platform: linux
|
||||||
os: ubuntu-24.04-arm
|
os: ubuntu-24.04-arm
|
||||||
cibw_arch: aarch64
|
cibw_arch: aarch64
|
||||||
build: "*manylinux*"
|
build: "*manylinux*"
|
||||||
manylinux: "manylinux_2_28"
|
|
||||||
- name: "iOS arm64 device"
|
- name: "iOS arm64 device"
|
||||||
platform: ios
|
platform: ios
|
||||||
os: macos-latest
|
os: macos-latest
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
rev: v0.12.0
|
rev: v0.12.2
|
||||||
hooks:
|
hooks:
|
||||||
- id: ruff-check
|
- id: ruff-check
|
||||||
args: [--exit-non-zero-on-fix]
|
args: [--exit-non-zero-on-fix]
|
||||||
|
@ -11,7 +11,7 @@ repos:
|
||||||
- id: black
|
- id: black
|
||||||
|
|
||||||
- repo: https://github.com/PyCQA/bandit
|
- repo: https://github.com/PyCQA/bandit
|
||||||
rev: 1.8.5
|
rev: 1.8.6
|
||||||
hooks:
|
hooks:
|
||||||
- id: bandit
|
- id: bandit
|
||||||
args: [--severity-level=high]
|
args: [--severity-level=high]
|
||||||
|
@ -24,7 +24,7 @@ repos:
|
||||||
exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$|\.patch$)
|
exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$|\.patch$)
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
- repo: https://github.com/pre-commit/mirrors-clang-format
|
||||||
rev: v20.1.6
|
rev: v20.1.7
|
||||||
hooks:
|
hooks:
|
||||||
- id: clang-format
|
- id: clang-format
|
||||||
types: [c]
|
types: [c]
|
||||||
|
@ -51,14 +51,14 @@ repos:
|
||||||
exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/|\.patch$
|
exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/|\.patch$
|
||||||
|
|
||||||
- repo: https://github.com/python-jsonschema/check-jsonschema
|
- repo: https://github.com/python-jsonschema/check-jsonschema
|
||||||
rev: 0.33.1
|
rev: 0.33.2
|
||||||
hooks:
|
hooks:
|
||||||
- id: check-github-workflows
|
- id: check-github-workflows
|
||||||
- id: check-readthedocs
|
- id: check-readthedocs
|
||||||
- id: check-renovate
|
- id: check-renovate
|
||||||
|
|
||||||
- repo: https://github.com/woodruffw/zizmor-pre-commit
|
- repo: https://github.com/woodruffw/zizmor-pre-commit
|
||||||
rev: v1.9.0
|
rev: v1.11.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: zizmor
|
- id: zizmor
|
||||||
|
|
||||||
|
|
12
MANIFEST.in
12
MANIFEST.in
|
@ -13,6 +13,7 @@ include LICENSE
|
||||||
include Makefile
|
include Makefile
|
||||||
include tox.ini
|
include tox.ini
|
||||||
graft Tests
|
graft Tests
|
||||||
|
graft Tests/images
|
||||||
graft checks
|
graft checks
|
||||||
graft patches
|
graft patches
|
||||||
graft src
|
graft src
|
||||||
|
@ -28,8 +29,19 @@ exclude .editorconfig
|
||||||
exclude .readthedocs.yml
|
exclude .readthedocs.yml
|
||||||
exclude codecov.yml
|
exclude codecov.yml
|
||||||
exclude renovate.json
|
exclude renovate.json
|
||||||
|
exclude Tests/images/README.md
|
||||||
|
exclude Tests/images/crash*.tif
|
||||||
|
exclude Tests/images/string_dimension.tiff
|
||||||
global-exclude .git*
|
global-exclude .git*
|
||||||
global-exclude *.pyc
|
global-exclude *.pyc
|
||||||
global-exclude *.so
|
global-exclude *.so
|
||||||
prune .ci
|
prune .ci
|
||||||
prune wheels
|
prune wheels
|
||||||
|
prune winbuild/build
|
||||||
|
prune winbuild/depends
|
||||||
|
prune Tests/errors
|
||||||
|
prune Tests/images/jpeg2000
|
||||||
|
prune Tests/images/msp
|
||||||
|
prune Tests/images/picins
|
||||||
|
prune Tests/images/sunraster
|
||||||
|
prune Tests/test-images
|
||||||
|
|
|
@ -271,17 +271,13 @@ def _cached_hopper(mode: str) -> Image.Image:
|
||||||
im = hopper("L")
|
im = hopper("L")
|
||||||
else:
|
else:
|
||||||
im = hopper()
|
im = hopper()
|
||||||
if mode.startswith("BGR;"):
|
try:
|
||||||
with pytest.warns(DeprecationWarning, match="BGR;"):
|
im = im.convert(mode)
|
||||||
im = im.convert(mode)
|
except ImportError:
|
||||||
else:
|
if mode == "LAB":
|
||||||
try:
|
im = Image.open("Tests/images/hopper.Lab.tif")
|
||||||
im = im.convert(mode)
|
else:
|
||||||
except ImportError:
|
raise
|
||||||
if mode == "LAB":
|
|
||||||
im = Image.open("Tests/images/hopper.Lab.tif")
|
|
||||||
else:
|
|
||||||
raise
|
|
||||||
return im
|
return im
|
||||||
|
|
||||||
|
|
||||||
|
@ -295,16 +291,6 @@ def djpeg_available() -> bool:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def cjpeg_available() -> bool:
|
|
||||||
if shutil.which("cjpeg"):
|
|
||||||
try:
|
|
||||||
subprocess.check_call(["cjpeg", "-version"])
|
|
||||||
return True
|
|
||||||
except subprocess.CalledProcessError: # pragma: no cover
|
|
||||||
return False
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def netpbm_available() -> bool:
|
def netpbm_available() -> bool:
|
||||||
return bool(shutil.which("ppmquant") and shutil.which("ppmtogif"))
|
return bool(shutil.which("ppmquant") and shutil.which("ppmtogif"))
|
||||||
|
|
||||||
|
|
BIN
Tests/images/unimplemented_pixel_format.dds
Normal file
BIN
Tests/images/unimplemented_pixel_format.dds
Normal file
Binary file not shown.
|
@ -9,9 +9,9 @@ from PIL import _deprecate
|
||||||
"version, expected",
|
"version, expected",
|
||||||
[
|
[
|
||||||
(
|
(
|
||||||
12,
|
13,
|
||||||
"Old thing is deprecated and will be removed in Pillow 12 "
|
"Old thing is deprecated and will be removed in Pillow 13 "
|
||||||
r"\(2025-10-15\)\. Use new thing instead\.",
|
r"\(2026-10-15\)\. Use new thing instead\.",
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
None,
|
None,
|
||||||
|
@ -53,18 +53,18 @@ def test_old_version(deprecated: str, plural: bool, expected: str) -> None:
|
||||||
|
|
||||||
def test_plural() -> None:
|
def test_plural() -> None:
|
||||||
expected = (
|
expected = (
|
||||||
r"Old things are deprecated and will be removed in Pillow 12 \(2025-10-15\)\. "
|
r"Old things are deprecated and will be removed in Pillow 13 \(2026-10-15\)\. "
|
||||||
r"Use new thing instead\."
|
r"Use new thing instead\."
|
||||||
)
|
)
|
||||||
with pytest.warns(DeprecationWarning, match=expected):
|
with pytest.warns(DeprecationWarning, match=expected):
|
||||||
_deprecate.deprecate("Old things", 12, "new thing", plural=True)
|
_deprecate.deprecate("Old things", 13, "new thing", plural=True)
|
||||||
|
|
||||||
|
|
||||||
def test_replacement_and_action() -> None:
|
def test_replacement_and_action() -> None:
|
||||||
expected = "Use only one of 'replacement' and 'action'"
|
expected = "Use only one of 'replacement' and 'action'"
|
||||||
with pytest.raises(ValueError, match=expected):
|
with pytest.raises(ValueError, match=expected):
|
||||||
_deprecate.deprecate(
|
_deprecate.deprecate(
|
||||||
"Old thing", 12, replacement="new thing", action="Upgrade to new thing"
|
"Old thing", 13, replacement="new thing", action="Upgrade to new thing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -77,16 +77,16 @@ def test_replacement_and_action() -> None:
|
||||||
)
|
)
|
||||||
def test_action(action: str) -> None:
|
def test_action(action: str) -> None:
|
||||||
expected = (
|
expected = (
|
||||||
r"Old thing is deprecated and will be removed in Pillow 12 \(2025-10-15\)\. "
|
r"Old thing is deprecated and will be removed in Pillow 13 \(2026-10-15\)\. "
|
||||||
r"Upgrade to new thing\."
|
r"Upgrade to new thing\."
|
||||||
)
|
)
|
||||||
with pytest.warns(DeprecationWarning, match=expected):
|
with pytest.warns(DeprecationWarning, match=expected):
|
||||||
_deprecate.deprecate("Old thing", 12, action=action)
|
_deprecate.deprecate("Old thing", 13, action=action)
|
||||||
|
|
||||||
|
|
||||||
def test_no_replacement_or_action() -> None:
|
def test_no_replacement_or_action() -> None:
|
||||||
expected = (
|
expected = (
|
||||||
r"Old thing is deprecated and will be removed in Pillow 12 \(2025-10-15\)"
|
r"Old thing is deprecated and will be removed in Pillow 13 \(2026-10-15\)"
|
||||||
)
|
)
|
||||||
with pytest.warns(DeprecationWarning, match=expected):
|
with pytest.warns(DeprecationWarning, match=expected):
|
||||||
_deprecate.deprecate("Old thing", 12)
|
_deprecate.deprecate("Old thing", 13)
|
||||||
|
|
|
@ -18,11 +18,7 @@ def test_check() -> None:
|
||||||
for codec in features.codecs:
|
for codec in features.codecs:
|
||||||
assert features.check_codec(codec) == features.check(codec)
|
assert features.check_codec(codec) == features.check(codec)
|
||||||
for feature in features.features:
|
for feature in features.features:
|
||||||
if "webp" in feature:
|
assert features.check_feature(feature) == features.check(feature)
|
||||||
with pytest.warns(DeprecationWarning, match="webp"):
|
|
||||||
assert features.check_feature(feature) == features.check(feature)
|
|
||||||
else:
|
|
||||||
assert features.check_feature(feature) == features.check(feature)
|
|
||||||
|
|
||||||
|
|
||||||
def test_version() -> None:
|
def test_version() -> None:
|
||||||
|
@ -48,26 +44,7 @@ def test_version() -> None:
|
||||||
for codec in features.codecs:
|
for codec in features.codecs:
|
||||||
test(codec, features.version_codec)
|
test(codec, features.version_codec)
|
||||||
for feature in features.features:
|
for feature in features.features:
|
||||||
if "webp" in feature:
|
test(feature, features.version_feature)
|
||||||
with pytest.warns(DeprecationWarning, match="webp"):
|
|
||||||
test(feature, features.version_feature)
|
|
||||||
else:
|
|
||||||
test(feature, features.version_feature)
|
|
||||||
|
|
||||||
|
|
||||||
def test_webp_transparency() -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="transp_webp"):
|
|
||||||
assert (features.check("transp_webp") or False) == features.check_module("webp")
|
|
||||||
|
|
||||||
|
|
||||||
def test_webp_mux() -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="webp_mux"):
|
|
||||||
assert (features.check("webp_mux") or False) == features.check_module("webp")
|
|
||||||
|
|
||||||
|
|
||||||
def test_webp_anim() -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="webp_anim"):
|
|
||||||
assert (features.check("webp_anim") or False) == features.check_module("webp")
|
|
||||||
|
|
||||||
|
|
||||||
@skip_unless_feature("libjpeg_turbo")
|
@skip_unless_feature("libjpeg_turbo")
|
||||||
|
@ -127,6 +104,25 @@ def test_unsupported_module() -> None:
|
||||||
features.version_module(module)
|
features.version_module(module)
|
||||||
|
|
||||||
|
|
||||||
|
def test_unsupported_feature() -> None:
|
||||||
|
# Arrange
|
||||||
|
feature = "unsupported_feature"
|
||||||
|
# Act / Assert
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
features.check_feature(feature)
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
features.version_feature(feature)
|
||||||
|
|
||||||
|
|
||||||
|
def test_unsupported_version() -> None:
|
||||||
|
assert features.version("unsupported_version") is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_modulenotfound(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||||
|
monkeypatch.setattr(features, "features", {"test": ("PIL._test", "", "")})
|
||||||
|
assert features.check_feature("test") is None
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("supported_formats", (True, False))
|
@pytest.mark.parametrize("supported_formats", (True, False))
|
||||||
def test_pilinfo(supported_formats: bool) -> None:
|
def test_pilinfo(supported_formats: bool) -> None:
|
||||||
buf = io.StringIO()
|
buf = io.StringIO()
|
||||||
|
|
|
@ -380,21 +380,28 @@ def test_palette() -> None:
|
||||||
assert_image_equal_tofile(im, "Tests/images/transparent.gif")
|
assert_image_equal_tofile(im, "Tests/images/transparent.gif")
|
||||||
|
|
||||||
|
|
||||||
|
def test_unsupported_header_size() -> None:
|
||||||
|
with pytest.raises(OSError, match="Unsupported header size 0"):
|
||||||
|
with Image.open(BytesIO(b"DDS " + b"\x00" * 4)):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def test_unsupported_bitcount() -> None:
|
def test_unsupported_bitcount() -> None:
|
||||||
with pytest.raises(OSError):
|
with pytest.raises(OSError, match="Unsupported bitcount 24 for 131072"):
|
||||||
with Image.open("Tests/images/unsupported_bitcount.dds"):
|
with Image.open("Tests/images/unsupported_bitcount.dds"):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"test_file",
|
"test_file, message",
|
||||||
(
|
(
|
||||||
"Tests/images/unimplemented_dxgi_format.dds",
|
("Tests/images/unimplemented_dxgi_format.dds", "Unimplemented DXGI format 93"),
|
||||||
"Tests/images/unimplemented_pfflags.dds",
|
("Tests/images/unimplemented_pixel_format.dds", "Unimplemented pixel format 0"),
|
||||||
|
("Tests/images/unimplemented_pfflags.dds", "Unknown pixel format flags 8"),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
def test_not_implemented(test_file: str) -> None:
|
def test_not_implemented(test_file: str, message: str) -> None:
|
||||||
with pytest.raises(NotImplementedError):
|
with pytest.raises(NotImplementedError, match=message):
|
||||||
with Image.open(test_file):
|
with Image.open(test_file):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
|
@ -93,21 +93,11 @@ def test_sizes() -> None:
|
||||||
with Image.open(TEST_FILE) as im:
|
with Image.open(TEST_FILE) as im:
|
||||||
assert isinstance(im, IcnsImagePlugin.IcnsImageFile)
|
assert isinstance(im, IcnsImagePlugin.IcnsImageFile)
|
||||||
for w, h, r in im.info["sizes"]:
|
for w, h, r in im.info["sizes"]:
|
||||||
wr = w * r
|
|
||||||
hr = h * r
|
|
||||||
with pytest.warns(
|
|
||||||
DeprecationWarning, match=r"Setting size to \(width, height, scale\)"
|
|
||||||
):
|
|
||||||
im.size = (w, h, r)
|
|
||||||
im.load()
|
|
||||||
assert im.mode == "RGBA"
|
|
||||||
assert im.size == (wr, hr)
|
|
||||||
|
|
||||||
# Test using load() with scale
|
# Test using load() with scale
|
||||||
im.size = (w, h)
|
im.size = (w, h)
|
||||||
im.load(scale=r)
|
im.load(scale=r)
|
||||||
assert im.mode == "RGBA"
|
assert im.mode == "RGBA"
|
||||||
assert im.size == (wr, hr)
|
assert im.size == (w * r, h * r)
|
||||||
|
|
||||||
# Check that we cannot load an incorrect size
|
# Check that we cannot load an incorrect size
|
||||||
with pytest.raises(ValueError):
|
with pytest.raises(ValueError):
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import sys
|
from io import BytesIO
|
||||||
from io import BytesIO, StringIO
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from PIL import Image, IptcImagePlugin, TiffImagePlugin, TiffTags
|
from PIL import Image, IptcImagePlugin, TiffImagePlugin, TiffTags
|
||||||
|
|
||||||
|
@ -101,35 +98,3 @@ def test_getiptcinfo_tiff_none() -> None:
|
||||||
|
|
||||||
# Assert
|
# Assert
|
||||||
assert iptc is None
|
assert iptc is None
|
||||||
|
|
||||||
|
|
||||||
def test_i() -> None:
|
|
||||||
# Arrange
|
|
||||||
c = b"a"
|
|
||||||
|
|
||||||
# Act
|
|
||||||
with pytest.warns(DeprecationWarning, match="IptcImagePlugin.i"):
|
|
||||||
ret = IptcImagePlugin.i(c)
|
|
||||||
|
|
||||||
# Assert
|
|
||||||
assert ret == 97
|
|
||||||
|
|
||||||
|
|
||||||
def test_dump(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
||||||
# Arrange
|
|
||||||
c = b"abc"
|
|
||||||
# Temporarily redirect stdout
|
|
||||||
mystdout = StringIO()
|
|
||||||
monkeypatch.setattr(sys, "stdout", mystdout)
|
|
||||||
|
|
||||||
# Act
|
|
||||||
with pytest.warns(DeprecationWarning, match="IptcImagePlugin.dump"):
|
|
||||||
IptcImagePlugin.dump(c)
|
|
||||||
|
|
||||||
# Assert
|
|
||||||
assert mystdout.getvalue() == "61 62 63 \n"
|
|
||||||
|
|
||||||
|
|
||||||
def test_pad_deprecation() -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="IptcImagePlugin.PAD"):
|
|
||||||
assert IptcImagePlugin.PAD == b"\0\0\0\0"
|
|
||||||
|
|
|
@ -26,7 +26,6 @@ from .helper import (
|
||||||
assert_image_equal_tofile,
|
assert_image_equal_tofile,
|
||||||
assert_image_similar,
|
assert_image_similar,
|
||||||
assert_image_similar_tofile,
|
assert_image_similar_tofile,
|
||||||
cjpeg_available,
|
|
||||||
djpeg_available,
|
djpeg_available,
|
||||||
hopper,
|
hopper,
|
||||||
is_win32,
|
is_win32,
|
||||||
|
@ -731,14 +730,6 @@ class TestFileJpeg:
|
||||||
img.load_djpeg()
|
img.load_djpeg()
|
||||||
assert_image_similar_tofile(img, TEST_FILE, 5)
|
assert_image_similar_tofile(img, TEST_FILE, 5)
|
||||||
|
|
||||||
@pytest.mark.skipif(not cjpeg_available(), reason="cjpeg not available")
|
|
||||||
def test_save_cjpeg(self, tmp_path: Path) -> None:
|
|
||||||
with Image.open(TEST_FILE) as img:
|
|
||||||
tempfile = str(tmp_path / "temp.jpg")
|
|
||||||
JpegImagePlugin._save_cjpeg(img, BytesIO(), tempfile)
|
|
||||||
# Default save quality is 75%, so a tiny bit of difference is alright
|
|
||||||
assert_image_similar_tofile(img, tempfile, 17)
|
|
||||||
|
|
||||||
def test_no_duplicate_0x1001_tag(self) -> None:
|
def test_no_duplicate_0x1001_tag(self) -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
tag_ids = {v: k for k, v in ExifTags.TAGS.items()}
|
tag_ids = {v: k for k, v in ExifTags.TAGS.items()}
|
||||||
|
@ -1115,14 +1106,6 @@ class TestFileJpeg:
|
||||||
|
|
||||||
assert im._repr_jpeg_() is None
|
assert im._repr_jpeg_() is None
|
||||||
|
|
||||||
def test_deprecation(self) -> None:
|
|
||||||
with Image.open(TEST_FILE) as im:
|
|
||||||
assert isinstance(im, JpegImagePlugin.JpegImageFile)
|
|
||||||
with pytest.warns(DeprecationWarning, match="huffman_ac"):
|
|
||||||
assert im.huffman_ac == {}
|
|
||||||
with pytest.warns(DeprecationWarning, match="huffman_dc"):
|
|
||||||
assert im.huffman_dc == {}
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.skipif(not is_win32(), reason="Windows only")
|
@pytest.mark.skipif(not is_win32(), reason="Windows only")
|
||||||
@skip_unless_feature("jpg")
|
@skip_unless_feature("jpg")
|
||||||
|
|
|
@ -256,19 +256,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
|
|
||||||
im.save(out, tiffinfo=new_ifd)
|
im.save(out, tiffinfo=new_ifd)
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize("libtiff", (True, False))
|
||||||
"libtiff",
|
|
||||||
(
|
|
||||||
pytest.param(
|
|
||||||
True,
|
|
||||||
marks=pytest.mark.skipif(
|
|
||||||
not getattr(Image.core, "libtiff_support_custom_tags", False),
|
|
||||||
reason="Custom tags not supported by older libtiff",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
False,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
def test_custom_metadata(
|
def test_custom_metadata(
|
||||||
self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool
|
self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool
|
||||||
) -> None:
|
) -> None:
|
||||||
|
@ -724,8 +712,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
|
|
||||||
with Image.open(out) as reloaded:
|
with Image.open(out) as reloaded:
|
||||||
assert isinstance(reloaded, TiffImagePlugin.TiffImageFile)
|
assert isinstance(reloaded, TiffImagePlugin.TiffImageFile)
|
||||||
if Image.core.libtiff_support_custom_tags:
|
assert reloaded.tag_v2[34665] == 125456
|
||||||
assert reloaded.tag_v2[34665] == 125456
|
|
||||||
|
|
||||||
def test_crashing_metadata(
|
def test_crashing_metadata(
|
||||||
self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
|
self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
|
||||||
|
@ -777,19 +764,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
assert icc_libtiff is not None
|
assert icc_libtiff is not None
|
||||||
assert icc == icc_libtiff
|
assert icc == icc_libtiff
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize("libtiff", (True, False))
|
||||||
"libtiff",
|
|
||||||
(
|
|
||||||
pytest.param(
|
|
||||||
True,
|
|
||||||
marks=pytest.mark.skipif(
|
|
||||||
not getattr(Image.core, "libtiff_support_custom_tags", False),
|
|
||||||
reason="Custom tags not supported by older libtiff",
|
|
||||||
),
|
|
||||||
),
|
|
||||||
False,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
def test_write_icc(
|
def test_write_icc(
|
||||||
self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool
|
self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool
|
||||||
) -> None:
|
) -> None:
|
||||||
|
@ -898,8 +873,8 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
assert im.mode == "RGB"
|
assert im.mode == "RGB"
|
||||||
assert im.size == (128, 128)
|
assert im.size == (128, 128)
|
||||||
assert im.format == "TIFF"
|
assert im.format == "TIFF"
|
||||||
im2 = hopper()
|
with hopper() as im2:
|
||||||
assert_image_similar(im, im2, 5)
|
assert_image_similar(im, im2, 5)
|
||||||
except OSError:
|
except OSError:
|
||||||
captured = capfd.readouterr()
|
captured = capfd.readouterr()
|
||||||
if "LZMA compression support is not configured" in captured.err:
|
if "LZMA compression support is not configured" in captured.err:
|
||||||
|
|
|
@ -44,6 +44,18 @@ def test_load_zero_inch() -> None:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def test_load_unsupported_wmf() -> None:
|
||||||
|
b = BytesIO(b"\xd7\xcd\xc6\x9a\x00\x00" + b"\x01" * 10)
|
||||||
|
with pytest.raises(SyntaxError, match="Unsupported WMF file format"):
|
||||||
|
WmfImagePlugin.WmfStubImageFile(b)
|
||||||
|
|
||||||
|
|
||||||
|
def test_load_unsupported() -> None:
|
||||||
|
b = BytesIO(b"\x01\x00\x00\x00")
|
||||||
|
with pytest.raises(SyntaxError, match="Unsupported file format"):
|
||||||
|
WmfImagePlugin.WmfStubImageFile(b)
|
||||||
|
|
||||||
|
|
||||||
def test_render() -> None:
|
def test_render() -> None:
|
||||||
with open("Tests/images/drawing.emf", "rb") as fp:
|
with open("Tests/images/drawing.emf", "rb") as fp:
|
||||||
data = fp.read()
|
data = fp.read()
|
||||||
|
|
|
@ -30,7 +30,6 @@ from .helper import (
|
||||||
assert_image_similar_tofile,
|
assert_image_similar_tofile,
|
||||||
assert_not_all_same,
|
assert_not_all_same,
|
||||||
hopper,
|
hopper,
|
||||||
is_big_endian,
|
|
||||||
is_win32,
|
is_win32,
|
||||||
mark_if_feature_version,
|
mark_if_feature_version,
|
||||||
skip_unless_feature,
|
skip_unless_feature,
|
||||||
|
@ -50,19 +49,10 @@ except ImportError:
|
||||||
PrettyPrinter = None
|
PrettyPrinter = None
|
||||||
|
|
||||||
|
|
||||||
# Deprecation helper
|
|
||||||
def helper_image_new(mode: str, size: tuple[int, int]) -> Image.Image:
|
|
||||||
if mode.startswith("BGR;"):
|
|
||||||
with pytest.warns(DeprecationWarning, match="BGR;"):
|
|
||||||
return Image.new(mode, size)
|
|
||||||
else:
|
|
||||||
return Image.new(mode, size)
|
|
||||||
|
|
||||||
|
|
||||||
class TestImage:
|
class TestImage:
|
||||||
@pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
|
@pytest.mark.parametrize("mode", Image.MODES)
|
||||||
def test_image_modes_success(self, mode: str) -> None:
|
def test_image_modes_success(self, mode: str) -> None:
|
||||||
helper_image_new(mode, (1, 1))
|
Image.new(mode, (1, 1))
|
||||||
|
|
||||||
@pytest.mark.parametrize("mode", ("", "bad", "very very long"))
|
@pytest.mark.parametrize("mode", ("", "bad", "very very long"))
|
||||||
def test_image_modes_fail(self, mode: str) -> None:
|
def test_image_modes_fail(self, mode: str) -> None:
|
||||||
|
@ -1142,39 +1132,29 @@ class TestImage:
|
||||||
assert len(caplog.records) == 0
|
assert len(caplog.records) == 0
|
||||||
assert im.fp is None
|
assert im.fp is None
|
||||||
|
|
||||||
def test_deprecation(self) -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="Image.isImageType"):
|
|
||||||
assert not Image.isImageType(None)
|
|
||||||
|
|
||||||
|
|
||||||
class TestImageBytes:
|
class TestImageBytes:
|
||||||
@pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
|
@pytest.mark.parametrize("mode", Image.MODES)
|
||||||
def test_roundtrip_bytes_constructor(self, mode: str) -> None:
|
def test_roundtrip_bytes_constructor(self, mode: str) -> None:
|
||||||
im = hopper(mode)
|
im = hopper(mode)
|
||||||
source_bytes = im.tobytes()
|
source_bytes = im.tobytes()
|
||||||
|
|
||||||
if mode.startswith("BGR;"):
|
reloaded = Image.frombytes(mode, im.size, source_bytes)
|
||||||
with pytest.warns(DeprecationWarning, match=mode):
|
|
||||||
reloaded = Image.frombytes(mode, im.size, source_bytes)
|
|
||||||
else:
|
|
||||||
reloaded = Image.frombytes(mode, im.size, source_bytes)
|
|
||||||
assert reloaded.tobytes() == source_bytes
|
assert reloaded.tobytes() == source_bytes
|
||||||
|
|
||||||
@pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
|
@pytest.mark.parametrize("mode", Image.MODES)
|
||||||
def test_roundtrip_bytes_method(self, mode: str) -> None:
|
def test_roundtrip_bytes_method(self, mode: str) -> None:
|
||||||
im = hopper(mode)
|
im = hopper(mode)
|
||||||
source_bytes = im.tobytes()
|
source_bytes = im.tobytes()
|
||||||
|
|
||||||
reloaded = helper_image_new(mode, im.size)
|
reloaded = Image.new(mode, im.size)
|
||||||
reloaded.frombytes(source_bytes)
|
reloaded.frombytes(source_bytes)
|
||||||
assert reloaded.tobytes() == source_bytes
|
assert reloaded.tobytes() == source_bytes
|
||||||
|
|
||||||
@pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
|
@pytest.mark.parametrize("mode", Image.MODES)
|
||||||
def test_getdata_putdata(self, mode: str) -> None:
|
def test_getdata_putdata(self, mode: str) -> None:
|
||||||
if is_big_endian() and mode == "BGR;15":
|
|
||||||
pytest.xfail("Known failure of BGR;15 on big-endian")
|
|
||||||
im = hopper(mode)
|
im = hopper(mode)
|
||||||
reloaded = helper_image_new(mode, im.size)
|
reloaded = Image.new(mode, im.size)
|
||||||
reloaded.putdata(im.getdata())
|
reloaded.putdata(im.getdata())
|
||||||
assert_image_equal(im, reloaded)
|
assert_image_equal(im, reloaded)
|
||||||
|
|
||||||
|
|
|
@ -123,10 +123,6 @@ class TestImageGetPixel:
|
||||||
bands = Image.getmodebands(mode)
|
bands = Image.getmodebands(mode)
|
||||||
if bands == 1:
|
if bands == 1:
|
||||||
return 1
|
return 1
|
||||||
if mode in ("BGR;15", "BGR;16"):
|
|
||||||
# These modes have less than 8 bits per band,
|
|
||||||
# so (1, 2, 3) cannot be roundtripped.
|
|
||||||
return (16, 32, 49)
|
|
||||||
return tuple(range(1, bands + 1))
|
return tuple(range(1, bands + 1))
|
||||||
|
|
||||||
def check(self, mode: str, expected_color_int: int | None = None) -> None:
|
def check(self, mode: str, expected_color_int: int | None = None) -> None:
|
||||||
|
@ -191,11 +187,6 @@ class TestImageGetPixel:
|
||||||
def test_basic(self, mode: str) -> None:
|
def test_basic(self, mode: str) -> None:
|
||||||
self.check(mode)
|
self.check(mode)
|
||||||
|
|
||||||
@pytest.mark.parametrize("mode", ("BGR;15", "BGR;16", "BGR;24"))
|
|
||||||
def test_deprecated(self, mode: str) -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="BGR;"):
|
|
||||||
self.check(mode)
|
|
||||||
|
|
||||||
def test_list(self) -> None:
|
def test_list(self) -> None:
|
||||||
im = hopper()
|
im = hopper()
|
||||||
assert im.getpixel([0, 0]) == (20, 20, 70)
|
assert im.getpixel([0, 0]) == (20, 20, 70)
|
||||||
|
@ -218,7 +209,7 @@ class TestImageGetPixel:
|
||||||
|
|
||||||
|
|
||||||
class TestImagePutPixelError:
|
class TestImagePutPixelError:
|
||||||
IMAGE_MODES1 = ["LA", "RGB", "RGBA", "BGR;15"]
|
IMAGE_MODES1 = ["LA", "RGB", "RGBA"]
|
||||||
IMAGE_MODES2 = ["L", "I", "I;16"]
|
IMAGE_MODES2 = ["L", "I", "I;16"]
|
||||||
INVALID_TYPES = ["foo", 1.0, None]
|
INVALID_TYPES = ["foo", 1.0, None]
|
||||||
|
|
||||||
|
@ -234,11 +225,6 @@ class TestImagePutPixelError:
|
||||||
(
|
(
|
||||||
("L", (0, 2), "color must be int or single-element tuple"),
|
("L", (0, 2), "color must be int or single-element tuple"),
|
||||||
("LA", (0, 3), "color must be int, or tuple of one or two elements"),
|
("LA", (0, 3), "color must be int, or tuple of one or two elements"),
|
||||||
(
|
|
||||||
"BGR;15",
|
|
||||||
(0, 2),
|
|
||||||
"color must be int, or tuple of one or three elements",
|
|
||||||
),
|
|
||||||
(
|
(
|
||||||
"RGB",
|
"RGB",
|
||||||
(0, 2, 5),
|
(0, 2, 5),
|
||||||
|
@ -329,3 +315,10 @@ int main(int argc, char* argv[])
|
||||||
process = subprocess.Popen(["embed_pil.exe"], env=env)
|
process = subprocess.Popen(["embed_pil.exe"], env=env)
|
||||||
process.communicate()
|
process.communicate()
|
||||||
assert process.returncode == 0
|
assert process.returncode == 0
|
||||||
|
|
||||||
|
def teardown_method(self) -> None:
|
||||||
|
try:
|
||||||
|
os.remove("embed_pil.c")
|
||||||
|
except FileNotFoundError:
|
||||||
|
# If the test was skipped or failed, the file won't exist
|
||||||
|
pass
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from .helper import hopper
|
from .helper import hopper
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,10 +8,3 @@ def test_sanity() -> None:
|
||||||
|
|
||||||
type_repr = repr(type(im.getim()))
|
type_repr = repr(type(im.getim()))
|
||||||
assert "PyCapsule" in type_repr
|
assert "PyCapsule" in type_repr
|
||||||
|
|
||||||
with pytest.warns(DeprecationWarning, match="id property"):
|
|
||||||
assert isinstance(im.im.id, int)
|
|
||||||
|
|
||||||
with pytest.warns(DeprecationWarning, match="unsafe_ptrs property"):
|
|
||||||
ptrs = dict(im.im.unsafe_ptrs)
|
|
||||||
assert ptrs.keys() == {"image8", "image32", "image"}
|
|
||||||
|
|
|
@ -10,9 +10,12 @@ def test_histogram() -> None:
|
||||||
|
|
||||||
assert histogram("1") == (256, 0, 10994)
|
assert histogram("1") == (256, 0, 10994)
|
||||||
assert histogram("L") == (256, 0, 662)
|
assert histogram("L") == (256, 0, 662)
|
||||||
|
assert histogram("LA") == (512, 0, 16384)
|
||||||
|
assert histogram("La") == (512, 0, 16384)
|
||||||
assert histogram("I") == (256, 0, 662)
|
assert histogram("I") == (256, 0, 662)
|
||||||
assert histogram("F") == (256, 0, 662)
|
assert histogram("F") == (256, 0, 662)
|
||||||
assert histogram("P") == (256, 0, 1551)
|
assert histogram("P") == (256, 0, 1551)
|
||||||
|
assert histogram("PA") == (512, 0, 16384)
|
||||||
assert histogram("RGB") == (768, 4, 675)
|
assert histogram("RGB") == (768, 4, 675)
|
||||||
assert histogram("RGBA") == (1024, 0, 16384)
|
assert histogram("RGBA") == (1024, 0, 16384)
|
||||||
assert histogram("CMYK") == (1024, 0, 16384)
|
assert histogram("CMYK") == (1024, 0, 16384)
|
||||||
|
|
|
@ -78,16 +78,6 @@ def test_mode_F() -> None:
|
||||||
assert list(im.getdata()) == target
|
assert list(im.getdata()) == target
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("mode", ("BGR;15", "BGR;16", "BGR;24"))
|
|
||||||
def test_mode_BGR(mode: str) -> None:
|
|
||||||
data = [(16, 32, 49), (32, 32, 98)]
|
|
||||||
with pytest.warns(DeprecationWarning, match=mode):
|
|
||||||
im = Image.new(mode, (1, 2))
|
|
||||||
im.putdata(data)
|
|
||||||
|
|
||||||
assert list(im.getdata()) == data
|
|
||||||
|
|
||||||
|
|
||||||
def test_array_B() -> None:
|
def test_array_B() -> None:
|
||||||
# shouldn't segfault
|
# shouldn't segfault
|
||||||
# see https://github.com/python-pillow/Pillow/issues/1008
|
# see https://github.com/python-pillow/Pillow/issues/1008
|
||||||
|
|
|
@ -324,7 +324,7 @@ class TestImageResize:
|
||||||
im = hopper(mode)
|
im = hopper(mode)
|
||||||
assert im.resize((20, 20), Image.Resampling.BICUBIC) == im.resize((20, 20))
|
assert im.resize((20, 20), Image.Resampling.BICUBIC) == im.resize((20, 20))
|
||||||
|
|
||||||
@pytest.mark.parametrize("mode", ("1", "P", "BGR;15", "BGR;16"))
|
@pytest.mark.parametrize("mode", ("1", "P"))
|
||||||
def test_default_filter_nearest(self, mode: str) -> None:
|
def test_default_filter_nearest(self, mode: str) -> None:
|
||||||
im = hopper(mode)
|
im = hopper(mode)
|
||||||
assert im.resize((20, 20), Image.Resampling.NEAREST) == im.resize((20, 20))
|
assert im.resize((20, 20), Image.Resampling.NEAREST) == im.resize((20, 20))
|
||||||
|
|
|
@ -54,10 +54,6 @@ def skip_missing() -> None:
|
||||||
def test_sanity() -> None:
|
def test_sanity() -> None:
|
||||||
# basic smoke test.
|
# basic smoke test.
|
||||||
# this mostly follows the cms_test outline.
|
# this mostly follows the cms_test outline.
|
||||||
with pytest.warns(DeprecationWarning, match="PIL.ImageCms.versions"):
|
|
||||||
v = ImageCms.versions() # should return four strings
|
|
||||||
assert v[0] == "1.0.0 pil"
|
|
||||||
assert list(map(type, v)) == [str, str, str, str]
|
|
||||||
|
|
||||||
# internal version number
|
# internal version number
|
||||||
version = features.version_module("littlecms2")
|
version = features.version_module("littlecms2")
|
||||||
|
@ -677,12 +673,6 @@ def test_auxiliary_channels_isolated() -> None:
|
||||||
assert_image_equal(test_image.convert(dst_format[2]), reference_image)
|
assert_image_equal(test_image.convert(dst_format[2]), reference_image)
|
||||||
|
|
||||||
|
|
||||||
def test_long_modes() -> None:
|
|
||||||
p = ImageCms.getOpenProfile("Tests/icc/sGrey-v2-nano.icc")
|
|
||||||
with pytest.warns(DeprecationWarning, match="ABCDEFGHI"):
|
|
||||||
ImageCms.buildTransform(p, p, "ABCDEFGHI", "ABCDEFGHI")
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("mode", ("RGB", "RGBA", "RGBX"))
|
@pytest.mark.parametrize("mode", ("RGB", "RGBA", "RGBX"))
|
||||||
def test_rgb_lab(mode: str) -> None:
|
def test_rgb_lab(mode: str) -> None:
|
||||||
im = Image.new(mode, (1, 1))
|
im = Image.new(mode, (1, 1))
|
||||||
|
@ -703,15 +693,14 @@ def test_cmyk_lab() -> None:
|
||||||
|
|
||||||
|
|
||||||
def test_deprecation() -> None:
|
def test_deprecation() -> None:
|
||||||
with pytest.warns(DeprecationWarning, match="ImageCms.DESCRIPTION"):
|
|
||||||
assert ImageCms.DESCRIPTION.strip().startswith("pyCMS")
|
|
||||||
with pytest.warns(DeprecationWarning, match="ImageCms.VERSION"):
|
|
||||||
assert ImageCms.VERSION == "1.0.0 pil"
|
|
||||||
with pytest.warns(DeprecationWarning, match="ImageCms.FLAGS"):
|
|
||||||
assert isinstance(ImageCms.FLAGS, dict)
|
|
||||||
|
|
||||||
profile = ImageCmsProfile(ImageCms.createProfile("sRGB"))
|
profile = ImageCmsProfile(ImageCms.createProfile("sRGB"))
|
||||||
with pytest.warns(DeprecationWarning, match="RGBA;16B"):
|
with pytest.warns(
|
||||||
ImageCms.ImageCmsTransform(profile, profile, "RGBA;16B", "RGB")
|
DeprecationWarning, match="ImageCms.ImageCmsProfile.product_name"
|
||||||
with pytest.warns(DeprecationWarning, match="RGBA;16B"):
|
):
|
||||||
ImageCms.ImageCmsTransform(profile, profile, "RGB", "RGBA;16B")
|
profile.product_name
|
||||||
|
with pytest.warns(
|
||||||
|
DeprecationWarning, match="ImageCms.ImageCmsProfile.product_info"
|
||||||
|
):
|
||||||
|
profile.product_info
|
||||||
|
with pytest.raises(AttributeError):
|
||||||
|
profile.this_attribute_does_not_exist
|
||||||
|
|
|
@ -1732,8 +1732,3 @@ def test_incorrectly_ordered_coordinates(xy: tuple[int, int, int, int]) -> None:
|
||||||
draw.rectangle(xy)
|
draw.rectangle(xy)
|
||||||
with pytest.raises(ValueError):
|
with pytest.raises(ValueError):
|
||||||
draw.rounded_rectangle(xy)
|
draw.rounded_rectangle(xy)
|
||||||
|
|
||||||
|
|
||||||
def test_getdraw() -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="'hints' parameter"):
|
|
||||||
ImageDraw.getdraw(None, [])
|
|
||||||
|
|
|
@ -151,11 +151,6 @@ class TestImageFile:
|
||||||
# Despite multiple tiles, assert only one tile caused a read of maxblock size
|
# Despite multiple tiles, assert only one tile caused a read of maxblock size
|
||||||
assert reads.count(im.decodermaxblock) == 1
|
assert reads.count(im.decodermaxblock) == 1
|
||||||
|
|
||||||
def test_raise_oserror(self) -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="raise_oserror"):
|
|
||||||
with pytest.raises(OSError):
|
|
||||||
ImageFile.raise_oserror(1)
|
|
||||||
|
|
||||||
def test_raise_typeerror(self) -> None:
|
def test_raise_typeerror(self) -> None:
|
||||||
with pytest.raises(TypeError):
|
with pytest.raises(TypeError):
|
||||||
parser = ImageFile.Parser()
|
parser = ImageFile.Parser()
|
||||||
|
|
|
@ -11,7 +11,6 @@ from pathlib import Path
|
||||||
from typing import Any, BinaryIO
|
from typing import Any, BinaryIO
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from packaging.version import parse as parse_version
|
|
||||||
|
|
||||||
from PIL import Image, ImageDraw, ImageFont, features
|
from PIL import Image, ImageDraw, ImageFont, features
|
||||||
from PIL._typing import StrOrBytesPath
|
from PIL._typing import StrOrBytesPath
|
||||||
|
@ -691,16 +690,6 @@ def test_complex_font_settings() -> None:
|
||||||
|
|
||||||
|
|
||||||
def test_variation_get(font: ImageFont.FreeTypeFont) -> None:
|
def test_variation_get(font: ImageFont.FreeTypeFont) -> None:
|
||||||
version = features.version_module("freetype2")
|
|
||||||
assert version is not None
|
|
||||||
freetype = parse_version(version)
|
|
||||||
if freetype < parse_version("2.9.1"):
|
|
||||||
with pytest.raises(NotImplementedError):
|
|
||||||
font.get_variation_names()
|
|
||||||
with pytest.raises(NotImplementedError):
|
|
||||||
font.get_variation_axes()
|
|
||||||
return
|
|
||||||
|
|
||||||
with pytest.raises(OSError):
|
with pytest.raises(OSError):
|
||||||
font.get_variation_names()
|
font.get_variation_names()
|
||||||
with pytest.raises(OSError):
|
with pytest.raises(OSError):
|
||||||
|
@ -763,14 +752,6 @@ def _check_text(font: ImageFont.FreeTypeFont, path: str, epsilon: float) -> None
|
||||||
|
|
||||||
|
|
||||||
def test_variation_set_by_name(font: ImageFont.FreeTypeFont) -> None:
|
def test_variation_set_by_name(font: ImageFont.FreeTypeFont) -> None:
|
||||||
version = features.version_module("freetype2")
|
|
||||||
assert version is not None
|
|
||||||
freetype = parse_version(version)
|
|
||||||
if freetype < parse_version("2.9.1"):
|
|
||||||
with pytest.raises(NotImplementedError):
|
|
||||||
font.set_variation_by_name("Bold")
|
|
||||||
return
|
|
||||||
|
|
||||||
with pytest.raises(OSError):
|
with pytest.raises(OSError):
|
||||||
font.set_variation_by_name("Bold")
|
font.set_variation_by_name("Bold")
|
||||||
|
|
||||||
|
@ -790,14 +771,6 @@ def test_variation_set_by_name(font: ImageFont.FreeTypeFont) -> None:
|
||||||
|
|
||||||
|
|
||||||
def test_variation_set_by_axes(font: ImageFont.FreeTypeFont) -> None:
|
def test_variation_set_by_axes(font: ImageFont.FreeTypeFont) -> None:
|
||||||
version = features.version_module("freetype2")
|
|
||||||
assert version is not None
|
|
||||||
freetype = parse_version(version)
|
|
||||||
if freetype < parse_version("2.9.1"):
|
|
||||||
with pytest.raises(NotImplementedError):
|
|
||||||
font.set_variation_by_axes([100])
|
|
||||||
return
|
|
||||||
|
|
||||||
with pytest.raises(OSError):
|
with pytest.raises(OSError):
|
||||||
font.set_variation_by_axes([500, 50])
|
font.set_variation_by_axes([500, 50])
|
||||||
|
|
||||||
|
@ -1209,15 +1182,3 @@ def test_invalid_truetype_sizes_raise_valueerror(
|
||||||
) -> None:
|
) -> None:
|
||||||
with pytest.raises(ValueError):
|
with pytest.raises(ValueError):
|
||||||
ImageFont.truetype(FONT_PATH, size, layout_engine=layout_engine)
|
ImageFont.truetype(FONT_PATH, size, layout_engine=layout_engine)
|
||||||
|
|
||||||
|
|
||||||
def test_freetype_deprecation(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
||||||
# Arrange: mock features.version_module to return fake FreeType version
|
|
||||||
def fake_version_module(module: str) -> str:
|
|
||||||
return "2.9.0"
|
|
||||||
|
|
||||||
monkeypatch.setattr(features, "version_module", fake_version_module)
|
|
||||||
|
|
||||||
# Act / Assert
|
|
||||||
with pytest.warns(DeprecationWarning, match="FreeType 2.9.0"):
|
|
||||||
ImageFont.truetype(FONT_PATH, FONT_SIZE)
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ from typing import Any
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from PIL import Image, ImageMath
|
from PIL import Image, ImageMath, _imagingmath
|
||||||
|
|
||||||
|
|
||||||
def pixel(im: Image.Image | int) -> str | int:
|
def pixel(im: Image.Image | int) -> str | int:
|
||||||
|
@ -55,11 +55,6 @@ def test_sanity() -> None:
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_options_deprecated() -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="ImageMath.lambda_eval options"):
|
|
||||||
assert ImageMath.lambda_eval(lambda args: 1, images) == 1
|
|
||||||
|
|
||||||
|
|
||||||
def test_ops() -> None:
|
def test_ops() -> None:
|
||||||
assert pixel(ImageMath.lambda_eval(lambda args: args["A"] * -1, **images)) == "I -1"
|
assert pixel(ImageMath.lambda_eval(lambda args: args["A"] * -1, **images)) == "I -1"
|
||||||
|
|
||||||
|
@ -505,3 +500,31 @@ def test_logical_not_equal() -> None:
|
||||||
)
|
)
|
||||||
== "I 1"
|
== "I 1"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_reflected_operands() -> None:
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 + args["A"], **images)) == "I 2"
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 - args["A"], **images)) == "I 0"
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 * args["A"], **images)) == "I 1"
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 / args["A"], **images)) == "I 1"
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 % args["A"], **images)) == "I 0"
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 ** args["A"], **images)) == "I 1"
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 & args["A"], **images)) == "I 1"
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 | args["A"], **images)) == "I 1"
|
||||||
|
assert pixel(ImageMath.lambda_eval(lambda args: 1 ^ args["A"], **images)) == "I 0"
|
||||||
|
|
||||||
|
|
||||||
|
def test_unsupported_mode() -> None:
|
||||||
|
im = Image.new("RGB", (1, 1))
|
||||||
|
with pytest.raises(ValueError, match="unsupported mode: RGB"):
|
||||||
|
ImageMath.lambda_eval(lambda args: args["im"] + 1, im=im)
|
||||||
|
|
||||||
|
|
||||||
|
def test_bad_operand_type(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||||
|
monkeypatch.delattr(_imagingmath, "abs_I")
|
||||||
|
with pytest.raises(TypeError, match="bad operand type for 'abs'"):
|
||||||
|
ImageMath.lambda_eval(lambda args: abs(args["I"]), I=I)
|
||||||
|
|
||||||
|
monkeypatch.delattr(_imagingmath, "max_F")
|
||||||
|
with pytest.raises(TypeError, match="bad operand type for 'max'"):
|
||||||
|
ImageMath.lambda_eval(lambda args: args["max"](args["I"], args["F"]), I=I, F=F)
|
||||||
|
|
|
@ -35,16 +35,6 @@ def test_sanity() -> None:
|
||||||
assert pixel(ImageMath.unsafe_eval("int(float(A)+B)", **images)) == "I 3"
|
assert pixel(ImageMath.unsafe_eval("int(float(A)+B)", **images)) == "I 3"
|
||||||
|
|
||||||
|
|
||||||
def test_eval_deprecated() -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="ImageMath.eval"):
|
|
||||||
assert ImageMath.eval("1") == 1
|
|
||||||
|
|
||||||
|
|
||||||
def test_options_deprecated() -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="ImageMath.unsafe_eval options"):
|
|
||||||
assert ImageMath.unsafe_eval("1", images) == 1
|
|
||||||
|
|
||||||
|
|
||||||
def test_ops() -> None:
|
def test_ops() -> None:
|
||||||
assert pixel(ImageMath.unsafe_eval("-A", **images)) == "I -1"
|
assert pixel(ImageMath.unsafe_eval("-A", **images)) == "I -1"
|
||||||
assert pixel(ImageMath.unsafe_eval("+B", **images)) == "L 2"
|
assert pixel(ImageMath.unsafe_eval("+B", **images)) == "L 2"
|
||||||
|
|
|
@ -361,18 +361,6 @@ class TestLibUnpack:
|
||||||
"RGB", "CMYK", 4, (250, 249, 248), (242, 241, 240), (234, 233, 233)
|
"RGB", "CMYK", 4, (250, 249, 248), (242, 241, 240), (234, 233, 233)
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_BGR(self) -> None:
|
|
||||||
with pytest.warns(DeprecationWarning, match="BGR;15"):
|
|
||||||
self.assert_unpack(
|
|
||||||
"BGR;15", "BGR;15", 3, (8, 131, 0), (24, 0, 8), (41, 131, 8)
|
|
||||||
)
|
|
||||||
with pytest.warns(DeprecationWarning, match="BGR;16"):
|
|
||||||
self.assert_unpack(
|
|
||||||
"BGR;16", "BGR;16", 3, (8, 64, 0), (24, 129, 0), (41, 194, 0)
|
|
||||||
)
|
|
||||||
with pytest.warns(DeprecationWarning, match="BGR;24"):
|
|
||||||
self.assert_unpack("BGR;24", "BGR;24", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
|
|
||||||
|
|
||||||
def test_RGBA(self) -> None:
|
def test_RGBA(self) -> None:
|
||||||
self.assert_unpack("RGBA", "LA", 2, (1, 1, 1, 2), (3, 3, 3, 4), (5, 5, 5, 6))
|
self.assert_unpack("RGBA", "LA", 2, (1, 1, 1, 2), (3, 3, 3, 4), (5, 5, 5, 6))
|
||||||
self.assert_unpack(
|
self.assert_unpack(
|
||||||
|
|
|
@ -9,9 +9,30 @@ from PIL import __version__
|
||||||
pyroma = pytest.importorskip("pyroma", reason="Pyroma not installed")
|
pyroma = pytest.importorskip("pyroma", reason="Pyroma not installed")
|
||||||
|
|
||||||
|
|
||||||
|
def map_metadata_keys(metadata):
|
||||||
|
# Convert installed wheel metadata into canonical Core Metadata 2.4 format.
|
||||||
|
# This was a utility method in pyroma 4.3.3; it was removed in 5.0.
|
||||||
|
# This implementation is constructed from the relevant logic from
|
||||||
|
# Pyroma 5.0's `build_metadata()` implementation. This has been submitted
|
||||||
|
# upstream to Pyroma as https://github.com/regebro/pyroma/pull/116,
|
||||||
|
# so it may be possible to simplify this test in future.
|
||||||
|
data = {}
|
||||||
|
for key in set(metadata.keys()):
|
||||||
|
value = metadata.get_all(key)
|
||||||
|
key = pyroma.projectdata.normalize(key)
|
||||||
|
|
||||||
|
if len(value) == 1:
|
||||||
|
value = value[0]
|
||||||
|
if value.strip() == "UNKNOWN":
|
||||||
|
continue
|
||||||
|
|
||||||
|
data[key] = value
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
||||||
def test_pyroma() -> None:
|
def test_pyroma() -> None:
|
||||||
# Arrange
|
# Arrange
|
||||||
data = pyroma.projectdata.map_metadata_keys(metadata("Pillow"))
|
data = map_metadata_keys(metadata("Pillow"))
|
||||||
|
|
||||||
# Act
|
# Act
|
||||||
rating = pyroma.ratings.rate(data)
|
rating = pyroma.ratings.rate(data)
|
||||||
|
@ -25,11 +46,5 @@ def test_pyroma() -> None:
|
||||||
)
|
)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
# Should have a perfect score, but pyroma does not support PEP 639 yet.
|
# Should have a perfect score
|
||||||
assert rating == (
|
assert rating == (10, [])
|
||||||
9,
|
|
||||||
[
|
|
||||||
"Your package does neither have a license field "
|
|
||||||
"nor any license classifiers."
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import pytest
|
||||||
|
|
||||||
from PIL import GifImagePlugin, Image, JpegImagePlugin
|
from PIL import GifImagePlugin, Image, JpegImagePlugin
|
||||||
|
|
||||||
from .helper import cjpeg_available, djpeg_available, is_win32, netpbm_available
|
from .helper import djpeg_available, is_win32, netpbm_available
|
||||||
|
|
||||||
TEST_JPG = "Tests/images/hopper.jpg"
|
TEST_JPG = "Tests/images/hopper.jpg"
|
||||||
TEST_GIF = "Tests/images/hopper.gif"
|
TEST_GIF = "Tests/images/hopper.gif"
|
||||||
|
@ -42,11 +42,6 @@ class TestShellInjection:
|
||||||
assert isinstance(im, JpegImagePlugin.JpegImageFile)
|
assert isinstance(im, JpegImagePlugin.JpegImageFile)
|
||||||
im.load_djpeg()
|
im.load_djpeg()
|
||||||
|
|
||||||
@pytest.mark.skipif(not cjpeg_available(), reason="cjpeg not available")
|
|
||||||
def test_save_cjpeg_filename(self, tmp_path: Path) -> None:
|
|
||||||
with Image.open(TEST_JPG) as im:
|
|
||||||
self.assert_save_filename_check(tmp_path, im, JpegImagePlugin._save_cjpeg)
|
|
||||||
|
|
||||||
@pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
|
@pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
|
||||||
def test_save_netpbm_filename_bmp_mode(self, tmp_path: Path) -> None:
|
def test_save_netpbm_filename_bmp_mode(self, tmp_path: Path) -> None:
|
||||||
with Image.open(TEST_GIF) as im:
|
with Image.open(TEST_GIF) as im:
|
||||||
|
|
|
@ -39,9 +39,6 @@ def test_wheel_codecs() -> None:
|
||||||
|
|
||||||
def test_wheel_features() -> None:
|
def test_wheel_features() -> None:
|
||||||
expected_features = {
|
expected_features = {
|
||||||
"webp_anim",
|
|
||||||
"webp_mux",
|
|
||||||
"transp_webp",
|
|
||||||
"raqm",
|
"raqm",
|
||||||
"fribidi",
|
"fribidi",
|
||||||
"harfbuzz",
|
"harfbuzz",
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# install webp
|
# install webp
|
||||||
|
|
||||||
archive=libwebp-1.5.0
|
archive=libwebp-1.6.0
|
||||||
|
|
||||||
./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
|
./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
|
||||||
|
|
||||||
|
|
|
@ -12,169 +12,6 @@ Deprecated features
|
||||||
Below are features which are considered deprecated. Where appropriate,
|
Below are features which are considered deprecated. Where appropriate,
|
||||||
a :py:exc:`DeprecationWarning` is issued.
|
a :py:exc:`DeprecationWarning` is issued.
|
||||||
|
|
||||||
ImageFile.raise_oserror
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
.. deprecated:: 10.2.0
|
|
||||||
|
|
||||||
``ImageFile.raise_oserror()`` has been deprecated and will be removed in Pillow
|
|
||||||
12.0.0 (2025-10-15). The function is undocumented and is only useful for translating
|
|
||||||
error codes returned by a codec's ``decode()`` method, which ImageFile already does
|
|
||||||
automatically.
|
|
||||||
|
|
||||||
IptcImageFile helper functions
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
.. deprecated:: 10.2.0
|
|
||||||
|
|
||||||
The functions ``IptcImageFile.dump`` and ``IptcImageFile.i``, and the constant
|
|
||||||
``IptcImageFile.PAD`` have been deprecated and will be removed in Pillow
|
|
||||||
12.0.0 (2025-10-15). These are undocumented helper functions intended
|
|
||||||
for internal use, so there is no replacement. They can each be replaced
|
|
||||||
by a single line of code using builtin functions in Python.
|
|
||||||
|
|
||||||
ImageCms constants and versions() function
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
.. deprecated:: 10.3.0
|
|
||||||
|
|
||||||
A number of constants and a function in :py:mod:`.ImageCms` have been deprecated.
|
|
||||||
This includes a table of flags based on LittleCMS version 1 which has been
|
|
||||||
replaced with a new class :py:class:`.ImageCms.Flags` based on LittleCMS 2 flags.
|
|
||||||
|
|
||||||
============================================ ====================================================
|
|
||||||
Deprecated Use instead
|
|
||||||
============================================ ====================================================
|
|
||||||
``ImageCms.DESCRIPTION`` No replacement
|
|
||||||
``ImageCms.VERSION`` ``PIL.__version__``
|
|
||||||
``ImageCms.FLAGS["MATRIXINPUT"]`` :py:attr:`.ImageCms.Flags.CLUT_POST_LINEARIZATION`
|
|
||||||
``ImageCms.FLAGS["MATRIXOUTPUT"]`` :py:attr:`.ImageCms.Flags.FORCE_CLUT`
|
|
||||||
``ImageCms.FLAGS["MATRIXONLY"]`` No replacement
|
|
||||||
``ImageCms.FLAGS["NOWHITEONWHITEFIXUP"]`` :py:attr:`.ImageCms.Flags.NOWHITEONWHITEFIXUP`
|
|
||||||
``ImageCms.FLAGS["NOPRELINEARIZATION"]`` :py:attr:`.ImageCms.Flags.CLUT_PRE_LINEARIZATION`
|
|
||||||
``ImageCms.FLAGS["GUESSDEVICECLASS"]`` :py:attr:`.ImageCms.Flags.GUESSDEVICECLASS`
|
|
||||||
``ImageCms.FLAGS["NOTCACHE"]`` :py:attr:`.ImageCms.Flags.NOCACHE`
|
|
||||||
``ImageCms.FLAGS["NOTPRECALC"]`` :py:attr:`.ImageCms.Flags.NOOPTIMIZE`
|
|
||||||
``ImageCms.FLAGS["NULLTRANSFORM"]`` :py:attr:`.ImageCms.Flags.NULLTRANSFORM`
|
|
||||||
``ImageCms.FLAGS["HIGHRESPRECALC"]`` :py:attr:`.ImageCms.Flags.HIGHRESPRECALC`
|
|
||||||
``ImageCms.FLAGS["LOWRESPRECALC"]`` :py:attr:`.ImageCms.Flags.LOWRESPRECALC`
|
|
||||||
``ImageCms.FLAGS["GAMUTCHECK"]`` :py:attr:`.ImageCms.Flags.GAMUTCHECK`
|
|
||||||
``ImageCms.FLAGS["WHITEBLACKCOMPENSATION"]`` :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
|
|
||||||
``ImageCms.FLAGS["BLACKPOINTCOMPENSATION"]`` :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
|
|
||||||
``ImageCms.FLAGS["SOFTPROOFING"]`` :py:attr:`.ImageCms.Flags.SOFTPROOFING`
|
|
||||||
``ImageCms.FLAGS["PRESERVEBLACK"]`` :py:attr:`.ImageCms.Flags.NONEGATIVES`
|
|
||||||
``ImageCms.FLAGS["NODEFAULTRESOURCEDEF"]`` :py:attr:`.ImageCms.Flags.NODEFAULTRESOURCEDEF`
|
|
||||||
``ImageCms.FLAGS["GRIDPOINTS"]`` :py:attr:`.ImageCms.Flags.GRIDPOINTS()`
|
|
||||||
``ImageCms.versions()`` :py:func:`PIL.features.version_module` with
|
|
||||||
``feature="littlecms2"``, :py:data:`sys.version` or
|
|
||||||
:py:data:`sys.version_info`, and ``PIL.__version__``
|
|
||||||
============================================ ====================================================
|
|
||||||
|
|
||||||
ImageMath eval()
|
|
||||||
^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 10.3.0
|
|
||||||
|
|
||||||
``ImageMath.eval()`` has been deprecated. Use :py:meth:`~PIL.ImageMath.lambda_eval` or
|
|
||||||
:py:meth:`~PIL.ImageMath.unsafe_eval` instead.
|
|
||||||
|
|
||||||
BGR;15, BGR 16 and BGR;24
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 10.4.0
|
|
||||||
|
|
||||||
The experimental BGR;15, BGR;16 and BGR;24 modes have been deprecated.
|
|
||||||
|
|
||||||
Non-image modes in ImageCms
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 10.4.0
|
|
||||||
|
|
||||||
The use in :py:mod:`.ImageCms` of input modes and output modes that are not Pillow
|
|
||||||
image modes has been deprecated. Defaulting to "L" or "1" if the mode cannot be mapped
|
|
||||||
is also deprecated.
|
|
||||||
|
|
||||||
Support for LibTIFF earlier than 4
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 10.4.0
|
|
||||||
|
|
||||||
Support for LibTIFF earlier than version 4 has been deprecated.
|
|
||||||
Upgrade to a newer version of LibTIFF instead.
|
|
||||||
|
|
||||||
ImageDraw.getdraw hints parameter
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 10.4.0
|
|
||||||
|
|
||||||
The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated.
|
|
||||||
|
|
||||||
FreeType 2.9.0
|
|
||||||
^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 11.0.0
|
|
||||||
|
|
||||||
Support for FreeType 2.9.0 is deprecated and will be removed in Pillow 12.0.0
|
|
||||||
(2025-10-15), when FreeType 2.9.1 will be the minimum supported.
|
|
||||||
|
|
||||||
We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe
|
|
||||||
vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`).
|
|
||||||
|
|
||||||
.. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/
|
|
||||||
|
|
||||||
ICNS (width, height, scale) sizes
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 11.0.0
|
|
||||||
|
|
||||||
Setting an ICNS image size to ``(width, height, scale)`` before loading has been
|
|
||||||
deprecated. Instead, ``load(scale)`` can be used.
|
|
||||||
|
|
||||||
Image isImageType()
|
|
||||||
^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 11.0.0
|
|
||||||
|
|
||||||
``Image.isImageType(im)`` has been deprecated. Use ``isinstance(im, Image.Image)``
|
|
||||||
instead.
|
|
||||||
|
|
||||||
ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 11.0.0
|
|
||||||
|
|
||||||
The ``options`` parameter in :py:meth:`~PIL.ImageMath.lambda_eval()` and
|
|
||||||
:py:meth:`~PIL.ImageMath.unsafe_eval()` has been deprecated. One or more keyword
|
|
||||||
arguments can be used instead.
|
|
||||||
|
|
||||||
JpegImageFile.huffman_ac and JpegImageFile.huffman_dc
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 11.0.0
|
|
||||||
|
|
||||||
The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused. They
|
|
||||||
have been deprecated, and will be removed in Pillow 12 (2025-10-15).
|
|
||||||
|
|
||||||
Specific WebP feature checks
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 11.0.0
|
|
||||||
|
|
||||||
``features.check("transp_webp")``, ``features.check("webp_mux")`` and
|
|
||||||
``features.check("webp_anim")`` are now deprecated. They will always return
|
|
||||||
``True`` if the WebP module is installed, until they are removed in Pillow
|
|
||||||
12.0.0 (2025-10-15).
|
|
||||||
|
|
||||||
Get internal pointers to objects
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
.. deprecated:: 11.0.0
|
|
||||||
|
|
||||||
``Image.core.ImagingCore.id`` and ``Image.core.ImagingCore.unsafe_ptrs`` have been
|
|
||||||
deprecated and will be removed in Pillow 12 (2025-10-15). They were used for obtaining
|
|
||||||
raw pointers to ``ImagingCore`` internals. To interact with C code, you can use
|
|
||||||
``Image.Image.getim()``, which returns a ``Capsule`` object.
|
|
||||||
|
|
||||||
ExifTags.IFD.Makernote
|
ExifTags.IFD.Makernote
|
||||||
^^^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
@ -215,18 +52,201 @@ another mode before saving::
|
||||||
im = Image.new("I", (1, 1))
|
im = Image.new("I", (1, 1))
|
||||||
im.convert("I;16").save("out.png")
|
im.convert("I;16").save("out.png")
|
||||||
|
|
||||||
|
ImageCms.ImageCmsProfile.product_name and .product_info
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 12.0.0
|
||||||
|
|
||||||
|
``ImageCms.ImageCmsProfile.product_name`` and the corresponding
|
||||||
|
``.product_info`` attributes have been deprecated, and will be removed in
|
||||||
|
Pillow 13 (2026-10-15). They have been set to ``None`` since Pillow 2.3.0.
|
||||||
|
|
||||||
Removed features
|
Removed features
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
Deprecated features are only removed in major releases after an appropriate
|
Deprecated features are only removed in major releases after an appropriate
|
||||||
period of deprecation has passed.
|
period of deprecation has passed.
|
||||||
|
|
||||||
|
ImageFile.raise_oserror
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 10.2.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
``ImageFile.raise_oserror()`` has been removed. The function was undocumented and was
|
||||||
|
only useful for translating error codes returned by a codec's ``decode()`` method,
|
||||||
|
which ImageFile already did automatically.
|
||||||
|
|
||||||
|
IptcImageFile helper functions
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 10.2.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
The functions ``IptcImageFile.dump`` and ``IptcImageFile.i``, and the constant
|
||||||
|
``IptcImageFile.PAD`` have been removed. These were undocumented helper functions
|
||||||
|
intended for internal use, so there is no replacement. They can each be replaced by a
|
||||||
|
single line of code using builtin functions in Python.
|
||||||
|
|
||||||
|
ImageCms constants and versions() function
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 10.3.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
A number of constants and a function in :py:mod:`.ImageCms` have been removed. This
|
||||||
|
includes a table of flags based on LittleCMS version 1 which has been replaced with a
|
||||||
|
new class :py:class:`.ImageCms.Flags` based on LittleCMS 2 flags.
|
||||||
|
|
||||||
|
============================================ ====================================================
|
||||||
|
Deprecated Use instead
|
||||||
|
============================================ ====================================================
|
||||||
|
``ImageCms.DESCRIPTION`` No replacement
|
||||||
|
``ImageCms.VERSION`` ``PIL.__version__``
|
||||||
|
``ImageCms.FLAGS["MATRIXINPUT"]`` :py:attr:`.ImageCms.Flags.CLUT_POST_LINEARIZATION`
|
||||||
|
``ImageCms.FLAGS["MATRIXOUTPUT"]`` :py:attr:`.ImageCms.Flags.FORCE_CLUT`
|
||||||
|
``ImageCms.FLAGS["MATRIXONLY"]`` No replacement
|
||||||
|
``ImageCms.FLAGS["NOWHITEONWHITEFIXUP"]`` :py:attr:`.ImageCms.Flags.NOWHITEONWHITEFIXUP`
|
||||||
|
``ImageCms.FLAGS["NOPRELINEARIZATION"]`` :py:attr:`.ImageCms.Flags.CLUT_PRE_LINEARIZATION`
|
||||||
|
``ImageCms.FLAGS["GUESSDEVICECLASS"]`` :py:attr:`.ImageCms.Flags.GUESSDEVICECLASS`
|
||||||
|
``ImageCms.FLAGS["NOTCACHE"]`` :py:attr:`.ImageCms.Flags.NOCACHE`
|
||||||
|
``ImageCms.FLAGS["NOTPRECALC"]`` :py:attr:`.ImageCms.Flags.NOOPTIMIZE`
|
||||||
|
``ImageCms.FLAGS["NULLTRANSFORM"]`` :py:attr:`.ImageCms.Flags.NULLTRANSFORM`
|
||||||
|
``ImageCms.FLAGS["HIGHRESPRECALC"]`` :py:attr:`.ImageCms.Flags.HIGHRESPRECALC`
|
||||||
|
``ImageCms.FLAGS["LOWRESPRECALC"]`` :py:attr:`.ImageCms.Flags.LOWRESPRECALC`
|
||||||
|
``ImageCms.FLAGS["GAMUTCHECK"]`` :py:attr:`.ImageCms.Flags.GAMUTCHECK`
|
||||||
|
``ImageCms.FLAGS["WHITEBLACKCOMPENSATION"]`` :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
|
||||||
|
``ImageCms.FLAGS["BLACKPOINTCOMPENSATION"]`` :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
|
||||||
|
``ImageCms.FLAGS["SOFTPROOFING"]`` :py:attr:`.ImageCms.Flags.SOFTPROOFING`
|
||||||
|
``ImageCms.FLAGS["PRESERVEBLACK"]`` :py:attr:`.ImageCms.Flags.NONEGATIVES`
|
||||||
|
``ImageCms.FLAGS["NODEFAULTRESOURCEDEF"]`` :py:attr:`.ImageCms.Flags.NODEFAULTRESOURCEDEF`
|
||||||
|
``ImageCms.FLAGS["GRIDPOINTS"]`` :py:attr:`.ImageCms.Flags.GRIDPOINTS()`
|
||||||
|
``ImageCms.versions()`` :py:func:`PIL.features.version_module` with
|
||||||
|
``feature="littlecms2"``, :py:data:`sys.version` or
|
||||||
|
:py:data:`sys.version_info`, and ``PIL.__version__``
|
||||||
|
============================================ ====================================================
|
||||||
|
|
||||||
|
ImageMath eval()
|
||||||
|
^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 10.3.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
``ImageMath.eval()`` has been removed. Use :py:meth:`~PIL.ImageMath.lambda_eval` or
|
||||||
|
:py:meth:`~PIL.ImageMath.unsafe_eval` instead.
|
||||||
|
|
||||||
|
BGR;15, BGR 16 and BGR;24
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 10.4.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
The experimental BGR;15, BGR;16 and BGR;24 modes have been removed.
|
||||||
|
|
||||||
|
Non-image modes in ImageCms
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 10.4.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
The use in :py:mod:`.ImageCms` of input modes and output modes that are not Pillow
|
||||||
|
image modes has been removed. Defaulting to "L" or "1" if the mode cannot be mapped has
|
||||||
|
also been removed.
|
||||||
|
|
||||||
|
Support for LibTIFF earlier than 4
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 10.4.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
Support for LibTIFF earlier than version 4 has been removed.
|
||||||
|
Upgrade to a newer version of LibTIFF instead.
|
||||||
|
|
||||||
|
ImageDraw.getdraw hints parameter
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 10.4.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been removed.
|
||||||
|
|
||||||
|
FreeType 2.9.0
|
||||||
|
^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 11.0.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
Support for FreeType 2.9.0 has been removed. FreeType 2.9.1 is the minimum version
|
||||||
|
supported.
|
||||||
|
|
||||||
|
We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe
|
||||||
|
vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`).
|
||||||
|
|
||||||
|
.. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/
|
||||||
|
|
||||||
|
ICNS (width, height, scale) sizes
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 11.0.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
Setting an ICNS image size to ``(width, height, scale)`` before loading has been
|
||||||
|
removed. Instead, ``load(scale)`` can be used.
|
||||||
|
|
||||||
|
Image isImageType()
|
||||||
|
^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 11.0.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
``Image.isImageType(im)`` has been removed. Use ``isinstance(im, Image.Image)``
|
||||||
|
instead.
|
||||||
|
|
||||||
|
ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 11.0.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
The ``options`` parameter in :py:meth:`~PIL.ImageMath.lambda_eval()` and
|
||||||
|
:py:meth:`~PIL.ImageMath.unsafe_eval()` has been removed. One or more keyword
|
||||||
|
arguments can be used instead.
|
||||||
|
|
||||||
|
JpegImageFile.huffman_ac and JpegImageFile.huffman_dc
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 11.0.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused. They
|
||||||
|
have been removed.
|
||||||
|
|
||||||
|
Specific WebP feature checks
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 11.0.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
``features.check("transp_webp")``, ``features.check("webp_mux")`` and
|
||||||
|
``features.check("webp_anim")`` have been removed.
|
||||||
|
|
||||||
|
Get internal pointers to objects
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
.. deprecated:: 11.0.0
|
||||||
|
.. versionremoved:: 12.0.0
|
||||||
|
|
||||||
|
``Image.core.ImagingCore.id`` and ``Image.core.ImagingCore.unsafe_ptrs`` have been
|
||||||
|
removed. They were used for obtaining raw pointers to ``ImagingCore`` internals. To
|
||||||
|
interact with C code, you can use ``Image.Image.getim()``, which returns a ``Capsule``
|
||||||
|
object.
|
||||||
|
|
||||||
TiffImagePlugin IFD_LEGACY_API
|
TiffImagePlugin IFD_LEGACY_API
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
.. versionremoved:: 11.0.0
|
.. versionremoved:: 11.0.0
|
||||||
|
|
||||||
``TiffImagePlugin.IFD_LEGACY_API`` was removed, as it was an unused setting.
|
``TiffImagePlugin.IFD_LEGACY_API`` has been removed, as it was an unused setting.
|
||||||
|
|
||||||
PSFile
|
PSFile
|
||||||
~~~~~~
|
~~~~~~
|
||||||
|
|
|
@ -101,6 +101,28 @@ Palette
|
||||||
The palette mode (``P``) uses a color palette to define the actual color for
|
The palette mode (``P``) uses a color palette to define the actual color for
|
||||||
each pixel.
|
each pixel.
|
||||||
|
|
||||||
|
.. _colors:
|
||||||
|
|
||||||
|
Colors
|
||||||
|
------
|
||||||
|
|
||||||
|
To specify colors, you can use tuples with a value for each channel in the image, e.g.
|
||||||
|
``Image.new("RGB", (1, 1), (255, 0, 0))``.
|
||||||
|
|
||||||
|
If an image has a single channel, you can use a single number instead, e.g.
|
||||||
|
``Image.new("L", (1, 1), 255)``. For "F" mode images, floating point values are also
|
||||||
|
accepted. In the case of "P" mode images, these will be indexes for the color palette.
|
||||||
|
|
||||||
|
If a single value is used for an image with more than one channel, it will still be
|
||||||
|
parsed::
|
||||||
|
|
||||||
|
>>> from PIL import Image
|
||||||
|
>>> im = Image.new("RGBA", (1, 1), 0x04030201)
|
||||||
|
>>> im.getpixel((0, 0))
|
||||||
|
(1, 2, 3, 4)
|
||||||
|
|
||||||
|
Some methods accept other forms, such as color names. See :ref:`color-names`.
|
||||||
|
|
||||||
Info
|
Info
|
||||||
----
|
----
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,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.7.0**
|
* Pillow has been tested with libtiff versions **4.0-4.7.0**
|
||||||
|
|
||||||
* **libfreetype** provides type related services
|
* **libfreetype** provides type related services
|
||||||
|
|
||||||
|
@ -276,10 +276,9 @@ Build options
|
||||||
|
|
||||||
* Config setting: ``-C parallel=n``. Can also be given
|
* Config setting: ``-C parallel=n``. Can also be given
|
||||||
with environment variable: ``MAX_CONCURRENCY=n``. Pillow can use
|
with environment variable: ``MAX_CONCURRENCY=n``. Pillow can use
|
||||||
multiprocessing to build the extension. Setting ``-C parallel=n``
|
multiprocessing to build the extensions. Setting ``-C parallel=n``
|
||||||
sets the number of CPUs to use to ``n``, or can disable parallel building by
|
sets the number of CPUs to use to ``n``, or can disable parallel building by
|
||||||
using a setting of 1. By default, it uses 4 CPUs, or if 4 are not
|
using a setting of 1. By default, it uses as many CPUs as are present.
|
||||||
available, as many as are present.
|
|
||||||
|
|
||||||
* Config settings: ``-C zlib=disable``, ``-C jpeg=disable``,
|
* Config settings: ``-C zlib=disable``, ``-C jpeg=disable``,
|
||||||
``-C tiff=disable``, ``-C freetype=disable``, ``-C raqm=disable``,
|
``-C tiff=disable``, ``-C freetype=disable``, ``-C raqm=disable``,
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
Python,3.13,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5
|
Python,3.14,3.13,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5
|
||||||
Pillow >= 11,Yes,Yes,Yes,Yes,Yes,,,,
|
Pillow 12,Yes,Yes,Yes,Yes,Yes,,,,,
|
||||||
Pillow 10.1 - 10.4,,Yes,Yes,Yes,Yes,Yes,,,
|
Pillow 11,,Yes,Yes,Yes,Yes,Yes,,,,
|
||||||
Pillow 10.0,,,Yes,Yes,Yes,Yes,,,
|
Pillow 10.1 - 10.4,,,Yes,Yes,Yes,Yes,Yes,,,
|
||||||
Pillow 9.3 - 9.5,,,Yes,Yes,Yes,Yes,Yes,,
|
Pillow 10.0,,,,Yes,Yes,Yes,Yes,,,
|
||||||
Pillow 9.0 - 9.2,,,,Yes,Yes,Yes,Yes,,
|
Pillow 9.3 - 9.5,,,,Yes,Yes,Yes,Yes,Yes,,
|
||||||
Pillow 8.3.2 - 8.4,,,,Yes,Yes,Yes,Yes,Yes,
|
Pillow 9.0 - 9.2,,,,,Yes,Yes,Yes,Yes,,
|
||||||
Pillow 8.0 - 8.3.1,,,,,Yes,Yes,Yes,Yes,
|
Pillow 8.3.2 - 8.4,,,,,Yes,Yes,Yes,Yes,Yes,
|
||||||
Pillow 7.0 - 7.2,,,,,,Yes,Yes,Yes,Yes
|
Pillow 8.0 - 8.3.1,,,,,,Yes,Yes,Yes,Yes,
|
||||||
|
Pillow 7.0 - 7.2,,,,,,,Yes,Yes,Yes,Yes
|
||||||
|
|
|
|
@ -75,7 +75,7 @@ These platforms have been reported to work at the versions mentioned.
|
||||||
| Operating system | | Tested Python | | Latest tested | | Tested |
|
| Operating system | | Tested Python | | Latest tested | | Tested |
|
||||||
| | | versions | | Pillow version | | processors |
|
| | | versions | | Pillow version | | processors |
|
||||||
+==================================+============================+==================+==============+
|
+==================================+============================+==================+==============+
|
||||||
| macOS 15 Sequoia | 3.9, 3.10, 3.11, 3.12, 3.13| 11.2.1 |arm |
|
| macOS 15 Sequoia | 3.9, 3.10, 3.11, 3.12, 3.13| 11.3.0 |arm |
|
||||||
| +----------------------------+------------------+ |
|
| +----------------------------+------------------+ |
|
||||||
| | 3.8 | 10.4.0 | |
|
| | 3.8 | 10.4.0 | |
|
||||||
+----------------------------------+----------------------------+------------------+--------------+
|
+----------------------------------+----------------------------+------------------+--------------+
|
||||||
|
|
|
@ -56,7 +56,6 @@ Functions
|
||||||
.. autofunction:: get_display_profile
|
.. autofunction:: get_display_profile
|
||||||
.. autofunction:: isIntentSupported
|
.. autofunction:: isIntentSupported
|
||||||
.. autofunction:: profileToProfile
|
.. autofunction:: profileToProfile
|
||||||
.. autofunction:: versions
|
|
||||||
|
|
||||||
CmsProfile
|
CmsProfile
|
||||||
----------
|
----------
|
||||||
|
|
|
@ -45,9 +45,7 @@ Colors
|
||||||
^^^^^^
|
^^^^^^
|
||||||
|
|
||||||
To specify colors, you can use numbers or tuples just as you would use with
|
To specify colors, you can use numbers or tuples just as you would use with
|
||||||
:py:meth:`PIL.Image.new` or :py:meth:`PIL.Image.Image.putpixel`. For “1”,
|
:py:meth:`PIL.Image.new`. See :ref:`colors` for more information.
|
||||||
“L”, and “I” images, use integers. For “RGB” images, use a 3-tuple containing
|
|
||||||
integer values. For “F” images, use integer or floating point values.
|
|
||||||
|
|
||||||
For palette images (mode “P”), use integers as color indexes. In 1.1.4 and
|
For palette images (mode “P”), use integers as color indexes. In 1.1.4 and
|
||||||
later, you can also use RGB 3-tuples or color names (see below). The drawing
|
later, you can also use RGB 3-tuples or color names (see below). The drawing
|
||||||
|
|
|
@ -59,7 +59,7 @@ Access using negative indexes is also possible. ::
|
||||||
|
|
||||||
Modifies the pixel at x,y. The color is given as a single
|
Modifies the pixel at x,y. The color is given as a single
|
||||||
numerical value for single band images, and a tuple for
|
numerical value for single band images, and a tuple for
|
||||||
multi-band images.
|
multi-band images. See :ref:`colors` for more information.
|
||||||
|
|
||||||
:param xy: The pixel coordinate, given as (x, y).
|
:param xy: The pixel coordinate, given as (x, y).
|
||||||
:param color: The pixel value according to its mode,
|
:param color: The pixel value according to its mode,
|
||||||
|
|
|
@ -21,9 +21,7 @@ with any Arrow provider or consumer in the Python ecosystem.
|
||||||
Data formats
|
Data formats
|
||||||
============
|
============
|
||||||
|
|
||||||
Pillow currently supports exporting Arrow images in all modes
|
Pillow currently supports exporting Arrow images in all modes.
|
||||||
**except** for ``BGR;15``, ``BGR;16`` and ``BGR;24``. This is due to
|
|
||||||
line-length packing in these modes making for non-continuous memory.
|
|
||||||
|
|
||||||
For single-band images, the exported array is width*height elements,
|
For single-band images, the exported array is width*height elements,
|
||||||
with each pixel corresponding to the appropriate Arrow type.
|
with each pixel corresponding to the appropriate Arrow type.
|
||||||
|
|
|
@ -60,9 +60,6 @@ Support for the following features can be checked:
|
||||||
* ``raqm``: Raqm library, required for ``ImageFont.Layout.RAQM`` in :py:func:`PIL.ImageFont.truetype`. Run-time version number is available for Raqm 0.7.0 or newer.
|
* ``raqm``: Raqm library, required for ``ImageFont.Layout.RAQM`` in :py:func:`PIL.ImageFont.truetype`. Run-time version number is available for Raqm 0.7.0 or newer.
|
||||||
* ``libimagequant``: (compile time) ImageQuant quantization support in :py:func:`PIL.Image.Image.quantize`. Run-time version number is available.
|
* ``libimagequant``: (compile time) ImageQuant quantization support in :py:func:`PIL.Image.Image.quantize`. Run-time version number is available.
|
||||||
* ``xcb``: (compile time) Support for X11 in :py:func:`PIL.ImageGrab.grab` via the XCB library.
|
* ``xcb``: (compile time) Support for X11 in :py:func:`PIL.ImageGrab.grab` via the XCB library.
|
||||||
* ``transp_webp``: Deprecated. Always ``True`` if WebP module is installed.
|
|
||||||
* ``webp_mux``: Deprecated. Always ``True`` if WebP module is installed.
|
|
||||||
* ``webp_anim``: Deprecated. Always ``True`` if WebP module is installed.
|
|
||||||
|
|
||||||
.. autofunction:: PIL.features.check_feature
|
.. autofunction:: PIL.features.check_feature
|
||||||
.. autofunction:: PIL.features.version_feature
|
.. autofunction:: PIL.features.version_feature
|
||||||
|
|
|
@ -69,12 +69,14 @@ AVIF support in wheels
|
||||||
|
|
||||||
Support for reading and writing AVIF images is now included in Pillow's wheels, except
|
Support for reading and writing AVIF images is now included in Pillow's wheels, except
|
||||||
for Windows ARM64 and iOS. libaom is available as an encoder and dav1d as a decoder.
|
for Windows ARM64 and iOS. libaom is available as an encoder and dav1d as a decoder.
|
||||||
|
(Thank you Frankie Dintino and Andrew Murray!)
|
||||||
|
|
||||||
iOS
|
iOS
|
||||||
^^^
|
^^^
|
||||||
|
|
||||||
Pillow now provides wheels that can be used on iOS ARM64 devices, and on the iOS
|
Pillow now provides wheels that can be used on iOS ARM64 devices, and on the iOS
|
||||||
simulator on ARM64 and x86_64. Currently, only Python 3.13 wheels are available.
|
simulator on ARM64 and x86_64. Currently, only Python 3.13 wheels are available.
|
||||||
|
(Thank you Russell Keith-Magee and Andrew Murray!)
|
||||||
|
|
||||||
Python 3.14 beta
|
Python 3.14 beta
|
||||||
^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^
|
||||||
|
|
146
docs/releasenotes/12.0.0.rst
Normal file
146
docs/releasenotes/12.0.0.rst
Normal file
|
@ -0,0 +1,146 @@
|
||||||
|
12.0.0
|
||||||
|
------
|
||||||
|
|
||||||
|
Security
|
||||||
|
========
|
||||||
|
|
||||||
|
TODO
|
||||||
|
^^^^
|
||||||
|
|
||||||
|
TODO
|
||||||
|
|
||||||
|
:cve:`YYYY-XXXXX`: TODO
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
TODO
|
||||||
|
|
||||||
|
Backwards incompatible changes
|
||||||
|
==============================
|
||||||
|
|
||||||
|
ImageFile.raise_oserror
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
``ImageFile.raise_oserror()`` has been removed. The function was undocumented and was
|
||||||
|
only useful for translating error codes returned by a codec's ``decode()`` method,
|
||||||
|
which ImageFile already did automatically.
|
||||||
|
|
||||||
|
IptcImageFile helper functions
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
The functions ``IptcImageFile.dump`` and ``IptcImageFile.i``, and the constant
|
||||||
|
``IptcImageFile.PAD`` have been removed. These were undocumented helper functions
|
||||||
|
intended for internal use, so there is no replacement. They can each be replaced by a
|
||||||
|
single line of code using builtin functions in Python.
|
||||||
|
|
||||||
|
ImageCms constants and versions() function
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
A number of constants and a function in :py:mod:`.ImageCms` have been removed. This
|
||||||
|
includes a table of flags based on LittleCMS version 1 which has been replaced with a
|
||||||
|
new class :py:class:`.ImageCms.Flags` based on LittleCMS 2 flags.
|
||||||
|
|
||||||
|
============================================ ====================================================
|
||||||
|
Deprecated Use instead
|
||||||
|
============================================ ====================================================
|
||||||
|
``ImageCms.DESCRIPTION`` No replacement
|
||||||
|
``ImageCms.VERSION`` ``PIL.__version__``
|
||||||
|
``ImageCms.FLAGS["MATRIXINPUT"]`` :py:attr:`.ImageCms.Flags.CLUT_POST_LINEARIZATION`
|
||||||
|
``ImageCms.FLAGS["MATRIXOUTPUT"]`` :py:attr:`.ImageCms.Flags.FORCE_CLUT`
|
||||||
|
``ImageCms.FLAGS["MATRIXONLY"]`` No replacement
|
||||||
|
``ImageCms.FLAGS["NOWHITEONWHITEFIXUP"]`` :py:attr:`.ImageCms.Flags.NOWHITEONWHITEFIXUP`
|
||||||
|
``ImageCms.FLAGS["NOPRELINEARIZATION"]`` :py:attr:`.ImageCms.Flags.CLUT_PRE_LINEARIZATION`
|
||||||
|
``ImageCms.FLAGS["GUESSDEVICECLASS"]`` :py:attr:`.ImageCms.Flags.GUESSDEVICECLASS`
|
||||||
|
``ImageCms.FLAGS["NOTCACHE"]`` :py:attr:`.ImageCms.Flags.NOCACHE`
|
||||||
|
``ImageCms.FLAGS["NOTPRECALC"]`` :py:attr:`.ImageCms.Flags.NOOPTIMIZE`
|
||||||
|
``ImageCms.FLAGS["NULLTRANSFORM"]`` :py:attr:`.ImageCms.Flags.NULLTRANSFORM`
|
||||||
|
``ImageCms.FLAGS["HIGHRESPRECALC"]`` :py:attr:`.ImageCms.Flags.HIGHRESPRECALC`
|
||||||
|
``ImageCms.FLAGS["LOWRESPRECALC"]`` :py:attr:`.ImageCms.Flags.LOWRESPRECALC`
|
||||||
|
``ImageCms.FLAGS["GAMUTCHECK"]`` :py:attr:`.ImageCms.Flags.GAMUTCHECK`
|
||||||
|
``ImageCms.FLAGS["WHITEBLACKCOMPENSATION"]`` :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
|
||||||
|
``ImageCms.FLAGS["BLACKPOINTCOMPENSATION"]`` :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
|
||||||
|
``ImageCms.FLAGS["SOFTPROOFING"]`` :py:attr:`.ImageCms.Flags.SOFTPROOFING`
|
||||||
|
``ImageCms.FLAGS["PRESERVEBLACK"]`` :py:attr:`.ImageCms.Flags.NONEGATIVES`
|
||||||
|
``ImageCms.FLAGS["NODEFAULTRESOURCEDEF"]`` :py:attr:`.ImageCms.Flags.NODEFAULTRESOURCEDEF`
|
||||||
|
``ImageCms.FLAGS["GRIDPOINTS"]`` :py:attr:`.ImageCms.Flags.GRIDPOINTS()`
|
||||||
|
``ImageCms.versions()`` :py:func:`PIL.features.version_module` with
|
||||||
|
``feature="littlecms2"``, :py:data:`sys.version` or
|
||||||
|
:py:data:`sys.version_info`, and ``PIL.__version__``
|
||||||
|
============================================ ====================================================
|
||||||
|
|
||||||
|
ImageMath eval()
|
||||||
|
^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
``ImageMath.eval()`` has been removed. Use :py:meth:`~PIL.ImageMath.lambda_eval` or
|
||||||
|
:py:meth:`~PIL.ImageMath.unsafe_eval` instead.
|
||||||
|
|
||||||
|
BGR;15, BGR 16 and BGR;24
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
The experimental BGR;15, BGR;16 and BGR;24 modes have been removed.
|
||||||
|
|
||||||
|
Non-image modes in ImageCms
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
The use in :py:mod:`.ImageCms` of input modes and output modes that are not Pillow
|
||||||
|
image modes has been removed. Defaulting to "L" or "1" if the mode cannot be mapped has
|
||||||
|
also been removed.
|
||||||
|
|
||||||
|
Support for LibTIFF earlier than 4
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
Support for LibTIFF earlier than version 4 has been removed.
|
||||||
|
Upgrade to a newer version of LibTIFF instead.
|
||||||
|
|
||||||
|
ImageDraw.getdraw hints parameter
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been removed.
|
||||||
|
|
||||||
|
FreeType 2.9.0
|
||||||
|
^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
Support for FreeType 2.9.0 has been removed. FreeType 2.9.1 is the minimum version
|
||||||
|
supported.
|
||||||
|
|
||||||
|
We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe
|
||||||
|
vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`).
|
||||||
|
|
||||||
|
.. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/
|
||||||
|
|
||||||
|
Deprecations
|
||||||
|
============
|
||||||
|
|
||||||
|
ImageCms.ImageCmsProfile.product_name and .product_info
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
``ImageCms.ImageCmsProfile.product_name`` and the corresponding
|
||||||
|
``.product_info`` attributes have been deprecated, and will be removed in
|
||||||
|
Pillow 13 (2026-10-15). They have been set to ``None`` since Pillow 2.3.0.
|
||||||
|
|
||||||
|
API changes
|
||||||
|
===========
|
||||||
|
|
||||||
|
TODO
|
||||||
|
^^^^
|
||||||
|
|
||||||
|
TODO
|
||||||
|
|
||||||
|
API additions
|
||||||
|
=============
|
||||||
|
|
||||||
|
TODO
|
||||||
|
^^^^
|
||||||
|
|
||||||
|
TODO
|
||||||
|
|
||||||
|
Other changes
|
||||||
|
=============
|
||||||
|
|
||||||
|
Python 3.14
|
||||||
|
^^^^^^^^^^^
|
||||||
|
|
||||||
|
Pillow 11.3.0 had wheels built against Python 3.14 beta, available as a preview to help
|
||||||
|
others prepare for 3.14, and to ensure Pillow could be used immediately at the release
|
||||||
|
of 3.14.0 final (2025-10-07, :pep:`745`).
|
||||||
|
|
||||||
|
Pillow 12.0.0 now officially supports Python 3.14.
|
|
@ -14,6 +14,7 @@ expected to be backported to earlier versions.
|
||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 2
|
:maxdepth: 2
|
||||||
|
|
||||||
|
12.0.0
|
||||||
11.3.0
|
11.3.0
|
||||||
11.2.1
|
11.2.1
|
||||||
11.1.0
|
11.1.0
|
||||||
|
|
|
@ -20,6 +20,8 @@ Backwards incompatible changes
|
||||||
TODO
|
TODO
|
||||||
^^^^
|
^^^^
|
||||||
|
|
||||||
|
TODO
|
||||||
|
|
||||||
Deprecations
|
Deprecations
|
||||||
============
|
============
|
||||||
|
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
# libwebp example binaries require dependencies that aren't available for iOS builds.
|
|
||||||
# There's also no easy way to invoke the build to *exclude* the example builds.
|
|
||||||
# Since we don't need the examples anyway, remove them from the Makefile.
|
|
||||||
#
|
|
||||||
# As a point of reference, libwebp provides an XCFramework build script that involves
|
|
||||||
# 7 separate invocations of make to avoid building the examples. Patching the Makefile
|
|
||||||
# to remove the examples is a simpler approach, and one that is more compatible with
|
|
||||||
# the existing multibuild infrastructure.
|
|
||||||
#
|
|
||||||
# In the next release, it should be possible to pass --disable-libwebpexamples
|
|
||||||
# instead of applying this patch.
|
|
||||||
#
|
|
||||||
diff -ur libwebp-1.5.0-orig/Makefile.am libwebp-1.5.0/Makefile.am
|
|
||||||
--- libwebp-1.5.0-orig/Makefile.am 2024-12-20 09:17:50
|
|
||||||
+++ libwebp-1.5.0/Makefile.am 2025-01-09 11:24:17
|
|
||||||
@@ -5,5 +5,3 @@
|
|
||||||
if BUILD_EXTRAS
|
|
||||||
SUBDIRS += extras
|
|
||||||
endif
|
|
||||||
-
|
|
||||||
-SUBDIRS += examples
|
|
||||||
diff -ur libwebp-1.5.0-orig/Makefile.in libwebp-1.5.0/Makefile.in
|
|
||||||
--- libwebp-1.5.0-orig/Makefile.in 2024-12-20 09:52:53
|
|
||||||
+++ libwebp-1.5.0/Makefile.in 2025-01-09 11:24:17
|
|
||||||
@@ -156,7 +156,7 @@
|
|
||||||
unique=`for i in $$list; do \
|
|
||||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
||||||
done | $(am__uniquify_input)`
|
|
||||||
-DIST_SUBDIRS = sharpyuv src imageio man extras examples
|
|
||||||
+DIST_SUBDIRS = sharpyuv src imageio man extras
|
|
||||||
am__DIST_COMMON = $(srcdir)/Makefile.in \
|
|
||||||
$(top_srcdir)/src/webp/config.h.in AUTHORS COPYING ChangeLog \
|
|
||||||
NEWS README.md ar-lib compile config.guess config.sub \
|
|
||||||
@@ -351,7 +351,7 @@
|
|
||||||
top_srcdir = @top_srcdir@
|
|
||||||
webp_libname_prefix = @webp_libname_prefix@
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
|
||||||
-SUBDIRS = sharpyuv src imageio man $(am__append_1) examples
|
|
||||||
+SUBDIRS = sharpyuv src imageio man $(am__append_1)
|
|
||||||
EXTRA_DIST = COPYING autogen.sh
|
|
||||||
all: all-recursive
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
[build-system]
|
[build-system]
|
||||||
build-backend = "backend"
|
build-backend = "backend"
|
||||||
requires = [
|
requires = [
|
||||||
|
"pybind11",
|
||||||
"setuptools>=77",
|
"setuptools>=77",
|
||||||
]
|
]
|
||||||
backend-path = [
|
backend-path = [
|
||||||
|
@ -9,7 +10,7 @@ backend-path = [
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "pillow"
|
name = "pillow"
|
||||||
description = "Python Imaging Library (Fork)"
|
description = "Python Imaging Library (fork)"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
keywords = [
|
keywords = [
|
||||||
"Imaging",
|
"Imaging",
|
||||||
|
@ -28,6 +29,7 @@ classifiers = [
|
||||||
"Programming Language :: Python :: 3.11",
|
"Programming Language :: Python :: 3.11",
|
||||||
"Programming Language :: Python :: 3.12",
|
"Programming Language :: Python :: 3.12",
|
||||||
"Programming Language :: Python :: 3.13",
|
"Programming Language :: Python :: 3.13",
|
||||||
|
"Programming Language :: Python :: 3.14",
|
||||||
"Programming Language :: Python :: Implementation :: CPython",
|
"Programming Language :: Python :: Implementation :: CPython",
|
||||||
"Programming Language :: Python :: Implementation :: PyPy",
|
"Programming Language :: Python :: Implementation :: PyPy",
|
||||||
"Topic :: Multimedia :: Graphics",
|
"Topic :: Multimedia :: Graphics",
|
||||||
|
@ -66,7 +68,7 @@ optional-dependencies.tests = [
|
||||||
"markdown2",
|
"markdown2",
|
||||||
"olefile",
|
"olefile",
|
||||||
"packaging",
|
"packaging",
|
||||||
"pyroma",
|
"pyroma>=5",
|
||||||
"pytest",
|
"pytest",
|
||||||
"pytest-cov",
|
"pytest-cov",
|
||||||
"pytest-timeout",
|
"pytest-timeout",
|
||||||
|
@ -205,7 +207,7 @@ lint.isort.required-imports = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.pyproject-fmt]
|
[tool.pyproject-fmt]
|
||||||
max_supported_python = "3.13"
|
max_supported_python = "3.14"
|
||||||
|
|
||||||
[tool.pytest.ini_options]
|
[tool.pytest.ini_options]
|
||||||
addopts = "-ra --color=auto"
|
addopts = "-ra --color=auto"
|
||||||
|
|
23
setup.py
23
setup.py
|
@ -17,9 +17,20 @@ import sys
|
||||||
import warnings
|
import warnings
|
||||||
from collections.abc import Iterator
|
from collections.abc import Iterator
|
||||||
|
|
||||||
|
from pybind11.setup_helpers import ParallelCompile
|
||||||
from setuptools import Extension, setup
|
from setuptools import Extension, setup
|
||||||
from setuptools.command.build_ext import build_ext
|
from setuptools.command.build_ext import build_ext
|
||||||
|
|
||||||
|
configuration: dict[str, list[str]] = {}
|
||||||
|
|
||||||
|
# parse configuration from _custom_build/backend.py
|
||||||
|
while sys.argv[-1].startswith("--pillow-configuration="):
|
||||||
|
_, key, value = sys.argv.pop().split("=", 2)
|
||||||
|
configuration.setdefault(key, []).append(value)
|
||||||
|
|
||||||
|
default = int(configuration.get("parallel", ["0"])[-1])
|
||||||
|
ParallelCompile("MAX_CONCURRENCY", default).install()
|
||||||
|
|
||||||
|
|
||||||
def get_version() -> str:
|
def get_version() -> str:
|
||||||
version_file = "src/PIL/_version.py"
|
version_file = "src/PIL/_version.py"
|
||||||
|
@ -27,9 +38,6 @@ def get_version() -> str:
|
||||||
return f.read().split('"')[1]
|
return f.read().split('"')[1]
|
||||||
|
|
||||||
|
|
||||||
configuration: dict[str, list[str]] = {}
|
|
||||||
|
|
||||||
|
|
||||||
PILLOW_VERSION = get_version()
|
PILLOW_VERSION = get_version()
|
||||||
AVIF_ROOT = None
|
AVIF_ROOT = None
|
||||||
FREETYPE_ROOT = None
|
FREETYPE_ROOT = None
|
||||||
|
@ -386,9 +394,7 @@ class pil_build_ext(build_ext):
|
||||||
cpu_count = os.cpu_count()
|
cpu_count = os.cpu_count()
|
||||||
if cpu_count is not None:
|
if cpu_count is not None:
|
||||||
try:
|
try:
|
||||||
self.parallel = int(
|
self.parallel = int(os.environ.get("MAX_CONCURRENCY", cpu_count))
|
||||||
os.environ.get("MAX_CONCURRENCY", min(4, cpu_count))
|
|
||||||
)
|
|
||||||
except TypeError:
|
except TypeError:
|
||||||
pass
|
pass
|
||||||
for x in self.feature:
|
for x in self.feature:
|
||||||
|
@ -1083,11 +1089,6 @@ ext_modules = [
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
# parse configuration from _custom_build/backend.py
|
|
||||||
while sys.argv[-1].startswith("--pillow-configuration="):
|
|
||||||
_, key, value = sys.argv.pop().split("=", 2)
|
|
||||||
configuration.setdefault(key, []).append(value)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
setup(
|
setup(
|
||||||
cmdclass={"build_ext": pil_build_ext},
|
cmdclass={"build_ext": pil_build_ext},
|
||||||
|
|
|
@ -25,7 +25,6 @@ import sys
|
||||||
from typing import IO
|
from typing import IO
|
||||||
|
|
||||||
from . import Image, ImageFile, PngImagePlugin, features
|
from . import Image, ImageFile, PngImagePlugin, features
|
||||||
from ._deprecate import deprecate
|
|
||||||
|
|
||||||
enable_jpeg2k = features.check_codec("jpg_2000")
|
enable_jpeg2k = features.check_codec("jpg_2000")
|
||||||
if enable_jpeg2k:
|
if enable_jpeg2k:
|
||||||
|
@ -275,34 +274,25 @@ class IcnsImageFile(ImageFile.ImageFile):
|
||||||
self.best_size[1] * self.best_size[2],
|
self.best_size[1] * self.best_size[2],
|
||||||
)
|
)
|
||||||
|
|
||||||
@property # type: ignore[override]
|
@property
|
||||||
def size(self) -> tuple[int, int] | tuple[int, int, int]:
|
def size(self) -> tuple[int, int]:
|
||||||
return self._size
|
return self._size
|
||||||
|
|
||||||
@size.setter
|
@size.setter
|
||||||
def size(self, value: tuple[int, int] | tuple[int, int, int]) -> None:
|
def size(self, value: tuple[int, int]) -> None:
|
||||||
if len(value) == 3:
|
# Check that a matching size exists,
|
||||||
deprecate("Setting size to (width, height, scale)", 12, "load(scale)")
|
# or that there is a scale that would create a size that matches
|
||||||
if value in self.info["sizes"]:
|
for size in self.info["sizes"]:
|
||||||
self._size = value # type: ignore[assignment]
|
simple_size = size[0] * size[2], size[1] * size[2]
|
||||||
|
scale = simple_size[0] // value[0]
|
||||||
|
if simple_size[1] / value[1] == scale:
|
||||||
|
self._size = value
|
||||||
return
|
return
|
||||||
else:
|
|
||||||
# Check that a matching size exists,
|
|
||||||
# or that there is a scale that would create a size that matches
|
|
||||||
for size in self.info["sizes"]:
|
|
||||||
simple_size = size[0] * size[2], size[1] * size[2]
|
|
||||||
scale = simple_size[0] // value[0]
|
|
||||||
if simple_size[1] / value[1] == scale:
|
|
||||||
self._size = value
|
|
||||||
return
|
|
||||||
msg = "This is not one of the allowed sizes of this image"
|
msg = "This is not one of the allowed sizes of this image"
|
||||||
raise ValueError(msg)
|
raise ValueError(msg)
|
||||||
|
|
||||||
def load(self, scale: int | None = None) -> Image.core.PixelAccess | None:
|
def load(self, scale: int | None = None) -> Image.core.PixelAccess | None:
|
||||||
if scale is not None or len(self.size) == 3:
|
if scale is not None:
|
||||||
if scale is None and len(self.size) == 3:
|
|
||||||
scale = self.size[2]
|
|
||||||
assert scale is not None
|
|
||||||
width, height = self.size[:2]
|
width, height = self.size[:2]
|
||||||
self.size = width * scale, height * scale
|
self.size = width * scale, height * scale
|
||||||
self.best_size = width, height, scale
|
self.best_size = width, height, scale
|
||||||
|
|
|
@ -115,21 +115,6 @@ except ImportError as v:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
|
||||||
def isImageType(t: Any) -> TypeGuard[Image]:
|
|
||||||
"""
|
|
||||||
Checks if an object is an image object.
|
|
||||||
|
|
||||||
.. warning::
|
|
||||||
|
|
||||||
This function is for internal use only.
|
|
||||||
|
|
||||||
:param t: object to check if it's an image
|
|
||||||
:returns: True if the object is an image
|
|
||||||
"""
|
|
||||||
deprecate("Image.isImageType(im)", 12, "isinstance(im, Image.Image)")
|
|
||||||
return hasattr(t, "im")
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Constants
|
# Constants
|
||||||
|
|
||||||
|
@ -219,7 +204,7 @@ if TYPE_CHECKING:
|
||||||
from IPython.lib.pretty import PrettyPrinter
|
from IPython.lib.pretty import PrettyPrinter
|
||||||
|
|
||||||
from . import ImageFile, ImageFilter, ImagePalette, ImageQt, TiffImagePlugin
|
from . import ImageFile, ImageFilter, ImagePalette, ImageQt, TiffImagePlugin
|
||||||
from ._typing import CapsuleType, NumpyArray, StrOrBytesPath, TypeGuard
|
from ._typing import CapsuleType, NumpyArray, StrOrBytesPath
|
||||||
ID: list[str] = []
|
ID: list[str] = []
|
||||||
OPEN: dict[
|
OPEN: dict[
|
||||||
str,
|
str,
|
||||||
|
@ -980,9 +965,6 @@ class Image:
|
||||||
:returns: An :py:class:`~PIL.Image.Image` object.
|
:returns: An :py:class:`~PIL.Image.Image` object.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if mode in ("BGR;15", "BGR;16", "BGR;24"):
|
|
||||||
deprecate(mode, 12)
|
|
||||||
|
|
||||||
self.load()
|
self.load()
|
||||||
|
|
||||||
has_transparency = "transparency" in self.info
|
has_transparency = "transparency" in self.info
|
||||||
|
@ -1748,9 +1730,10 @@ class Image:
|
||||||
details).
|
details).
|
||||||
|
|
||||||
Instead of an image, the source can be a integer or tuple
|
Instead of an image, the source can be a integer or tuple
|
||||||
containing pixel values. The method then fills the region
|
containing pixel values. The method then fills the region
|
||||||
with the given color. When creating RGB images, you can
|
with the given color. When creating RGB images, you can
|
||||||
also use color strings as supported by the ImageColor module.
|
also use color strings as supported by the ImageColor module. See
|
||||||
|
:ref:`colors` for more information.
|
||||||
|
|
||||||
If a mask is given, this method updates only the regions
|
If a mask is given, this method updates only the regions
|
||||||
indicated by the mask. You can use either "1", "L", "LA", "RGBA"
|
indicated by the mask. You can use either "1", "L", "LA", "RGBA"
|
||||||
|
@ -2006,7 +1989,8 @@ class Image:
|
||||||
sequence ends. The scale and offset values are used to adjust the
|
sequence ends. The scale and offset values are used to adjust the
|
||||||
sequence values: **pixel = value*scale + offset**.
|
sequence values: **pixel = value*scale + offset**.
|
||||||
|
|
||||||
:param data: A flattened sequence object.
|
:param data: A flattened sequence object. See :ref:`colors` for more
|
||||||
|
information about values.
|
||||||
:param scale: An optional scale value. The default is 1.0.
|
:param scale: An optional scale value. The default is 1.0.
|
||||||
:param offset: An optional offset value. The default is 0.0.
|
:param offset: An optional offset value. The default is 0.0.
|
||||||
"""
|
"""
|
||||||
|
@ -2065,7 +2049,7 @@ class Image:
|
||||||
Modifies the pixel at the given position. The color is given as
|
Modifies the pixel at the given position. The color is given as
|
||||||
a single numerical value for single-band images, and a tuple for
|
a single numerical value for single-band images, and a tuple for
|
||||||
multi-band images. In addition to this, RGB and RGBA tuples are
|
multi-band images. In addition to this, RGB and RGBA tuples are
|
||||||
accepted for P and PA images.
|
accepted for P and PA images. See :ref:`colors` for more information.
|
||||||
|
|
||||||
Note that this method is relatively slow. For more extensive changes,
|
Note that this method is relatively slow. For more extensive changes,
|
||||||
use :py:meth:`~PIL.Image.Image.paste` or the :py:mod:`~PIL.ImageDraw`
|
use :py:meth:`~PIL.Image.Image.paste` or the :py:mod:`~PIL.ImageDraw`
|
||||||
|
@ -2229,8 +2213,6 @@ class Image:
|
||||||
:py:data:`Resampling.BILINEAR`, :py:data:`Resampling.HAMMING`,
|
:py:data:`Resampling.BILINEAR`, :py:data:`Resampling.HAMMING`,
|
||||||
:py:data:`Resampling.BICUBIC` or :py:data:`Resampling.LANCZOS`.
|
:py:data:`Resampling.BICUBIC` or :py:data:`Resampling.LANCZOS`.
|
||||||
If the image has mode "1" or "P", it is always set to
|
If the image has mode "1" or "P", it is always set to
|
||||||
:py:data:`Resampling.NEAREST`. If the image mode is "BGR;15",
|
|
||||||
"BGR;16" or "BGR;24", then the default filter is
|
|
||||||
:py:data:`Resampling.NEAREST`. Otherwise, the default filter is
|
:py:data:`Resampling.NEAREST`. Otherwise, the default filter is
|
||||||
:py:data:`Resampling.BICUBIC`. See: :ref:`concept-filters`.
|
:py:data:`Resampling.BICUBIC`. See: :ref:`concept-filters`.
|
||||||
:param box: An optional 4-tuple of floats providing
|
:param box: An optional 4-tuple of floats providing
|
||||||
|
@ -2253,8 +2235,7 @@ class Image:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if resample is None:
|
if resample is None:
|
||||||
bgr = self.mode.startswith("BGR;")
|
resample = Resampling.BICUBIC
|
||||||
resample = Resampling.NEAREST if bgr else Resampling.BICUBIC
|
|
||||||
elif resample not in (
|
elif resample not in (
|
||||||
Resampling.NEAREST,
|
Resampling.NEAREST,
|
||||||
Resampling.BILINEAR,
|
Resampling.BILINEAR,
|
||||||
|
@ -3076,18 +3057,15 @@ def new(
|
||||||
:param mode: The mode to use for the new image. See:
|
:param mode: The mode to use for the new image. See:
|
||||||
:ref:`concept-modes`.
|
:ref:`concept-modes`.
|
||||||
:param size: A 2-tuple, containing (width, height) in pixels.
|
:param size: A 2-tuple, containing (width, height) in pixels.
|
||||||
:param color: What color to use for the image. Default is black.
|
:param color: What color to use for the image. Default is black. If given,
|
||||||
If given, this should be a single integer or floating point value
|
this should be a single integer or floating point value for single-band
|
||||||
for single-band modes, and a tuple for multi-band modes (one value
|
modes, and a tuple for multi-band modes (one value per band). When
|
||||||
per band). When creating RGB or HSV images, you can also use color
|
creating RGB or HSV images, you can also use color strings as supported
|
||||||
strings as supported by the ImageColor module. If the color is
|
by the ImageColor module. See :ref:`colors` for more information. If the
|
||||||
None, the image is not initialised.
|
color is None, the image is not initialised.
|
||||||
:returns: An :py:class:`~PIL.Image.Image` object.
|
:returns: An :py:class:`~PIL.Image.Image` object.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if mode in ("BGR;15", "BGR;16", "BGR;24"):
|
|
||||||
deprecate(mode, 12)
|
|
||||||
|
|
||||||
_check_size(size)
|
_check_size(size)
|
||||||
|
|
||||||
if color is None:
|
if color is None:
|
||||||
|
|
|
@ -25,7 +25,7 @@ from enum import IntEnum, IntFlag
|
||||||
from functools import reduce
|
from functools import reduce
|
||||||
from typing import Any, Literal, SupportsFloat, SupportsInt, Union
|
from typing import Any, Literal, SupportsFloat, SupportsInt, Union
|
||||||
|
|
||||||
from . import Image, __version__
|
from . import Image
|
||||||
from ._deprecate import deprecate
|
from ._deprecate import deprecate
|
||||||
from ._typing import SupportsRead
|
from ._typing import SupportsRead
|
||||||
|
|
||||||
|
@ -108,20 +108,6 @@ pyCMS
|
||||||
_VERSION = "1.0.0 pil"
|
_VERSION = "1.0.0 pil"
|
||||||
|
|
||||||
|
|
||||||
def __getattr__(name: str) -> Any:
|
|
||||||
if name == "DESCRIPTION":
|
|
||||||
deprecate("PIL.ImageCms.DESCRIPTION", 12)
|
|
||||||
return _DESCRIPTION
|
|
||||||
elif name == "VERSION":
|
|
||||||
deprecate("PIL.ImageCms.VERSION", 12)
|
|
||||||
return _VERSION
|
|
||||||
elif name == "FLAGS":
|
|
||||||
deprecate("PIL.ImageCms.FLAGS", 12, "PIL.ImageCms.Flags")
|
|
||||||
return _FLAGS
|
|
||||||
msg = f"module '{__name__}' has no attribute '{name}'"
|
|
||||||
raise AttributeError(msg)
|
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------.
|
# --------------------------------------------------------------------.
|
||||||
|
|
||||||
|
|
||||||
|
@ -248,9 +234,7 @@ class ImageCmsProfile:
|
||||||
low-level profile object
|
low-level profile object
|
||||||
|
|
||||||
"""
|
"""
|
||||||
self.filename = None
|
self.filename: str | None = None
|
||||||
self.product_name = None # profile.product_name
|
|
||||||
self.product_info = None # profile.product_info
|
|
||||||
|
|
||||||
if isinstance(profile, str):
|
if isinstance(profile, str):
|
||||||
if sys.platform == "win32":
|
if sys.platform == "win32":
|
||||||
|
@ -271,6 +255,13 @@ class ImageCmsProfile:
|
||||||
msg = "Invalid type for Profile" # type: ignore[unreachable]
|
msg = "Invalid type for Profile" # type: ignore[unreachable]
|
||||||
raise TypeError(msg)
|
raise TypeError(msg)
|
||||||
|
|
||||||
|
def __getattr__(self, name: str) -> Any:
|
||||||
|
if name in ("product_name", "product_info"):
|
||||||
|
deprecate(f"ImageCms.ImageCmsProfile.{name}", 13)
|
||||||
|
return None
|
||||||
|
msg = f"'{self.__class__.__name__}' object has no attribute '{name}'"
|
||||||
|
raise AttributeError(msg)
|
||||||
|
|
||||||
def tobytes(self) -> bytes:
|
def tobytes(self) -> bytes:
|
||||||
"""
|
"""
|
||||||
Returns the profile in a format suitable for embedding in
|
Returns the profile in a format suitable for embedding in
|
||||||
|
@ -301,31 +292,6 @@ class ImageCmsTransform(Image.ImagePointHandler):
|
||||||
proof_intent: Intent = Intent.ABSOLUTE_COLORIMETRIC,
|
proof_intent: Intent = Intent.ABSOLUTE_COLORIMETRIC,
|
||||||
flags: Flags = Flags.NONE,
|
flags: Flags = Flags.NONE,
|
||||||
):
|
):
|
||||||
supported_modes = (
|
|
||||||
"RGB",
|
|
||||||
"RGBA",
|
|
||||||
"RGBX",
|
|
||||||
"CMYK",
|
|
||||||
"I;16",
|
|
||||||
"I;16L",
|
|
||||||
"I;16B",
|
|
||||||
"YCbCr",
|
|
||||||
"LAB",
|
|
||||||
"L",
|
|
||||||
"1",
|
|
||||||
)
|
|
||||||
for mode in (input_mode, output_mode):
|
|
||||||
if mode not in supported_modes:
|
|
||||||
deprecate(
|
|
||||||
mode,
|
|
||||||
12,
|
|
||||||
{
|
|
||||||
"L;16": "I;16 or I;16L",
|
|
||||||
"L:16B": "I;16B",
|
|
||||||
"YCCA": "YCbCr",
|
|
||||||
"YCC": "YCbCr",
|
|
||||||
}.get(mode),
|
|
||||||
)
|
|
||||||
if proof is None:
|
if proof is None:
|
||||||
self.transform = core.buildTransform(
|
self.transform = core.buildTransform(
|
||||||
input.profile, output.profile, input_mode, output_mode, intent, flags
|
input.profile, output.profile, input_mode, output_mode, intent, flags
|
||||||
|
@ -1108,16 +1074,3 @@ def isIntentSupported(
|
||||||
return -1
|
return -1
|
||||||
except (AttributeError, OSError, TypeError, ValueError) as v:
|
except (AttributeError, OSError, TypeError, ValueError) as v:
|
||||||
raise PyCMSError(v) from v
|
raise PyCMSError(v) from v
|
||||||
|
|
||||||
|
|
||||||
def versions() -> tuple[str, str | None, str, str]:
|
|
||||||
"""
|
|
||||||
(pyCMS) Fetches versions.
|
|
||||||
"""
|
|
||||||
|
|
||||||
deprecate(
|
|
||||||
"PIL.ImageCms.versions()",
|
|
||||||
12,
|
|
||||||
'(PIL.features.version("littlecms2"), sys.version, PIL.__version__)',
|
|
||||||
)
|
|
||||||
return _VERSION, core.littlecms_version, sys.version.split()[0], __version__
|
|
||||||
|
|
|
@ -38,7 +38,6 @@ from types import ModuleType
|
||||||
from typing import Any, AnyStr, Callable, Union, cast
|
from typing import Any, AnyStr, Callable, Union, cast
|
||||||
|
|
||||||
from . import Image, ImageColor
|
from . import Image, ImageColor
|
||||||
from ._deprecate import deprecate
|
|
||||||
from ._typing import Coords
|
from ._typing import Coords
|
||||||
|
|
||||||
# experimental access to the outline API
|
# experimental access to the outline API
|
||||||
|
@ -1009,16 +1008,11 @@ def Draw(im: Image.Image, mode: str | None = None) -> ImageDraw:
|
||||||
return ImageDraw(im, mode)
|
return ImageDraw(im, mode)
|
||||||
|
|
||||||
|
|
||||||
def getdraw(
|
def getdraw(im: Image.Image | None = None) -> tuple[ImageDraw2.Draw | None, ModuleType]:
|
||||||
im: Image.Image | None = None, hints: list[str] | None = None
|
|
||||||
) -> tuple[ImageDraw2.Draw | None, ModuleType]:
|
|
||||||
"""
|
"""
|
||||||
:param im: The image to draw in.
|
:param im: The image to draw in.
|
||||||
:param hints: An optional list of hints. Deprecated.
|
|
||||||
:returns: A (drawing context, drawing resource factory) tuple.
|
:returns: A (drawing context, drawing resource factory) tuple.
|
||||||
"""
|
"""
|
||||||
if hints is not None:
|
|
||||||
deprecate("'hints' parameter", 12)
|
|
||||||
from . import ImageDraw2
|
from . import ImageDraw2
|
||||||
|
|
||||||
draw = ImageDraw2.Draw(im) if im is not None else None
|
draw = ImageDraw2.Draw(im) if im is not None else None
|
||||||
|
|
|
@ -37,7 +37,6 @@ import struct
|
||||||
from typing import IO, Any, NamedTuple, cast
|
from typing import IO, Any, NamedTuple, cast
|
||||||
|
|
||||||
from . import ExifTags, Image
|
from . import ExifTags, Image
|
||||||
from ._deprecate import deprecate
|
|
||||||
from ._util import DeferredError, is_path
|
from ._util import DeferredError, is_path
|
||||||
|
|
||||||
TYPE_CHECKING = False
|
TYPE_CHECKING = False
|
||||||
|
@ -83,16 +82,6 @@ def _get_oserror(error: int, *, encoder: bool) -> OSError:
|
||||||
return OSError(msg)
|
return OSError(msg)
|
||||||
|
|
||||||
|
|
||||||
def raise_oserror(error: int) -> OSError:
|
|
||||||
deprecate(
|
|
||||||
"raise_oserror",
|
|
||||||
12,
|
|
||||||
action="It is only useful for translating error codes returned by a codec's "
|
|
||||||
"decode() method, which ImageFile already does automatically.",
|
|
||||||
)
|
|
||||||
raise _get_oserror(error, encoder=False)
|
|
||||||
|
|
||||||
|
|
||||||
def _tilesort(t: _Tile) -> int:
|
def _tilesort(t: _Tile) -> int:
|
||||||
# sort on offset
|
# sort on offset
|
||||||
return t[2]
|
return t[2]
|
||||||
|
|
|
@ -36,7 +36,7 @@ from io import BytesIO
|
||||||
from types import ModuleType
|
from types import ModuleType
|
||||||
from typing import IO, Any, BinaryIO, TypedDict, cast
|
from typing import IO, Any, BinaryIO, TypedDict, cast
|
||||||
|
|
||||||
from . import Image, features
|
from . import Image
|
||||||
from ._typing import StrOrBytesPath
|
from ._typing import StrOrBytesPath
|
||||||
from ._util import DeferredError, is_path
|
from ._util import DeferredError, is_path
|
||||||
|
|
||||||
|
@ -236,21 +236,6 @@ class FreeTypeFont:
|
||||||
self.index = index
|
self.index = index
|
||||||
self.encoding = encoding
|
self.encoding = encoding
|
||||||
|
|
||||||
try:
|
|
||||||
from packaging.version import parse as parse_version
|
|
||||||
except ImportError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
if freetype_version := features.version_module("freetype2"):
|
|
||||||
if parse_version(freetype_version) < parse_version("2.9.1"):
|
|
||||||
warnings.warn(
|
|
||||||
"Support for FreeType 2.9.0 is deprecated and will be removed "
|
|
||||||
"in Pillow 12 (2025-10-15). Please upgrade to FreeType 2.9.1 "
|
|
||||||
"or newer, preferably FreeType 2.10.4 which fixes "
|
|
||||||
"CVE-2020-15999.",
|
|
||||||
DeprecationWarning,
|
|
||||||
)
|
|
||||||
|
|
||||||
if layout_engine not in (Layout.BASIC, Layout.RAQM):
|
if layout_engine not in (Layout.BASIC, Layout.RAQM):
|
||||||
layout_engine = Layout.BASIC
|
layout_engine = Layout.BASIC
|
||||||
if core.HAVE_RAQM:
|
if core.HAVE_RAQM:
|
||||||
|
|
|
@ -21,7 +21,6 @@ from types import CodeType
|
||||||
from typing import Any, Callable
|
from typing import Any, Callable
|
||||||
|
|
||||||
from . import Image, _imagingmath
|
from . import Image, _imagingmath
|
||||||
from ._deprecate import deprecate
|
|
||||||
|
|
||||||
|
|
||||||
class _Operand:
|
class _Operand:
|
||||||
|
@ -233,11 +232,7 @@ ops = {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def lambda_eval(
|
def lambda_eval(expression: Callable[[dict[str, Any]], Any], **kw: Any) -> Any:
|
||||||
expression: Callable[[dict[str, Any]], Any],
|
|
||||||
options: dict[str, Any] = {},
|
|
||||||
**kw: Any,
|
|
||||||
) -> Any:
|
|
||||||
"""
|
"""
|
||||||
Returns the result of an image function.
|
Returns the result of an image function.
|
||||||
|
|
||||||
|
@ -246,23 +241,13 @@ def lambda_eval(
|
||||||
:py:func:`~PIL.Image.merge` function.
|
:py:func:`~PIL.Image.merge` function.
|
||||||
|
|
||||||
:param expression: A function that receives a dictionary.
|
:param expression: A function that receives a dictionary.
|
||||||
:param options: Values to add to the function's dictionary. Deprecated.
|
|
||||||
You can instead use one or more keyword arguments.
|
|
||||||
:param **kw: Values to add to the function's dictionary.
|
:param **kw: Values to add to the function's dictionary.
|
||||||
:return: The expression result. This is usually an image object, but can
|
:return: The expression result. This is usually an image object, but can
|
||||||
also be an integer, a floating point value, or a pixel tuple,
|
also be an integer, a floating point value, or a pixel tuple,
|
||||||
depending on the expression.
|
depending on the expression.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if options:
|
|
||||||
deprecate(
|
|
||||||
"ImageMath.lambda_eval options",
|
|
||||||
12,
|
|
||||||
"ImageMath.lambda_eval keyword arguments",
|
|
||||||
)
|
|
||||||
|
|
||||||
args: dict[str, Any] = ops.copy()
|
args: dict[str, Any] = ops.copy()
|
||||||
args.update(options)
|
|
||||||
args.update(kw)
|
args.update(kw)
|
||||||
for k, v in args.items():
|
for k, v in args.items():
|
||||||
if isinstance(v, Image.Image):
|
if isinstance(v, Image.Image):
|
||||||
|
@ -275,11 +260,7 @@ def lambda_eval(
|
||||||
return out
|
return out
|
||||||
|
|
||||||
|
|
||||||
def unsafe_eval(
|
def unsafe_eval(expression: str, **kw: Any) -> Any:
|
||||||
expression: str,
|
|
||||||
options: dict[str, Any] = {},
|
|
||||||
**kw: Any,
|
|
||||||
) -> Any:
|
|
||||||
"""
|
"""
|
||||||
Evaluates an image expression. This uses Python's ``eval()`` function to process
|
Evaluates an image expression. This uses Python's ``eval()`` function to process
|
||||||
the expression string, and carries the security risks of doing so. It is not
|
the expression string, and carries the security risks of doing so. It is not
|
||||||
|
@ -291,29 +272,19 @@ def unsafe_eval(
|
||||||
:py:func:`~PIL.Image.merge` function.
|
:py:func:`~PIL.Image.merge` function.
|
||||||
|
|
||||||
:param expression: A string containing a Python-style expression.
|
:param expression: A string containing a Python-style expression.
|
||||||
:param options: Values to add to the evaluation context. Deprecated.
|
|
||||||
You can instead use one or more keyword arguments.
|
|
||||||
:param **kw: Values to add to the evaluation context.
|
:param **kw: Values to add to the evaluation context.
|
||||||
:return: The evaluated expression. This is usually an image object, but can
|
:return: The evaluated expression. This is usually an image object, but can
|
||||||
also be an integer, a floating point value, or a pixel tuple,
|
also be an integer, a floating point value, or a pixel tuple,
|
||||||
depending on the expression.
|
depending on the expression.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if options:
|
|
||||||
deprecate(
|
|
||||||
"ImageMath.unsafe_eval options",
|
|
||||||
12,
|
|
||||||
"ImageMath.unsafe_eval keyword arguments",
|
|
||||||
)
|
|
||||||
|
|
||||||
# build execution namespace
|
# build execution namespace
|
||||||
args: dict[str, Any] = ops.copy()
|
args: dict[str, Any] = ops.copy()
|
||||||
for k in [*options, *kw]:
|
for k in kw:
|
||||||
if "__" in k or hasattr(builtins, k):
|
if "__" in k or hasattr(builtins, k):
|
||||||
msg = f"'{k}' not allowed"
|
msg = f"'{k}' not allowed"
|
||||||
raise ValueError(msg)
|
raise ValueError(msg)
|
||||||
|
|
||||||
args.update(options)
|
|
||||||
args.update(kw)
|
args.update(kw)
|
||||||
for k, v in args.items():
|
for k, v in args.items():
|
||||||
if isinstance(v, Image.Image):
|
if isinstance(v, Image.Image):
|
||||||
|
@ -337,32 +308,3 @@ def unsafe_eval(
|
||||||
return out.im
|
return out.im
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
return out
|
return out
|
||||||
|
|
||||||
|
|
||||||
def eval(
|
|
||||||
expression: str,
|
|
||||||
_dict: dict[str, Any] = {},
|
|
||||||
**kw: Any,
|
|
||||||
) -> Any:
|
|
||||||
"""
|
|
||||||
Evaluates an image expression.
|
|
||||||
|
|
||||||
Deprecated. Use lambda_eval() or unsafe_eval() instead.
|
|
||||||
|
|
||||||
:param expression: A string containing a Python-style expression.
|
|
||||||
:param _dict: Values to add to the evaluation context. You
|
|
||||||
can either use a dictionary, or one or more keyword
|
|
||||||
arguments.
|
|
||||||
:return: The evaluated expression. This is usually an image object, but can
|
|
||||||
also be an integer, a floating point value, or a pixel tuple,
|
|
||||||
depending on the expression.
|
|
||||||
|
|
||||||
.. deprecated:: 10.3.0
|
|
||||||
"""
|
|
||||||
|
|
||||||
deprecate(
|
|
||||||
"ImageMath.eval",
|
|
||||||
12,
|
|
||||||
"ImageMath.lambda_eval or ImageMath.unsafe_eval",
|
|
||||||
)
|
|
||||||
return unsafe_eval(expression, _dict, **kw)
|
|
||||||
|
|
|
@ -18,8 +18,6 @@ import sys
|
||||||
from functools import lru_cache
|
from functools import lru_cache
|
||||||
from typing import NamedTuple
|
from typing import NamedTuple
|
||||||
|
|
||||||
from ._deprecate import deprecate
|
|
||||||
|
|
||||||
|
|
||||||
class ModeDescriptor(NamedTuple):
|
class ModeDescriptor(NamedTuple):
|
||||||
"""Wrapper for mode strings."""
|
"""Wrapper for mode strings."""
|
||||||
|
@ -57,16 +55,11 @@ def getmode(mode: str) -> ModeDescriptor:
|
||||||
"HSV": ("RGB", "L", ("H", "S", "V"), "|u1"),
|
"HSV": ("RGB", "L", ("H", "S", "V"), "|u1"),
|
||||||
# extra experimental modes
|
# extra experimental modes
|
||||||
"RGBa": ("RGB", "L", ("R", "G", "B", "a"), "|u1"),
|
"RGBa": ("RGB", "L", ("R", "G", "B", "a"), "|u1"),
|
||||||
"BGR;15": ("RGB", "L", ("B", "G", "R"), "|u1"),
|
|
||||||
"BGR;16": ("RGB", "L", ("B", "G", "R"), "|u1"),
|
|
||||||
"BGR;24": ("RGB", "L", ("B", "G", "R"), "|u1"),
|
|
||||||
"LA": ("L", "L", ("L", "A"), "|u1"),
|
"LA": ("L", "L", ("L", "A"), "|u1"),
|
||||||
"La": ("L", "L", ("L", "a"), "|u1"),
|
"La": ("L", "L", ("L", "a"), "|u1"),
|
||||||
"PA": ("RGB", "L", ("P", "A"), "|u1"),
|
"PA": ("RGB", "L", ("P", "A"), "|u1"),
|
||||||
}
|
}
|
||||||
if mode in modes:
|
if mode in modes:
|
||||||
if mode in ("BGR;15", "BGR;16", "BGR;24"):
|
|
||||||
deprecate(mode, 12)
|
|
||||||
base_mode, base_type, bands, type_str = modes[mode]
|
base_mode, base_type, bands, type_str = modes[mode]
|
||||||
return ModeDescriptor(mode, bands, base_mode, base_type, type_str)
|
return ModeDescriptor(mode, bands, base_mode, base_type, type_str)
|
||||||
|
|
||||||
|
|
|
@ -16,26 +16,16 @@
|
||||||
#
|
#
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from collections.abc import Sequence
|
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
from typing import cast
|
from typing import cast
|
||||||
|
|
||||||
from . import Image, ImageFile
|
from . import Image, ImageFile
|
||||||
from ._binary import i16be as i16
|
from ._binary import i16be as i16
|
||||||
from ._binary import i32be as i32
|
from ._binary import i32be as i32
|
||||||
from ._deprecate import deprecate
|
|
||||||
|
|
||||||
COMPRESSION = {1: "raw", 5: "jpeg"}
|
COMPRESSION = {1: "raw", 5: "jpeg"}
|
||||||
|
|
||||||
|
|
||||||
def __getattr__(name: str) -> bytes:
|
|
||||||
if name == "PAD":
|
|
||||||
deprecate("IptcImagePlugin.PAD", 12)
|
|
||||||
return b"\0\0\0\0"
|
|
||||||
msg = f"module '{__name__}' has no attribute '{name}'"
|
|
||||||
raise AttributeError(msg)
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Helpers
|
# Helpers
|
||||||
|
|
||||||
|
@ -48,20 +38,6 @@ def _i8(c: int | bytes) -> int:
|
||||||
return c if isinstance(c, int) else c[0]
|
return c if isinstance(c, int) else c[0]
|
||||||
|
|
||||||
|
|
||||||
def i(c: bytes) -> int:
|
|
||||||
""".. deprecated:: 10.2.0"""
|
|
||||||
deprecate("IptcImagePlugin.i", 12)
|
|
||||||
return _i(c)
|
|
||||||
|
|
||||||
|
|
||||||
def dump(c: Sequence[int | bytes]) -> None:
|
|
||||||
""".. deprecated:: 10.2.0"""
|
|
||||||
deprecate("IptcImagePlugin.dump", 12)
|
|
||||||
for i in c:
|
|
||||||
print(f"{_i8(i):02x}", end=" ")
|
|
||||||
print()
|
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# Image plugin for IPTC/NAA datastreams. To read IPTC/NAA fields
|
# Image plugin for IPTC/NAA datastreams. To read IPTC/NAA fields
|
||||||
# from TIFF and JPEG files, use the <b>getiptcinfo</b> function.
|
# from TIFF and JPEG files, use the <b>getiptcinfo</b> function.
|
||||||
|
|
|
@ -49,7 +49,6 @@ from ._binary import i16be as i16
|
||||||
from ._binary import i32be as i32
|
from ._binary import i32be as i32
|
||||||
from ._binary import o8
|
from ._binary import o8
|
||||||
from ._binary import o16be as o16
|
from ._binary import o16be as o16
|
||||||
from ._deprecate import deprecate
|
|
||||||
from .JpegPresets import presets
|
from .JpegPresets import presets
|
||||||
|
|
||||||
TYPE_CHECKING = False
|
TYPE_CHECKING = False
|
||||||
|
@ -393,12 +392,6 @@ class JpegImageFile(ImageFile.ImageFile):
|
||||||
|
|
||||||
self._read_dpi_from_exif()
|
self._read_dpi_from_exif()
|
||||||
|
|
||||||
def __getattr__(self, name: str) -> Any:
|
|
||||||
if name in ("huffman_ac", "huffman_dc"):
|
|
||||||
deprecate(name, 12)
|
|
||||||
return getattr(self, "_" + name)
|
|
||||||
raise AttributeError(name)
|
|
||||||
|
|
||||||
def __getstate__(self) -> list[Any]:
|
def __getstate__(self) -> list[Any]:
|
||||||
return super().__getstate__() + [self.layers, self.layer]
|
return super().__getstate__() + [self.layers, self.layer]
|
||||||
|
|
||||||
|
@ -852,16 +845,6 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def _save_cjpeg(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
|
|
||||||
# ALTERNATIVE: handle JPEGs via the IJG command line utilities.
|
|
||||||
tempfile = im._dump()
|
|
||||||
subprocess.check_call(["cjpeg", "-outfile", filename, tempfile])
|
|
||||||
try:
|
|
||||||
os.unlink(tempfile)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# Factory for making JPEG and MPO instances
|
# Factory for making JPEG and MPO instances
|
||||||
def jpeg_factory(
|
def jpeg_factory(
|
||||||
|
|
|
@ -56,7 +56,6 @@ from . import ExifTags, Image, ImageFile, ImageOps, ImagePalette, TiffTags
|
||||||
from ._binary import i16be as i16
|
from ._binary import i16be as i16
|
||||||
from ._binary import i32be as i32
|
from ._binary import i32be as i32
|
||||||
from ._binary import o8
|
from ._binary import o8
|
||||||
from ._deprecate import deprecate
|
|
||||||
from ._typing import StrOrBytesPath
|
from ._typing import StrOrBytesPath
|
||||||
from ._util import DeferredError, is_path
|
from ._util import DeferredError, is_path
|
||||||
from .TiffTags import TYPES
|
from .TiffTags import TYPES
|
||||||
|
@ -284,9 +283,6 @@ PREFIXES = [
|
||||||
b"II\x2b\x00", # BigTIFF with little-endian byte order
|
b"II\x2b\x00", # BigTIFF with little-endian byte order
|
||||||
]
|
]
|
||||||
|
|
||||||
if not getattr(Image.core, "libtiff_support_custom_tags", True):
|
|
||||||
deprecate("Support for LibTIFF earlier than version 4", 12)
|
|
||||||
|
|
||||||
|
|
||||||
def _accept(prefix: bytes) -> bool:
|
def _accept(prefix: bytes) -> bool:
|
||||||
return prefix.startswith(tuple(PREFIXES))
|
return prefix.startswith(tuple(PREFIXES))
|
||||||
|
@ -1934,9 +1930,6 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
|
||||||
# Custom items are supported for int, float, unicode, string and byte
|
# Custom items are supported for int, float, unicode, string and byte
|
||||||
# values. Other types and tuples require a tagtype.
|
# values. Other types and tuples require a tagtype.
|
||||||
if tag not in TiffTags.LIBTIFF_CORE:
|
if tag not in TiffTags.LIBTIFF_CORE:
|
||||||
if not getattr(Image.core, "libtiff_support_custom_tags", False):
|
|
||||||
continue
|
|
||||||
|
|
||||||
if tag in TiffTags.TAGS_V2_GROUPS:
|
if tag in TiffTags.TAGS_V2_GROUPS:
|
||||||
types[tag] = TiffTags.LONG8
|
types[tag] = TiffTags.LONG8
|
||||||
elif tag in ifd.tagtype:
|
elif tag in ifd.tagtype:
|
||||||
|
|
|
@ -46,8 +46,6 @@ def deprecate(
|
||||||
elif when <= int(__version__.split(".")[0]):
|
elif when <= int(__version__.split(".")[0]):
|
||||||
msg = f"{deprecated} {is_} deprecated and should be removed."
|
msg = f"{deprecated} {is_} deprecated and should be removed."
|
||||||
raise RuntimeError(msg)
|
raise RuntimeError(msg)
|
||||||
elif when == 12:
|
|
||||||
removed = "Pillow 12 (2025-10-15)"
|
|
||||||
elif when == 13:
|
elif when == 13:
|
||||||
removed = "Pillow 13 (2026-10-15)"
|
removed = "Pillow 13 (2026-10-15)"
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Master version for Pillow
|
# Master version for Pillow
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
__version__ = "11.3.0"
|
__version__ = "12.0.0.dev0"
|
||||||
|
|
|
@ -9,7 +9,6 @@ from typing import IO
|
||||||
import PIL
|
import PIL
|
||||||
|
|
||||||
from . import Image
|
from . import Image
|
||||||
from ._deprecate import deprecate
|
|
||||||
|
|
||||||
modules = {
|
modules = {
|
||||||
"pil": ("PIL._imaging", "PILLOW_VERSION"),
|
"pil": ("PIL._imaging", "PILLOW_VERSION"),
|
||||||
|
@ -120,10 +119,7 @@ def get_supported_codecs() -> list[str]:
|
||||||
return [f for f in codecs if check_codec(f)]
|
return [f for f in codecs if check_codec(f)]
|
||||||
|
|
||||||
|
|
||||||
features: dict[str, tuple[str, str | bool, str | None]] = {
|
features: dict[str, tuple[str, str, str | None]] = {
|
||||||
"webp_anim": ("PIL._webp", True, None),
|
|
||||||
"webp_mux": ("PIL._webp", True, None),
|
|
||||||
"transp_webp": ("PIL._webp", True, None),
|
|
||||||
"raqm": ("PIL._imagingft", "HAVE_RAQM", "raqm_version"),
|
"raqm": ("PIL._imagingft", "HAVE_RAQM", "raqm_version"),
|
||||||
"fribidi": ("PIL._imagingft", "HAVE_FRIBIDI", "fribidi_version"),
|
"fribidi": ("PIL._imagingft", "HAVE_FRIBIDI", "fribidi_version"),
|
||||||
"harfbuzz": ("PIL._imagingft", "HAVE_HARFBUZZ", "harfbuzz_version"),
|
"harfbuzz": ("PIL._imagingft", "HAVE_HARFBUZZ", "harfbuzz_version"),
|
||||||
|
@ -149,12 +145,8 @@ def check_feature(feature: str) -> bool | None:
|
||||||
|
|
||||||
module, flag, ver = features[feature]
|
module, flag, ver = features[feature]
|
||||||
|
|
||||||
if isinstance(flag, bool):
|
|
||||||
deprecate(f'check_feature("{feature}")', 12)
|
|
||||||
try:
|
try:
|
||||||
imported_module = __import__(module, fromlist=["PIL"])
|
imported_module = __import__(module, fromlist=["PIL"])
|
||||||
if isinstance(flag, bool):
|
|
||||||
return flag
|
|
||||||
return getattr(imported_module, flag)
|
return getattr(imported_module, flag)
|
||||||
except ModuleNotFoundError:
|
except ModuleNotFoundError:
|
||||||
return None
|
return None
|
||||||
|
@ -184,17 +176,7 @@ def get_supported_features() -> list[str]:
|
||||||
"""
|
"""
|
||||||
:returns: A list of all supported features.
|
:returns: A list of all supported features.
|
||||||
"""
|
"""
|
||||||
supported_features = []
|
return [f for f in features if check_feature(f)]
|
||||||
for f, (module, flag, _) in features.items():
|
|
||||||
if flag is True:
|
|
||||||
for feature, (feature_module, _) in modules.items():
|
|
||||||
if feature_module == module:
|
|
||||||
if check_module(feature):
|
|
||||||
supported_features.append(f)
|
|
||||||
break
|
|
||||||
elif check_feature(f):
|
|
||||||
supported_features.append(f)
|
|
||||||
return supported_features
|
|
||||||
|
|
||||||
|
|
||||||
def check(feature: str) -> bool | None:
|
def check(feature: str) -> bool | None:
|
||||||
|
|
136
src/_imaging.c
136
src/_imaging.c
|
@ -681,30 +681,6 @@ getink(PyObject *color, Imaging im, char *ink) {
|
||||||
} else if (!PyArg_ParseTuple(color, "iiL", &b, &g, &r)) {
|
} else if (!PyArg_ParseTuple(color, "iiL", &b, &g, &r)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (!strcmp(im->mode, "BGR;15")) {
|
|
||||||
UINT16 v = ((((UINT16)r) << 7) & 0x7c00) +
|
|
||||||
((((UINT16)g) << 2) & 0x03e0) +
|
|
||||||
((((UINT16)b) >> 3) & 0x001f);
|
|
||||||
|
|
||||||
ink[0] = (UINT8)v;
|
|
||||||
ink[1] = (UINT8)(v >> 8);
|
|
||||||
ink[2] = ink[3] = 0;
|
|
||||||
return ink;
|
|
||||||
} else if (!strcmp(im->mode, "BGR;16")) {
|
|
||||||
UINT16 v = ((((UINT16)r) << 8) & 0xf800) +
|
|
||||||
((((UINT16)g) << 3) & 0x07e0) +
|
|
||||||
((((UINT16)b) >> 3) & 0x001f);
|
|
||||||
ink[0] = (UINT8)v;
|
|
||||||
ink[1] = (UINT8)(v >> 8);
|
|
||||||
ink[2] = ink[3] = 0;
|
|
||||||
return ink;
|
|
||||||
} else if (!strcmp(im->mode, "BGR;24")) {
|
|
||||||
ink[0] = (UINT8)b;
|
|
||||||
ink[1] = (UINT8)g;
|
|
||||||
ink[2] = (UINT8)r;
|
|
||||||
ink[3] = 0;
|
|
||||||
return ink;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1650,54 +1626,33 @@ _putdata(ImagingObject *self, PyObject *args) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
double value;
|
double value;
|
||||||
if (image->bands == 1) {
|
int bigendian = 0;
|
||||||
int bigendian = 0;
|
if (image->type == IMAGING_TYPE_SPECIAL) {
|
||||||
if (image->type == IMAGING_TYPE_SPECIAL) {
|
// I;16*
|
||||||
// I;16*
|
if (
|
||||||
if (
|
strcmp(image->mode, "I;16B") == 0
|
||||||
strcmp(image->mode, "I;16B") == 0
|
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
|| strcmp(image->mode, "I;16N") == 0
|
|| strcmp(image->mode, "I;16N") == 0
|
||||||
#endif
|
#endif
|
||||||
) {
|
) {
|
||||||
bigendian = 1;
|
bigendian = 1;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
for (i = x = y = 0; i < n; i++) {
|
}
|
||||||
set_value_to_item(seq, i);
|
for (i = x = y = 0; i < n; i++) {
|
||||||
if (scale != 1.0 || offset != 0.0) {
|
set_value_to_item(seq, i);
|
||||||
value = value * scale + offset;
|
if (scale != 1.0 || offset != 0.0) {
|
||||||
}
|
value = value * scale + offset;
|
||||||
if (image->type == IMAGING_TYPE_SPECIAL) {
|
|
||||||
image->image8[y][x * 2 + (bigendian ? 1 : 0)] =
|
|
||||||
CLIP8((int)value % 256);
|
|
||||||
image->image8[y][x * 2 + (bigendian ? 0 : 1)] =
|
|
||||||
CLIP8((int)value >> 8);
|
|
||||||
} else {
|
|
||||||
image->image8[y][x] = (UINT8)CLIP8(value);
|
|
||||||
}
|
|
||||||
if (++x >= (int)image->xsize) {
|
|
||||||
x = 0, y++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
if (image->type == IMAGING_TYPE_SPECIAL) {
|
||||||
// BGR;*
|
image->image8[y][x * 2 + (bigendian ? 1 : 0)] =
|
||||||
int b;
|
CLIP8((int)value % 256);
|
||||||
for (i = x = y = 0; i < n; i++) {
|
image->image8[y][x * 2 + (bigendian ? 0 : 1)] =
|
||||||
char ink[4];
|
CLIP8((int)value >> 8);
|
||||||
|
} else {
|
||||||
op = PySequence_Fast_GET_ITEM(seq, i);
|
image->image8[y][x] = (UINT8)CLIP8(value);
|
||||||
if (!op || !getink(op, image, ink)) {
|
}
|
||||||
Py_DECREF(seq);
|
if (++x >= (int)image->xsize) {
|
||||||
return NULL;
|
x = 0, y++;
|
||||||
}
|
|
||||||
/* FIXME: what about scale and offset? */
|
|
||||||
for (b = 0; b < image->pixelsize; b++) {
|
|
||||||
image->image8[y][x * image->pixelsize + b] = ink[b];
|
|
||||||
}
|
|
||||||
if (++x >= (int)image->xsize) {
|
|
||||||
x = 0, y++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PyErr_Clear(); /* Avoid weird exceptions */
|
PyErr_Clear(); /* Avoid weird exceptions */
|
||||||
|
@ -3769,18 +3724,6 @@ _getattr_bands(ImagingObject *self, void *closure) {
|
||||||
return PyLong_FromLong(self->image->bands);
|
return PyLong_FromLong(self->image->bands);
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyObject *
|
|
||||||
_getattr_id(ImagingObject *self, void *closure) {
|
|
||||||
if (PyErr_WarnEx(
|
|
||||||
PyExc_DeprecationWarning,
|
|
||||||
"id property is deprecated and will be removed in Pillow 12 (2025-10-15)",
|
|
||||||
1
|
|
||||||
) < 0) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
return PyLong_FromSsize_t((Py_ssize_t)self->image);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ptr_destructor(PyObject *capsule) {
|
_ptr_destructor(PyObject *capsule) {
|
||||||
PyObject *self = (PyObject *)PyCapsule_GetContext(capsule);
|
PyObject *self = (PyObject *)PyCapsule_GetContext(capsule);
|
||||||
|
@ -3795,27 +3738,6 @@ _getattr_ptr(ImagingObject *self, void *closure) {
|
||||||
return capsule;
|
return capsule;
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyObject *
|
|
||||||
_getattr_unsafe_ptrs(ImagingObject *self, void *closure) {
|
|
||||||
if (PyErr_WarnEx(
|
|
||||||
PyExc_DeprecationWarning,
|
|
||||||
"unsafe_ptrs property is deprecated and will be removed in Pillow 12 "
|
|
||||||
"(2025-10-15)",
|
|
||||||
1
|
|
||||||
) < 0) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
return Py_BuildValue(
|
|
||||||
"(sn)(sn)(sn)",
|
|
||||||
"image8",
|
|
||||||
self->image->image8,
|
|
||||||
"image32",
|
|
||||||
self->image->image32,
|
|
||||||
"image",
|
|
||||||
self->image->image
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
static PyObject *
|
static PyObject *
|
||||||
_getattr_readonly(ImagingObject *self, void *closure) {
|
_getattr_readonly(ImagingObject *self, void *closure) {
|
||||||
return PyLong_FromLong(self->image->read_only);
|
return PyLong_FromLong(self->image->read_only);
|
||||||
|
@ -3825,9 +3747,7 @@ static struct PyGetSetDef getsetters[] = {
|
||||||
{"mode", (getter)_getattr_mode},
|
{"mode", (getter)_getattr_mode},
|
||||||
{"size", (getter)_getattr_size},
|
{"size", (getter)_getattr_size},
|
||||||
{"bands", (getter)_getattr_bands},
|
{"bands", (getter)_getattr_bands},
|
||||||
{"id", (getter)_getattr_id},
|
|
||||||
{"ptr", (getter)_getattr_ptr},
|
{"ptr", (getter)_getattr_ptr},
|
||||||
{"unsafe_ptrs", (getter)_getattr_unsafe_ptrs},
|
|
||||||
{"readonly", (getter)_getattr_readonly},
|
{"readonly", (getter)_getattr_readonly},
|
||||||
{NULL}
|
{NULL}
|
||||||
};
|
};
|
||||||
|
@ -4432,16 +4352,6 @@ setup_module(PyObject *m) {
|
||||||
PyObject *v = PyUnicode_FromString(ImagingTiffVersion());
|
PyObject *v = PyUnicode_FromString(ImagingTiffVersion());
|
||||||
PyDict_SetItemString(d, "libtiff_version", v ? v : Py_None);
|
PyDict_SetItemString(d, "libtiff_version", v ? v : Py_None);
|
||||||
Py_XDECREF(v);
|
Py_XDECREF(v);
|
||||||
|
|
||||||
// Test for libtiff 4.0 or later, excluding libtiff 3.9.6 and 3.9.7
|
|
||||||
PyObject *support_custom_tags;
|
|
||||||
#if TIFFLIB_VERSION >= 20111221 && TIFFLIB_VERSION != 20120218 && \
|
|
||||||
TIFFLIB_VERSION != 20120922
|
|
||||||
support_custom_tags = Py_True;
|
|
||||||
#else
|
|
||||||
support_custom_tags = Py_False;
|
|
||||||
#endif
|
|
||||||
PyDict_SetItemString(d, "libtiff_support_custom_tags", support_custom_tags);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -82,31 +82,6 @@ get_pixel_16B(Imaging im, int x, int y, void *color) {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
get_pixel_BGR15(Imaging im, int x, int y, void *color) {
|
|
||||||
UINT8 *in = (UINT8 *)&im->image8[y][x * 2];
|
|
||||||
UINT16 pixel = in[0] + (in[1] << 8);
|
|
||||||
char *out = color;
|
|
||||||
out[0] = (pixel & 31) * 255 / 31;
|
|
||||||
out[1] = ((pixel >> 5) & 31) * 255 / 31;
|
|
||||||
out[2] = ((pixel >> 10) & 31) * 255 / 31;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
get_pixel_BGR16(Imaging im, int x, int y, void *color) {
|
|
||||||
UINT8 *in = (UINT8 *)&im->image8[y][x * 2];
|
|
||||||
UINT16 pixel = in[0] + (in[1] << 8);
|
|
||||||
char *out = color;
|
|
||||||
out[0] = (pixel & 31) * 255 / 31;
|
|
||||||
out[1] = ((pixel >> 5) & 63) * 255 / 63;
|
|
||||||
out[2] = ((pixel >> 11) & 31) * 255 / 31;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
get_pixel_BGR24(Imaging im, int x, int y, void *color) {
|
|
||||||
memcpy(color, &im->image8[y][x * 3], sizeof(UINT8) * 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
get_pixel_32(Imaging im, int x, int y, void *color) {
|
get_pixel_32(Imaging im, int x, int y, void *color) {
|
||||||
memcpy(color, &im->image32[y][x], sizeof(INT32));
|
memcpy(color, &im->image32[y][x], sizeof(INT32));
|
||||||
|
@ -154,16 +129,6 @@ put_pixel_16B(Imaging im, int x, int y, const void *color) {
|
||||||
out[1] = in[0];
|
out[1] = in[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
put_pixel_BGR1516(Imaging im, int x, int y, const void *color) {
|
|
||||||
memcpy(&im->image8[y][x * 2], color, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
put_pixel_BGR24(Imaging im, int x, int y, const void *color) {
|
|
||||||
memcpy(&im->image8[y][x * 3], color, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
put_pixel_32L(Imaging im, int x, int y, const void *color) {
|
put_pixel_32L(Imaging im, int x, int y, const void *color) {
|
||||||
memcpy(&im->image8[y][x * 4], color, 4);
|
memcpy(&im->image8[y][x * 4], color, 4);
|
||||||
|
@ -212,9 +177,6 @@ ImagingAccessInit(void) {
|
||||||
ADD("F", get_pixel_32, put_pixel_32);
|
ADD("F", get_pixel_32, put_pixel_32);
|
||||||
ADD("P", get_pixel_8, put_pixel_8);
|
ADD("P", get_pixel_8, put_pixel_8);
|
||||||
ADD("PA", get_pixel_32_2bands, put_pixel_32);
|
ADD("PA", get_pixel_32_2bands, put_pixel_32);
|
||||||
ADD("BGR;15", get_pixel_BGR15, put_pixel_BGR1516);
|
|
||||||
ADD("BGR;16", get_pixel_BGR16, put_pixel_BGR1516);
|
|
||||||
ADD("BGR;24", get_pixel_BGR24, put_pixel_BGR24);
|
|
||||||
ADD("RGB", get_pixel_32, put_pixel_32);
|
ADD("RGB", get_pixel_32, put_pixel_32);
|
||||||
ADD("RGBA", get_pixel_32, put_pixel_32);
|
ADD("RGBA", get_pixel_32, put_pixel_32);
|
||||||
ADD("RGBa", get_pixel_32, put_pixel_32);
|
ADD("RGBa", get_pixel_32, put_pixel_32);
|
||||||
|
|
|
@ -277,38 +277,6 @@ rgb2f(UINT8 *out_, const UINT8 *in, int xsize) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
rgb2bgr15(UINT8 *out_, const UINT8 *in, int xsize) {
|
|
||||||
int x;
|
|
||||||
for (x = 0; x < xsize; x++, in += 4, out_ += 2) {
|
|
||||||
UINT16 v = ((((UINT16)in[0]) << 7) & 0x7c00) +
|
|
||||||
((((UINT16)in[1]) << 2) & 0x03e0) +
|
|
||||||
((((UINT16)in[2]) >> 3) & 0x001f);
|
|
||||||
memcpy(out_, &v, sizeof(v));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
rgb2bgr16(UINT8 *out_, const UINT8 *in, int xsize) {
|
|
||||||
int x;
|
|
||||||
for (x = 0; x < xsize; x++, in += 4, out_ += 2) {
|
|
||||||
UINT16 v = ((((UINT16)in[0]) << 8) & 0xf800) +
|
|
||||||
((((UINT16)in[1]) << 3) & 0x07e0) +
|
|
||||||
((((UINT16)in[2]) >> 3) & 0x001f);
|
|
||||||
memcpy(out_, &v, sizeof(v));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
rgb2bgr24(UINT8 *out, const UINT8 *in, int xsize) {
|
|
||||||
int x;
|
|
||||||
for (x = 0; x < xsize; x++, in += 4) {
|
|
||||||
*out++ = in[2];
|
|
||||||
*out++ = in[1];
|
|
||||||
*out++ = in[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
rgb2hsv_row(UINT8 *out, const UINT8 *in) { // following colorsys.py
|
rgb2hsv_row(UINT8 *out, const UINT8 *in) { // following colorsys.py
|
||||||
float h, s, rc, gc, bc, cr;
|
float h, s, rc, gc, bc, cr;
|
||||||
|
@ -971,9 +939,6 @@ static struct {
|
||||||
{"RGB", "I;16N", rgb2i16l},
|
{"RGB", "I;16N", rgb2i16l},
|
||||||
#endif
|
#endif
|
||||||
{"RGB", "F", rgb2f},
|
{"RGB", "F", rgb2f},
|
||||||
{"RGB", "BGR;15", rgb2bgr15},
|
|
||||||
{"RGB", "BGR;16", rgb2bgr16},
|
|
||||||
{"RGB", "BGR;24", rgb2bgr24},
|
|
||||||
{"RGB", "RGBA", rgb2rgba},
|
{"RGB", "RGBA", rgb2rgba},
|
||||||
{"RGB", "RGBa", rgb2rgba},
|
{"RGB", "RGBa", rgb2rgba},
|
||||||
{"RGB", "RGBX", rgb2rgba},
|
{"RGB", "RGBX", rgb2rgba},
|
||||||
|
|
|
@ -132,11 +132,15 @@ ImagingGetHistogram(Imaging im, Imaging imMask, void *minmax) {
|
||||||
ImagingSectionEnter(&cookie);
|
ImagingSectionEnter(&cookie);
|
||||||
for (y = 0; y < im->ysize; y++) {
|
for (y = 0; y < im->ysize; y++) {
|
||||||
UINT8 *in = (UINT8 *)im->image[y];
|
UINT8 *in = (UINT8 *)im->image[y];
|
||||||
for (x = 0; x < im->xsize; x++) {
|
for (x = 0; x < im->xsize; x++, in += 4) {
|
||||||
h->histogram[(*in++)]++;
|
h->histogram[*in]++;
|
||||||
h->histogram[(*in++) + 256]++;
|
if (im->bands == 2) {
|
||||||
h->histogram[(*in++) + 512]++;
|
h->histogram[*(in + 3) + 256]++;
|
||||||
h->histogram[(*in++) + 768]++;
|
} else {
|
||||||
|
h->histogram[*(in + 1) + 256]++;
|
||||||
|
h->histogram[*(in + 2) + 512]++;
|
||||||
|
h->histogram[*(in + 3) + 768]++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ImagingSectionLeave(&cookie);
|
ImagingSectionLeave(&cookie);
|
||||||
|
|
|
@ -471,12 +471,6 @@ copy2(UINT8 *out, const UINT8 *in, int pixels) {
|
||||||
memcpy(out, in, pixels * 2);
|
memcpy(out, in, pixels * 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
copy3(UINT8 *out, const UINT8 *in, int pixels) {
|
|
||||||
/* BGR;24, etc */
|
|
||||||
memcpy(out, in, pixels * 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
copy4(UINT8 *out, const UINT8 *in, int pixels) {
|
copy4(UINT8 *out, const UINT8 *in, int pixels) {
|
||||||
/* RGBA, CMYK quadruples */
|
/* RGBA, CMYK quadruples */
|
||||||
|
@ -657,9 +651,6 @@ static struct {
|
||||||
{"I;16", "I;16N", 16, packI16N_I16}, // LibTiff native->image endian.
|
{"I;16", "I;16N", 16, packI16N_I16}, // LibTiff native->image endian.
|
||||||
{"I;16L", "I;16N", 16, packI16N_I16},
|
{"I;16L", "I;16N", 16, packI16N_I16},
|
||||||
{"I;16B", "I;16N", 16, packI16N_I16B},
|
{"I;16B", "I;16N", 16, packI16N_I16B},
|
||||||
{"BGR;15", "BGR;15", 16, copy2},
|
|
||||||
{"BGR;16", "BGR;16", 16, copy2},
|
|
||||||
{"BGR;24", "BGR;24", 24, copy3},
|
|
||||||
|
|
||||||
{NULL} /* sentinel */
|
{NULL} /* sentinel */
|
||||||
};
|
};
|
||||||
|
|
|
@ -151,36 +151,6 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
|
||||||
strcpy(im->band_names[2], "B");
|
strcpy(im->band_names[2], "B");
|
||||||
strcpy(im->band_names[3], "X");
|
strcpy(im->band_names[3], "X");
|
||||||
|
|
||||||
} else if (strcmp(mode, "BGR;15") == 0) {
|
|
||||||
/* EXPERIMENTAL */
|
|
||||||
/* 15-bit reversed true colour */
|
|
||||||
im->bands = 3;
|
|
||||||
im->pixelsize = 2;
|
|
||||||
im->linesize = (xsize * 2 + 3) & -4;
|
|
||||||
im->type = IMAGING_TYPE_SPECIAL;
|
|
||||||
/* not allowing arrow due to line length packing */
|
|
||||||
strcpy(im->arrow_band_format, "");
|
|
||||||
|
|
||||||
} else if (strcmp(mode, "BGR;16") == 0) {
|
|
||||||
/* EXPERIMENTAL */
|
|
||||||
/* 16-bit reversed true colour */
|
|
||||||
im->bands = 3;
|
|
||||||
im->pixelsize = 2;
|
|
||||||
im->linesize = (xsize * 2 + 3) & -4;
|
|
||||||
im->type = IMAGING_TYPE_SPECIAL;
|
|
||||||
/* not allowing arrow due to line length packing */
|
|
||||||
strcpy(im->arrow_band_format, "");
|
|
||||||
|
|
||||||
} else if (strcmp(mode, "BGR;24") == 0) {
|
|
||||||
/* EXPERIMENTAL */
|
|
||||||
/* 24-bit reversed true colour */
|
|
||||||
im->bands = 3;
|
|
||||||
im->pixelsize = 3;
|
|
||||||
im->linesize = (xsize * 3 + 3) & -4;
|
|
||||||
im->type = IMAGING_TYPE_SPECIAL;
|
|
||||||
/* not allowing arrow due to line length packing */
|
|
||||||
strcpy(im->arrow_band_format, "");
|
|
||||||
|
|
||||||
} else if (strcmp(mode, "RGBX") == 0) {
|
} else if (strcmp(mode, "RGBX") == 0) {
|
||||||
/* 32-bit true colour images with padding */
|
/* 32-bit true colour images with padding */
|
||||||
im->bands = im->pixelsize = 4;
|
im->bands = im->pixelsize = 4;
|
||||||
|
|
|
@ -884,7 +884,6 @@ ImagingLibTiffMergeFieldInfo(
|
||||||
// Refer to libtiff docs (http://www.simplesystems.org/libtiff/addingtags.html)
|
// Refer to libtiff docs (http://www.simplesystems.org/libtiff/addingtags.html)
|
||||||
TIFFSTATE *clientstate = (TIFFSTATE *)state->context;
|
TIFFSTATE *clientstate = (TIFFSTATE *)state->context;
|
||||||
uint32_t n;
|
uint32_t n;
|
||||||
int status = 0;
|
|
||||||
|
|
||||||
// custom fields added with ImagingLibTiffMergeFieldInfo are only used for
|
// custom fields added with ImagingLibTiffMergeFieldInfo are only used for
|
||||||
// decoding, ignore readcount;
|
// decoding, ignore readcount;
|
||||||
|
@ -907,14 +906,7 @@ ImagingLibTiffMergeFieldInfo(
|
||||||
|
|
||||||
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
|
return TIFFMergeFieldInfo(clientstate->tiff, info, n);
|
||||||
#if TIFFLIB_VERSION >= 20111221 && TIFFLIB_VERSION != 20120218 && \
|
|
||||||
TIFFLIB_VERSION != 20120922
|
|
||||||
status = TIFFMergeFieldInfo(clientstate->tiff, info, n);
|
|
||||||
#else
|
|
||||||
TIFFMergeFieldInfo(clientstate->tiff, info, n);
|
|
||||||
#endif
|
|
||||||
return status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
|
@ -1284,12 +1284,6 @@ copy2(UINT8 *out, const UINT8 *in, int pixels) {
|
||||||
memcpy(out, in, pixels * 2);
|
memcpy(out, in, pixels * 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
copy3(UINT8 *out, const UINT8 *in, int pixels) {
|
|
||||||
/* BGR;24 */
|
|
||||||
memcpy(out, in, pixels * 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
copy4(UINT8 *out, const UINT8 *in, int pixels) {
|
copy4(UINT8 *out, const UINT8 *in, int pixels) {
|
||||||
/* RGBA, CMYK quadruples */
|
/* RGBA, CMYK quadruples */
|
||||||
|
@ -1649,10 +1643,6 @@ static struct {
|
||||||
{"RGB", "B;16B", 16, band216B},
|
{"RGB", "B;16B", 16, band216B},
|
||||||
{"RGB", "CMYK", 32, cmyk2rgb},
|
{"RGB", "CMYK", 32, cmyk2rgb},
|
||||||
|
|
||||||
{"BGR;15", "BGR;15", 16, copy2},
|
|
||||||
{"BGR;16", "BGR;16", 16, copy2},
|
|
||||||
{"BGR;24", "BGR;24", 24, copy3},
|
|
||||||
|
|
||||||
/* true colour w. alpha */
|
/* true colour w. alpha */
|
||||||
{"RGBA", "LA", 16, unpackRGBALA},
|
{"RGBA", "LA", 16, unpackRGBALA},
|
||||||
{"RGBA", "LA;16B", 32, unpackRGBALA16B},
|
{"RGBA", "LA;16B", 32, unpackRGBALA16B},
|
||||||
|
|
|
@ -121,8 +121,8 @@ V = {
|
||||||
"LCMS2": "2.17",
|
"LCMS2": "2.17",
|
||||||
"LIBAVIF": "1.3.0",
|
"LIBAVIF": "1.3.0",
|
||||||
"LIBIMAGEQUANT": "4.3.4",
|
"LIBIMAGEQUANT": "4.3.4",
|
||||||
"LIBPNG": "1.6.49",
|
"LIBPNG": "1.6.50",
|
||||||
"LIBWEBP": "1.5.0",
|
"LIBWEBP": "1.6.0",
|
||||||
"OPENJPEG": "2.5.3",
|
"OPENJPEG": "2.5.3",
|
||||||
"TIFF": "4.7.0",
|
"TIFF": "4.7.0",
|
||||||
"XZ": "5.8.1",
|
"XZ": "5.8.1",
|
||||||
|
@ -149,18 +149,17 @@ DEPS: dict[str, dict[str, Any]] = {
|
||||||
},
|
},
|
||||||
"build": [
|
"build": [
|
||||||
*cmds_cmake(
|
*cmds_cmake(
|
||||||
("jpeg-static", "cjpeg-static", "djpeg-static"),
|
("jpeg-static", "djpeg-static"),
|
||||||
"-DENABLE_SHARED:BOOL=FALSE",
|
"-DENABLE_SHARED:BOOL=FALSE",
|
||||||
"-DWITH_JPEG8:BOOL=TRUE",
|
"-DWITH_JPEG8:BOOL=TRUE",
|
||||||
"-DWITH_CRT_DLL:BOOL=TRUE",
|
"-DWITH_CRT_DLL:BOOL=TRUE",
|
||||||
),
|
),
|
||||||
cmd_copy("jpeg-static.lib", "libjpeg.lib"),
|
cmd_copy("jpeg-static.lib", "libjpeg.lib"),
|
||||||
cmd_copy("cjpeg-static.exe", "cjpeg.exe"),
|
|
||||||
cmd_copy("djpeg-static.exe", "djpeg.exe"),
|
cmd_copy("djpeg-static.exe", "djpeg.exe"),
|
||||||
],
|
],
|
||||||
"headers": ["jconfig.h", r"src\j*.h"],
|
"headers": ["jconfig.h", r"src\j*.h"],
|
||||||
"libs": ["libjpeg.lib"],
|
"libs": ["libjpeg.lib"],
|
||||||
"bins": ["cjpeg.exe", "djpeg.exe"],
|
"bins": ["djpeg.exe"],
|
||||||
},
|
},
|
||||||
"zlib": {
|
"zlib": {
|
||||||
"url": f"https://github.com/zlib-ng/zlib-ng/archive/refs/tags/{V['ZLIBNG']}.tar.gz",
|
"url": f"https://github.com/zlib-ng/zlib-ng/archive/refs/tags/{V['ZLIBNG']}.tar.gz",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user