Merge branch 'main' into feat/riscv64-wheels

Author: radarhere

.github/workflows/test-docker.yml

@@ -43,16 +43,12 @@ jobs:
           ubuntu-24.04-noble-s390x,
           # Then run the remainder
           alpine,
-          amazon-2-amd64,
           amazon-2023-amd64,
           arch,
           centos-stream-9-amd64,
           centos-stream-10-amd64,
-          debian-12-bookworm-x86,
-          debian-12-bookworm-amd64,
           debian-13-trixie-x86,
           debian-13-trixie-amd64,
-          fedora-42-amd64,
           fedora-43-amd64,
           gentoo,
           ubuntu-22.04-jammy-amd64,

.github/workflows/wheels-dependencies.sh

@@ -93,9 +93,9 @@ ARCHIVE_SDIR=pillow-depends-main
 FREETYPE_VERSION=2.14.3
 HARFBUZZ_VERSION=13.2.1
 LIBPNG_VERSION=1.6.56
-JPEGTURBO_VERSION=3.1.3
+JPEGTURBO_VERSION=3.1.4.1
 OPENJPEG_VERSION=2.5.4
-XZ_VERSION=5.8.2
+XZ_VERSION=5.8.3
 ZSTD_VERSION=1.5.7
 TIFF_VERSION=4.7.1
 LCMS2_VERSION=2.18
@@ -178,7 +178,6 @@ function build_libavif {
         build_simple nasm 2.16.03 https://www.nasm.us/pub/nasm/releasebuilds/2.16.03
     fi
 
-    local build_type=MinSizeRel
     local build_shared=ON
     local lto=ON
 
@@ -195,9 +194,6 @@ function build_libavif {
             build_shared=OFF
         fi
     else
-        if [[ "$MB_ML_VER" == 2014 ]] && [[ "$PLAT" == "x86_64" ]]; then
-            build_type=Release
-        fi
         libavif_cmake_flags=(-DCMAKE_SHARED_LINKER_FLAGS_INIT="-Wl,--strip-all,-z,relro,-z,now")
     fi
     if [[ -n "$IOS_SDK" ]] && [[ "$PLAT" == "x86_64" ]]; then
@@ -226,7 +222,7 @@ function build_libavif {
             -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=$lto \
             -DCMAKE_C_VISIBILITY_PRESET=hidden \
             -DCMAKE_CXX_VISIBILITY_PRESET=hidden \
-            -DCMAKE_BUILD_TYPE=$build_type \
+            -DCMAKE_BUILD_TYPE=MinSizeRel \
             "${libavif_cmake_flags[@]}" \
             $HOST_CMAKE_FLAGS . )
 

.github/workflows/wheels.yml

@@ -39,7 +39,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  EXPECTED_DISTS: 91
+  EXPECTED_DISTS: 75
   FORCE_COLOR: 1
 
 jobs:
@@ -74,26 +74,26 @@ jobs:
             os: macos-latest
             cibw_arch: arm64
             macosx_deployment_target: "11.0"
-          - name: "manylinux2014 and musllinux x86_64"
+          - name: "manylinux_2_28 x86_64"
             platform: linux
             os: ubuntu-latest
             cibw_arch: x86_64
-            manylinux: "manylinux2014"
-          - name: "manylinux_2_28 x86_64"
+            build: "*manylinux*"
+          - name: "musllinux x86_64"
             platform: linux
             os: ubuntu-latest
             cibw_arch: x86_64
-            build: "*manylinux*"
-          - name: "manylinux2014 and musllinux aarch64"
+            build: "*musllinux*"
+          - name: "manylinux_2_28 aarch64"
             platform: linux
             os: ubuntu-24.04-arm
             cibw_arch: aarch64
-            manylinux: "manylinux2014"
-          - name: "manylinux_2_28 aarch64"
+            build: "*manylinux*"
+          - name: "musllinux aarch64"
             platform: linux
             os: ubuntu-24.04-arm
             cibw_arch: aarch64
-            build: "*manylinux*"
+            build: "*musllinux*"
           - name: "manylinux_2_39 riscv64"
             platform: linux
             os: ubuntu-latest
@@ -140,11 +140,7 @@ jobs:
           CIBW_ARCHS: ${{ matrix.cibw_arch }}
           CIBW_BUILD: ${{ matrix.build }}
           CIBW_ENABLE: cpython-prerelease cpython-freethreading pypy
-          CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.manylinux }}
-          CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.manylinux }}
-          CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }}
           CIBW_MANYLINUX_RISCV64_IMAGE: ${{ matrix.manylinux }}
