Merge branch 'main' into fix-qtables-and-quality-scaling

Author: Kyliroco

.github/workflows/test-docker.yml

@@ -47,8 +47,8 @@ jobs:
           centos-stream-10-amd64,
           debian-12-bookworm-x86,
           debian-12-bookworm-amd64,
-          fedora-40-amd64,
           fedora-41-amd64,
+          fedora-42-amd64,
           gentoo,
           ubuntu-22.04-jammy-amd64,
           ubuntu-24.04-noble-amd64,

.github/workflows/wheels-dependencies.sh

@@ -38,11 +38,11 @@ ARCHIVE_SDIR=pillow-depends-main
 
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.13.3
-HARFBUZZ_VERSION=11.0.0
+HARFBUZZ_VERSION=11.0.1
 LIBPNG_VERSION=1.6.47
 JPEGTURBO_VERSION=3.1.0
 OPENJPEG_VERSION=2.5.3
-XZ_VERSION=5.8.0
+XZ_VERSION=5.8.1
 TIFF_VERSION=4.7.0
 LCMS2_VERSION=2.17
 ZLIB_VERSION=1.3.1
@@ -51,21 +51,6 @@ LIBWEBP_VERSION=1.5.0
 BZIP2_VERSION=1.0.8
 LIBXCB_VERSION=1.17.0
 BROTLI_VERSION=1.1.0
-LIBAVIF_VERSION=1.2.1
-
-if [[ $MB_ML_VER == 2014 ]]; then
-    function build_xz {
-        if [ -e xz-stamp ]; then return; fi
-        yum install -y gettext-devel
-        fetch_unpack https://tukaani.org/xz/xz-$XZ_VERSION.tar.gz
-        (cd xz-$XZ_VERSION \
-            && ./autogen.sh --no-po4a \
-            && ./configure --prefix=$BUILD_PREFIX \
-            && make -j4 \
-            && make install)
-        touch xz-stamp
-    }
-fi
 
 function build_pkg_config {
     if [ -e pkg-config-stamp ]; then return; fi
@@ -107,51 +92,12 @@ function build_harfbuzz {
 
     local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/harfbuzz-$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz)
     (cd $out_dir \
-        && meson setup build --prefix=$BUILD_PREFIX --libdir=$BUILD_PREFIX/lib --buildtype=release -Dfreetype=enabled -Dglib=disabled)
+        && meson setup build --prefix=$BUILD_PREFIX --libdir=$BUILD_PREFIX/lib --buildtype=release -Dfreetype=enabled -Dglib=disabled -Dtests=disabled)
     (cd $out_dir/build \
         && meson install)
     touch harfbuzz-stamp
 }
 
