python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-06-05 21:53:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix_ifdrational_tagtype_negative_numerator

Browse Source
This commit is contained in:
Andrew Murray 2025-05-25 15:50:47 +10:00 committed by GitHub
commit 83de8cd22c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test-windows.yml vendored
View File

@ -98,8 +98,8 @@ jobs:
choco install nasm --no-progress choco install nasm --no-progress
echo "C:\Program Files\NASM" >> $env:GITHUB_PATH echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
choco install ghostscript --version=10.5.0 --no-progress choco install ghostscript --version=10.5.1 --no-progress
echo "C:\Program Files\gs\gs10.05.0\bin" >> $env:GITHUB_PATH echo "C:\Program Files\gs\gs10.05.1\bin" >> $env:GITHUB_PATH
# Install extra test images # Install extra test images
xcopy /S /Y Tests\test-images\* Tests\images xcopy /S /Y Tests\test-images\* Tests\images

2
.github/workflows/wheels-dependencies.sh vendored
View File

@ -38,7 +38,7 @@ ARCHIVE_SDIR=pillow-depends-main
# Package versions for fresh source builds # Package versions for fresh source builds
FREETYPE_VERSION=2.13.3 FREETYPE_VERSION=2.13.3
HARFBUZZ_VERSION=11.1.0 HARFBUZZ_VERSION=11.2.1
LIBPNG_VERSION=1.6.47 LIBPNG_VERSION=1.6.47
JPEGTURBO_VERSION=3.1.0 JPEGTURBO_VERSION=3.1.0
OPENJPEG_VERSION=2.5.3 OPENJPEG_VERSION=2.5.3

2
Tests/test_file_avif.py
View File

@ -233,7 +233,7 @@ class TestFileAvif:
with Image.open(out_gif) as reread: with Image.open(out_gif) as reread:
reread_value = reread.convert("RGB").getpixel((1, 1)) reread_value = reread.convert("RGB").getpixel((1, 1))
difference = sum([abs(original_value[i] - reread_value[i]) for i in range(3)]) difference = sum([abs(original_value[i] - reread_value[i]) for i in range(3)])
assert difference <= 3 assert difference <= 6
def test_save_single_frame(self, tmp_path: Path) -> None: def test_save_single_frame(self, tmp_path: Path) -> None:
temp_file = tmp_path / "temp.avif" temp_file = tmp_path / "temp.avif"

2
depends/install_libavif.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail
version=1.2.1 version=1.3.0
./download-and-extract.sh libavif-$version https://github.com/AOMediaCodec/libavif/archive/refs/tags/v$version.tar.gz ./download-and-extract.sh libavif-$version https://github.com/AOMediaCodec/libavif/archive/refs/tags/v$version.tar.gz

6
winbuild/build_prepare.py
View File

@ -113,10 +113,10 @@ V = {
"BROTLI": "1.1.0", "BROTLI": "1.1.0",
"FREETYPE": "2.13.3", "FREETYPE": "2.13.3",
"FRIBIDI": "1.0.16", "FRIBIDI": "1.0.16",
"HARFBUZZ": "11.1.0", "HARFBUZZ": "11.2.1",
"JPEGTURBO": "3.1.0", "JPEGTURBO": "3.1.0",
"LCMS2": "2.17", "LCMS2": "2.17",
"LIBAVIF": "1.2.1", "LIBAVIF": "1.3.0",
"LIBIMAGEQUANT": "4.3.4", "LIBIMAGEQUANT": "4.3.4",
"LIBPNG": "1.6.47", "LIBPNG": "1.6.47",
"LIBWEBP": "1.5.0", "LIBWEBP": "1.5.0",
@ -389,6 +389,7 @@ DEPS: dict[str, dict[str, Any]] = {
"filename": f"libavif-{V['LIBAVIF']}.zip", "filename": f"libavif-{V['LIBAVIF']}.zip",
"license": "LICENSE", "license": "LICENSE",
"build": [ "build": [
"rustup update",
f"{sys.executable} -m pip install meson", f"{sys.executable} -m pip install meson",
*cmds_cmake( *cmds_cmake(
"avif_static", "avif_static",
@ -399,7 +400,6 @@ DEPS: dict[str, dict[str, Any]] = {
"-DAVIF_CODEC_DAV1D=LOCAL", "-DAVIF_CODEC_DAV1D=LOCAL",
"-DAVIF_CODEC_RAV1E=LOCAL", "-DAVIF_CODEC_RAV1E=LOCAL",
"-DAVIF_CODEC_SVT=LOCAL", "-DAVIF_CODEC_SVT=LOCAL",
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
), ),
cmd_xcopy("include", "{inc_dir}"), cmd_xcopy("include", "{inc_dir}"),
], ],