-          CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
           MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
 
       - uses: actions/upload-artifact@v6

Tests/images/pal8_offset.bmp

@@ -42,7 +42,7 @@ def test_fallback_if_mmap_errors() -> None:
     # This image has been truncated,
     # so that the buffer is not large enough when using mmap
     with Image.open("Tests/images/mmap_error.bmp") as im:
-        assert_image_equal_tofile(im, "Tests/images/pal8_offset.bmp")
+        assert_image_equal_tofile(im, "Tests/images/bmp/g/pal8.bmp")
 
 
 def test_save_to_bytes() -> None:
@@ -238,11 +238,21 @@ def test_unsupported_bmp_bitfields_layout() -> None:
         Image.open(fp)
 
 
-def test_offset() -> None:
-    # This image has been hexedited
-    # to exclude the palette size from the pixel data offset
-    with Image.open("Tests/images/pal8_offset.bmp") as im:
-        assert_image_equal_tofile(im, "Tests/images/bmp/g/pal8.bmp")
+@pytest.mark.parametrize(
+    "offset, path",
+    (
+        (26, "pal8os2.bmp"),
+        (54, "pal8.bmp"),
+    ),
+)
+def test_offset(offset: int, path: str) -> None:
+    image_path = "Tests/images/bmp/g/" + path
+    # Exclude the palette size from the pixel data offset
+    with open(image_path, "rb") as fp:
+        data = fp.read()
+        data = data[:10] + o32(offset) + data[14:]
+        with Image.open(io.BytesIO(data)) as im:
+            assert_image_equal_tofile(im, image_path)
 
 
 def test_use_raw_alpha(monkeypatch: pytest.MonkeyPatch) -> None:

Tests/images/psd-oob-write-overflow.psd

@@ -1055,6 +1055,15 @@ def test_strip_planar_16bit_RGBa(self) -> None:
         with Image.open("Tests/images/tiff_strip_planar_16bit_RGBa.tiff") as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_16bit_RGBa_target.png")
 
+    def test_separate_planar_extra_samples(self, tmp_path: Path) -> None:
+        out = tmp_path / "temp.tif"
+        with Image.open("Tests/images/separate_planar_extra_samples.tiff") as im:
+            assert im.mode == "L"
+
+            im.save(out)
+        with Image.open(out) as reloaded:
+            assert reloaded.mode == "L"
+
     @pytest.mark.parametrize("compression", (None, "jpeg"))
     def test_block_tile_tags(self, compression: str | None, tmp_path: Path) -> None:
         im = hopper()

Tests/images/separate_planar_extra_samples.tiff

@@ -1,12 +1,18 @@
 from __future__ import annotations
 
+import sys
 import warnings
 
 import pytest
 
 from PIL import Image, PsdImagePlugin
 
-from .helper import assert_image_equal_tofile, assert_image_similar, hopper, is_pypy
+from .helper import (
+    assert_image_equal_tofile,
+    assert_image_similar,
+    hopper,
+    is_pypy,
+)
 
 test_file = "Tests/images/hopper.psd"
 
@@ -85,6 +91,11 @@ def test_eoferror() -> None:
         # Test that seeking to the last frame does not raise an error
         im.seek(n_frames - 1)
 
+    # Test seeking past the last frame without calling n_frames first
+    with Image.open(test_file) as im:
+        with pytest.raises(EOFError):
+            im.seek(3)
+
 
 def test_seek_tell() -> None:
     with Image.open(test_file) as im:
@@ -199,3 +210,17 @@ def test_bounds_crash(test_file: str) -> None:
 
         with pytest.raises(ValueError):
             im.load()
+
+
+def test_bounds_crash_overflow() -> None:
+    with Image.open("Tests/images/psd-oob-write-overflow.psd") as im:
+        assert isinstance(im, PsdImagePlugin.PsdImageFile)
+        im.load()
+        if sys.maxsize <= 2**32:
+            with pytest.raises(OverflowError):
+                im.seek(im.n_frames)
+        else:
+            im.seek(im.n_frames)
+
+            with pytest.raises(ValueError):
+                im.load()