-function build_libavif {
-    if [ -e libavif-stamp ]; then return; fi
-
-    python3 -m pip install meson ninja
-
-    if [[ "$PLAT" == "x86_64" ]] || [ -n "$SANITIZER" ]; then
-        build_simple nasm 2.16.03 https://www.nasm.us/pub/nasm/releasebuilds/2.16.03
-    fi
-
-    # For rav1e
-    curl https://sh.rustup.rs -sSf | sh -s -- -y
-    . "$HOME/.cargo/env"
-    if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
-        yum install -y perl
-        if [[ "$MB_ML_VER" == 2014 ]]; then
-            yum install -y perl-IPC-Cmd
-        fi
-    fi
-
-    local out_dir=$(fetch_unpack https://github.com/AOMediaCodec/libavif/archive/refs/tags/v$LIBAVIF_VERSION.tar.gz libavif-$LIBAVIF_VERSION.tar.gz)
-    (cd $out_dir \
-        && CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake \
-            -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX \
-            -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DAVIF_LIBSHARPYUV=LOCAL \
-            -DAVIF_LIBYUV=LOCAL \
-            -DAVIF_CODEC_AOM=LOCAL \
-            -DAVIF_CODEC_DAV1D=LOCAL \
-            -DAVIF_CODEC_RAV1E=LOCAL \
-            -DAVIF_CODEC_SVT=LOCAL \
-            -DENABLE_NASM=ON \
-            -DCMAKE_MODULE_PATH=/tmp/cmake/Modules \
-            . \
-        && make install)
-    touch libavif-stamp
-}
-
 function build {
     build_xz
     if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
@@ -186,7 +132,6 @@ function build {
         build_tiff
     fi
 
-    build_libavif
     build_libpng
     build_lcms2
     build_openjpeg

.github/workflows/wheels.yml

@@ -121,14 +121,17 @@ jobs:
   windows:
     if: github.event_name != 'schedule' || github.repository_owner == 'python-pillow'
     name: Windows ${{ matrix.cibw_arch }}
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - cibw_arch: x86
+            os: windows-latest
           - cibw_arch: AMD64
+            os: windows-latest
           - cibw_arch: ARM64
+            os: windows-11-arm
     steps:
       - uses: actions/checkout@v4
         with:
@@ -157,14 +160,9 @@ jobs:
           # Install extra test images
           xcopy /S /Y Tests\test-images\* Tests\images
 
-          & python.exe winbuild\build_prepare.py -v --no-imagequant --architecture=${{ matrix.cibw_arch }}
+          & python.exe winbuild\build_prepare.py -v --no-imagequant --no-avif --architecture=${{ matrix.cibw_arch }}
         shell: pwsh
 
-      - name: Update rust
-        if: matrix.cibw_arch == 'AMD64'
-        run: |
-          rustup update
-
       - name: Build wheels
         run: |
           setlocal EnableDelayedExpansion

Tests/check_wheel.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import platform
-import struct
 import sys
 
 from PIL import features
@@ -10,7 +9,7 @@
 
 
 def test_wheel_modules() -> None:
-    expected_modules = {"pil", "tkinter", "freetype2", "littlecms2", "webp", "avif"}
+    expected_modules = {"pil", "tkinter", "freetype2", "littlecms2", "webp"}
 
     # tkinter is not available in cibuildwheel installed CPython on Windows
     try:
@@ -20,11 +19,6 @@ def test_wheel_modules() -> None:
     except ImportError:
         expected_modules.remove("tkinter")
 
-    # libavif is not available on Windows for x86 and ARM64 architectures
-    if sys.platform == "win32":
-        if platform.machine() == "ARM64" or struct.calcsize("P") == 4:
-            expected_modules.remove("avif")
-
     assert set(features.get_supported_modules()) == expected_modules
 
 

Tests/test_file_bmp.py

@@ -190,9 +190,9 @@ def test_rle8() -> None:
     # Signal end of bitmap before the image is finished
     with open("Tests/images/bmp/g/pal8rle.bmp", "rb") as fp:
         data = fp.read(1063) + b"\x01"
-        with Image.open(io.BytesIO(data)) as im:
-            with pytest.raises(ValueError):
-                im.load()
+    with Image.open(io.BytesIO(data)) as im:
+        with pytest.raises(ValueError):
+            im.load()
 
 
 def test_rle4() -> None:
@@ -214,9 +214,9 @@ def test_rle4() -> None:
 def test_rle8_eof(file_name: str, length: int) -> None:
     with open(file_name, "rb") as fp:
         data = fp.read(length)
-        with Image.open(io.BytesIO(data)) as im:
-            with pytest.raises(ValueError):
-                im.load()
+    with Image.open(io.BytesIO(data)) as im:
+        with pytest.raises(ValueError):
+            im.load()
 
 
 def test_offset() -> None:

Tests/test_file_jpeg2k.py

@@ -457,8 +457,8 @@ def test_comment() -> None:
     # Test an image that is truncated partway through a codestream
     with open("Tests/images/comment.jp2", "rb") as fp:
         b = BytesIO(fp.read(130))
-        with Image.open(b) as im:
-            pass
+    with Image.open(b) as im:
+        pass
 
 
 def test_save_comment(card: ImageFile.ImageFile) -> None:

Tests/test_file_libtiff.py

@@ -81,7 +81,7 @@ def test_g4_tiff_bytesio(self, tmp_path: Path) -> None:
         s = io.BytesIO()
         with open(test_file, "rb") as f:
             s.write(f.read())
-            s.seek(0)
+        s.seek(0)
         with Image.open(s) as im:
             assert im.size == (500, 500)
             self._assert_noerr(tmp_path, im)
@@ -1050,12 +1050,12 @@ def test_old_style_jpeg_orientation(self) -> None:
         with open("Tests/images/old-style-jpeg-compression.tif", "rb") as fp:
             data = fp.read()
 
-            # Set EXIF Orientation to 2
-            data = data[:102] + b"\x02" + data[103:]
+        # Set EXIF Orientation to 2
+        data = data[:102] + b"\x02" + data[103:]
 
-            with Image.open(io.BytesIO(data)) as im:
-                im = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
-            assert_image_equal_tofile(im, "Tests/images/old-style-jpeg-compression.png")
+        with Image.open(io.BytesIO(data)) as im:
+            im = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
+        assert_image_equal_tofile(im, "Tests/images/old-style-jpeg-compression.png")
 
     def test_open_missing_samplesperpixel(self) -> None:
         with Image.open(

Tests/test_file_libtiff_small.py

@@ -32,7 +32,7 @@ def test_g4_hopper_bytesio(self, tmp_path: Path) -> None:
         s = BytesIO()
         with open(test_file, "rb") as f:
             s.write(f.read())
-            s.seek(0)
+        s.seek(0)
         with Image.open(s) as im:
             assert im.size == (128, 128)
             self._assert_noerr(tmp_path, im)

docs/deprecations.rst

@@ -186,7 +186,7 @@ ExifTags.IFD.Makernote
 Image.Image.get_child_images()
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. deprecated:: 11.2.0
+.. deprecated:: 11.2.1
 
 ``Image.Image.get_child_images()`` has been deprecated. and will be removed in Pillow
 13 (2026-10-15). It will be moved to ``ImageFile.ImageFile.get_child_images()``. The

docs/handbook/image-file-formats.rst

@@ -170,7 +170,7 @@ DXT1 and DXT5 pixel formats can be read, only in ``RGBA`` mode.
    in ``P`` mode.
 
 
-.. versionadded:: 11.2.0
+.. versionadded:: 11.2.1
    DXT1, DXT3, DXT5, BC2, BC3 and BC5 pixel formats can be saved::
 
        im.save(out, pixel_format="DXT1")
@@ -1671,6 +1671,11 @@ The :py:meth:`~PIL.Image.open` method sets the following
     Transparency color index. This key is omitted if the image is not
     transparent.
 
+XV Thumbnails
+^^^^^^^^^^^^^
+
+Pillow can read XV thumbnail files.
+
 Write-only formats
 ------------------
 
@@ -1776,11 +1781,6 @@ The :py:meth:`~PIL.Image.Image.save` method can take the following keyword argum
 
     .. versionadded:: 5.3.0
 
-XV Thumbnails
-^^^^^^^^^^^^^
-
-Pillow can read XV thumbnail files.
-
 Identify-only formats
 ---------------------