diff --git a/.appveyor.yml b/.appveyor.yml
index 0f5dea9c515..781ad4a4b1d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,3 +1,10 @@
+skip_commits:
+  files:
+    - ".github/**/*"
+    - ".gitmodules"
+    - "docs/**/*"
+    - "wheels/**/*"
+
 version: '{build}'
 clone_folder: c:\pillow
 init:
@@ -6,16 +13,17 @@ init:
 # Uncomment previous line to get RDP access during the build.
 
 environment:
+  COVERAGE_CORE: sysmon
   EXECUTABLE: python.exe
   TEST_OPTIONS:
   DEPLOY: YES
   matrix:
-  - PYTHON: C:/Python312
+  - PYTHON: C:/Python313
     ARCHITECTURE: x86
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-  - PYTHON: C:/Python38-x64
-    ARCHITECTURE: x64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  - PYTHON: C:/Python39-x64
+    ARCHITECTURE: AMD64
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
 
 install:
@@ -24,13 +32,13 @@ install:
 - curl -fsSL -o pillow-test-images.zip https://github.com/python-pillow/test-images/archive/main.zip
 - 7z x pillow-test-images.zip -oc:\
 - xcopy /S /Y c:\test-images-main\* c:\pillow\tests\images
-- curl -fsSL -o nasm-win64.zip https://raw.githubusercontent.com/python-pillow/pillow-depends/main/nasm-2.16.01-win64.zip
+- curl -fsSL -o nasm-win64.zip https://raw.githubusercontent.com/python-pillow/pillow-depends/main/nasm-2.16.03-win64.zip
 - 7z x nasm-win64.zip -oc:\
-- choco install ghostscript --version=10.0.0.20230317
-- path c:\nasm-2.16.01;C:\Program Files\gs\gs10.00.0\bin;%PATH%
+- choco install ghostscript --version=10.4.0
+- path c:\nasm-2.16.03;C:\Program Files\gs\gs10.04.0\bin;%PATH%
 - cd c:\pillow\winbuild\
 - ps: |
-        c:\python38\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\
+        c:\python39\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\
         c:\pillow\winbuild\build\build_dep_all.cmd
         $host.SetShouldExit(0)
 - path C:\pillow\winbuild\build\bin;%PATH%
@@ -43,11 +51,10 @@ build_script:
 
 test_script:
 - cd c:\pillow
-- '%PYTHON%\%EXECUTABLE% -m pip install pytest pytest-cov pytest-timeout defusedxml numpy olefile pyroma'
+- '%PYTHON%\%EXECUTABLE% -m pip install pytest pytest-cov pytest-timeout defusedxml ipython numpy olefile pyroma'
 - c:\"Program Files (x86)"\"Windows Kits"\10\Debuggers\x86\gflags.exe /p /enable %PYTHON%\%EXECUTABLE%
-- '%PYTHON%\%EXECUTABLE% -c "from PIL import Image"'
-- '%PYTHON%\%EXECUTABLE% -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests'
-#- '%PYTHON%\%EXECUTABLE% test-installed.py -v -s %TEST_OPTIONS%' TODO TEST_OPTIONS with pytest?
+- path %PYTHON%;%PATH%
+- .ci\test.cmd
 
 after_test:
 - curl -Os https://uploader.codecov.io/latest/windows/codecov.exe
diff --git a/.ci/install.sh b/.ci/install.sh
index 30b64349d70..e85e6bdc575 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -21,17 +21,16 @@ set -e
 
 if [[ $(uname) != CYGWIN* ]]; then
     sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\
-                             ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\
+                             ghostscript libjpeg-turbo-progs libopenjp2-7-dev\
                              cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
                              sway wl-clipboard libopenblas-dev
 fi
 
 python3 -m pip install --upgrade pip
 python3 -m pip install --upgrade wheel
-# TODO Update condition when cffi supports 3.13
-if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then PYTHONOPTIMIZE=0 python3 -m pip install cffi ; fi
 python3 -m pip install coverage
 python3 -m pip install defusedxml
+python3 -m pip install ipython
 python3 -m pip install olefile
 python3 -m pip install -U pytest
 python3 -m pip install -U pytest-cov
@@ -39,21 +38,17 @@ python3 -m pip install -U pytest-timeout
 python3 -m pip install pyroma
 
 if [[ $(uname) != CYGWIN* ]]; then
-    # TODO Update condition when NumPy supports 3.13
-    if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then python3 -m pip install numpy ; fi
+    python3 -m pip install numpy
 
     # PyQt6 doesn't support PyPy3
     if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
         sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0
-        python3 -m pip install pyqt6
+        # TODO Update condition when pyqt6 supports free-threading
+        if ! [[ "$PYTHON_GIL" == "0" ]]; then python3 -m pip install pyqt6 ; fi
     fi
 
     # Pyroma uses non-isolated build and fails with old setuptools
-    if [[
-        $GHA_PYTHON_VERSION == pypy3.9
-        || $GHA_PYTHON_VERSION == 3.8
-        || $GHA_PYTHON_VERSION == 3.9
-    ]]; then
+    if [[ $GHA_PYTHON_VERSION == 3.9 ]]; then
         # To match pyproject.toml
         python3 -m pip install "setuptools>=67.8"
     fi
diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt
index dd61634cd31..c4511439ccb 100644
--- a/.ci/requirements-cibw.txt
+++ b/.ci/requirements-cibw.txt
@@ -1 +1 @@
-cibuildwheel==2.16.2
+cibuildwheel==2.21.3
diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt
new file mode 100644
index 00000000000..dcb3996e24e
--- /dev/null
+++ b/.ci/requirements-mypy.txt
@@ -0,0 +1,12 @@
+mypy==1.11.2
+IceSpringPySideStubs-PyQt6
+IceSpringPySideStubs-PySide6
+ipython
+numpy
+packaging
+pytest
+sphinx
+types-atheris
+types-defusedxml
+types-olefile
+types-setuptools
diff --git a/.ci/test.cmd b/.ci/test.cmd
new file mode 100644
index 00000000000..aafc9290c80
--- /dev/null
+++ b/.ci/test.cmd
@@ -0,0 +1,3 @@
+python.exe -c "from PIL import Image"
+IF ERRORLEVEL 1 EXIT /B
+python.exe -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests
diff --git a/.ci/test.sh b/.ci/test.sh
index 8ff7c5f6483..3f0ddc350a9 100755
--- a/.ci/test.sh
+++ b/.ci/test.sh
@@ -4,4 +4,4 @@ set -e
 
 python3 -c "from PIL import Image"
 
-python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term Tests $REVERSE
+python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests $REVERSE
diff --git a/.clang-format b/.clang-format
index be32e6d1a8a..143dde82c2c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,12 +3,13 @@
 BasedOnStyle: Google
 AlwaysBreakAfterReturnType: All
 AllowShortIfStatementsOnASingleLine: false
-AlignAfterOpenBracket: AlwaysBreak
+AlignAfterOpenBracket: BlockIndent
 BinPackArguments: false
 BinPackParameters: false
 BreakBeforeBraces: Attach
 ColumnLimit: 88
 DerivePointerAlignment: false
+IndentGotoLabels: false
 IndentWidth: 4
 Language: Cpp
 PointerAlignment: Right
diff --git a/.coveragerc b/.coveragerc
index 46df3f90d27..a94a2567854 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -10,10 +10,14 @@ exclude_also =
     if DEBUG:
     # Don't complain about compatibility code for missing optional dependencies
     except ImportError
+    if TYPE_CHECKING:
+    @abc.abstractmethod
+    # Empty bodies in protocols or abstract methods
+    ^\s*def [a-zA-Z0-9_]+\(.*\)(\s*->.*)?:\s*\.\.\.(\s*#.*)?$
+    ^\s*\.\.\.(\s*#.*)?$
 
 [run]
 omit =
     Tests/32bit_segfault_check.py
-    Tests/bench_cffi_access.py
     Tests/check_*.py
     Tests/createfontdatachunk.py
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index e0e6804bfe4..8fc6bd0ad54 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-tidelift: "pypi/Pillow"
+tidelift: "pypi/pillow"
diff --git a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
index 115f6135dfb..ea4c0e92b8e 100644
--- a/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/ISSUE_REPORT.md
@@ -48,6 +48,21 @@ Thank you.
 * Python: 
 * Pillow: 
 
+```text
+Please paste here the output of running:
+
+python3 -m PIL.report
+or
+python3 -m PIL --report
+
+Or the output of the following Python code:
+
+from PIL import report
+# or
+from PIL import features
+features.pilinfo(supported_formats=False)
+```
+
 <!--
 Please include **code** that reproduces the issue and whenever possible, an **image** that demonstrates the issue. Please upload images to GitHub, not to third-party file hosting sites. If necessary, add the image to a zip or tar archive.
 
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index eb73fc6a7cd..0456bbaba3c 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -6,11 +6,13 @@ on:
       - "**"
     paths:
       - ".github/workflows/cifuzz.yml"
+      - ".github/workflows/wheels-dependencies.sh"
       - "**.c"
       - "**.h"
   pull_request:
     paths:
       - ".github/workflows/cifuzz.yml"
+      - ".github/workflows/wheels-dependencies.sh"
       - "**.c"
       - "**.h"
   workflow_dispatch:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 9fe345c8a3d..92e860cb547 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -7,10 +7,12 @@ on:
     paths:
       - ".github/workflows/docs.yml"
       - "docs/**"
+      - "src/PIL/**"
   pull_request:
     paths:
       - ".github/workflows/docs.yml"
       - "docs/**"
+      - "src/PIL/**"
   workflow_dispatch:
 
 permissions:
@@ -37,16 +39,26 @@ jobs:
       with:
         python-version: "3.x"
         cache: pip
-        cache-dependency-path: ".ci/*.sh"
+        cache-dependency-path: |
+          ".ci/*.sh"
+          "pyproject.toml"
 
     - name: Build system information
       run: python3 .github/workflows/system-info.py
 
+    - name: Cache libimagequant
+      uses: actions/cache@v4
+      id: cache-libimagequant
+      with:
+        path: ~/cache-libimagequant
+        key: ${{ runner.os }}-libimagequant-${{ hashFiles('depends/install_imagequant.sh') }}
+
     - name: Install Linux dependencies
       run: |
         .ci/install.sh
       env:
         GHA_PYTHON_VERSION: "3.x"
+        GHA_LIBIMAGEQUANT_CACHE_HIT: ${{ steps.cache-libimagequant.outputs.cache-hit }}
 
     - name: Build
       run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9069fc615f3..cc4760288e5 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: pre-commit cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pre-commit
         key: lint-pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}
diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh
index f41324c4ba6..ddb4212301d 100755
--- a/.github/workflows/macos-install.sh
+++ b/.github/workflows/macos-install.sh
@@ -2,22 +2,34 @@
 
 set -e
 
-brew install libtiff libjpeg openjpeg libimagequant webp little-cms2 freetype libraqm
+if [[ "$ImageOS" == "macos13" ]]; then
+    brew uninstall gradle maven
+fi
+brew install \
+    freetype \
+    ghostscript \
+    libimagequant \
+    libjpeg \
+    libtiff \
+    little-cms2 \
+    openjpeg \
+    webp
+if [[ "$ImageOS" == "macos13" ]]; then
+    brew install --ignore-dependencies libraqm
+else
+    brew install libraqm
+fi
 export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
 
-# TODO Update condition when cffi supports 3.13
-if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then PYTHONOPTIMIZE=0 python3 -m pip install cffi ; fi
-
 python3 -m pip install coverage
 python3 -m pip install defusedxml
+python3 -m pip install ipython
 python3 -m pip install olefile
 python3 -m pip install -U pytest
 python3 -m pip install -U pytest-cov
 python3 -m pip install -U pytest-timeout
 python3 -m pip install pyroma
-
-# TODO Update condition when NumPy supports 3.13
-if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then python3 -m pip install numpy ; fi
+python3 -m pip install numpy
 
 # extra test images
 pushd depends && ./install_extra_test_images.sh && popd
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 8fc7bd3799d..a8ddef22c86 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -23,6 +23,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next release notes as pull requests are merged into "main"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/system-info.py b/.github/workflows/system-info.py
index 57f28c620b7..9e97b897104 100644
--- a/.github/workflows/system-info.py
+++ b/.github/workflows/system-info.py
@@ -6,6 +6,7 @@
 Requested here:
 https://github.com/actions/virtual-environments/issues/79
 """
+
 from __future__ import annotations
 
 import os
diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
index 32ac6f65e76..0aa79e4235a 100644
--- a/.github/workflows/test-cygwin.yml
+++ b/.github/workflows/test-cygwin.yml
@@ -8,7 +8,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   pull_request:
@@ -16,7 +15,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   workflow_dispatch:
@@ -28,13 +26,16 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  COVERAGE_CORE: sysmon
+
 jobs:
   build:
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        python-minor-version: [8, 9]
+        python-minor-version: [9]
 
     timeout-minutes: 40
 
@@ -51,10 +52,10 @@ jobs:
       - name: Install Cygwin
         uses: cygwin/cygwin-install-action@v4
         with:
-          platform: x86_64
           packages: >
             gcc-g++
             ghostscript
+            git
             ImageMagick
             jpeg
             libfreetype-devel
@@ -71,9 +72,9 @@ jobs:
             make
             netpbm
             perl
-            python3${{ matrix.python-minor-version }}-cffi
             python3${{ matrix.python-minor-version }}-cython
             python3${{ matrix.python-minor-version }}-devel
+            python3${{ matrix.python-minor-version }}-ipython
             python3${{ matrix.python-minor-version }}-numpy
             python3${{ matrix.python-minor-version }}-sip
             python3${{ matrix.python-minor-version }}-tkinter
@@ -82,7 +83,7 @@ jobs:
             zlib-devel
 
       - name: Add Lapack to PATH
-        uses: egor-tensin/cleanup-path@v3
+        uses: egor-tensin/cleanup-path@v4
         with:
           dirs: 'C:\cygwin\bin;C:\cygwin\lib\lapack'
 
@@ -90,19 +91,13 @@ jobs:
         run: |
           ln -sf c:/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/cygwin/bin/python3
 
-      - name: Get latest NumPy version
-        id: latest-numpy
-        shell: bash.exe -eo pipefail -o igncr "{0}"
-        run: |
-          python3 -m pip list --outdated | grep numpy | sed -r 's/ +/ /g' | cut -d ' ' -f 3 | sed 's/^/version=/' >> $GITHUB_OUTPUT
-
       - name: pip cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: 'C:\cygwin\home\runneradmin\.cache\pip'
-          key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-${{ hashFiles('.ci/install.sh') }}
+          key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-${{ hashFiles('.ci/install.sh') }}
           restore-keys: |
-            ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-
+            ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
 
       - name: Build system information
         run: |
@@ -112,11 +107,6 @@ jobs:
         run: |
           bash.exe .ci/install.sh
 
-      - name: Upgrade NumPy
-        shell: dash.exe -l "{0}"
-        run: |
-          python3 -m pip install -U "numpy<1.26"
-
       - name: Build
         shell: bash.exe -eo pipefail -o igncr "{0}"
         run: |
@@ -143,11 +133,12 @@ jobs:
           bash.exe .ci/after_success.sh
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           file: ./coverage.xml
           flags: GHA_Cygwin
           name: Cygwin Python 3.${{ matrix.python-minor-version }}
+          token: ${{ secrets.CODECOV_ORG_TOKEN }}
 
   success:
     permissions:
diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index eb27b4bf75b..21e1275e7c9 100644
--- a/.github/workflows/test-docker.yml
+++ b/.github/workflows/test-docker.yml
@@ -8,7 +8,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   pull_request:
@@ -16,7 +15,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   workflow_dispatch:
@@ -38,32 +36,29 @@ jobs:
         docker: [
           # Run slower jobs first to give them a headstart and reduce waiting time
           ubuntu-22.04-jammy-arm64v8,
-          ubuntu-22.04-jammy-ppc64le,
-          ubuntu-22.04-jammy-s390x,
+          ubuntu-24.04-noble-ppc64le,
+          ubuntu-24.04-noble-s390x,
           # Then run the remainder
           alpine,
           amazon-2-amd64,
           amazon-2023-amd64,
           arch,
-          centos-7-amd64,
-          centos-stream-8-amd64,
           centos-stream-9-amd64,
-          debian-11-bullseye-amd64,
           debian-12-bookworm-x86,
           debian-12-bookworm-amd64,
-          fedora-38-amd64,
           fedora-39-amd64,
+          fedora-40-amd64,
           gentoo,
-          ubuntu-20.04-focal-amd64,
           ubuntu-22.04-jammy-amd64,
+          ubuntu-24.04-noble-amd64,
         ]
         dockerTag: [main]
         include:
           - docker: "ubuntu-22.04-jammy-arm64v8"
             qemu-arch: "aarch64"
-          - docker: "ubuntu-22.04-jammy-ppc64le"
+          - docker: "ubuntu-24.04-noble-ppc64le"
             qemu-arch: "ppc64le"
-          - docker: "ubuntu-22.04-jammy-s390x"
+          - docker: "ubuntu-24.04-noble-s390x"
             qemu-arch: "s390x"
 
     name: ${{ matrix.docker }}
@@ -85,8 +80,8 @@ jobs:
 
     - name: Docker build
       run: |
-        # The Pillow user in the docker container is UID 1000
-        sudo chown -R 1000 $GITHUB_WORKSPACE
+        # The Pillow user in the docker container is UID 1001
+        sudo chown -R 1001 $GITHUB_WORKSPACE
         docker run --name pillow_container  -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
         sudo chown -R runner $GITHUB_WORKSPACE
 
@@ -103,11 +98,12 @@ jobs:
         MATRIX_DOCKER: ${{ matrix.docker }}
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         flags: GHA_Docker
         name: ${{ matrix.docker }}
         gcov: true
+        token: ${{ secrets.CODECOV_ORG_TOKEN }}
 
   success:
     permissions:
diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml
index 115c2e9bebc..c7a73439ca9 100644
--- a/.github/workflows/test-mingw.yml
+++ b/.github/workflows/test-mingw.yml
@@ -8,7 +8,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   pull_request:
@@ -16,7 +15,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   workflow_dispatch:
@@ -28,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  COVERAGE_CORE: sysmon
+
 jobs:
   build:
     runs-on: windows-latest
@@ -63,13 +64,12 @@ jobs:
               mingw-w64-x86_64-libtiff \
               mingw-w64-x86_64-libwebp \
               mingw-w64-x86_64-openjpeg2 \
-              mingw-w64-x86_64-python3-cffi \
               mingw-w64-x86_64-python3-numpy \
               mingw-w64-x86_64-python3-olefile \
-              mingw-w64-x86_64-python3-pip \
               mingw-w64-x86_64-python3-setuptools \
               mingw-w64-x86_64-python-pyqt6
 
+          python3 -m ensurepip
           python3 -m pip install pyroma pytest pytest-cov pytest-timeout
 
           pushd depends && ./install_extra_test_images.sh && popd
@@ -80,12 +80,12 @@ jobs:
       - name: Test Pillow
         run: |
           python3 selftest.py --installed
-          python3 -c "from PIL import Image"
-          python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests
+          .ci/test.sh
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           file: ./coverage.xml
           flags: GHA_Windows
           name: "MSYS2 MinGW"
+          token: ${{ secrets.CODECOV_ORG_TOKEN }}
diff --git a/.github/workflows/test-valgrind.yml b/.github/workflows/test-valgrind.yml
index 59bb958ec1c..63aec586b79 100644
--- a/.github/workflows/test-valgrind.yml
+++ b/.github/workflows/test-valgrind.yml
@@ -50,7 +50,7 @@ jobs:
 
     - name: Build and Run Valgrind
       run: |
-        # The Pillow user in the docker container is UID 1000
-        sudo chown -R 1000 $GITHUB_WORKSPACE
+        # The Pillow user in the docker container is UID 1001
+        sudo chown -R 1001 $GITHUB_WORKSPACE
         docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
         sudo chown -R runner $GITHUB_WORKSPACE
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 86cd5b5fa1e..c8842e37b2c 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -2,11 +2,12 @@ name: Test Windows
 
 on:
   push:
+    branches:
+      - "**"
     paths-ignore:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   pull_request:
@@ -14,7 +15,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   workflow_dispatch:
@@ -26,13 +26,16 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  COVERAGE_CORE: sysmon
+
 jobs:
   build:
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy3.10", "pypy3.9", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["pypy3.10", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     timeout-minutes: 30
 
@@ -66,8 +69,16 @@ jobs:
     - name: Print build system information
       run: python3 .github/workflows/system-info.py
 
-    - name: python3 -m pip install pytest pytest-cov pytest-timeout defusedxml olefile pyroma
-      run: python3 -m pip install pytest pytest-cov pytest-timeout defusedxml olefile pyroma
+    - name: Install Python dependencies
+      run: >
+        python3 -m pip install
+        coverage>=7.4.2
+        defusedxml
+        olefile
+        pyroma
+        pytest
+        pytest-cov
+        pytest-timeout
 
     - name: Install dependencies
       id: install
@@ -75,8 +86,8 @@ jobs:
         choco install nasm --no-progress
         echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
 
-        choco install ghostscript --version=10.0.0.20230317 --no-progress
-        echo "C:\Program Files\gs\gs10.00.0\bin" >> $env:GITHUB_PATH
+        choco install ghostscript --version=10.4.0 --no-progress
+        echo "C:\Program Files\gs\gs10.04.0\bin" >> $env:GITHUB_PATH
 
         # Install extra test images
         xcopy /S /Y Tests\test-images\* Tests\images
@@ -89,7 +100,7 @@ jobs:
 
     - name: Cache build
       id: build-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: winbuild\build
         key:
@@ -179,8 +190,8 @@ jobs:
 
     - name: Test Pillow
       run: |
-        path %GITHUB_WORKSPACE%\\winbuild\\build\\bin;%PATH%
-        python.exe -m pytest -vx -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests
+        path %GITHUB_WORKSPACE%\winbuild\build\bin;%PATH%
+        .ci\test.cmd
       shell: cmd
 
     - name: Prepare to upload errors
@@ -202,11 +213,12 @@ jobs:
       shell: pwsh
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         file: ./coverage.xml
         flags: GHA_Windows
         name: ${{ runner.os }} Python ${{ matrix.python-version }}
+        token: ${{ secrets.CODECOV_ORG_TOKEN }}
 
   success:
     permissions:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b7e112f4364..6576292b5e4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   pull_request:
@@ -16,7 +15,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   workflow_dispatch:
@@ -28,6 +26,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  COVERAGE_CORE: sysmon
+  FORCE_COLOR: 1
+
 jobs:
   build:
 
@@ -40,44 +42,69 @@ jobs:
         ]
         python-version: [
           "pypy3.10",
-          "pypy3.9",
           "3.13",
           "3.12",
           "3.11",
           "3.10",
           "3.9",
-          "3.8",
         ]
         include:
-        - python-version: "3.9"
-          PYTHONOPTIMIZE: 1
-          REVERSE: "--reverse"
-        - python-version: "3.8"
-          PYTHONOPTIMIZE: 2
+        - { python-version: "3.11", PYTHONOPTIMIZE: 1, REVERSE: "--reverse" }
+        - { python-version: "3.10", PYTHONOPTIMIZE: 2 }
+        # Free-threaded
+        - { os: "ubuntu-latest", python-version: "3.13-dev", disable-gil: true }
+        # M1 only available for 3.10+
+        - { os: "macos-13", python-version: "3.9" }
+        exclude:
+        - { os: "macos-latest", python-version: "3.9" }
 
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }} Python ${{ matrix.python-version }}
+    name: ${{ matrix.os }} Python ${{ matrix.python-version }} ${{ matrix.disable-gil && 'free-threaded' || '' }}
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
+      if: "${{ !matrix.disable-gil }}"
       with:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true
         cache: pip
-        cache-dependency-path: ".ci/*.sh"
+        cache-dependency-path: |
+          ".ci/*.sh"
+          "pyproject.toml"
+
+    - name: Set up Python ${{ matrix.python-version }} (free-threaded)
+      uses: deadsnakes/action@v3.2.0
+      if: "${{ matrix.disable-gil }}"
+      with:
+        python-version: ${{ matrix.python-version }}
+        nogil: ${{ matrix.disable-gil }}
+
+    - name: Set PYTHON_GIL
+      if: "${{ matrix.disable-gil }}"
+      run: |
+        echo "PYTHON_GIL=0" >> $GITHUB_ENV
 
     - name: Build system information
       run: python3 .github/workflows/system-info.py
 
+    - name: Cache libimagequant
+      if: startsWith(matrix.os, 'ubuntu')
+      uses: actions/cache@v4
+      id: cache-libimagequant
+      with:
+        path: ~/cache-libimagequant
+        key: ${{ runner.os }}-libimagequant-${{ hashFiles('depends/install_imagequant.sh') }}
+
     - name: Install Linux dependencies
       if: startsWith(matrix.os, 'ubuntu')
       run: |
         .ci/install.sh
       env:
         GHA_PYTHON_VERSION: ${{ matrix.python-version }}
+        GHA_LIBIMAGEQUANT_CACHE_HIT: ${{ steps.cache-libimagequant.outputs.cache-hit }}
 
     - name: Install macOS dependencies
       if: startsWith(matrix.os, 'macOS')
@@ -127,11 +154,12 @@ jobs:
         .ci/after_success.sh
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
-        flags: ${{ matrix.os == 'macos-latest' && 'GHA_macOS' || 'GHA_Ubuntu' }}
+        flags: ${{ matrix.os == 'ubuntu-latest' && 'GHA_Ubuntu' || 'GHA_macOS' }}
         name: ${{ matrix.os }} Python ${{ matrix.python-version }}
         gcov: true
+        token: ${{ secrets.CODECOV_ORG_TOKEN }}
 
   success:
     permissions:
diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
index 3ec3148734f..97c1adf098a 100755
--- a/.github/workflows/wheels-dependencies.sh
+++ b/.github/workflows/wheels-dependencies.sh
@@ -16,41 +16,31 @@ ARCHIVE_SDIR=pillow-depends-main
 
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.13.2
-HARFBUZZ_VERSION=8.3.0
-LIBPNG_VERSION=1.6.40
-JPEGTURBO_VERSION=3.0.1
-OPENJPEG_VERSION=2.5.0
-XZ_VERSION=5.4.5
+HARFBUZZ_VERSION=10.0.1
+LIBPNG_VERSION=1.6.44
+JPEGTURBO_VERSION=3.0.4
+OPENJPEG_VERSION=2.5.2
+XZ_VERSION=5.6.3
 TIFF_VERSION=4.6.0
 LCMS2_VERSION=2.16
 if [[ -n "$IS_MACOS" ]]; then
-    GIFLIB_VERSION=5.1.4
+    GIFLIB_VERSION=5.2.2
 else
     GIFLIB_VERSION=5.2.1
 fi
 if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then
-    ZLIB_VERSION=1.3
+    ZLIB_VERSION=1.3.1
 else
     ZLIB_VERSION=1.2.8
 fi
-LIBWEBP_VERSION=1.3.2
+LIBWEBP_VERSION=1.4.0
 BZIP2_VERSION=1.0.8
-LIBXCB_VERSION=1.16
+LIBXCB_VERSION=1.17.0
 BROTLI_VERSION=1.1.0
 
-if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "x86_64" ]]; then
-    function build_openjpeg {
-        local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz openjpeg-2.5.0.tar.gz)
-        (cd $out_dir \
-            && cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
-            && make install)
-        touch openjpeg-stamp
-    }
-fi
-
 function build_brotli {
     local cmake=$(get_modern_cmake)
-    local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-1.1.0.tar.gz)
+    local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz)
     (cd $out_dir \
         && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
         && make install)
@@ -60,9 +50,22 @@ function build_brotli {
     fi
 }
 
+function build_harfbuzz {
+    python3 -m pip install meson ninja
+
+    local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz)
+    (cd $out_dir \
+        && meson setup build --buildtype=release -Dfreetype=enabled -Dglib=disabled)
+    (cd $out_dir/build \
+        && meson install)
+    if [[ "$MB_ML_LIBC" == "manylinux" ]]; then
+        cp /usr/local/lib64/libharfbuzz* /usr/local/lib
+    fi
+}
+
 function build {
     if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "arm64" ]]; then
-        export BUILD_PREFIX="/usr/local"
+        sudo chown -R runner /usr/local
     fi
     build_xz
     if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then
@@ -70,15 +73,13 @@ function build {
     fi
     build_new_zlib
 
-    build_simple xcb-proto 1.16.0 https://xorg.freedesktop.org/archive/individual/proto
+    build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
     if [ -n "$IS_MACOS" ]; then
+        build_simple xorgproto 2024.1 https://www.x.org/pub/individual/proto
+        build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib
+        build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist
         if [[ "$CIBW_ARCHS" == "arm64" ]]; then
-            build_simple xorgproto 2023.2 https://www.x.org/pub/individual/proto
-            build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib
-            build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist
-            if [ -f /Library/Frameworks/Python.framework/Versions/Current/share/pkgconfig/xcb-proto.pc ]; then
-                cp /Library/Frameworks/Python.framework/Versions/Current/share/pkgconfig/xcb-proto.pc /Library/Frameworks/Python.framework/Versions/Current/lib/pkgconfig/xcb-proto.pc
-            fi
+            cp /usr/local/share/pkgconfig/xcb-proto.pc /usr/local/lib/pkgconfig
         fi
     else
         sed s/\${pc_sysrootdir\}// /usr/local/share/pkgconfig/xcb-proto.pc > /usr/local/lib/pkgconfig/xcb-proto.pc
@@ -89,12 +90,10 @@ function build {
     build_tiff
     build_libpng
     build_lcms2
-    if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "arm64" ]]; then
-        for dylib in libjpeg.dylib libtiff.dylib liblcms2.dylib; do
-            cp $BUILD_PREFIX/lib/$dylib /opt/arm64-builds/lib
-        done
-    fi
     build_openjpeg
+    if [ -f /usr/local/lib64/libopenjp2.so ]; then
+        cp /usr/local/lib64/libopenjp2.so /usr/local/lib
+    fi
 
     ORIGINAL_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS -O3 -DNDEBUG"
@@ -113,15 +112,7 @@ function build {
         build_freetype
     fi
 
-    if [ -z "$IS_MACOS" ]; then
-        export FREETYPE_LIBS=-lfreetype
-        export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/
-    fi
-    build_simple harfbuzz $HARFBUZZ_VERSION https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION tar.xz --with-freetype=yes --with-glib=no
-    if [ -z "$IS_MACOS" ]; then
-        export FREETYPE_LIBS=""
-        export FREETYPE_CFLAGS=""
-    fi
+    build_harfbuzz
 }
 
 # Any stuff that you need to do before you start building the wheels
@@ -130,14 +121,19 @@ curl -fsSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-de
 untar pillow-depends-main.zip
 
 if [[ -n "$IS_MACOS" ]]; then
-  # webp, libtiff, libxcb cause a conflict with building webp, libtiff, libxcb
-  # libxdmcp causes an issue on macOS < 11
-  # if php is installed, brew tries to reinstall these after installing openblas
+  # libtiff and libxcb cause a conflict with building libtiff and libxcb
+  # libxau and libxdmcp cause an issue on macOS < 11
   # remove cairo to fix building harfbuzz on arm64
   # remove lcms2 and libpng to fix building openjpeg on arm64
-  # remove zstd to avoid inclusion on x86_64
+  # remove jpeg-turbo to avoid inclusion on arm64
+  # remove webp and zstd to avoid inclusion on x86_64
   # curl from brew requires zstd, use system curl
-  brew remove --ignore-dependencies webp libpng libtiff libxcb libxdmcp curl php cairo lcms2 ghostscript zstd
+  brew remove --ignore-dependencies libpng libtiff libxcb libxau libxdmcp curl cairo lcms2 zstd
+  if [[ "$CIBW_ARCHS" == "arm64" ]]; then
+    brew remove --ignore-dependencies jpeg-turbo
+  else
+    brew remove --ignore-dependencies webp
+  fi
 
   brew install pkg-config
 fi
diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh
index 207ec15678b..b30b1725f94 100755
--- a/.github/workflows/wheels-test.sh
+++ b/.github/workflows/wheels-test.sh
@@ -4,14 +4,16 @@ set -e
 if [[ "$OSTYPE" == "darwin"* ]]; then
     brew install fribidi
     export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
+    if [ -f /opt/homebrew/lib/libfribidi.dylib ]; then
+        sudo cp /opt/homebrew/lib/libfribidi.dylib /usr/local/lib
+    fi
 elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then
     apk add curl fribidi
 else
     yum install -y fribidi
 fi
-if [ "${AUDITWHEEL_POLICY::9}" != "musllinux" ]; then
-    python3 -m pip install numpy
-fi
+
+python3 -m pip install numpy
 
 if [ ! -d "test-images-main" ]; then
     curl -fsSL -o pillow-test-images.zip https://github.com/python-pillow/test-images/archive/main.zip
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 060fc497ea7..837e5ea91fe 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -1,10 +1,19 @@
 name: Wheels
 
 on:
+  schedule:
+  #        ┌───────────── minute (0 - 59)
+  #        │  ┌───────────── hour (0 - 23)
+  #        │  │ ┌───────────── day of the month (1 - 31)
+  #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+  #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+  #        │  │ │ │ │
+  - cron: "42 1 * * 0,3"
   push:
     paths:
       - ".ci/requirements-cibw.txt"
       - ".github/workflows/wheel*"
+      - "setup.py"
       - "wheels/*"
       - "winbuild/build_prepare.py"
       - "winbuild/fribidi.cmake"
@@ -14,6 +23,7 @@ on:
     paths:
       - ".ci/requirements-cibw.txt"
       - ".github/workflows/wheel*"
+      - "setup.py"
       - "wheels/*"
       - "winbuild/build_prepare.py"
       - "winbuild/fribidi.cmake"
@@ -30,27 +40,93 @@ env:
   FORCE_COLOR: 1
 
 jobs:
-  build:
+  build-1-QEMU-emulated-wheels:
+    if: github.event_name != 'schedule'
+    name: aarch64 ${{ matrix.python-version }} ${{ matrix.spec }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - pp310
+          - cp3{9,10,11}
+          - cp3{12,13}
+        spec:
+          - manylinux2014
+          - manylinux_2_28
+          - musllinux
+        exclude:
+          - { python-version: pp310, spec: musllinux }
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Install cibuildwheel
+        run: |
+          python3 -m pip install -r .ci/requirements-cibw.txt
+
+      - name: Build wheels
+        run: |
+          python3 -m cibuildwheel --output-dir wheelhouse
+        env:
+          # Build only the currently selected Linux architecture (so we can
+          # parallelise for speed).
+          CIBW_ARCHS: "aarch64"
+          # Likewise, select only one Python version per job to speed this up.
+          CIBW_BUILD: "${{ matrix.python-version }}-${{ matrix.spec == 'musllinux' && 'musllinux' || 'manylinux' }}*"
+          CIBW_PRERELEASE_PYTHONS: True
+          # Extra options for manylinux.
+          CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.spec }}
+          CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.spec }}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist-qemu-${{ matrix.python-version }}-${{ matrix.spec }}
+          path: ./wheelhouse/*.whl
+
+  build-2-native-wheels:
+    if: github.event_name != 'schedule' || github.repository_owner == 'python-pillow'
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - name: "macOS x86_64"
-            os: macos-latest
-            archs: x86_64
+          - name: "macOS 10.10 x86_64"
+            os: macos-13
+            cibw_arch: x86_64
+            build: "cp3{9,10,11}*"
             macosx_deployment_target: "10.10"
+          - name: "macOS 10.13 x86_64"
+            os: macos-13
+            cibw_arch: x86_64
+            build: "cp3{12,13}*"
+            macosx_deployment_target: "10.13"
+          - name: "macOS 10.15 x86_64"
+            os: macos-13
+            cibw_arch: x86_64
+            build: "pp310*"
+            macosx_deployment_target: "10.15"
           - name: "macOS arm64"
             os: macos-latest
-            archs: arm64
+            cibw_arch: arm64
             macosx_deployment_target: "11.0"
           - name: "manylinux2014 and musllinux x86_64"
             os: ubuntu-latest
-            archs: x86_64
+            cibw_arch: x86_64
           - name: "manylinux_2_28 x86_64"
             os: ubuntu-latest
-            archs: x86_64
+            cibw_arch: x86_64
             build: "*manylinux*"
             manylinux: "manylinux_2_28"
     steps:
@@ -62,37 +138,38 @@ jobs:
         with:
           python-version: "3.x"
 
-      - name: Build wheels
+      - name: Install cibuildwheel
         run: |
           python3 -m pip install -r .ci/requirements-cibw.txt
+
+      - name: Build wheels
+        run: |
           python3 -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_ARCHS: ${{ matrix.archs }}
+          CIBW_ARCHS: ${{ matrix.cibw_arch }}
           CIBW_BUILD: ${{ matrix.build }}
+          CIBW_FREE_THREADED_SUPPORT: True
           CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }}
           CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
-          CIBW_SKIP: pp38-*
-          CIBW_TEST_SKIP: "*-macosx_arm64"
+          CIBW_PRERELEASE_PYTHONS: True
           MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
 
       - uses: actions/upload-artifact@v4
         with:
-          name: dist-${{ matrix.os }}-${{ matrix.archs }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }}
+          name: dist-${{ matrix.os }}${{ matrix.macosx_deployment_target && format('-{0}', matrix.macosx_deployment_target) }}-${{ matrix.cibw_arch }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }}
           path: ./wheelhouse/*.whl
 
   windows:
-    name: Windows ${{ matrix.arch }}
+    if: github.event_name != 'schedule' || github.repository_owner == 'python-pillow'
+    name: Windows ${{ matrix.cibw_arch }}
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - arch: x86
-            cibw_arch: x86
-          - arch: x64
-            cibw_arch: AMD64
-          - arch: ARM64
-            cibw_arch: ARM64
+          - cibw_arch: x86
+          - cibw_arch: AMD64
+          - cibw_arch: ARM64
     steps:
       - uses: actions/checkout@v4
 
@@ -106,6 +183,10 @@ jobs:
         with:
           python-version: "3.x"
 
+      - name: Install cibuildwheel
+        run: |
+          python.exe -m pip install -r .ci/requirements-cibw.txt
+
       - name: Prepare for build
         run: |
           choco install nasm --no-progress
@@ -114,9 +195,7 @@ jobs:
           # Install extra test images
           xcopy /S /Y Tests\test-images\* Tests\images
 
-          & python.exe -m pip install -r .ci/requirements-cibw.txt
-
-          & python.exe winbuild\build_prepare.py -v --no-imagequant --architecture=${{ matrix.arch }}
+          & python.exe winbuild\build_prepare.py -v --no-imagequant --architecture=${{ matrix.cibw_arch }}
         shell: pwsh
 
       - name: Build wheels
@@ -143,6 +222,8 @@ jobs:
           CIBW_ARCHS: ${{ matrix.cibw_arch }}
           CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd"
           CIBW_CACHE_PATH: "C:\\cibw"
+          CIBW_FREE_THREADED_SUPPORT: True
+          CIBW_PRERELEASE_PYTHONS: True
           CIBW_TEST_SKIP: "*-win_arm64"
           CIBW_TEST_COMMAND: 'docker run --rm
             -v {project}:C:\pillow
@@ -156,16 +237,17 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: dist-windows-${{ matrix.arch }}
+          name: dist-windows-${{ matrix.cibw_arch }}
           path: ./wheelhouse/*.whl
 
       - name: Upload fribidi.dll
         uses: actions/upload-artifact@v4
         with:
-          name: fribidi-windows-${{ matrix.arch }}
+          name: fribidi-windows-${{ matrix.cibw_arch }}
           path: winbuild\build\bin\fribidi*
 
   sdist:
+    if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -184,9 +266,26 @@ jobs:
         name: dist-sdist
         path: dist/*.tar.gz
 
+  scientific-python-nightly-wheels-publish:
+    if: github.repository_owner == 'python-pillow' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+    needs: [build-2-native-wheels, windows]
+    runs-on: ubuntu-latest
+    name: Upload wheels to scientific-python-nightly-wheels
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: dist-*
+          path: dist
+          merge-multiple: true
+      - name: Upload wheels to scientific-python-nightly-wheels
+        uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b # 0.6.1
+        with:
+          artifacts_path: dist
+          anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}
+
   pypi-publish:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-    needs: [build, windows, sdist]
+    if: github.repository_owner == 'python-pillow' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    needs: [build-1-QEMU-emulated-wheels, build-2-native-wheels, windows, sdist]
     runs-on: ubuntu-latest
     name: Upload release to PyPI
     environment:
@@ -202,3 +301,5 @@ jobs:
           merge-multiple: true
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          attestations: true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6adc75b4902..6254b89416f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,37 +1,45 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.9
+    rev: v0.6.9
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: [--exit-non-zero-on-fix]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.12.1
+    rev: 24.8.0
     hooks:
       - id: black
 
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.6
+    rev: 1.7.10
     hooks:
     - id: bandit
       args: [--severity-level=high]
       files: ^src/
 
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.5.4
+    rev: v1.5.5
     hooks:
       - id: remove-tabs
         exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$)
 
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v19.1.1
+    hooks:
+      - id: clang-format
+        types: [c]
+        exclude: ^src/thirdparty/
+
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:
       - id: rst-backticks
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-executables-have-shebangs
+      - id: check-shebang-scripts-are-executable
       - id: check-merge-conflict
       - id: check-json
       - id: check-toml
@@ -41,25 +49,38 @@ repos:
       - id: trailing-whitespace
         exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/
 
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.29.3
+    hooks:
+      - id: check-github-workflows
+      - id: check-readthedocs
+      - id: check-renovate
+
   - repo: https://github.com/sphinx-contrib/sphinx-lint
-    rev: v0.9.1
+    rev: v1.0.0
     hooks:
       - id: sphinx-lint
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 1.5.3
+    rev: 2.2.4
     hooks:
       - id: pyproject-fmt
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.15
+    rev: v0.20.2
     hooks:
       - id: validate-pyproject
+        additional_dependencies: [trove-classifiers>=2024.10.12]
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.3.1
+    rev: 1.4.1
     hooks:
       - id: tox-ini-fmt
 
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
+
 ci:
   autoupdate_schedule: monthly
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 0c8f935d58c..def6282dd56 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -3,9 +3,13 @@ version: 2
 formats: [pdf]
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
     python: "3"
+  jobs:
+    post_checkout:
+    - git remote add upstream https://github.com/python-pillow/Pillow.git # For forks
+    - git fetch upstream --tags
 
 python:
   install:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8f8250809d7..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-if: tag IS present OR type = api
-
-env:
-  global:
-    - CIBW_ARCHS=aarch64
-    - CIBW_SKIP=pp38-*
-
-language: python
-# Default Python version is usually 3.6
-python: "3.12"
-dist: jammy
-services: docker
-
-jobs:
-  include:
-    - name: "manylinux2014 aarch64"
-      os: linux
-      arch: arm64
-      env:
-        - CIBW_BUILD="*manylinux*"
-        - CIBW_MANYLINUX_AARCH64_IMAGE=manylinux2014
-        - CIBW_MANYLINUX_PYPY_AARCH64_IMAGE=manylinux2014
-    - name: "manylinux_2_28 aarch64"
-      os: linux
-      arch: arm64
-      env:
-        - CIBW_BUILD="*manylinux*"
-        - CIBW_MANYLINUX_AARCH64_IMAGE=manylinux_2_28
-        - CIBW_MANYLINUX_PYPY_AARCH64_IMAGE=manylinux_2_28
-    - name: "musllinux aarch64"
-      os: linux
-      arch: arm64
-      env:
-        - CIBW_BUILD="*musllinux*"
-
-install:
-    - python3 -m pip install -r .ci/requirements-cibw.txt
-
-script:
-    - python3 -m cibuildwheel --output-dir wheelhouse
-    - ls -l "${TRAVIS_BUILD_DIR}/wheelhouse/"
-
-# Upload wheels to GitHub Releases
-deploy:
-  provider: releases
-  api_key: $GITHUB_RELEASE_TOKEN
-  file_glob: true
-  file: "${TRAVIS_BUILD_DIR}/wheelhouse/*.whl"
-  on:
-    repo: python-pillow/Pillow
-    tags: true
-  skip_cleanup: true
diff --git a/CHANGES.rst b/CHANGES.rst
index 85036f6425b..8a20fe16a92 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,429 @@
 Changelog (Pillow)
 ==================
 
+11.0.0 (2024-10-15)
+-------------------
+
+- Update licence to MIT-CMU #8460
+  [hugovk]
+
+- Conditionally define ImageCms type hint to avoid requiring core #8197
+  [radarhere]
+
+- Support writing LONG8 offsets in AppendingTiffWriter #8417
+  [radarhere]
+
+- Use ImageFile.MAXBLOCK when saving TIFF images #8461
+  [radarhere]
+
+- Do not close provided file handles with libtiff when saving #8458
+  [radarhere]
+
+- Support ImageFilter.BuiltinFilter for I;16* images #8438
+  [radarhere]
+
+- Use ImagingCore.ptr instead of ImagingCore.id #8341
+  [homm, radarhere, hugovk]
+
+- Updated EPS mode when opening images without transparency #8281
+  [Yay295, radarhere]
+
+- Use transparency when combining P frames from APNGs #8443
+  [radarhere]
+
+- Support all resampling filters when resizing I;16* images #8422
+  [radarhere]
+
+- Free memory on early return #8413
+  [radarhere]
+
+- Cast int before potentially exceeding INT_MAX #8402
+  [radarhere]
+
+- Check image value before use #8400
+  [radarhere]
+
+- Improved copying imagequant libraries #8420
+  [radarhere]
+
+- Use Capsule for WebP saving #8386
+  [homm, radarhere]
+
+- Fixed writing multiple StripOffsets to TIFF #8317
+  [Yay295, radarhere]
+
+- Fix dereference before checking for NULL in ImagingTransformAffine #8398
+  [PavlNekrasov]
+
+- Use transposed size after opening for TIFF images #8390
+  [radarhere, homm]
+
+- Improve ImageFont error messages #8338
+  [yngvem, radarhere, hugovk]
+
+- Mention MAX_TEXT_CHUNK limit in PNG error message #8391
+  [radarhere]
+
+- Cast Dib handle to int #8385
+  [radarhere]
+
+- Accept float stroke widths #8369
+  [radarhere]
+
+- Deprecate ICNS (width, height, scale) sizes in favour of load(scale) #8352
+  [radarhere]
+
+- Improved handling of RGBA palettes when saving GIF images #8366
+  [radarhere]
+
+- Deprecate isImageType #8364
+  [radarhere]
+
+- Support converting more modes to LAB by converting to RGBA first #8358
+  [radarhere]
+
+- Deprecate support for FreeType 2.9.0 #8356
+  [hugovk, radarhere]
+
+- Removed unused TiffImagePlugin IFD_LEGACY_API #8355
+  [radarhere]
+
+- Handle duplicate EXIF header #8350
+  [zakajd, radarhere]
+
+- Return early from BoxBlur if either width or height is zero #8347
+  [radarhere]
+
+- Check text is either string or bytes #8308
+  [radarhere]
+
+- Added writing XMP bytes to JPEG #8286
+  [radarhere]
+
+- Support JPEG2000 RGBA palettes #8256
+  [radarhere]
+
+- Expand C image to match GIF frame image size #8237
+  [radarhere]
+
+- Allow saving I;16 images as PPM #8231
+  [radarhere]
+
+- When IFD is missing, connect get_ifd() dictionary to Exif #8230
+  [radarhere]
+
+- Skip truncated ICO mask if LOAD_TRUNCATED_IMAGES is enabled #8180
+  [radarhere]
+
+- Treat unknown JPEG2000 colorspace as unspecified #8343
+  [radarhere]
+
+- Updated error message when saving WebP with invalid width or height #8322
+  [radarhere, hugovk]
+
+- Remove warning if NumPy failed to raise an error during conversion #8326
+  [radarhere]
+
+- If left and right sides meet in ImageDraw.rounded_rectangle(), do not draw rectangle to fill gap #8304
+  [radarhere]
+
+- Remove WebP support without anim, mux/demux, and with buggy alpha #8213
+  [homm, radarhere]
+
+- Add missing TIFF CMYK;16B reader #8298
+  [homm]
+
+- Remove all WITH_* flags from _imaging.c and other flags #8211
+  [homm]
+
+- Improve ImageDraw2 shape methods #8265
+  [radarhere]
+
+- Lock around usages of imaging memory arenas #8238
+  [lysnikolaou]
+
+- Deprecate JpegImageFile huffman_ac and huffman_dc #8274
+  [radarhere]
+
+- Deprecate ImageMath lambda_eval and unsafe_eval options argument #8242
+  [radarhere]
+
+- Changed ContainerIO to subclass IO #8240
+  [radarhere]
+
+- Move away from APIs that use borrowed references under the free-threaded build #8216
+  [hugovk, lysnikolaou]
+
+- Allow size argument to resize() to be a NumPy array #8201
+  [radarhere]
+
+- Drop support for Python 3.8 #8183
+  [hugovk, radarhere]
+
+- Add support for Python 3.13 #8181
+  [hugovk, radarhere]
+
+- Fix incompatibility with NumPy 1.20 #8187
+  [neutrinoceros, radarhere]
+
+- Remove PSFile, PyAccess and USE_CFFI_ACCESS #8182
+  [hugovk, radarhere]
+
+10.4.0 (2024-07-01)
+-------------------
+
+- Raise FileNotFoundError if show_file() path does not exist #8178
+  [radarhere]
+
+- Improved reading 16-bit TGA images with colour #7965
+  [Yay295, radarhere]
+
+- Deprecate non-image ImageCms modes #8031
+  [radarhere]
+
+- Fixed processing multiple JPEG EXIF markers #8127
+  [radarhere]
+
+- Do not preserve EXIFIFD tag by default when saving TIFF images #8110
+  [radarhere]
+
+- Added ImageFont.load_default_imagefont() #8086
+  [radarhere]
+
+- Added Image.WARN_POSSIBLE_FORMATS #8063
+  [radarhere]
+
+- Remove zero-byte end padding when parsing any XMP data #8171
+  [radarhere]
+
+- Do not detect Ultra HDR images as MPO #8056
+  [radarhere]
+
+- Raise SyntaxError specific to JP2 #8146
+  [Yay295, radarhere]
+
+- Do not use first frame duration for other frames when saving APNG images #8104
+  [radarhere]
+
+- Consider I;16 pixel size when using a 1 mode mask #8112
+  [radarhere]
+
+- When saving multiple PNG frames, convert to mode rather than raw mode #8087
+  [radarhere]
+
+- Added byte support to FreeTypeFont #8141
+  [radarhere]
+
+- Allow float center for rotate operations #8114
+  [radarhere]
+
+- Do not read layers immediately when opening PSD images #8039
+  [radarhere]
+
+- Restore original thread state #8065
+  [radarhere]
+
+- Read IM and TIFF images as RGB, rather than RGBX #7997
+  [radarhere]
+
+- Only preserve TIFF IPTC_NAA_CHUNK tag if type is BYTE or UNDEFINED #7948
+  [radarhere]
+
+- Clarify ImageDraw2 error message when size is missing #8165
+  [radarhere]
+
+- Support unpacking more rawmodes to RGBA palettes #7966
+  [radarhere]
+
+- Removed support for Qt 5 #8159
+  [radarhere]
+
+- Improve ``ImageFont.freetype`` support for XDG directories on Linux #8135
+  [mamg22, radarhere]
+
+- Improved consistency of XMP handling #8069
+  [radarhere]
+
+- Use pkg-config to help find libwebp and raqm #8142
+  [radarhere]
+
+- Accept 't' suffix for libtiff version #8126, #8129
+  [radarhere]
+
+- Deprecate ImageDraw.getdraw hints parameter #8124
+  [radarhere, hugovk]
+
+- Added ImageDraw circle() #8085
+  [void4, hugovk, radarhere]
+
+- Add mypy target to Makefile #8077
+  [Yay295]
+
+- Added more modes to Image.MODES #7984
+  [radarhere]
+
+- Deprecate BGR;15, BGR;16 and BGR;24 modes #7978
+  [radarhere, hugovk]
+
+- Fix ImagingAccess for I;16N on big-endian #7921
+  [Yay295, radarhere]
+
+- Support reading P mode TIFF images with padding #7996
+  [radarhere]
+
+- Deprecate support for libtiff < 4 #7998
+  [radarhere, hugovk]
+
+- Corrected ImageShow UnixViewer command #7987
+  [radarhere]
+
+- Use functools.cached_property in ImageStat #7952
+  [nulano, hugovk, radarhere]
+
+- Add support for reading BITMAPV2INFOHEADER and BITMAPV3INFOHEADER #7956
+  [Cirras, radarhere]
+
+- Support reading CMYK JPEG2000 images #7947
+  [radarhere]
+
+10.3.0 (2024-04-01)
+-------------------
+
+- CVE-2024-28219: Use ``strncpy`` to avoid buffer overflow #7928
+  [radarhere, hugovk]
+
+- Deprecate ``eval()``, replacing it with ``lambda_eval()`` and ``unsafe_eval()`` #7927
+  [radarhere, hugovk]
+
+- Raise ``ValueError`` if seeking to greater than offset-sized integer in TIFF #7883
+  [radarhere]
+
+- Add ``--report`` argument to ``__main__.py`` to omit supported formats #7818
+  [nulano, radarhere, hugovk]
+
+- Added RGB to I;16, I;16L, I;16B and I;16N conversion #7918, #7920
+  [radarhere]
+
+- Fix editable installation with custom build backend and configuration options #7658
+  [nulano, radarhere]
+
+- Fix putdata() for I;16N on big-endian #7209
+  [Yay295, hugovk, radarhere]
+
+- Determine MPO size from markers, not EXIF data #7884
+  [radarhere]
+
+- Improved conversion from RGB to RGBa, LA and La #7888
+  [radarhere]
+
+- Support FITS images with GZIP_1 compression #7894
+  [radarhere]
+
+- Use I;16 mode for 9-bit JPEG 2000 images #7900
+  [scaramallion, radarhere]
+
+- Raise ValueError if kmeans is negative #7891
+  [radarhere]
+
+- Remove TIFF tag OSUBFILETYPE when saving using libtiff #7893
+  [radarhere]
+
+- Raise ValueError for negative values when loading P1-P3 PPM images #7882
+  [radarhere]
+
+- Added reading of JPEG2000 palettes #7870
+  [radarhere]
+
+- Added alpha_quality argument when saving WebP images #7872
+  [radarhere]
+
+- Fixed joined corners for ImageDraw rounded_rectangle() non-integer dimensions #7881
+  [radarhere]
+
+- Stop reading EPS image at EOF marker #7753
+  [radarhere]
+
+- PSD layer co-ordinates may be negative #7706
+  [radarhere]
+
+- Use subprocess with CREATE_NO_WINDOW flag in ImageShow WindowsViewer #7791
+  [radarhere]
+
+- When saving GIF frame that restores to background color, do not fill identical pixels #7788
+  [radarhere]
+
+- Fixed reading PNG iCCP compression method #7823
+  [radarhere]
+
+- Allow writing IFDRational to UNDEFINED tag #7840
+  [radarhere]
+
+- Fix logged tag name when loading Exif data #7842
+  [radarhere]
+
+- Use maximum frame size in IHDR chunk when saving APNG images #7821
+  [radarhere]
+
+- Prevent opening P TGA images without a palette #7797
+  [radarhere]
+
+- Use palette when loading ICO images #7798
+  [radarhere]
+
+- Use consistent arguments for load_read and load_seek #7713
+  [radarhere]
+
+- Turn off nullability warnings for macOS SDK #7827
+  [radarhere]
+
+- Fix shift-sign issue in Convert.c #7838
+  [r-barnes, radarhere]
+
+- Open 16-bit grayscale PNGs as I;16 #7849
+  [radarhere]
+
+- Handle truncated chunks at the end of PNG images #7709
+  [lajiyuan, radarhere]
+
+- Match mask size to pasted image size in GifImagePlugin #7779
+  [radarhere]
+
+- Release GIL while calling ``WebPAnimDecoderGetNext`` #7782
+  [evanmiller, radarhere]
+
+- Fixed reading FLI/FLC images with a prefix chunk #7804
+  [twolife]
+
+- Update wl-paste handling and return None for some errors in grabclipboard() on Linux #7745
+  [nik012003, radarhere]
+
+- Remove execute bit from ``setup.py`` #7760
+  [hugovk]
+
+- Do not support using test-image-results to upload images after test failures #7739
+  [radarhere]
+
+- Changed ImageMath.ops to be static #7721
+  [radarhere]
+
+- Fix APNG info after seeking backwards more than twice #7701
+  [esoma, radarhere]
+
+- Deprecate ImageCms constants and versions() function #7702
+  [nulano, radarhere]
+
+- Added PerspectiveTransform #7699
+  [radarhere]
+
+- Add support for reading and writing grayscale PFM images #7696
+  [nulano, hugovk]
+
+- Add LCMS2 flags to ImageCms #7676
+  [nulano, radarhere, hugovk]
+
+- Rename x64 to AMD64 in winbuild #7693
+  [nulano]
+
 10.2.0 (2024-01-02)
 -------------------
 
@@ -4208,7 +4631,7 @@ Changelog (Pillow)
 - Documentation changes, URL update, transpose, release checklist
   [radarhere]
 
-- Fixed saving to nonexistant files specified by pathlib.Path objects #1748 (fixes #1747)
+- Fixed saving to nonexistent files specified by pathlib.Path objects #1748 (fixes #1747)
   [radarhere]
 
 - Round Image.crop arguments to the nearest integer #1745 (fixes #1744)
@@ -7419,7 +7842,7 @@ The test suite includes 400 individual tests.
 - A handbook is available (distributed separately).
 
 - The coordinate system is changed so that (0,0) is now located
-  in the upper left corner.  This is in compliancy with ISO 12087
+  in the upper left corner.  This is in compliance with ISO 12087
   and 90% of all other image processing and graphics libraries.
 
 - Modes "1" (bilevel) and "P" (palette) have been introduced.  Note
diff --git a/LICENSE b/LICENSE
index 0069eb5bcec..7990a6e57dc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,11 +1,11 @@
 The Python Imaging Library (PIL) is
 
     Copyright © 1997-2011 by Secret Labs AB
-    Copyright © 1995-2011 by Fredrik Lundh
+    Copyright © 1995-2011 by Fredrik Lundh and contributors
 
 Pillow is the friendly PIL fork. It is
 
-    Copyright © 2010-2024 by Jeffrey A. Clark (Alex) and contributors.
+    Copyright © 2010-2024 by Jeffrey A. Clark and contributors
 
 Like PIL, Pillow is licensed under the open source HPND License:
 
diff --git a/Makefile b/Makefile
index ad0a1adab50..53164b08a90 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 
 .PHONY: clean
 clean:
-	python3 setup.py clean
 	rm src/PIL/*.so || true
 	rm -r build || true
 	find . -name __pycache__ | xargs rm -r || true
@@ -18,12 +17,10 @@ coverage:
 .PHONY: doc
 .PHONY: html
 doc html:
-	python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install .
 	$(MAKE) -C docs html
 
 .PHONY: htmlview
 htmlview:
-	python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install .
 	$(MAKE) -C docs htmlview
 
 .PHONY: doccheck
@@ -78,8 +75,6 @@ release-test:
 	python3 selftest.py
 	python3 -m pytest Tests
 	python3 -m pip install .
-	-rm dist/*.egg
-	-rmdir dist
 	python3 -m pytest -qq
 	python3 -m check_manifest
 	python3 -m pyroma .
@@ -120,4 +115,9 @@ lint-fix:
 	python3 -c "import black" > /dev/null 2>&1 || python3 -m pip install black
 	python3 -m black .
 	python3 -c "import ruff" > /dev/null 2>&1 || python3 -m pip install ruff
-	python3 -m ruff --fix .
+	python3 -m ruff check --fix .
+
+.PHONY: mypy
+mypy:
+	python3 -c "import tox" > /dev/null 2>&1 || python3 -m pip install tox
+	python3 -m tox -e mypy
diff --git a/README.md b/README.md
index e11bd2faa1d..5bbebaccb4a 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
 
 ## Python Imaging Library (Fork)
 
-Pillow is the friendly PIL fork by [Jeffrey A. Clark (Alex) and
+Pillow is the friendly PIL fork by [Jeffrey A. Clark and
 contributors](https://github.com/python-pillow/Pillow/graphs/contributors).
-PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
+PIL is the Python Imaging Library by Fredrik Lundh and contributors.
 As of 2019, Pillow development is
 [supported by Tidelift](https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=readme&utm_campaign=enterprise).
 
@@ -48,13 +48,10 @@ As of 2019, Pillow development is
             <a href="https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml"><img
                 alt="GitHub Actions build status (Wheels)"
                 src="https://github.com/python-pillow/Pillow/workflows/Wheels/badge.svg"></a>
-            <a href="https://app.travis-ci.com/github/python-pillow/Pillow"><img
-                alt="Travis CI wheels build status (aarch64)"
-                src="https://img.shields.io/travis/com/python-pillow/Pillow/main.svg?label=aarch64%20wheels"></a>
             <a href="https://app.codecov.io/gh/python-pillow/Pillow"><img
                 alt="Code coverage"
                 src="https://codecov.io/gh/python-pillow/Pillow/branch/main/graph/badge.svg"></a>
-            <a href="https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:pillow"><img
+            <a href="https://issues.oss-fuzz.com/issues?q=title:pillow"><img
                 alt="Fuzzing Status"
                 src="https://oss-fuzz-build-logs.storage.googleapis.com/badges/pillow.svg"></a>
         </td>
@@ -67,11 +64,11 @@ As of 2019, Pillow development is
                 src="https://zenodo.org/badge/17549/python-pillow/Pillow.svg"></a>
             <a href="https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=badge"><img
                 alt="Tidelift"
-                src="https://tidelift.com/badges/package/pypi/Pillow?style=flat"></a>
-            <a href="https://pypi.org/project/Pillow/"><img
+                src="https://tidelift.com/badges/package/pypi/pillow?style=flat"></a>
+            <a href="https://pypi.org/project/pillow/"><img
                 alt="Newest PyPI version"
                 src="https://img.shields.io/pypi/v/pillow.svg"></a>
-            <a href="https://pypi.org/project/Pillow/"><img
+            <a href="https://pypi.org/project/pillow/"><img
                 alt="Number of PyPI downloads"
                 src="https://img.shields.io/pypi/dm/pillow.svg"></a>
             <a href="https://www.bestpractices.dev/projects/6331"><img
@@ -85,9 +82,6 @@ As of 2019, Pillow development is
             <a href="https://gitter.im/python-pillow/Pillow?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"><img
                 alt="Join the chat at https://gitter.im/python-pillow/Pillow"
                 src="https://badges.gitter.im/python-pillow/Pillow.svg"></a>
-            <a href="https://twitter.com/PythonPillow"><img
-                alt="Follow on https://twitter.com/PythonPillow"
-                src="https://img.shields.io/badge/tweet-on%20Twitter-00aced.svg"></a>
             <a href="https://fosstodon.org/@pillow"><img
                 alt="Follow on https://fosstodon.org/@pillow"
                 src="https://img.shields.io/badge/publish-on%20Mastodon-595aff.svg"
@@ -107,7 +101,7 @@ The core image library is designed for fast access to data stored in a few basic
 ## More Information
 
 - [Documentation](https://pillow.readthedocs.io/)
-  - [Installation](https://pillow.readthedocs.io/en/latest/installation.html)
+  - [Installation](https://pillow.readthedocs.io/en/latest/installation/basic-installation.html)
   - [Handbook](https://pillow.readthedocs.io/en/latest/handbook/index.html)
 - [Contribute](https://github.com/python-pillow/Pillow/blob/main/.github/CONTRIBUTING.md)
   - [Issues](https://github.com/python-pillow/Pillow/issues)
diff --git a/RELEASING.md b/RELEASING.md
index b3fd72a520e..9e6ec5dd4c1 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -10,7 +10,7 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th.
 * [ ] Open a release ticket e.g. https://github.com/python-pillow/Pillow/issues/3154
 * [ ] Develop and prepare release in `main` branch.
 * [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `main` branch.
-* [ ] Check that all of the wheel builds pass the tests in the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) and [Travis CI](https://app.travis-ci.com/github/python-pillow/pillow) jobs by manually triggering them.
+* [ ] Check that all the wheel builds pass the tests in the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) jobs by manually triggering them.
 * [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py`
 * [ ] Update `CHANGES.rst`.
 * [ ] Run pre-release check via `make release-test` in a freshly cloned repo.
@@ -20,8 +20,10 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th.
   git tag 5.2.0
   git push --tags
   ```
-* [ ] Create and upload all [source and binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#source-and-binary-distributions)
-* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases)
+* [ ] Check the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml)
+  has passed, including the "Upload release to PyPI" job. This will have been triggered
+  by the new tag.
+* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases).
 * [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/),
       increment and append `.dev0` to version identifier in `src/PIL/_version.py` and then:
   ```bash
@@ -50,7 +52,9 @@ Released as needed for security, installation or critical bug fixes.
   ```bash
   make sdist
   ```
-* [ ] Create and upload all [source and binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#source-and-binary-distributions)
+* [ ] Check the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml)
+  has passed, including the "Upload release to PyPI" job. This will have been triggered
+  by the new tag.
 * [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) and then:
   ```bash
   git push
@@ -72,27 +76,17 @@ Released as needed privately to individual vendors for critical security-related
   git tag 2.5.3
   git push origin --tags
   ```
-* [ ] Create and upload all [source and binary distributions](https://github.com/python-pillow/Pillow/blob/main/RELEASING.md#source-and-binary-distributions)
-* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) and then:
-  ```bash
-  git push origin 2.5.x
-  ```
-
-## Source and Binary Distributions
-
 * [ ] Check the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml)
   has passed, including the "Upload release to PyPI" job. This will have been triggered
   by the new tag.
-* [ ] Download the Linux aarch64 wheels created by Travis CI from [GitHub releases](https://github.com/python-pillow/Pillow/releases)
-  and copy into `dist`. Check and upload them e.g.:
+* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases) and then:
   ```bash
-  python3 -m twine check --strict dist/*
-  python3 -m twine upload dist/Pillow-5.2.0*
+  git push origin 2.5.x
   ```
 
 ## Publicize Release
 
-* [ ] Announce release availability via [Twitter](https://twitter.com/pythonpillow) and [Mastodon](https://fosstodon.org/@pillow) e.g. https://twitter.com/PythonPillow/status/1013789184354603010
+* [ ] Announce release availability via [Mastodon](https://fosstodon.org/@pillow) e.g. https://fosstodon.org/@pillow/110639450470725321
 
 ## Documentation
 
diff --git a/Tests/bench_cffi_access.py b/Tests/bench_cffi_access.py
deleted file mode 100644
index 8a37c7d5157..00000000000
--- a/Tests/bench_cffi_access.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from __future__ import annotations
-import time
-
-from PIL import PyAccess
-
-from .helper import hopper
-
-# Not running this test by default. No DOS against CI.
-
-
-def iterate_get(size, access):
-    (w, h) = size
-    for x in range(w):
-        for y in range(h):
-            access[(x, y)]
-
-
-def iterate_set(size, access):
-    (w, h) = size
-    for x in range(w):
-        for y in range(h):
-            access[(x, y)] = (x % 256, y % 256, 0)
-
-
-def timer(func, label, *args):
-    iterations = 5000
-    starttime = time.time()
-    for x in range(iterations):
-        func(*args)
-        if time.time() - starttime > 10:
-            break
-    endtime = time.time()
-    print(
-        "{}: completed {} iterations in {:.4f}s, {:.6f}s per iteration".format(
-            label, x + 1, endtime - starttime, (endtime - starttime) / (x + 1.0)
-        )
-    )
-
-
-def test_direct():
-    im = hopper()
-    im.load()
-    # im = Image.new("RGB", (2000, 2000), (1, 3, 2))
-    caccess = im.im.pixel_access(False)
-    access = PyAccess.new(im, False)
-
-    assert caccess[(0, 0)] == access[(0, 0)]
-
-    print(f"Size: {im.width}x{im.height}")
-    timer(iterate_get, "PyAccess - get", im.size, access)
-    timer(iterate_set, "PyAccess - set", im.size, access)
-    timer(iterate_get, "C-api - get", im.size, caccess)
-    timer(iterate_set, "C-api - set", im.size, caccess)
diff --git a/Tests/check_fli_oob.py b/Tests/check_fli_oob.py
index ac46ff1ebc0..e0057a2c2ad 100644
--- a/Tests/check_fli_oob.py
+++ b/Tests/check_fli_oob.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from __future__ import annotations
 
 from PIL import Image
diff --git a/Tests/check_fli_overflow.py b/Tests/check_fli_overflow.py
index 0fabcb5d35f..5c89efc7666 100644
--- a/Tests/check_fli_overflow.py
+++ b/Tests/check_fli_overflow.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 from PIL import Image
 
 TEST_FILE = "Tests/images/fli_overflow.fli"
 
 
-def test_fli_overflow():
+def test_fli_overflow() -> None:
     # this should not crash with a malloc error or access violation
     with Image.open(TEST_FILE) as im:
         im.load()
diff --git a/Tests/check_imaging_leaks.py b/Tests/check_imaging_leaks.py
index 8c17c051d4b..231789ca0a0 100755
--- a/Tests/check_imaging_leaks.py
+++ b/Tests/check_imaging_leaks.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 from __future__ import annotations
+
+from typing import Any, Callable
+
 import pytest
 
 from PIL import Image
@@ -12,31 +15,37 @@
 pytestmark = pytest.mark.skipif(is_win32(), reason="requires Unix or macOS")
 
 
-def _get_mem_usage():
+def _get_mem_usage() -> float:
     from resource import RUSAGE_SELF, getpagesize, getrusage
 
     mem = getrusage(RUSAGE_SELF).ru_maxrss
     return mem * getpagesize() / 1024 / 1024
 
 
-def _test_leak(min_iterations, max_iterations, fn, *args, **kwargs):
+def _test_leak(
+    min_iterations: int,
+    max_iterations: int,
+    fn: Callable[..., Image.Image | None],
+    *args: Any,
+) -> None:
     mem_limit = None
     for i in range(max_iterations):
-        fn(*args, **kwargs)
+        fn(*args)
         mem = _get_mem_usage()
         if i < min_iterations:
             mem_limit = mem + 1
             continue
         msg = f"memory usage limit exceeded after {i + 1} iterations"
+        assert mem_limit is not None
         assert mem <= mem_limit, msg
 
 
-def test_leak_putdata():
+def test_leak_putdata() -> None:
     im = Image.new("RGB", (25, 25))
     _test_leak(min_iterations, max_iterations, im.putdata, im.getdata())
 
 
-def test_leak_getlist():
+def test_leak_getlist() -> None:
     im = Image.new("P", (25, 25))
     _test_leak(
         min_iterations,
diff --git a/Tests/check_j2k_leaks.py b/Tests/check_j2k_leaks.py
index 83a12e2c29f..bbe35b591fc 100644
--- a/Tests/check_j2k_leaks.py
+++ b/Tests/check_j2k_leaks.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from io import BytesIO
 
 import pytest
@@ -19,7 +20,7 @@
 ]
 
 
-def test_leak_load():
+def test_leak_load() -> None:
     from resource import RLIMIT_AS, RLIMIT_STACK, setrlimit
 
     setrlimit(RLIMIT_STACK, (stack_size, stack_size))
@@ -29,7 +30,7 @@ def test_leak_load():
             im.load()
 
 
-def test_leak_save():
+def test_leak_save() -> None:
     from resource import RLIMIT_AS, RLIMIT_STACK, setrlimit
 
     setrlimit(RLIMIT_STACK, (stack_size, stack_size))
diff --git a/Tests/check_j2k_overflow.py b/Tests/check_j2k_overflow.py
index 982f6ea74d2..dbdd5a4f557 100644
--- a/Tests/check_j2k_overflow.py
+++ b/Tests/check_j2k_overflow.py
@@ -1,10 +1,13 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image
 
 
-def test_j2k_overflow(tmp_path):
+def test_j2k_overflow(tmp_path: Path) -> None:
     im = Image.new("RGBA", (1024, 131584))
     target = str(tmp_path / "temp.jpc")
     with pytest.raises(OSError):
diff --git a/Tests/check_jp2_overflow.py b/Tests/check_jp2_overflow.py
old mode 100755
new mode 100644
index 9afbff112b0..954d68bf7e3
--- a/Tests/check_jp2_overflow.py
+++ b/Tests/check_jp2_overflow.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 # Reproductions/tests for OOB read errors in FliDecode.c
 
 # When run in python, all of these images should fail for
@@ -14,7 +12,6 @@
 # version.
 from __future__ import annotations
 
-
 from PIL import Image
 
 repro = ("00r0_gray_l.jp2", "00r1_graya_la.jp2")
diff --git a/Tests/check_jpeg_leaks.py b/Tests/check_jpeg_leaks.py
index 3cd37c7af7b..5f290c6cd37 100644
--- a/Tests/check_jpeg_leaks.py
+++ b/Tests/check_jpeg_leaks.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from io import BytesIO
 
 import pytest
@@ -110,14 +111,14 @@
         [standard_l_qtable, standard_chrominance_qtable],
     ),
 )
-def test_qtables_leak(qtables):
+def test_qtables_leak(qtables: tuple[tuple[int, ...]] | list[tuple[int, ...]]) -> None:
     im = hopper("RGB")
     for _ in range(iterations):
         test_output = BytesIO()
         im.save(test_output, "JPEG", qtables=qtables)
 
 
-def test_exif_leak():
+def test_exif_leak() -> None:
     """
     pre patch:
 
@@ -180,7 +181,7 @@ def test_exif_leak():
         im.save(test_output, "JPEG", exif=exif)
 
 
-def test_base_save():
+def test_base_save() -> None:
     """
     base case:
         MB
diff --git a/Tests/check_large_memory.py b/Tests/check_large_memory.py
index 9b83798d5e7..a9ce79e57e6 100644
--- a/Tests/check_large_memory.py
+++ b/Tests/check_large_memory.py
@@ -1,5 +1,8 @@
 from __future__ import annotations
+
 import sys
+from pathlib import Path
+from types import ModuleType
 
 import pytest
 
@@ -15,6 +18,7 @@
 # 2.7 and 3.2.
 
 
+numpy: ModuleType | None
 try:
     import numpy
 except ImportError:
@@ -27,23 +31,24 @@
 pytestmark = pytest.mark.skipif(sys.maxsize <= 2**32, reason="requires 64-bit system")
 
 
-def _write_png(tmp_path, xdim, ydim):
+def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
     f = str(tmp_path / "temp.png")
     im = Image.new("L", (xdim, ydim), 0)
     im.save(f)
 
 
-def test_large(tmp_path):
+def test_large(tmp_path: Path) -> None:
     """succeeded prepatch"""
     _write_png(tmp_path, XDIM, YDIM)
 
 
-def test_2gpx(tmp_path):
+def test_2gpx(tmp_path: Path) -> None:
     """failed prepatch"""
     _write_png(tmp_path, XDIM, XDIM)
 
 
 @pytest.mark.skipif(numpy is None, reason="Numpy is not installed")
-def test_size_greater_than_int():
+def test_size_greater_than_int() -> None:
+    assert numpy is not None
     arr = numpy.ndarray(shape=(16394, 16394))
     Image.fromarray(arr)
diff --git a/Tests/check_large_memory_numpy.py b/Tests/check_large_memory_numpy.py
index 0ff3de8dcc7..f4ca8d0aa68 100644
--- a/Tests/check_large_memory_numpy.py
+++ b/Tests/check_large_memory_numpy.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 import sys
+from pathlib import Path
 
 import pytest
 
@@ -23,7 +25,7 @@
 pytestmark = pytest.mark.skipif(sys.maxsize <= 2**32, reason="requires 64-bit system")
 
 
-def _write_png(tmp_path, xdim, ydim):
+def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
     dtype = np.uint8
     a = np.zeros((xdim, ydim), dtype=dtype)
     f = str(tmp_path / "temp.png")
@@ -31,11 +33,11 @@ def _write_png(tmp_path, xdim, ydim):
     im.save(f)
 
 
-def test_large(tmp_path):
+def test_large(tmp_path: Path) -> None:
     """succeeded prepatch"""
     _write_png(tmp_path, XDIM, YDIM)
 
 
-def test_2gpx(tmp_path):
+def test_2gpx(tmp_path: Path) -> None:
     """failed prepatch"""
     _write_png(tmp_path, XDIM, XDIM)
diff --git a/Tests/check_libtiff_segfault.py b/Tests/check_libtiff_segfault.py
index ee1d7d11f0c..84bda53ed28 100644
--- a/Tests/check_libtiff_segfault.py
+++ b/Tests/check_libtiff_segfault.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -6,7 +7,7 @@
 TEST_FILE = "Tests/images/libtiff_segfault.tif"
 
 
-def test_libtiff_segfault():
+def test_libtiff_segfault() -> None:
     """This test should not segfault. It will on Pillow <= 3.1.0 and
     libtiff >= 4.0.0
     """
diff --git a/Tests/check_png_dos.py b/Tests/check_png_dos.py
index 292fe4b7f09..63d6657bc45 100644
--- a/Tests/check_png_dos.py
+++ b/Tests/check_png_dos.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import zlib
 from io import BytesIO
 
@@ -7,7 +8,7 @@
 TEST_FILE = "Tests/images/png_decompression_dos.png"
 
 
-def test_ignore_dos_text():
+def test_ignore_dos_text() -> None:
     ImageFile.LOAD_TRUNCATED_IMAGES = True
 
     try:
@@ -16,6 +17,7 @@ def test_ignore_dos_text():
     finally:
         ImageFile.LOAD_TRUNCATED_IMAGES = False
 
+    assert isinstance(im, PngImagePlugin.PngImageFile)
     for s in im.text.values():
         assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
 
@@ -23,7 +25,7 @@ def test_ignore_dos_text():
         assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
 
 
-def test_dos_text():
+def test_dos_text() -> None:
     try:
         im = Image.open(TEST_FILE)
         im.load()
@@ -31,11 +33,12 @@ def test_dos_text():
         assert msg, "Decompressed Data Too Large"
         return
 
+    assert isinstance(im, PngImagePlugin.PngImageFile)
     for s in im.text.values():
         assert len(s) < 1024 * 1024, "Text chunk larger than 1M"
 
 
-def test_dos_total_memory():
+def test_dos_total_memory() -> None:
     im = Image.new("L", (1, 1))
     compressed_data = zlib.compress(b"a" * 1024 * 1023)
 
@@ -52,10 +55,11 @@ def test_dos_total_memory():
     try:
         im2 = Image.open(b)
     except ValueError as msg:
-        assert "Too much memory" in msg
+        assert "Too much memory" in str(msg)
         return
 
     total_len = 0
+    assert isinstance(im2, PngImagePlugin.PngImageFile)
     for txt in im2.text.values():
         total_len += len(txt)
     assert total_len < 64 * 1024 * 1024, "Total text chunks greater than 64M"
diff --git a/Tests/check_release_notes.py b/Tests/check_release_notes.py
index ebfaffa47e1..cf414d7fff0 100644
--- a/Tests/check_release_notes.py
+++ b/Tests/check_release_notes.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import sys
 from pathlib import Path
 
diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py
index afe4cc3eeaa..4b91984f58a 100644
--- a/Tests/check_wheel.py
+++ b/Tests/check_wheel.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 import sys
 
 from PIL import features
 
 
-def test_wheel_modules():
+def test_wheel_modules() -> None:
     expected_modules = {"pil", "tkinter", "freetype2", "littlecms2", "webp"}
 
     # tkinter is not available in cibuildwheel installed CPython on Windows
@@ -18,13 +19,13 @@ def test_wheel_modules():
     assert set(features.get_supported_modules()) == expected_modules
 
 
-def test_wheel_codecs():
+def test_wheel_codecs() -> None:
     expected_codecs = {"jpg", "jpg_2000", "zlib", "libtiff"}
 
     assert set(features.get_supported_codecs()) == expected_codecs
 
 
-def test_wheel_features():
+def test_wheel_features() -> None:
     expected_features = {
         "webp_anim",
         "webp_mux",
diff --git a/Tests/conftest.py b/Tests/conftest.py
index cd64bd755f0..e00d1f019f5 100644
--- a/Tests/conftest.py
+++ b/Tests/conftest.py
@@ -1,8 +1,11 @@
 from __future__ import annotations
+
 import io
 
+import pytest
+
 
-def pytest_report_header(config):
+def pytest_report_header(config: pytest.Config) -> str:
     try:
         from PIL import features
 
@@ -13,7 +16,7 @@ def pytest_report_header(config):
         return f"pytest_report_header failed: {e}"
 
 
-def pytest_configure(config):
+def pytest_configure(config: pytest.Config) -> None:
     config.addinivalue_line(
         "markers",
         "pil_noop_mark: A conditional mark where nothing special happens",
diff --git a/Tests/createfontdatachunk.py b/Tests/createfontdatachunk.py
index 2e990b70916..41c76f87eac 100755
--- a/Tests/createfontdatachunk.py
+++ b/Tests/createfontdatachunk.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 from __future__ import annotations
+
 import base64
 import os
 
diff --git a/Tests/helper.py b/Tests/helper.py
index b333c2fd4ef..d6a93a8030b 100644
--- a/Tests/helper.py
+++ b/Tests/helper.py
@@ -1,6 +1,7 @@
 """
 Helper functions.
 """
+
 from __future__ import annotations
 
 import logging
@@ -10,51 +11,43 @@
 import sys
 import sysconfig
 import tempfile
+from collections.abc import Sequence
+from functools import lru_cache
 from io import BytesIO
+from typing import Any, Callable
 
 import pytest
 from packaging.version import parse as parse_version
 
-from PIL import Image, ImageMath, features
+from PIL import Image, ImageFile, ImageMath, features
 
 logger = logging.getLogger(__name__)
 
-
-HAS_UPLOADER = False
-
+uploader = None
 if os.environ.get("SHOW_ERRORS"):
-    # local img.show for errors.
-    HAS_UPLOADER = True
-
-    class test_image_results:
-        @staticmethod
-        def upload(a, b):
-            a.show()
-            b.show()
-
+    uploader = "show"
 elif "GITHUB_ACTIONS" in os.environ:
-    HAS_UPLOADER = True
-
-    class test_image_results:
-        @staticmethod
-        def upload(a, b):
-            dir_errors = os.path.join(os.path.dirname(__file__), "errors")
-            os.makedirs(dir_errors, exist_ok=True)
-            tmpdir = tempfile.mkdtemp(dir=dir_errors)
-            a.save(os.path.join(tmpdir, "a.png"))
-            b.save(os.path.join(tmpdir, "b.png"))
-            return tmpdir
-
-else:
-    try:
-        import test_image_results
-
-        HAS_UPLOADER = True
-    except ImportError:
-        pass
-
-
-def convert_to_comparable(a, b):
+    uploader = "github_actions"
+
+
+def upload(a: Image.Image, b: Image.Image) -> str | None:
+    if uploader == "show":
+        # local img.show for errors.
+        a.show()
+        b.show()
+    elif uploader == "github_actions":
+        dir_errors = os.path.join(os.path.dirname(__file__), "errors")
+        os.makedirs(dir_errors, exist_ok=True)
+        tmpdir = tempfile.mkdtemp(dir=dir_errors)
+        a.save(os.path.join(tmpdir, "a.png"))
+        b.save(os.path.join(tmpdir, "b.png"))
+        return tmpdir
+    return None
+
+
+def convert_to_comparable(
+    a: Image.Image, b: Image.Image
+) -> tuple[Image.Image, Image.Image]:
     new_a, new_b = a, b
     if a.mode == "P":
         new_a = Image.new("L", a.size)
@@ -67,14 +60,16 @@ def convert_to_comparable(a, b):
     return new_a, new_b
 
 
-def assert_deep_equal(a, b, msg=None):
+def assert_deep_equal(a: Any, b: Any, msg: str | None = None) -> None:
     try:
         assert len(a) == len(b), msg or f"got length {len(a)}, expected {len(b)}"
     except Exception:
         assert a == b, msg
 
 
-def assert_image(im, mode, size, msg=None):
+def assert_image(
+    im: Image.Image, mode: str, size: tuple[int, int], msg: str | None = None
+) -> None:
     if mode is not None:
         assert im.mode == mode, (
             msg or f"got mode {repr(im.mode)}, expected {repr(mode)}"
@@ -86,28 +81,32 @@ def assert_image(im, mode, size, msg=None):
         )
 
 
-def assert_image_equal(a, b, msg=None):
+def assert_image_equal(a: Image.Image, b: Image.Image, msg: str | None = None) -> None:
     assert a.mode == b.mode, msg or f"got mode {repr(a.mode)}, expected {repr(b.mode)}"
     assert a.size == b.size, msg or f"got size {repr(a.size)}, expected {repr(b.size)}"
     if a.tobytes() != b.tobytes():
-        if HAS_UPLOADER:
-            try:
-                url = test_image_results.upload(a, b)
+        try:
+            url = upload(a, b)
+            if url:
                 logger.error("URL for test images: %s", url)
-            except Exception:
-                pass
+        except Exception:
+            pass
 
         pytest.fail(msg or "got different content")
 
 
-def assert_image_equal_tofile(a, filename, msg=None, mode=None):
+def assert_image_equal_tofile(
+    a: Image.Image, filename: str, msg: str | None = None, mode: str | None = None
+) -> None:
     with Image.open(filename) as img:
         if mode:
             img = img.convert(mode)
         assert_image_equal(a, img, msg)
 
 
-def assert_image_similar(a, b, epsilon, msg=None):
+def assert_image_similar(
+    a: Image.Image, b: Image.Image, epsilon: float, msg: str | None = None
+) -> None:
     assert a.mode == b.mode, msg or f"got mode {repr(a.mode)}, expected {repr(b.mode)}"
     assert a.size == b.size, msg or f"got size {repr(a.size)}, expected {repr(b.size)}"
 
@@ -115,7 +114,9 @@ def assert_image_similar(a, b, epsilon, msg=None):
 
     diff = 0
     for ach, bch in zip(a.split(), b.split()):
-        chdiff = ImageMath.eval("abs(a - b)", a=ach, b=bch).convert("L")
+        chdiff = ImageMath.lambda_eval(
+            lambda args: abs(args["a"] - args["b"]), a=ach, b=bch
+        ).convert("L")
         diff += sum(i * num for i, num in enumerate(chdiff.histogram()))
 
     ave_diff = diff / (a.size[0] * a.size[1])
@@ -125,61 +126,76 @@ def assert_image_similar(a, b, epsilon, msg=None):
             + f" average pixel value difference {ave_diff:.4f} > epsilon {epsilon:.4f}"
         )
     except Exception as e:
-        if HAS_UPLOADER:
-            try:
-                url = test_image_results.upload(a, b)
+        try:
+            url = upload(a, b)
+            if url:
                 logger.exception("URL for test images: %s", url)
-            except Exception:
-                pass
+        except Exception:
+            pass
         raise e
 
 
-def assert_image_similar_tofile(a, filename, epsilon, msg=None, mode=None):
+def assert_image_similar_tofile(
+    a: Image.Image,
+    filename: str,
+    epsilon: float,
+    msg: str | None = None,
+    mode: str | None = None,
+) -> None:
     with Image.open(filename) as img:
         if mode:
             img = img.convert(mode)
         assert_image_similar(a, img, epsilon, msg)
 
 
-def assert_all_same(items, msg=None):
+def assert_all_same(items: Sequence[Any], msg: str | None = None) -> None:
     assert items.count(items[0]) == len(items), msg
 
 
-def assert_not_all_same(items, msg=None):
+def assert_not_all_same(items: Sequence[Any], msg: str | None = None) -> None:
     assert items.count(items[0]) != len(items), msg
 
 
-def assert_tuple_approx_equal(actuals, targets, threshold, msg):
+def assert_tuple_approx_equal(
+    actuals: Sequence[int], targets: tuple[int, ...], threshold: int, msg: str
+) -> None:
     """Tests if actuals has values within threshold from targets"""
-    value = True
     for i, target in enumerate(targets):
-        value *= target - threshold <= actuals[i] <= target + threshold
-
-    assert value, msg + ": " + repr(actuals) + " != " + repr(targets)
+        if not (target - threshold <= actuals[i] <= target + threshold):
+            pytest.fail(msg + ": " + repr(actuals) + " != " + repr(targets))
 
 
-def skip_unless_feature(feature):
+def skip_unless_feature(feature: str) -> pytest.MarkDecorator:
     reason = f"{feature} not available"
     return pytest.mark.skipif(not features.check(feature), reason=reason)
 
 
-def skip_unless_feature_version(feature, version_required, reason=None):
-    if not features.check(feature):
+def skip_unless_feature_version(
+    feature: str, required: str, reason: str | None = None
+) -> pytest.MarkDecorator:
+    version = features.version(feature)
+    if version is None:
         return pytest.mark.skip(f"{feature} not available")
     if reason is None:
-        reason = f"{feature} is older than {version_required}"
-    version_required = parse_version(version_required)
-    version_available = parse_version(features.version(feature))
+        reason = f"{feature} is older than {required}"
+    version_required = parse_version(required)
+    version_available = parse_version(version)
     return pytest.mark.skipif(version_available < version_required, reason=reason)
 
 
-def mark_if_feature_version(mark, feature, version_blacklist, reason=None):
-    if not features.check(feature):
+def mark_if_feature_version(
+    mark: pytest.MarkDecorator,
+    feature: str,
+    version_blacklist: str,
+    reason: str | None = None,
+) -> pytest.MarkDecorator:
+    version = features.version(feature)
+    if version is None:
         return pytest.mark.pil_noop_mark()
     if reason is None:
         reason = f"{feature} is {version_blacklist}"
     version_required = parse_version(version_blacklist)
-    version_available = parse_version(features.version(feature))
+    version_available = parse_version(version)
     if (
         version_available.major == version_required.major
         and version_available.minor == version_required.minor
@@ -194,7 +210,7 @@ class PillowLeakTestCase:
     iterations = 100  # count
     mem_limit = 512  # k
 
-    def _get_mem_usage(self):
+    def _get_mem_usage(self) -> float:
         """
         Gets the RUSAGE memory usage, returns in K. Encapsulates the difference
         between macOS and Linux rss reporting
@@ -205,18 +221,13 @@ def _get_mem_usage(self):
         from resource import RUSAGE_SELF, getrusage
 
         mem = getrusage(RUSAGE_SELF).ru_maxrss
-        if sys.platform == "darwin":
-            # man 2 getrusage:
-            #     ru_maxrss
-            # This is the maximum resident set size utilized (in bytes).
-            return mem / 1024  # Kb
-        # linux
-        # man 2 getrusage
-        #        ru_maxrss (since Linux 2.6.32)
-        #  This is the maximum resident set size used (in kilobytes).
-        return mem  # Kb
-
-    def _test_leak(self, core):
+        # man 2 getrusage:
+        #     ru_maxrss
+        # This is the maximum resident set size utilized
+        # in bytes on macOS, in kilobytes on Linux
+        return mem / 1024 if sys.platform == "darwin" else mem
+
+    def _test_leak(self, core: Callable[[], None]) -> None:
         start_mem = self._get_mem_usage()
         for cycle in range(self.iterations):
             core()
@@ -228,60 +239,75 @@ def _test_leak(self, core):
 # helpers
 
 
-def fromstring(data):
+def fromstring(data: bytes) -> ImageFile.ImageFile:
     return Image.open(BytesIO(data))
 
 
-def tostring(im, string_format, **options):
+def tostring(im: Image.Image, string_format: str, **options: Any) -> bytes:
     out = BytesIO()
     im.save(out, string_format, **options)
     return out.getvalue()
 
 
-def hopper(mode=None, cache={}):
+def hopper(mode: str | None = None) -> Image.Image:
+    # Use caching to reduce reading from disk, but return a copy
+    # so that the cached image isn't modified by the tests
+    # (for fast, isolated, repeatable tests).
+
     if mode is None:
         # Always return fresh not-yet-loaded version of image.
-        # Operations on not-yet-loaded images is separate class of errors
-        # what we should catch.
+        # Operations on not-yet-loaded images are a separate class of errors
+        # that we should catch.
         return Image.open("Tests/images/hopper.ppm")
-    # Use caching to reduce reading from disk but so an original copy is
-    # returned each time and the cached image isn't modified by tests
-    # (for fast, isolated, repeatable tests).
-    im = cache.get(mode)
-    if im is None:
-        if mode == "F":
-            im = hopper("L").convert(mode)
-        elif mode[:4] == "I;16":
-            im = hopper("I").convert(mode)
-        else:
-            im = hopper().convert(mode)
-        cache[mode] = im
-    return im.copy()
+
+    return _cached_hopper(mode).copy()
+
+
+@lru_cache
+def _cached_hopper(mode: str) -> Image.Image:
+    if mode == "F":
+        im = hopper("L")
+    else:
+        im = hopper()
+    if mode.startswith("BGR;"):
+        with pytest.warns(DeprecationWarning):
+            im = im.convert(mode)
+    else:
+        try:
+            im = im.convert(mode)
+        except ImportError:
+            if mode == "LAB":
+                im = Image.open("Tests/images/hopper.Lab.tif")
+            else:
+                raise
+    return im
 
 
-def djpeg_available():
+def djpeg_available() -> bool:
     if shutil.which("djpeg"):
         try:
             subprocess.check_call(["djpeg", "-version"])
             return True
         except subprocess.CalledProcessError:  # pragma: no cover
             return False
+    return False
 
 
-def cjpeg_available():
+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():
+def netpbm_available() -> bool:
     return bool(shutil.which("ppmquant") and shutil.which("ppmtogif"))
 
 
-def magick_command():
+def magick_command() -> list[str] | None:
     if sys.platform == "win32":
         magickhome = os.environ.get("MAGICK_HOME")
         if magickhome:
@@ -298,47 +324,48 @@ def magick_command():
         return imagemagick
     if graphicsmagick and shutil.which(graphicsmagick[0]):
         return graphicsmagick
+    return None
 
 
-def on_appveyor():
+def on_appveyor() -> bool:
     return "APPVEYOR" in os.environ
 
 
-def on_github_actions():
+def on_github_actions() -> bool:
     return "GITHUB_ACTIONS" in os.environ
 
 
-def on_ci():
+def on_ci() -> bool:
     # GitHub Actions and AppVeyor have "CI"
     return "CI" in os.environ
 
 
-def is_big_endian():
+def is_big_endian() -> bool:
     return sys.byteorder == "big"
 
 
-def is_ppc64le():
+def is_ppc64le() -> bool:
     import platform
 
     return platform.machine() == "ppc64le"
 
 
-def is_win32():
+def is_win32() -> bool:
     return sys.platform.startswith("win32")
 
 
-def is_pypy():
+def is_pypy() -> bool:
     return hasattr(sys, "pypy_translation_info")
 
 
-def is_mingw():
+def is_mingw() -> bool:
     return sysconfig.get_platform() == "mingw"
 
 
 class CachedProperty:
-    def __init__(self, func):
+    def __init__(self, func: Callable[[Any], Any]) -> None:
         self.func = func
 
-    def __get__(self, instance, cls=None):
+    def __get__(self, instance: Any, cls: type[Any] | None = None) -> Any:
         result = instance.__dict__[self.func.__name__] = self.func(instance)
         return result
diff --git a/Tests/icc/sGrey-v2-nano.icc b/Tests/icc/sGrey-v2-nano.icc
new file mode 100644
index 00000000000..0e9edfd4031
Binary files /dev/null and b/Tests/icc/sGrey-v2-nano.icc differ
diff --git a/Tests/images/16_bit_binary_pgm.png b/Tests/images/16_bit_binary_pgm.png
deleted file mode 100644
index 918be1ad41d..00000000000
Binary files a/Tests/images/16_bit_binary_pgm.png and /dev/null differ
diff --git a/Tests/images/16_bit_binary_pgm.tiff b/Tests/images/16_bit_binary_pgm.tiff
new file mode 100644
index 00000000000..1ce808bcfbf
Binary files /dev/null and b/Tests/images/16_bit_binary_pgm.tiff differ
diff --git a/Tests/images/2422.flc b/Tests/images/2422.flc
new file mode 100644
index 00000000000..eed5fb59e1b
Binary files /dev/null and b/Tests/images/2422.flc differ
diff --git a/Tests/images/9bit.j2k b/Tests/images/9bit.j2k
new file mode 100644
index 00000000000..174f565fc64
Binary files /dev/null and b/Tests/images/9bit.j2k differ
diff --git a/Tests/images/apng/different_durations.png b/Tests/images/apng/different_durations.png
new file mode 100644
index 00000000000..984254b8e56
Binary files /dev/null and b/Tests/images/apng/different_durations.png differ
diff --git a/Tests/images/bmp/q/rgb32h52.bmp b/Tests/images/bmp/q/rgb32h52.bmp
new file mode 100644
index 00000000000..db6e4538ef8
Binary files /dev/null and b/Tests/images/bmp/q/rgb32h52.bmp differ
diff --git a/Tests/images/bmp/q/rgba32h56.bmp b/Tests/images/bmp/q/rgba32h56.bmp
new file mode 100644
index 00000000000..343baa3300f
Binary files /dev/null and b/Tests/images/bmp/q/rgba32h56.bmp differ
diff --git a/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png b/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png
deleted file mode 100644
index 2b84283b7a9..00000000000
Binary files a/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png and /dev/null differ
diff --git a/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.tiff b/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.tiff
new file mode 100644
index 00000000000..b72509cc4b3
Binary files /dev/null and b/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.tiff differ
diff --git a/Tests/images/eps/1.bmp b/Tests/images/eps/1.bmp
new file mode 100644
index 00000000000..194c85784c5
Binary files /dev/null and b/Tests/images/eps/1.bmp differ
diff --git a/Tests/images/1.eps b/Tests/images/eps/1.eps
similarity index 100%
rename from Tests/images/1.eps
rename to Tests/images/eps/1.eps
diff --git a/Tests/images/eps/1_boundingbox_after_imagedata.eps b/Tests/images/eps/1_boundingbox_after_imagedata.eps
new file mode 100644
index 00000000000..08f8c4681a9
Binary files /dev/null and b/Tests/images/eps/1_boundingbox_after_imagedata.eps differ
diff --git a/Tests/images/eps/1_second_imagedata.eps b/Tests/images/eps/1_second_imagedata.eps
new file mode 100644
index 00000000000..e6309a3b4ed
Binary files /dev/null and b/Tests/images/eps/1_second_imagedata.eps differ
diff --git a/Tests/images/binary_preview_map.eps b/Tests/images/eps/binary_preview_map.eps
similarity index 100%
rename from Tests/images/binary_preview_map.eps
rename to Tests/images/eps/binary_preview_map.eps
diff --git a/Tests/images/create_eps.gnuplot b/Tests/images/eps/create_eps.gnuplot
similarity index 98%
rename from Tests/images/create_eps.gnuplot
rename to Tests/images/eps/create_eps.gnuplot
index 4d7e2987769..57a3c8c9725 100644
--- a/Tests/images/create_eps.gnuplot
+++ b/Tests/images/eps/create_eps.gnuplot
@@ -1,5 +1,3 @@
-#!/usr/bin/gnuplot
-
 #This is the script that was used to create our sample EPS files
 #We used the following version of the gnuplot program
 #G N U P L O T
diff --git a/Tests/images/illu10_no_preview.eps b/Tests/images/eps/illu10_no_preview.eps
similarity index 100%
rename from Tests/images/illu10_no_preview.eps
rename to Tests/images/eps/illu10_no_preview.eps
diff --git a/Tests/images/illu10_preview.eps b/Tests/images/eps/illu10_preview.eps
similarity index 100%
rename from Tests/images/illu10_preview.eps
rename to Tests/images/eps/illu10_preview.eps
diff --git a/Tests/images/illuCS6_no_preview.eps b/Tests/images/eps/illuCS6_no_preview.eps
similarity index 100%
rename from Tests/images/illuCS6_no_preview.eps
rename to Tests/images/eps/illuCS6_no_preview.eps
diff --git a/Tests/images/illuCS6_preview.eps b/Tests/images/eps/illuCS6_preview.eps
similarity index 100%
rename from Tests/images/illuCS6_preview.eps
rename to Tests/images/eps/illuCS6_preview.eps
diff --git a/Tests/images/non_zero_bb.eps b/Tests/images/eps/non_zero_bb.eps
similarity index 100%
rename from Tests/images/non_zero_bb.eps
rename to Tests/images/eps/non_zero_bb.eps
diff --git a/Tests/images/non_zero_bb.png b/Tests/images/eps/non_zero_bb.png
similarity index 100%
rename from Tests/images/non_zero_bb.png
rename to Tests/images/eps/non_zero_bb.png
diff --git a/Tests/images/non_zero_bb_scale2.png b/Tests/images/eps/non_zero_bb_scale2.png
similarity index 100%
rename from Tests/images/non_zero_bb_scale2.png
rename to Tests/images/eps/non_zero_bb_scale2.png
diff --git a/Tests/images/pil_sample_cmyk.eps b/Tests/images/eps/pil_sample_cmyk.eps
similarity index 100%
rename from Tests/images/pil_sample_cmyk.eps
rename to Tests/images/eps/pil_sample_cmyk.eps
diff --git a/Tests/images/reqd_showpage.eps b/Tests/images/eps/reqd_showpage.eps
similarity index 100%
rename from Tests/images/reqd_showpage.eps
rename to Tests/images/eps/reqd_showpage.eps
diff --git a/Tests/images/reqd_showpage.png b/Tests/images/eps/reqd_showpage.png
similarity index 100%
rename from Tests/images/reqd_showpage.png
rename to Tests/images/eps/reqd_showpage.png
diff --git a/Tests/images/reqd_showpage_transparency.png b/Tests/images/eps/reqd_showpage_transparency.png
similarity index 100%
rename from Tests/images/reqd_showpage_transparency.png
rename to Tests/images/eps/reqd_showpage_transparency.png
diff --git a/Tests/images/timeout-d675703545fee17acab56e5fec644c19979175de.eps b/Tests/images/eps/timeout-d675703545fee17acab56e5fec644c19979175de.eps
similarity index 100%
rename from Tests/images/timeout-d675703545fee17acab56e5fec644c19979175de.eps
rename to Tests/images/eps/timeout-d675703545fee17acab56e5fec644c19979175de.eps
diff --git a/Tests/images/zero_bb.eps b/Tests/images/eps/zero_bb.eps
similarity index 100%
rename from Tests/images/zero_bb.eps
rename to Tests/images/eps/zero_bb.eps
diff --git a/Tests/images/zero_bb.png b/Tests/images/eps/zero_bb.png
similarity index 100%
rename from Tests/images/zero_bb.png
rename to Tests/images/eps/zero_bb.png
diff --git a/Tests/images/zero_bb_emptyline.eps b/Tests/images/eps/zero_bb_emptyline.eps
similarity index 100%
rename from Tests/images/zero_bb_emptyline.eps
rename to Tests/images/eps/zero_bb_emptyline.eps
diff --git a/Tests/images/zero_bb_eof_before_boundingbox.eps b/Tests/images/eps/zero_bb_eof_before_boundingbox.eps
similarity index 100%
rename from Tests/images/zero_bb_eof_before_boundingbox.eps
rename to Tests/images/eps/zero_bb_eof_before_boundingbox.eps
diff --git a/Tests/images/zero_bb_scale2.png b/Tests/images/eps/zero_bb_scale2.png
similarity index 100%
rename from Tests/images/zero_bb_scale2.png
rename to Tests/images/eps/zero_bb_scale2.png
diff --git a/Tests/images/zero_bb_trailer.eps b/Tests/images/eps/zero_bb_trailer.eps
similarity index 100%
rename from Tests/images/zero_bb_trailer.eps
rename to Tests/images/eps/zero_bb_trailer.eps
diff --git a/Tests/images/hopper.pfm b/Tests/images/hopper.pfm
new file mode 100644
index 00000000000..b5766156401
Binary files /dev/null and b/Tests/images/hopper.pfm differ
diff --git a/Tests/images/hopper_be.pfm b/Tests/images/hopper_be.pfm
new file mode 100644
index 00000000000..93c75e26fda
Binary files /dev/null and b/Tests/images/hopper_be.pfm differ
diff --git a/Tests/images/hopper_emboss.bmp b/Tests/images/hopper_emboss.bmp
index d8e001e2bd7..01d48fa3f48 100644
Binary files a/Tests/images/hopper_emboss.bmp and b/Tests/images/hopper_emboss.bmp differ
diff --git a/Tests/images/hopper_emboss_I.png b/Tests/images/hopper_emboss_I.png
deleted file mode 100644
index f4dab388fe5..00000000000
Binary files a/Tests/images/hopper_emboss_I.png and /dev/null differ
diff --git a/Tests/images/hopper_emboss_more.bmp b/Tests/images/hopper_emboss_more.bmp
index 37a5db83075..01247f97ed3 100644
Binary files a/Tests/images/hopper_emboss_more.bmp and b/Tests/images/hopper_emboss_more.bmp differ
diff --git a/Tests/images/hopper_emboss_more_I.png b/Tests/images/hopper_emboss_more_I.png
deleted file mode 100644
index c417c915f54..00000000000
Binary files a/Tests/images/hopper_emboss_more_I.png and /dev/null differ
diff --git a/Tests/images/imagedraw_polygon_width_I.tiff b/Tests/images/imagedraw_polygon_width_I.tiff
new file mode 100644
index 00000000000..ce1917d61fe
Binary files /dev/null and b/Tests/images/imagedraw_polygon_width_I.tiff differ
diff --git a/Tests/images/imagedraw_rectangle_I.png b/Tests/images/imagedraw_rectangle_I.png
deleted file mode 100644
index a75f12c2e98..00000000000
Binary files a/Tests/images/imagedraw_rectangle_I.png and /dev/null differ
diff --git a/Tests/images/imagedraw_rectangle_I.tiff b/Tests/images/imagedraw_rectangle_I.tiff
new file mode 100644
index 00000000000..9b9eda883a3
Binary files /dev/null and b/Tests/images/imagedraw_rectangle_I.tiff differ
diff --git a/Tests/images/imagedraw_rounded_rectangle_joined_x_different_corners.png b/Tests/images/imagedraw_rounded_rectangle_joined_x_different_corners.png
new file mode 100644
index 00000000000..b225afc2dc1
Binary files /dev/null and b/Tests/images/imagedraw_rounded_rectangle_joined_x_different_corners.png differ
diff --git a/Tests/images/imagedraw_stroke_float.png b/Tests/images/imagedraw_stroke_float.png
new file mode 100644
index 00000000000..a590f8af0b6
Binary files /dev/null and b/Tests/images/imagedraw_stroke_float.png differ
diff --git a/Tests/images/m13.fits b/Tests/images/m13.fits
new file mode 100644
index 00000000000..1f2f82a4f18
Binary files /dev/null and b/Tests/images/m13.fits differ
diff --git a/Tests/images/m13_gzip.fits b/Tests/images/m13_gzip.fits
new file mode 100644
index 00000000000..cf7acea4eac
--- /dev/null
+++ b/Tests/images/m13_gzip.fits
@@ -0,0 +1,366 @@
+SIMPLE  =                    T / file does conform to FITS standard             BITPIX  =                   16 / number of bits per data pixel                  NAXIS   =                    0 / number of data axes                            EXTEND  =                    T / FITS dataset may contain extensions            COMMENT   FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT   and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H CHECKSUM= '0aE73a960aC60a96'   / HDU checksum updated 2006-11-15T17:28:30       DATASUM = '         0'         / data unit checksum updated 2006-11-15T17:28:30 END                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             XTENSION= 'BINTABLE'           / binary table extension                         BITPIX  =                    8 / 8-bit bytes                                    NAXIS   =                    2 / 2-dimensional binary table                     NAXIS1  =                    8 / width of table in bytes                        NAXIS2  =                  300 / number of rows in table                        PCOUNT  =               111820 / size of special data area                      GCOUNT  =                    1 / one data group (required keyword)              TFIELDS =                    1 / number of fields in each row                   TTYPE1  = 'COMPRESSED_DATA'    / label for field   1                            TFORM1  = '1PB(506)'           / data format of field: variable length array    ZIMAGE  =                    T / extension contains compressed image            ZTILE1  =                  300 / size of tiles to be compressed                 ZTILE2  =                    1 / size of tiles to be compressed                 ZCMPTYPE= 'GZIP_1  '           / compression algorithm                          EXTNAME = 'COMPRESSED_IMAGE'                                                    ZSIMPLE =                    T / file does conform to FITS standard             ZBITPIX =                   16 / number of bits per data pixel                  ZNAXIS  =                    2 / number of data axes                            ZNAXIS1 =                  300 / length of data axis 1                          ZNAXIS2 =                  300 / length of data axis 2                          ZEXTEND =                    T / FITS dataset may contain extensions            COMMENT   FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT   and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT                                                                         COMMENT This file was produced by the SkyView survey analysis system from       COMMENT available astronomical surveys.  The data are formatted                 COMMENT as a simple two-dimensional FITS image with the same units as           COMMENT the orginal survey.                                                     CTYPE1  = 'RA---TAN'           / X-axis type                                    CTYPE2  = 'DEC--TAN'           / Y-axis type                                    CRVAL1  =             250.4226 / Reference pixel value                          CRVAL2  =              36.4602 / Reference pixel value                          CRPIX1  =              150.500 / Reference pixel                                CRPIX2  =              150.500 / Reference pixel                                CDELT1  =       -0.00027770002 / Degrees/pixel                                  CDELT2  =        0.00027770002 / Degrees/pixel                                  CROTA1  =              0.00000 / Rotation in degrees.                           EQUINOX =              2000.00 /Equinox of coordinates                          ZHECKSUM= '2f4R3c4O2c4O2c4O'   / HDU checksum updated 2006-11-15T17:18:55       ZDATASUM= '1803906202'         / data unit checksum updated 2006-11-15T17:18:55 CHECKSUM= 'CeA6FZ03Cd73CZ73'   / HDU checksum updated 2006-11-15T17:28:30       DATASUM = '3567348586'         / data unit checksum updated 2006-11-15T17:28:30 END                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             
"
/
"
6Q
O�
S�
P)
Sy
K�
7
+
-N
{

�
�
�
�
�
&
)2
&[
/�
�
�
�
*�
*'
,Q
}
"�
 �
-!�
;#	
9$D
6%}
8&�
-'�
)
*-
+?
 ,]
$-}
.�
/�
0�
1�
3
 4*
5J
?6g
Q7�
p8�
e:g
i;�
g=5
H>�
8?�
A
"B5
BCW
YD�
iE�
G[
zH�
iJT
hK�
nM%
rN�
fP
aQk
jR�
{T6
�U�
�W3
�X�
rZ?
_[�
m]
o^}
}_�
�ai
~b�
�do
�e�
�g�
�i
lj�
nl
�mv
�n�
�p�
�ri
�t*
�u�
�w�
�y"
�z�
}|<
�}�
�Q
���
��w
��
���
��<
���
���
��C
���
���
��9
���
��v
��
���
���
��H
��)
���
���
���
��o
��
���
���
���
��
��W
��!
���
���
���
��g
��G
��!
���
���
���
�ù
�ū
�ǒ
��x
��b
��:
��
���
���
�Խ
�֚
��z
��Q
��#
��
���
��
��q
��
���
��
��O
��
���
��
��
��
���
��}
��g
��X
��?
��
�
�
�
�
�
�
�
q
�
>
�

+
�
�
�

�
�
c
�

�
�
�
�
�
l
�

�
�
�
�
�
A
�
�
�
 �
�
"6
�
#�
�
%p
�
'0
�
(�
�
*�
�
,
�
..
�
/�
�
1J
�
2�
�
4c
�
6
�
7�
�
9�
�
;m
�
=+
�
>�
l
@f
l
A�
o
C>
q
D�
z
F
�
G�
�
I!
z
J�
k
L"
{
M�
f
O
q
Pn
t
Q�
n
SS
o
T�
�
V0
�
W�
�
YJ
�
Z�
�
\p
�
]�
�
_�
x
a
{
b�
t
d

b
eu
X
f�
D
h/
@
is
0
j�
G
k�
R
m*
Q
n|
]
o�
b
q*
\
r�
^
s�
c
uF
`
v�
K
x	
@
yT
>
z�
;
{�
/
}

(
~<
'
d

��

��


��

���
��


��

��

��

��

��

��
$
��
)
�
.
�D
,
�r
4
��
@
��
9
�
9
�K
3
��
 
��

��
(
��
,
�
6
�I
"
�

��

��

���
���
��

��

��

��
	
�

�	

�

� 

�7

�U

�c�
�e


�^�
�_

�[
"
�c
'
��
 
�����;n1��3p�H�\
+��.�M
+�"%���"}DA���GR�7��я
ŧ�c^�wly���s^��ؾg��_Ap?.A
&�u:���'�SЀJ�B\���2�'7���3X�w�/&����؀��w�WQ�S�<vn���9��v!��Ú{֣1�iժ�s��qk�yJ�S�ō�m��\�����|��N���VS�N���}�W�7}���<�Mɓ�o���u?�;��������)vOS}���8�����ރԻ�z?F�y���7^����=N�@����p:��c�xp�
��A"�At�P �AOI��x��Ið�'g��3;;���m0�R�����~�����&A6�ua	��i��[��װ��`N�Jr>i��1��9�)��
�bo<���܍+4u��E�57�%˯�gqj��˦r��x�2����>���`ž��k]>����[V���������+��nb�2�=����
��a��	o0B{�/paC��+q�uk��}���.m�M��}�Y���.���݇�~�8�s�;)������q~��?��i�����NA�В�LT<
��rw cb�1�(	/@G�=��O`eſ�O�o��r��3;3�̝�dr�G����6!��~����g���d
+�>Ejx�۠�����
�xK�L���Rb����3~	��԰�S��'k��֭��Z]<}S=CBU�@
+��75���v�6�YI����؀{P$����ϥ��K�y�;���Șw��o����ק�5ƹzG��^���n���ټ��x�N������Ċ�NYo�h��f�F�!]b�/�CQ���r����w��Q4/�����|Lϰ���A.Q�˄c�:
�pK�����i�L̐Y̊�� �`cao!n`���-%���X|�z����z��,�Y
vIAJ��m�v)G��7�}p
��^�z`�[�=�c0'���w�θ?u�W�I�!�A�e�]
�`�:��`P��{jjw�hp[�ծH���3h���!{P�o��a���aԫ�k2�mk�d���5�����3sD��?�=��k=2d<�����.f�������7��o��U��;<�����ǜK%���z]gM���o���9�>��<�^�GԢ��swj���]�)g����]���{���~����=N�@����
+Z��T��q vb�#�"�A 
+
+(�h��.@��	��7�jd�'g&ޙ�o�kf����@�D&<�'<��P'֋�_x�>��>����Wx~��g��n��������;�G�N.J������C�M�N`���v'<.�u����|�s_�7�a3��)�B�R���
+}J�
+k��I���<•��};�t�
+��V?K��3���LL��������]��m�sn���5�3x��j���s���<3b�)����K���B��:۩~;����<�{���ﴯZ����~M�f���NgR%5����{���������J�@��lm|�|c��}�Csj#�"����Y[�#�bkc�/�X��i�#ٙ����NB�Cl�L�8�?wؾ���Fk+�]�
�<�g�
X��
�0�	\�7>��f���	�����n��=W�	�s^����3�GQ��|�"�ۇ�ΏTk_؞JX�4�J���k8�=&�����þt�L�߃�!�[_f�a�8���|��Ã����6o�u�^ME-]>����KDzy��c��/恺V�y>�*���'qA�esgw3Too���Uz�WI��޴���=]wh��_}���^??���r���AJ�����i�RZ*����KJ�@���x/�
<�1��d&��
��]����F\x��K��'�ڿ��������L����N̬4���E����
+��.�U�H��\
˰Gpgp��	��<��f`�?�V��u4�$����sX�Cx���:v��:�_I]�czܜ�&�8��q=Nź��W��>����[8�;���rr�t�̥��&�u&���-���p[�>_'��X�!
������Z�k�~O�z���8�Gx�g�bm�]��v��|6��|�<��<�p}K���|?���&����_}�16l�nMXw�����ƾϩ~����~c}
Fp
|��}�MN�@�M��!8�I�L��Z�W�X�8g`��{��x�ϊe&]|J2�߳="RȆ1��
+L��v���IE���)���ٔ��Χ�O��܃;�0G�����G�
+>�3��?�5�0퍋�9�X��t���W>F�X��-k^��񬥶9�R�ay�T�5X�C�?�b/��{�et��S;�C:������>�����wp�Z���I��ϛ̹�+ߟ�W�8���������|��KpKM�-s���I�������=���sl���E�}���k�c��֒��IΉ���5���������ß�/��H��u�MJ�@�{<�gPc:=�����A\�u-��x�.<�����G�^|�T��^UW%�t�6��|҃.m�D
#)��,N}^�#��Xs8�10n=w��%����Jc��\���Myb�ܠ�P��rG�r��9Xj]'wgf/3y���4��L�x���ZO�N�{r��A����]5Vm����_�F-U��X�P��@��Hs��w$޿⩟k�ۚ���=��5G�9=����wJ���.@��#l_i�>�B�4�7z�#1����i&'��
+<���5�������/�����i�����MAD����٠���`�X�႐o\��J�	��A
�H�fV��ٞ��T��Ye��`:@C{�s�`���o�s�-y?���9-�LI$������4��S >�G�.�+��5���k
|7�������a'�eҜ��X3����=�q�`�yf{�)r�7���؂pK��w�V����׽o~}󩬼����w�,h�3�}�Rg����z<~�g���l0�`Na{�\u.����s�O}������;��w�P����ř�ه��������o(�p�����n�@E����~,�ۘG@Q
�G�(�D�JOO�q7�#M�1�8Z{�swC1���tA���$}��X���͸V`�S(J�j�铨i������#*?
�^�ȗt����}��[y�9ǜ��Y��L�\K����n�P�\��M��v�Zo_��x����9X��{�A�~����խI����}
3�F}z��^����Ot���؂S����l�����	5��@�af��'�m6��O���V�{߬�u��[�i>?�mD>
+����=N�@��.܃A6�M~����!
+
+*�����-~#=����d�;;;;^;"�1��)����3��:��W��<�FrT眷�\#���������rN�k����ǫ�57�K��}x��[�NH�p{��-��7o(7Y�����Bh�ڟ��{Z}�<��Uǜ��Gx�w��uϞt"����2����y��]�c%����Ν���<_�O���o���Z�xɺ�~����N��s��7�P���D���7|�i���
�~��:����#c�����}�]JA��j�����κ��@�?"j@|�p�AR�TAS���,���S;���u��o#UX���+x�o��'�B�撺 ���kW�Y��%ϭ~MZS����-�9CV�s��,�d��T_����3l�*d�Ĝ�9�̾s�K�ޢ�Z6��sÙ��E}to4ooT�z>���>��\�^c�ǩo�I���;�0��e�����u��s����j��ܳf
+g�����_������+��N��>9c
}���>��sx��u2�����
+�0����kLm+�_��^�z|>���em(x�(I6���"D$�	I�X�-h�^���Y�؃9��3Π�#��)�#b��Zv���6��[����
X�5�����:�}����͡��Gz�0�C�:vO�o�Gv�N$�Y�����E����S�Oҫ��2z^?2�e-V����&~�Q�.r>���0���4�?^'w��<r��Q��h��\�5^�>�t�����ţo(�m�x��|��c�{������{��	�����Mn�0�9q��
U�]U��
X��z$6ܤ��{b:‚.>EN&c�%6�'3�������78�0��.�
tPs<"�e�W�y
+R��s�a�p�/x��k�]�(��Ì�7_E-5|���W����>E�Zǔ��8.��#�Oi�/�]G̹�6�/���
g8�;l���#��0Ӵ����=�n�}���'ͣ���uM.�����7�;�a?�6��ͫ�� ����-h��v�C�C���*�>w����R^+x�-<��_��<��+��S�
K��k����9nA��
8+0ݳ	c���"�CB���%���@�}<���k�&xz�^�3[��SX�
��V�p\y���B�
+��j
+�;�7$�/������3�`	-L`xb_��?Rþ��>�F�w!������*�8��y��h�*D�������|�#|�>��nk�ʘPöϭ3����G�����5��o�N#�����u�R��y�����=�Osx}�7��;l��������*2�^�}�Ը������1}W�w$r�����~�?�����}�;NA�������ޏ��
+�	��Cs�@�D�
+$��*i(v<i{�==cG�(�j��	��3|�n�g�Ԥ����kޘwpDS�iN�n8�����ٞr��'��\���<K�u'���]���w^Śߐb�Wm�<����|�<z�d�ݫ�J羄��,�*����`J=c��
+t��b�}��>�e�'���qʾ���}C���x~�.Jy
�_��=�{}��ۇ|��}m�w�{՝y-w��!Z/_g������L�������(H@����MNA����KxNC���a@4*�Q6lX`�jB�a-��8�v�H�,p�a���#"=i�!�����
��+�	z�뫞Ë�拾GpS��A�̤T)�Gx�-�`��i���{����?�*=�p�)H�	���T���q֏@��w�!�ٛ�=+ϛ�*��Vګgx����b�3�c��.�����p~����3������jX�+̥ٱ:�x��|�WI�\�}J������.`
;��ާ4;���-��y{�;/O�������o.^��xp��k����MNA��;xW������O�����
�¥�p���:�2�K
,�3=]կ{0���M��na
X�
���c*~��4Id��2�5<�<@jƺ
�)�V�`�����>�ʘo��zj9OQS��u�L-�3C�T|��Vt�Ps���k������wˬ����Ι��k���06�$O��iN�w1�Y��sW�?/���l�������B�{��g-�טI�|[~��w��s�2��s�k�h�ω�7ڃ�?���{��9��#�P�ӱ}��>$�����צ����Mn�@�
�
�	+n�aH�LDK���6��,Xp�^�oijj,>ebǿcGD
+��
��5X�O�SƠ�sl����
+ڧ������{`����LɄ$��Hg(��
��
���$�-Q�������/�5�}������Xy��桽�m��z9���{��k�H֚�����>���{j�#�Wk��>���
��L��X��fdv`6r���գ1m
������ꯑ���~���s
+Y��x?�u��q��_{�������i4y�}�y/�~�s���>��x��v�����MNA��
��02N���h&�0a͚�n<�W�_%ţ#,��t�t�טYc��A^���5e�ԟiA泥.�׫�'>(�'Y������`�0�!�8��`�L���>G�
o��Dy�^�wT^xU��y��=��^�j��z�^ǁ1z�K��z��g}��A��.<����s�N$�D7�g���s���<�v=W�3���xU^���c�
+�9�o�>���Ҿ��>F�g����wy��8�ޯ8o�]�uܛ�����_T�fq�9����M�0�{b(@�'Ɲ����x��i2/��_��tZBX�oJЁ#��(�&��Ԯ���rB[�����"I$R��Z�т��'x��q
#؃-X���V���z��n�`�xo~��z�s
�멟8���e�z-�FzѺR�q�?V�&��
�9��i4.�=s�n�/�_R�r��շ?S����oͽ�����z}���\t孞m\ϫ�/{�g���L�6��O��X��g���ԧ��k��Ĝ�8�Ͻ����1����m8S�����J�@D��L�L6F�]\Ae=x�<�
~�5K5�e�������g�R�Hɠ�+Ҿ{�Y�%�[p-u=�yA�9:�-�VB��������=xo�	܁x��@�#)�ՋV��6�+K�D�Ͳ����7������D��0�?�w���v��F��(B�ǘ�
+3g8p�{���?�7�������;������(r��~�m���z�����B�Ɇ{���W�O��$����g�����u\ͧׯ�h�}
��|�#�?���q6��������e°���KN�@D�cpI���@�#>(kv!��%7�Ԑ*�)�b���L�{z��i
�7��-�5�7`�01�G�r�%iS��y!=��.������;����i�?HO��Ẉxw`^ٓ�~=ײ����W��q>�'�[����[qJ���MZ���|�O����y$������O����>~���u��:;�W��<�^���ʓ5��v]>�YGթyҹ��~:���w�o��Έ��s��?VW��C���;��`���Ț6��#��������~~��k�����MNA�˽W�$�IQzf@6�?�7,H�����K�ڼ�JO`�e���~^�t�ٵ2 7��}F��d��m``��h��#�+�r�s�"%wC[aL2)�x����	��S�G��&G�-��`֬�s~�.ѹz�WzJ�%�?�|�7��W>N��}/��Ta|T��e>'�9'S�#?��������6NW���s�����-x�����u��Ǻj��z��I��3�_q���s��k�9����5]�=�4;;���o�l����E�����ϟ}���S����9jAE��Um�f׌� B�@�@ʜl9t�H��
|
�ƿ�wѣ	�TW��CW�?�f� h�F{F�/'�c�0���D}b���
l�
��D}+�<�;Ѓ��ܷ��zʄ%��I̱�K�I/F�s
cv��-5�x_�^��:4�\�0�.ޞ�W����Ӡ-s��5�����z񨖭��?ܓ��&���'x
kp+���F�py��2ѿ�o���g�^�_j>�9o����}��oAmO!\L�~�w�߅��a�}ɨS<s-�?�/J1e���Իn1P1	ٵ��&�G
�	)�C�*J�>|
_��tG�;�
�����5!����x�ӀR�S�XAS�װqˏT����p�XCb�P݂�ZT"ʼ~=�9
Y~�:~fK��0��D�g�h��Qͺ��c+8����9�[c+5�wzVC�~�y�gx��o݇�7#�,޶��sҞ(���0�o�>�^ٯ/��츷Fj뻑d��7�W��Jίr�6�ܓ���Nc�Ώ����?�?H�g���pf��B�?�?���|6�Onp�S��u��N�`��G�EJ[(�
&��'!<�}��3��N2���/��w�����QE��safT�|$�׌_��s�ˤ��r݀�
��7��:㚼�E����m�5�:s�$�VX��de{�`m����:��,ŷh=�g��ێ�>��_�3���m��s]�%[˳�}�{?���<hoԧϵ΃����~#&w���/p��>R��:������|�ϝ����9b������������5���S4���;�8~G�ݗ9}/q�����1��u_�.���7����=N�P���18} ����I�!h8D:.@IGA˅�i4r���}���}?U�T�
+�K�@V�(^��X��$uSo�Ӂ�x���7�>�	�����Z�;��n�b�����Hg�[ҙ�mЄ��p ;0�=͋�H�	��o��_^������ϑ쬆���5�e��b���:��uԞ|>������+�
n�`���Gj�3��9��uǙ��{��H��k�?�S�q�!�ݹ�&�oyNOd�󒟬q�/���|�^����E����*��T�����N�0���M���&�V
+\�� �H<W^�	���Q"��Ƴ㵝�h#��K�M�-ߛ�$�Y%��1�i�4*X���}���	��{p��n����B�1~��ҝ�_��N�+�~Ҥ5I�1��c�G�ʵ���.Q�F3SO��j�I'���Eg�َ�N:=��9i˗�V��oɆc�Ͼ��
x�8ZD�g'�g�x�����ȿѷ�����'_��8�1��|.�|��uu_<�����:�^e_��'���=ڥ��/~߽^�M�G^�����C����
ľ���u�MN�0��X�� ��rJ�m��
��Y�� !��!�ł�O&]|��v�\;3Kfփ3҂�~쉿;�;
�s��P�\��������q=}#�����p.�����׹�������u�/ў+��� 1��:+���#x/�s�܉q��D�اI��aOF�㤀��d������x�V�CM/�w=������w
��vN�vѷ�#��w��C�`?��	\�,�n�����I�cw�Y������zޥz�\��R������^=�O�����������W����5�<M �k��s�������KJADCԓ�;o"3NW��ߠ �Bĕ��\x�`�D�i�ȸxЕY��,	��,�R$���#����ݺ�H�b|~6ClIjш9#���S�wC��59�Fp>�[s��J��V�.�Ja�Xc�ǹ$�u?�w�J�T��۬�gQ	��{��Z����F1���jnkr��8��۟ϣ�-�"�kE'�#�Ї������f��3���p>�7���$�������:�x�:���zn1�Qܟ���w�z
~��2��T)�5�f����|�'r����6�Evo.����ؐ���
ۭĐ����=NQ��@���h8
J�n�7�� � AҀ�hRF����P��<i,
�C��+�wgl?{��ff6�0ܐ�����
�1���$�Ԥ	Ԓ#Q1������<�{��=5kzT|�J���O!1��{)�M^��
�2o/����������w���yx����'�;ށ�xޔ�,��s�|:����g������������o�х�ٗ������+ď`rk�߃�k�Yo�>W�y�̷��^��u�%k����M���P�������I�����3~����	�&����ܿ����	�,�{����MN�0����
��*]BHhb'�
+
+UaSq$6,�r.�8��=1�ŧ�c�����Z3k�9iHK:���;�ҭ/I� �)wzp
��
+d�ۊ^����#�^�����[���/z;�B��@�D���e��_��ѯ�߃[���GƞC�Ճ��Q}F����[��'������O�
+������o\/���
X���XT_�r��qp=��{o��|�.�1֧�����·�����~��ՇsYs���9��?�_��=�g���u|G�8c޲3�����8����3�҉��{?����%���u��NAD�o�\�۽KH	�DC��i(���Z
+>��Y4#�ѥx:�=g{m�ED3pNf�#���s�|��[��!��4M�������D�>����
�ly�-O��ZR�Q�|�O��<��!�K��zj�����������<�W�皁�]O�1F�Q�k����|E������=؁�u߁6��d�3�8P3Z
y>�MqJ򩯹�+�^�'j�#��x�,k���<���<�N�jG{������������n+���{�{�}�ڏ!�=k��~�����y>���
5�)�����Mn�0�sbT���P�(�T��ZXu�;����0�a����3�y��ɲl��y2b>7��O�
X�g��\i���	�t��9���+
�I�s���'�#_`�:k���x!�����򕆄׭~����ܗ����滚$�+�
{���p�˵+0p/�4��%36d$�k�E�~|\����|
�`����-3}��ț˞�F���GO�8�z7r�U�j���y_'����uD��~���>V
+ɸ�}	��k&�"��/b����Qk�0��bY5���X�T�m��ٱ�������{����ޛ&
!d�����������ðC�0���D����ױ	TP�Yצ�h�=�U��'����<�Z��_R��m˯t.��'�1����p�3,a&�>�|�|��
'���?�-�ro�S1g�y���]ØRzQ�o[��.�[���}�:=��ס�J��]�2�άޗh��=�G��������k��{�g~wt>�G���F�������f@wy�:�����;nAD�g�4�
+؏g?`��!��G$�SX�G�\��ZQ-�J��	�4�S=�ٞ
!�Í�0&D�f�{Ȉ����s��;{t�b��6I�9mE}�
5��GI:���x-�)\�Q�Z�'� ��5\۾%f�u{R���^����0���5Y�5؃_�G�
X�7�J���w�>��v�S�w'p������Y�گJ��4%�󫸯��iK�����ɥ�����ۼ�٬�.��M}g��̿�8E"������{K����k��?t�w�K����X����AJ�@�<���i<�M:Im�V��hw"�"�w�¥'����?<~&X\|�L��{y3IJi�~������g�I�c���ڠ��y�
+�A+��5\q�L�9�����{z|95w
��Y���.��m!�����]������&p����G������
��nXÊu����3<�-��~k"�1���^�c��)o���)�p�9گ6�yO������,�c\/���^:���<�l�w�ߓr��l���������������8���??��z~����]jA����]r�����]��	B"x�� w���Q$5�
+�f}�f�����7�0�<� #��A	��Z���h�<3ro]剹+C��J�9�>���+؂w�
N`�M^�+L~_�p���H�;�Ż,HM/&���׵~j���;�CM�����[�4�c?���x'�f
�
�@Oߑ
�?��zc��E�fe�\=W���ca������!���Ͼ/����8�˓�����<����{������ˍƒ�G�R�o�7�	]�_*���}�?�d�&������Mn�0`_��-���Up6lz�.P/�+��E}O����'�3�MJ��~=��GZ���
+3(�O9)Ny:�ߺ�B� ��y�7�C��
+���������ߪ�qR�\�TQ����0�	�Jʍ�n�7�����Gx����Χ�K��u�k~ס�)c�'��
cU�fo��Z�a�Mg�q�/��k*���й�a.ޟ�i^{��~�����}���,�W�m񪗅���������������z��uu�wt߸��%��m�KK1��}��d��2����zqԓ"�Mk�
+�2��N�:��R�i�㌜p�`pGp&Ɲ>�\���E�u3ޓ.����
+fp
����w�XO��+��('�o�;��4�C�t�[p��U�D��`ԈO��~�o�Iϻ�+�5~^�x��<�G�~��WԒυg��=Џל�^������3��O��.�?Z��;���־�y�j�Y�Q}�u�Am�9�g��s.rD�M�9W��q�Z���g������s����d���	T�����N�@���Q[iٶTDM�/�7BL4�|.y'N�9ar�x�%0;g�v�)����5�1
+p{�X��֠�}�!��J������ع�F���ށ{��]��4Ԕ!���k�������,n1�GE�%xo`��J��S�����L�r����3����?�lx�[��`>9����ϒ1�0Ӹ#�Os���M�z�s���we�=�>���)��A�X���}�����~�������߃��߻��h�=��~�!��K�jg��U<}�&�h���u��N�0��Ɛ�MS(�J�"$ Q�[_����;1�f���9|J�ٟ��*)��t�=ѹ#�1�X�-x
P@&�
�Hj�C����z��+�`�Q���	<�.���Xci9F��}�����c>�8��⤭�=�x��O�!S�3#m>�B���Op�|V]��~���(��Q/���8�>��wM<W���~(��"�Շb~>ϖ�c���Q3��x�,׼W�����δ���D=�L>���b\�1�{�|�s����~h��p������9Fְ�u��n�@���3��	����)"��p�Ì����+��7����R�����-�<P��,H�b��:�"�o,^9���V�S��Y�.���g�у��A��-�$}8��C�lՋ4��
�	ިA��k�gp�̑^��>0�_g�8���|�#xg��'p
�����0�[�i
+dƬ��o��H
��C]�/�\���u�QC.ؚ����T~��g+����&=�Li�c�S=����8ϫ�{����?>{J���\Z;����t*������MR1���*!�d�
��{�p�I8�'�|]>��*_�t:y��ta~�#���FG����#��A+� ��l���k��A�WB$>_����I���w�؃-x}c�|��V��=�L�z�$n���'��f���3� �3�,�5�^�c5=�8��׬����<0W�L��Y�f�$=�.�Q�-�o���x�k�k�lxGG�5I�K׷,w�z7�{�s��u�t���}�������5o�������{]O��$9�s�w�3��}�MR�@���xB0!$��F�X.�Yv�8g���/�{UmW&������=��Ý�ko)Y�������h����A~I�>�/c�l@	r"}�+�Vװ_P_�w��^�g�	�����������tغ�����o�~C�=��`�yV���֙Y�����S\����k�}�6�Xޜ}������Yz_9�+�����ʧ4������˜Վ}*~l�S�%�}z��c߯���s�zbq�:����I��)��?05{oӑ���w���F������;N�P�aT����g;��q @A@(�(h����`t@I�"h�Q��ȑ(��7�?��ȶ�tL�����`�9cc
�i`~��c4?�1~\F�4~s�L�^0����v���9�@�X��:������>�! �
+����:(�~�{WE�WyR~O�>�����r�V|.o�9<�Ozλ�+�wwjH9��Ckͩ��y��4	�j������N~�����m����\��]ޔ���|��^�k�ܾ^�j|d���s(����[qޮ�$ֹ�Ul�x�U�yP�|gpaۚ��Q���|�2�~�VcC����MJA�K����&ӓ̟�DM�$�o�Bw�E�	^��.����=l�A=������{�l�~���y���8�
@�hY���D{�1����$����_�E���7 C�y�`	.8�����ܘ�m����6>��Ϡm��H���:�$����\�E�'�{|��=�0�-�S��i����O�P}Bu�>;�w�M�#2!-m�\;�޸������}n��%q*�߃�9���>�3�������t�{���+���C\�w����u����޺��B��n�5�u�<�.���\g��+x/�뼣}���}����|
�z����u�=N�@�'�{Pp7Db�?��$�@ ����QRP"JnA�x��H�Q\|����웙]��P:Fd�P{�`�`
+r�RP���h��$ pm�yD�9}��voƳS�OHJ-ޯ���s�/������\�o�������%���Qdc��5hw�qA݉��84�������xNih��W���������s�<��Ei��^=��6z*�8�v�e\װ��ɡ��8m�YNGuN�^[׌�����x�}�Wp��.�k�4�ޣ��;c����[��k���A�j�:���{�|�3�τ6]��o(����o
��;���<Iwon�{K�z4��'��ȡ�����J�����KN�@D {��
�!�c���@�,���q��#��F�R�Q"O�{f��{�1�#���Q�KB��4 g�T.��|jp.��9���?
+0�o��Cyń�%sm��x��#��{I�?�}���w�6?Ͷgf[?x~Bl��o0c~AcDZ�d�ԑq]̭��UGA��t����){=b<w��P����4����D��N�U��[����ѽ�~�)����~�k�˖�P?���/����[��J���l=Ǭ���^D<���+?�������^��[�YB�����O"��Y	9]�w��=�=�6:����.��܁����<KW������/@����m�;N�PE��`
4,�e�:Db������PPR�*Z((�X[��>�^i�8�=����|bf}[��
(��C�)Aͻ9���|��t�<�rFNC�
+�tp
��=�Ҟ-A�K�U�M>g`��j~��1ud������l��l��{f�xG��m�}�S�R+qDjR1/���9}��)��<g�aJ�&}��2��)��/����qkj6��7���mC�����9��.��=�0G=�+@��
�Q/ֵ�_�C?�-���~i{Ds��y�DWv���i�{�E{���6��{����>�Y������.��|?��	���s��r�JG�ʫ�}?��%
���}�=NA�Mr.�KP!��H�l2��%�B��Hj
+�"*::��܁C�<K�
+�v����x������ ���3�S��w�i��P�,��$/`�b���
�Ds��
؂w�*���&�}���0rg�gAkb��������H�D�	_�c�����3u%�������kƩ��y��߇�yf�����=w�sM�C�G,����8%��|/S�.yw|NY�:�)Q��_0�yx�F�c���<����-u=���s0��
+��P�������q����iH������9��pFln��L�ϡ�S���
+|����ߘ
�c��zv���^�|c^�����
��*?���{����OJ1�t!.=�k�Q;��Nf2�Z�n�AD7���p��/�=�x���G�4yy��B��?+XC��-iEgT�p:���Z��w��Ox�׫k1��o'��7���G$��ij<j*�4�����,g���\��
��<�0;�8�����y��q��Q��g��j�3�uAsI.�ݣ�O{
��c�g��\�7l��c:��{he�@=�7rW�IJ��f�w�;����-��9���J>[����:�s�rV�����zҺ�﷒ulэ��ǔxV�V�~G߉��ij)�u<;���R��0���ϰ<�=�6��Ȱ����N�@��CLb�s�@�@���&B�	Q@���sʌ4Z]A�I�3��w�uJi��4de��)Y�5)kKpRAqZЁ
\�'�	����ikY��=���|�{�Z�^x--5��3�ՙ���m,o[p��<�7�
+������������d����=O����\�1�O�Q�g�v<���X_�jU�h��� �d�-�C�n�7�,���ۓ���K'�����m<�������^:�K��~r��.U�xb�%��]}��8�N����܁�~�w:�����Y<O�gh_�E�?}��U��u���@D�ň`C
+�	����Ƨ�ib��)�f=.�
����}�|��̝�s
+'w&�����6�*��<�����3�|'�G{$�M�,P��9�r�%^B��K�F�h����QfB�=>:{g)�1.����D�hjZCs�wj�n)}���9�m���3�<j���Y��jE�!_��>;����y97���q���
aX���O�=�:�q�x�t3���h�sm=�Y�n������9�����}OD��x��@k���¦��}��n�0`?q��$������T�C/���z��Ե:#
#��$Y�;)�e��h�����3��XՄ:XAbZh����E�va
+r-e�c���x~�^���h�>&���*2�3����-��5n���q�ظb�z�[㷰�:���.�Nx�y?!G����`�
�b/�l1�=~GY�n�X�/b?��[�
+?���gx�<2�F�4�s%��t��t�\�9b����d��s����{�k����签�w8�x�����w�fƿ#p��������MJ�P�+��"܍bML�<���**��8���I�Q�Ν9p
����%|��{���3���Ρ�*�O�SR��J*c���$�u,+�������T�u����1�k�s6���e�^�7�4�q�~*+ޮ�,aE�ӆx�߯%���G�[x�o��}|?�1|>3�[��U���(���
7pO�p��K�Cy���z�٨>��r�g_X�
�!�?��9���>�x5�A����c��?7��#1�=��Ɇwˋyk\�;���g�k����c�1�r���9�������r+Qٰ���=N�@�'�@������
;Nb�8��!��������\����VzO<V
�⓽��ٙ7㉈2"NA���"~~�G������;���`��܁�,gH�s2���9goA��p]d��
��/�h��������N���|���I�3��gw�-~�R�	�Y���܀���@�:;X��6�'?c�5��%k����M��5x�|�X��(�9i�V�BqH��u��w	��'����
+���}�z{_����u2���ԌI�������{��"i�&���e�w��r����kX��
���n�����͍M3 ͑rH4_��a�|
�ȉ���u�IN�@E�G� �܃��1vc3�b��ĴcϞ
�
+H�����hً����~UWu��r3���Ȑ�>p��ߗ:���G[*�E���������%���`�:c�����l0�x�ԛ���Я�Ԉ)�OZ��g��M�P1O�t�%����P���H_q]{�9n��Y�
+��
+֟��13���W窩w�ޞ�CΫ�_��h�sp^�#����R3�Xk�x�I���&
s�n����/Ԉ{�,�k�Z������Ϯyuͧd�Яw����6~?ZKKg(ؗP�3x
��\��+��S���|9���,�E�����Qu��������Ƞ��
@/�,��}�MN�@����%���i�4I����#@�.�`�
+$�6HHHl8
��Y}f�X|Jfb{�lOD�%"M�C"�Kl���u�|z;���x����)(�x�܁~o�_ڠt6��yy=}��p�`�8)c�E"��e��
+�:m��=0�����L�wD]-�OLb��._��<rb~>��y�y����g`���Hm�����38qz��r�uŸ�Ҙg�]Q[X���G�<�9���6��z��f���'=�sG��]ƺ_и���	.+���p?��T~�Y��3�*���
�O8�6��c�:=���\���󷞗���Z�����W�y��YxGmV�
+���_��u�{g����z��e����
��cH��uԹN�@��ax?���N|� .!�8$A"�!
=-/A�����2Z��S������$ι�s.�)�eZ2dS�Ņf�����G$5�0�gx�X���'��Rܑ;44^�'P�&��B��Pj�1�KL
�Јk40�9cZ�f�xcn�c��v[��
� �}s����%k��Y�zĐc�_c^9�w����=Xg�2�vna��p[�qN���>6g#q�k;����1�Z���'��+�Fj���ƶ�c�A�tl�t^�A��fp̺l��}�_?������s�mx�w��>��3���H��p�3�ܼg�燼�)�p�{)ܼ���4�}W����LLݖ���{�o�y�M|�X�r�����=N�@���[P�pNCIb;v��1�A!���4H��P!Jh�qN@�[�4š�d����ٝ]�H� 
1�H����.qv�:��v�#�/�\�9���I)����%a>�eݧ����
��kbX?�l*pD�c�;���ı�5s��_��M|��-��p�����9g�Ԡ���>5���z
+��/��o��_`��F�}
���\g����5��������׌�~B�6��������7p�z�~�k�շ����U}�ԇ�_2�j��yk���w�ދ����+��,{kN�}�;�܌��γ\p/�WzoB�)�����?n9�mi��cc�
�^ư�}�;N�@��-8���@b;v��ID		/A�x������PpJJ���W�UD�I^{g��6���
��2j��ݡ��N׃=
+�t��F»�q
�|V|B��4��SE%��f0f*���z*���G�1~?��Ռ�çYk
����p
+�4q��G��}j�!��?����x�x�/�e𽵅�7ܱ��y	��7p��]�<��7Ѿ��w��yh}�g��l�6�9��W��6�YN��c�
+�����'>7�[u��P=���>�h��&��x|շ�'w�r:➯y��ʖ�&sz�S8�wxelc˺�w��u�����vb���A{���n�WV,������J�P�G��O�iӦI�4i�V+�ZTE]�p#�7��O�Vp�z\�
+.>���g����.� %-�NtNH���>胆�����������m����y����� 9�{#�M�*���
��^�GdH[?�_1�ߛ��a�������;܃���T�K��ױ��&�j�1��c�zO��,�5���8b����
8���cMi?3�Q��Nő.��g܁w��Z��P�n�e]W��)kh�G�Q~�%��Hz��g�c
+w��X_q|�[y2�j�����ܲg�I1Ҁ{�q^'��L�~�[b�w=��M�����v�b���_�������V�j��u��.A�k�9<��c�t�L�݆��aa��6Vba�!$�֩�9q���ˤ���޺U5f�mf_p�PB]��"-�r�K=���(��ǥ��~I�i���Ρ�5毸E�G�7�s�̦�ѼX�
c�n��n�̍R�`��^�>�f�`fѾ����r���#p�
l��ű����b{ĵ��n���
^�Naӭ�c8d��̭��ȝ{��T�@}��=5\;�u	\WcKW����p�=�r�	�[�U��Z�F麅���}*y��>�	4O�����^��֞+�(����'��1�T����'suk�������ߧ���:{�fh�{�g�;X��W|տf����$Կ����Q����;N�@�	���t	a;6~�M�Ѐ����q�(�8g�_��'e׳;;�qD�"���#�a$�A)m:����(��8�'!?��<��/�G0�J������cr�gf��wR1W�֗f�=���	��+�Mdi����\2~�n��o9�Yw���\�|�Z���+=Ü�}�43�:�yv9�ς�o��5�u��iHǵ��f[��k������
���Mކ{s^=CEי�V�8�Z_�9�g:�u�������LX���'�������T�����/�o?k
�;��x�\�����n�N~z7�{�=b
c���9�?�8:�}��纰�m��.CA�)��ƽw�����iO�=U�"D$�åK/�A��O�'�����잝�=�i���VD�v�t`���&um�P€���T�b��o�>w
5U.w����r�.�?�����☒�4Ϙ{{
+פ�W���?Y�Yn��*�7�;��#���^�M`F��A�x�Д�[������
k����o�[���Ӑ}u0a�$�uN)��$�z�pK��wp����XEVW�~�˳M��{̗�sP��z��y��u�y�����`_������[SƔ�6g�̽���3���ٝ�uٽ*�7���]��s��"=B��m��NAE�*��<6�n��%!<�� ^�@���E� Q#*
+��;p�b�G�����y��}��+�
c��[�6�y���@�d\�
+4I�ہf@룎T�%PG�A���n^����
ʭu�7_AZ?;���>�#�of
�[�3[�ĸ
�
�%�:��_}֤�ܘ��)�1��U�f�đ�H�>�������7
+kK�M5}Sj�/�]�}�c�:�#pN�����ž���]��\g'ͻ���̨Iq�����38�?�����ދ�{�����G��Ρ;�9u-�+g�n���\]�ӹ��*F��K�=��]Nw�����<�3[�KTϿ����z�_(���
���}��m�MN�0�qN�a�q�	Iڤ)nZӦAˏ@H�N�ذBb�UX��Y}���.>){��xby�5h@����	I�^b��~ H��Q�$��F��՞�!����i�M>�
+��<�{��3热��\��i�IA���������Wdg���<�7��
+��#����9�p�+&ij�}j��sܟP�q�f�C��̘��`)�YY�'����S_E������䡄8�&~��%{���7Z���<s�����ԡ�����<5�E{{ͺ[��lĻ�Ľ�C����A?�F�������I������͵�m_��$7q3�k��?��ܲ���_��/x�U6�;e/��������#~G�ɶ�]߉����ϰ�m�9N�@E���3�s��`c�f�x6�1��X%��D��3p
~I�K���'����~UWwaB(@vIvH�$n-q�=�
2�F~�7��Zo�W����|������\�p�ίt�ק�܁0
}��pO�1M�^5x�!���5�?�	8���O�\��ǐ�MϜ�g���'��q��*2"ڙ�1���c�8�U��X�k�H��C����'.����-XR���W��̷�������������Q��Q�+����9k���n��p��`�g�N-����Fю���ч�7O�ȟͩ���P������4��
���s�fő�
k��p����F��oK���M�����?�����m��N�@�]fށ����$
m�&i�4i
�@��,�
!�̆XXR��
+�)�U1|r����HOD�![���
ֿA��i�`t��8}��1?0qNg@����	��#p�A"�9���IB��}i���fSR���)��S;�ӎIB�+���;��VF{Y�률V��?��
q=߂�	��>'SRp=ẢM�GD��ޒ9��.8��
�s���������F�<�x�\K��,u���)Ycl�A��9�gf�9��91��Y��nDl_�����݀o��*��ߺy�B�#�90h\W�g~@
�q����������YcŚ��I]wk
<����>��#�y6�S���o��;�������wl����3Z�/3ZoȰ�m�=N�@��jz
+n�8׀�$�Ipb� BTP��_�@	���Ppn���;bbQ<J��ϬwBh��A���ǷPC̕�.�I%_�Ws�7��#��3q�����Dn�Y��X�̋2��a��yV����2 ������(d(Gr*)��br���+y�;��.�O���fD/��uA=��1�_!,,ˊ�S�͟`H#~�okc1t�Ky�W�;u=�^��}z~�պ*K��A?9�fyl=F�Yb@\����Z7�}X_VI�n��~�K�O�l��w���ɣ��
ke9Z�}ֆ��v^L������J��>M���m��׌��_�ħ��f��=����u�?P��4̟;S�6����޳��� q��_m�w���u�;N�@�'���s����&��	��@�
+�����D���
+\��?�y����ڳ�3��>Dd ��@l�����ۻ��#���<u�$!cP�!��č9wn�x'`B���~;��8?�}��\�5��Ωi2�9�(�3�Rsn��r���Z9�c������ӱn�����R�Ґ�9��SPo�u3Ұ�Kp9^P�ŝ�׾�\���<�O��:X������u֤`�p�Rڬ�Vo)��O\M��@��{v��s�Ѽ1��孂�v�Ri�U���٬���ο����N�){ٰ�=i�[��]�l���M��`
�k֐I{M� �4���Ϳ�,���YF����n��u��J�@��{y�j�&Mb����R���EQ�O>�A��у7/�U��_����l:;3�ݍ��d�mآ�k��m����N��:�H)�������N�Na�4f�mȩO�_��3�#�Q�\%k��pHsW2g��FAZc`��̡����ሽ��}��Gx�g�����c�)��?]�.�~���������:�����o��:5����LH�{��I(g݉�yƱ����Ծ�yy�x��c��	9¹���_����s�8='1��������������=��p��DZ������:����
}j�fʹ��}/�����u�
�}��%�Q�����;N�@�al�P�VB��gb{�؎�'|Bt4Q� A�
+XK��^�1�Dqd���{���sm�t�;�e�H�i^;2���Z&~z���1�$�B_
+#h��|�p�5a�5\����!�|�\�s�1L��pGgPCż��7�<��k���y��n��3����gx��ceT�g슔�ļ/��œ��w�66a����'��s��Ѿ���1]�#���Uù��4�N�bL}?�����G5�.}��(��P�6��ڿ��ѷ�훺��������(g�O]#>����/Z�-�gb���̫a���
ny�
+�;0u�{+�u�ĭ�Ih����n�ls�ҝ�x��k������m�]N1��N\�[pCfgg�?�`P������&܌�xΉ7�_����s���9w�v��֎�����s]�ƍL��A
+r���U?�cg ��gFl-C�g�����~
+CC
+�fԒ��(�܀g�
+�����'�1�*NC�K�t�`Z�`�5xo�<�G�J/g�5s�3ޚ�ү�~�W���v��pW��?��q�\��+
�9�s��=����?b������.���Dw �����܃���W`����-�{��^˳�r�����R�W"�=��T�i��I�jZ5�yտ8%�!|g�Yk���
+�Q��-��3���l�+�������tI��^��q�v�D���q�����N�@����K���(�
+��#j��ݸ3х��k��">�1�I�	���K�sϽwf�s�霫�:�Є�?�L��k����⊏�uD&�b_�EN�-Z���'�'�h�s 
+1)�}Cf4(�
���
+��.�!E?�Z܊b�.#1c���;E��K���p)�ģx���1=���������&>���p��/����Ľx��"��і�����a�q�<u��0b��x[Jg�e����Wԙ�C}�����e	���.>4�戾��2�T쉺G�}-���s���=
�1��s	���z�;���]��'n}'m��
1k�h��[
+>a��~�����6^�^l�c��/���
�Gݎ�������}�;N�@���D�
h8-uH�؎���@$	�x	
+DAGEE���� Z:�E��a�(>9���z7�HDhP�Z���|H.�n�"��Y���kަ��ͥ0�8�(9�Q׉�]Ƶy݄�ˠ�Q0f�k���̙Qj����v��`��Ǭ�����m�naz�n���9����9��<�5kV̝�n���}�������,���^���^1����	3x�7^o�&\��?�vYk�~��
��-}�}�x���������e\�[�;+����=N8������5.�:���n���+�7	��^���:��{��@��g�h�����?kZ#1ڌ	�sN@���L~l(��v��Y��M=�;���B��7��Ѹ
���H��d��m�=N�@�(�7����c'Ώ�$v�@H��D
���@ (�
���x#=����y�vv��r3;"��]�O�ZR�˭3�ڠC�%9��h�X�G`
��%��4$.��4�3`n�>�;�q�a^�4�����z�V��D�r�m�[��	ǩ�x?��G��u(�Sp��{t(uK��9�u>�V��Vw��^������xG����M�CϿ�=k��9
�ʞ����1�r�>t?����.d��/�Y���nIB�ƝSw���R;��!c_����ӌ�s2fS�ףV���?s?�B��&9�H�B�g�׉�9��I=��w�o/�u��e]�`@�VMP
�_F���*T�ݣ���e�]#xH~
4�R��m�KNA����+x2���3<AT|$�Wİr�
��;��[����ŗ������{̬cf�8��|�!�E]4EU�DM�Kh����$�������P\�����#�ւ-��8
q���!�袷�Xï�ܼ��s���Q"��H[8�^�ŋ�-���S#����?��ˆ<�.y;m|oĻيz��j��%�����
�fh���M�fk���������`�ym���yZ��\N�Y��������ߝ���0�1|?�'qE���aB��6�1�S|=Ǡ��	1{�~B�#�V�����ǘ�Sb���{��<��x̔Zz�S��ga_����&QߓD���U��{�w�����o/G>�kt{�s�~���?��>P���uԻN1�
z:>�����	���;�d!��w�K*��h(��-5%��ܑ��%�������k�̺fV�<ȟs�F���	ԡ	)Ԡ�pM��Ɣ�����P!ۉ���� F�1+|'ޮFw��ԧ��J�y���Y�x�w��op��z���?���/��!���6�F��6nj!c�&
8fH[��}x0�Y4�]0�[�U����
�p��<L�n	�����)��6e̩�lS���pq�dQ��Ź޷˼���'4溵ޞ��zo��~�Zu���?��	�x�#�w�p��dg���F��7�`-��ü>GgUt�t��v���߶�~���{����:�������|�|�?M�V���yƉﮄ�%���5T
J��H��m��.aǧ}��
���:J��k�G�U[%����{D%�V��".ĕ��b���/��|s�vFDb)�%R&�d���_5�$`���u�vU���9���B���n�&��Ű:�Ϩ�>��j��4I�|����rȞRp�E
+�`
+�g�����k��y0��;ߨE�&�\#��
Ș+q��:�1���#�96�8
o�?��#��n�%���E��"�
+���֑2W��;����ͻe_B�|O��g�����xޠ�:��O{}����>rs`�&|�!�+c�������k|��.�؜[|{��
+܀��
���������N�9��:SW�1إ^gM�����߯I��G�	r �����1�m�K��;��~Ϫ�:���&�#ݰ�}ԻN�0��7Vx
+&��%M�Z�6�-�".�K$&���ÈXY+#;����#1|����'vE$�
+����{a�B*q\X��)����+Sdb�j�~?�
+�i|��bOB5Ob�X�o�׹�-x�o�`f�~�SB���
+��Kh��6�ի�!�t��z����tɽۄ��;��#����	��;|�-r
����
9�f�w����S����ye&�ۙ�qM����9k0��-�o�}=>�;[�3xF�2!���[3�����gva���}��5h�5c�܃�75Z�����ߦ0qz��3f�e���5q���29Sc֣�9�������ӡL�?��z��;Ѡ��CO�����U��ߙ���L.��u��J�@�q�����4^�j��D�B�.A\"]("���
\�Vܺr�?���8�⣝�9g.ͩs��kMhC��8�e�̸ab{�J	tL�p�P�:�2�8��m���`
V����O8�Z݀��n
+[pO���38�	lR
w�	p���r3��3�7��㑩'9
s��̽�2_q;p��C؃
+J؅x�oz`|νȈ��
s�k�Ņ�}ʘo�Qq͚wRp^���+y�	��?�i
+��E3��~�o�d�بhn�w�����7�ǂ�y�)kk��T$&.5s��:�\�N�t�p�濻����	���7�3�q���v �P_G��?�>>v��M�s�u�����а�u�KJA���|�+��hB�s�31�h$>AAD\�B7�э+O7���_�HS��G�{�j�&�B��?K��UYA&���E�8C�����W�̱����˿���eC:RK']ir���5���r�:�YC3�&!;r,Wr+��*�2a��=�k��1���.#�D�z��
k��M���:^�I�e��>k��5J�m��^��3!���^Jԓ;V_I��[���J���T���瘂���Q���w��=|ȧ<�!}�z�$_��J�����Ws�2�oY��'䴾,6}G�/���(�i�f{"��K���ك�<��fu�{<�Ϲ?s�\�w.���c�N,3_�7�M��u���o��:C��}�9NC1�q��9'��$$,�FH�B�- �	 �B����T�t�o��%�$?%��g�~�s�e��|�ڹ@&� =��<|ۏg#�H<?̝a� ei˅\ˮTd	�R�"�8O\o��b��x��P��4�gS��(/r#{�WѤ�}�I#c�i�Y[";��J����쓿#�r&r/G<�˹N�6���Y�C�w���M�����|�$�����3��։�PDZ���g��MX�yw.5)s2����P��|��*Wrʼ5��~��}.����΍�]L|;���9K�>��	��ll��-���}�U�`ޛb�eJ��sТv�Qbv��;��F�����e�||��w#�|[���[�t��Ut��7�w&�
N@���m�I/CQ�Ӧ�����;����*m
E̒"!��!ba!6vb+,%l�_�{�ωœs����c�Ml�ᖏ�
��)R��	�����g����'�Y�A��
ΡκH	��qm�:��k�Tr�i�C	*Ѐ�1��c+���s�f*k)P�J$e3,�1V`�cv8�|�;\�M��-rC�y�֘6i6T����⟇��:�u���¹f��X�w�Q�j1�3��~oq�-����$p��B�>��+w�N�c7�|uWU�E�y)߄W�gL�'6��ۗ��?1�6��9���������<߂ڧ2�p�1&�em�7���a��p/�L|�3�e��;+wXޣ���
���}%���sߏ}/��qߗn�s���>M�~{\sh��FH�/ҿEf���mԿNTA��l �`|
��(�@|:k#v�,fA��+�,A���!�B 44+_@KH,�����N2��⓽3wf�9sg��F-5����"�˘x�+̢�vA��4?��BFQ|^x~�%��,���
+�z�D<�	I�XcѺ��O�9��rӪu�x�=|�>�QG3�C

�inP��Ȭ�,`ﱉ��M�O�s��w�u��Jh��:3Z3���N��a�&֕��bE5TTNJ�l*΂�=�׊W����z͞WSc�n�SW��G]�B?�_�����.�s[�wx��o��C��I��]ʵ��ѷ�������M���u<6�~n���Yg�Y�)�x�}�/�78�7��M���-����*�/��C,Ʒ��:�'�}��O�7e�/YzfK��u�s8�����(Ih��~����%{�-���*Ę���]�?�hO*�?����b�S殟����K/�Q����5t�=XXK���Kw�3�aF�J�-,h*,���'�hHl-$6"}����89!���<��_΅���Yw�K����J?���4���;">����$�A�c�x�O�֜�Ȁ��N��~�~���aEF}�b���LhNV��y_�.���P�$r��շ3X�:V�ˬ��f)jI�����J��dZqr�-c׸å�.���[���]A�$�-��I�u��sS�/aQ���ǜ	�N�&.�9�|�
��}�:S��=Ļ'�����x�[���rLI�~�_�K^�˪��^>k�2ꫨ��{�\�U�1�a�k���v�s{R�9����g�{f����-(�H�˟#�N��k1��*֩����iP��Vw���vg�ݷ1�<�g��y�n:߷�~��>��q�
�����=��K�ר�鴗����1�
lڣ �����.CQ��ik&F����x�.U�P��j�K��i�HD���!f��x	��';;�/眵�^������HLD��i�;��́E��I�,X�`��=�0Ez�!��,��"8'�R3~��E-�����%&o��I���]-�`��yyP
5��~��(�Xa�����18d�So\��0/�>{�����RG�lPO}�T_��
|�G����~�ߪw:̑�?��d�-��3�@.���}����V�
Ʊ�DM�"a�����;z��(}��'p������o�U�{��4�ƹi�U��iƫݚ�xA�"w"}C�6��6�T��X�>�-����]"F+���:�[o:���йA�c/웞?s����}KZu'�qsG��,�������{�����Iz�a/2��k���l�
v��m��.CA��J���6;/`�!<�����T�����W$*�_+K6��Ζx���O�4w�˝�;sf�̌�̊H�:$���m�P�"�Eֵ�ucF��OM8���k�2v*09�_�OR���!�g�~S!�d�3����=Wa`�_[_
��/�%hA��(ql�q�k�#x�������@�Nܼ�	۰�o�p�t	����G�]p��-���N��=x�_�a��s�H�قM��ɶ8�0W�H�[$�����D��o}�����9:�C��ʵ���ʁ�o��͵�yVF�L�����-���]�
����\��M�gigkw���*���g.���5|A�~�Y���ӻhw;�֬q�����=����{�;g�5��H:��ޭ�N�e�p�&B��?�'̰�}��.Q����<���1�괔jkZ5��4B��vb!��ʆW ��?��dt����{�9�޹WD�D$1i�����C
(�4L���L�3F���4�@y�d.�Ϝg�m{��K��X����f:�)�Z��:
h�k��g`��\�<�`���Tc�\�;|���
�ëHW
+�*����N�pp�i�/�Z���9n�cw�μ
ٱ!�߆G��'8�5X���[��qXˠH��HjT��E�oOt����/�p���9��>7�
+T9�%�e�{��u�ܷ��e�+�K�wO�D�7��g�����YfL�1U�qgA�D��ճ��U���X��������~䙷h����{������tϓ���fcuT�q�>)㙺^�w�
X�W��u��JA�
+.G�B��l&��uL�6�$C4�D�݃E!("� �����Y�Ŀ�_�6�������펈E$G�(
d)��·�"�:��5̷2�@�뎳��Z/��WW���1^~ZP��
+2^�g9���F�S�Z=�s�!i\���Ad�+ܧ�ց
l�>\�;|�'<���3��
��s�uv����-؃ځ>sc����o]�\�~���qm�n�_���5��:�&��`�����-���M̉L���y��{�g1�z�����1���,#�W�A��x6M��&��T��Bڿ��p�*��S�]���XǞ�:s�N�x>�#�;0�Z��}s�������a{������;���L����8�wx1Z�����8��/Y,Ű�u��.A���,l$<������M��3��e\"q�B"�6�be�^�<���Tf_f��ԩS�Um�I�1S��7�&eB@=�Ia�1�$�4N:�n1W
f)g���-b
+)r�/�"4X[F�56f�^�uݺ��q��٢��RҸ:�do�`���qJ��1\�9]���
�`^o}�p��۴
{pOpG�	�K�6�ͮS����d۱�ڥ�3�-���Jj;�gx�G�a�_Xӥ1؋
+�U�����`���g�.�5]q�	k���g�z:�E�_��]�^5�NENn���Wɹ�V\��ճ\�Š�:�Y���sX�0���;�$O�qU����;�Bw=���;�#����X����[�{�;4�>w�z���~7~��i��u�KN�P��j���VTZ�WA
+��j|E�F&�q��7����_�O<�)�/m���܊HADbH`N�6�k�2C�qU�9�3���He�ӺG��m�N��[̡a�,�9�G��WL_Ŭ���5�8[��>�ű
m��6u�8�Wx���{�	�DB�0����.���1<���	&p	���u28�uĘz���8.�i}97���rO�!�����~L��i
�u�)2��!�]���7攙�3�5���a�O�K�<:�y�{YZ+	�u���}n���-�q��Ziz�Z+.�����c�9s�[���.y�VcҺ�3��\_!G䉹n�Y��D�wl�v���o����x���/�_Ϧ%���m��2A������Byo�d"7�MRAĥ*nE�,U������P����
��?U'�⫙>��t���HJD"�@���!�4�x��
+d9s����-��-�ųd�<Y��D�+B�k�9Vg�P�ޭ��Ux
��rl�l��λ%/s>C�bj��_��Hb&p�gp���Hr\d�t�>b��{e�
ܓ�l�6�>lAZ�a��om9�
�`��l��v���!��}���9��tٯ5n�
>����u�����$����J�3|�Ϋu֨����߀{�:n�m����k�޾	U�;k���~Sw�l��b�ՃzEG�]�'�?Ӹ��;y�{^�������w_�<�����;���C;�7�D������a����i������o�*����m��.Q����{�x��ә~�N)5UJE�R�c!V6>"V6+������IO&��%s���{��+"���P���

�(k�R�y��H�
�Is��S"�k;?`��A��D�*�9�`���c���`����Ye݊������y
+Y���ʝ�&܈d&�2�h�\�=�"c��3h�!�
+�p	t1�@��n��#���
مǯ��	a�����ZW���nq~��cZ�.l�)��-׾��ľ�`�_3`�s���1����ҵ�̾�y����L����>��o���\bN�_7�\k�g�b֍���)���Y�}��\sM��e��^���ѽӻ�v���y�{o��|�7�'����̧�5w6A�ulZ�N�^ӡ}��m��/A��"q���;��.�m��n�����J�UBS4�W\D"���A� w�I�/���'�;���ٙ5�d�1��@N�(���g�/Kn�|���"��/�<n���
5�T>�yB*1�W}
�$�~Y�^%GȾ�"�#�R��θ
+k6�u����֘�1��i<��>�mS�m��,L�~�7�Ø3�C�k�`�%e
����^3��Ѕ�1vȹ�z�=�����
��r���>w�y��&���v��W|�k�λt�gs�	��̹�b[\k�ȶ��-��\���v��g]���������<}��3��.���"{D�GW}הuٷ�GΥ�x}�4��� Oə�g� g[�#�%Nrg������?��/�9������.Q�;���+�{/et�a�cZ�*�� Q�B����H��^������$�_f�{Ϲ=u�e�sY !eȧ�ߌ�'0���=Ӥ��?��)���*,�$��s�}"�8�%*Pެ'd_*R�9k��8%�m@�l�M>+�%ƪrN��9o��X�}xA� ����p��	;Ѕm�l�4���o�=؂u��`<�{B����(����n�����ָ�xb�S�5�d=�|v�Sr��1�������e�m���v9���-3��R�*�f�k��w��[��޻�%�y�ڮq?zg�={���#�,e�)�
+��\�=�����8_s�S��� g�\�O��t�fRt^�~��w��m�?�&���lMK{�?�
R�t������.�A��A"����sx��֥Z�Z��PE\q	!DXYXX��������$����d�3s�̥3
!�CY�Ȉ$03c1��;>ͷI��x���X,>>>.�&GE�(Eڲ�3����ob^&#�R���>�
+2�|�|Ok}e�J]���ILDX�q���L�);r)��^+̻*{r*��%-�aI��Zne_�������ڕ#rn��E�ms�z��%��n����5?ɛ��#��~�i��O�����j������þ䄲�>����Y�
+{lDb���+���ؼw��y7�/��H��8O��^�=��C��K���W�c��N���X�������W3ڬ���l�
+9�
��v6��g�=G�k"��%��������s"6_�M[}�?�
j�[���mԹN�@��z*j:^�'�-� ��$8'���rp��H�$h����DI�C� Ŀ�_e����x<����ZD�Dd��C�8� 
��B�>F���g�����>%)��(�����P�*T;��`^����j�>�1BG�=ס
�sd�Ӡ
+�r��2���ǬS�"�)r�l�����	��;�y-jC�y�T�6���1�p�>DFf`�0������+��z�O�O�$��`�snq=�_�����<�%r�5�{f�jq�H=���*��XeN�ϡȽ6��W�y%��4/���>�|%2�w`bVds�Cl
+�N�3�w�@�ڼ3
+՜���3��������u�ʳ�y�I��S���3n���z��;5���,���������{PEI��m��.Q��ҕ�����"v�5m�N�I[�.��"���D���H�<V��$��^�_f��9w#"��"�!	��$�C
+|�
�-h@̑�y̛�"`�}i���Gn�b|�2_�}n�_�[��8��c��v8/p�m
�:�
+M���#��p���"�洼��%�l��ߦ������:��2������
n�6h�m���:l3^m�λ��B�&E��j�D�����\�}��ߘ;	����H���*�C���^��k�rO��a��U�4Oϩ����Y�
+���]s�m��<%�}U�5�����|'����дHb5�B�&�7ʺ�d�Z���I��)s����y�1��cM�~�S�Uϼ��E�S��wϸ������t$��f�����μ��@����u��JA���C�O>���iM&�,fsKb�w���"T�y��A��	��<����4�>z������fDdZD��k����Ƥ`rP�E��2�!��G�̹���?��cd����?��q���,��&��&�� ��=�+�G��:��W�sdxv&9�sY���8�9�Z�Z�
+�a��%Ɩ��>[�uh����B�Zp
+m��&c���-'Vs=��FDp�	a,�zF�=0̵�}N����
:p���\k68�ޡK��	�p���s՘C�D�He'��Sa�s�]��6�D�N|G
�w�V9f�T��q6�8�1��Q�z�9_a�qV7��֚֘֋�sRz��e��i��p,�yU�A�{�9	�y>���������=[l\���I�6fs�?�	�D|�Sd�Q���/%��˰�m�K/CA�sI�Fv�����
+[��.ՖV��Q�hh;B<"�J���V"���?�?�ɍ�/73s���sg���D$,Ϡ1eD`2��*���i3'$��Iƕ�#n����5�����(�&���9�B�D�>���`
��_�'N	J1��M�&*�u�/.g,A��̶S���7^�<,�*l�6l�{Ђ}h�:��C8���?�����;���mH�5骉�D�"�"��
"�9�d�7��Ox�k��5O�v{���^��Fa�%��Ȝ-�o��.ֲʶ=�S��y,�ή.gp�}�8V`���������\�[��,���V�zch��}ˌK�\�:.�;c�\��3�`_��g��.׫�/��������h~=�z����s�1����?������k{��&o��H�˹r�����/Q�C"XX�H,E�$�$�>�]E��(��T�"%,+BB,H��Zb���;qM"��̝{�;s���q�6F�d�z/�0�c���	��I������G����?���Ĝ�B�	�w\���:��+<A���)'�+DaJ:5�:�g52:©Y��T�`V�s�ϼ�</�_��ޫ0k����6�.�fT��G��.�<‡HK7�C/����"�C"m�"x��>���������>�`��
+����Kg�C8�:�N�
�K��.���
��٤:�5˺ͳ.�e�f�nZ�E֪�yk�E�myf�(��l߰�:6�.E������s7p
����`{(�l���.�{�ۚ��稲n
>�>��03������g?�k*�|ﾶkݻ���a����~�����W�>

�NU����K/CA�H|;����J�V[-���UJh�xm�"�V؈���!���IO�X��;���9sf�ι
����H��-c����0E`�"���QH�YޅIc�ȶ�P�*�g)�\�d�E�-�y3P�X�%(�[܌e�ҵ&H�島}��<E�-r�_c���a�`�}�i�9�1��J�4c�13|_!ɥ�wU�T�x�pOp
�7�y��C݀Z�h��^ ��^��{@����}��aVa.�^�
�8���9����	��>0����,5~�+�5�a�k����f�D���z��:k'��U��7�}�_�J�}��
+����>�8~����s%�iÞM�gzF�L���|��
�O������p�;k�]�9�9Mr.���?�m���"���k��������N��^��m�K/CA�i#"ai';;k_������Q�h{)��+���H�H$��k!숈O���drb�K�̜93���뜋�?1�¨!�	�R�m7F���_���Pʓ�X�:T�sP`L�˯su�y��"�)�g
雀I��sl8? �O6`
V8�����slv`�aZ�/�ė/y�i���q�ž&�5jr��/3w����
�0t�������s�s�W�t�y�_�}p��(\��=�c�;<����p����S8�c>_���=_!g/|c�W@MCrƟ$y��nXKy�%֦�ܗp�ZTY�E��9Gռ�P�g��x��4�s��ލ�7����)1F�z�tL���
��s�:����n缜�=���24>i��Zȿä��_��F��m�E������?��]��.CQ����70�����y��j�E�7�R��.%QqI���ML$�L�`�	$����e�����Zg�ӽ�����`��\����g��	{�d�#0B#Y��<a�ci渺im�3F	�h�8$�{��'�y�mZ嚖�k��\�<�`�
+n��`J읥�@��%*�����:*��
+��/����7��.�V��p
/�{E��D��F�4�����>a�ڠ:�5_�p�p���s]U>��C����
k��ۇg��W8�f�߲�)\�e��\f�{�F~���W0�S�e���i�4�X��a��Q�{$ū��R�ɲO�2&���(�8.{Z�uoF=����L�{%�������.,��?wQ�c鹶���z��\���u>�$�����
���}��uԻJA೦H��7���-K�w����M�h��E#�
+
+�/����"����������������93;{vD$.���RR���'i$H�ڸ�ɧ�)#͙�<��$���Ђ*�s��,���-��E�)��Ĺ�y-��A�����Y��6����8�N��
/�b��ʫ�/3��������_�:m‹H�}�>�%<�yP$�w�~���a���B�5����������s���u��"׶�|�O��W8�>�����Dq�'�w���-�w��@��������U�^������r�+����m~�։3!ax_25S��6Wc��2�S�*��Z�k��k��qy/��ΛC���)C�C��ڲ�����qgI܌����Q�Γo�`���}��.CA��h��3�{
v���έ�j��][�k��%"""�$��^�Z�;�&�	������?�s�1��E	{�{�W��vWϵ��Ĉ'�1�cy��y�~I��3�4J���Rz�}��ۜ&0�IOU��G\b���X��/`
�8���g\c,aAul^Yk��4FA�7�'ۨaUs���v���+��OZC��j1���	�����;�u����C�o�.�{��j�]�o�[�ת�h�/���=�ZBm�^q�}��g�r�z5��*nͶ�Z��@7Z�[����UQ�_���t����=���^���t_R����XV2^���ݳ��P@"��������خ_�YO���~;�oߡ+�%��k��GD�\��?'���j~�/>^�V��}ԹN[A��1(�B4<O��+�M�j�ۘ-!�̾�-
��""Q����(()�x�#,D���;��93s��Bk(i�v��It!�,0�/FN�S��|QG�����jeЇ^t�t5�.��I��-��p�%��ؼdU+��ES�,�XW������Id�G��C��؍���h����j[��
+�i��<V��Ή��aSs5߰�=�������W{B�S�����
+�%ثD>���'\�D��{�8™�}�渢���i"wj��%��A��y�_��Q�
�֢�nI�5��#�kP��1����͎8����� Eմwu#��S.;9}7����o*��A����.����i|N�Y�qχ�_���}���;_��t�RnN��,���c�:�ݮ�����E�(����K�3{-1���m�9KA�Icao������¯#Ys�Dݘ�#1��DC<�@�@DA�,�lm������������̛7ovG)գ<��GA� q�1�
+,�L�
ac�?�?�����C�1a�9D �gQ����~=Or��|+h��O!�ks
Y+	e؁c��'�����g<�K��!aV�J�0�e�+���i(@�f9.Ǹ�Ƙ�����5��
'pW��Z4Cڏ��:lr�;���H@�~��Fh@�n�.��`�kҖ��*�_{qo�]�ʵ;���v5�˥�-q�=��'x�;�e]�<�4�J�:��wy�yƗ��ÇW7u�<����V�;g;I	���DJ�_�uH���a�����^F���&��a>�!n0s�oK���O�,����}���󈑇������=$m}o�����8����m��*DQ����p�x��ҕg`ff0N�4Ό!�(��HI�"��p!�p%I.��]�oe7��g��{��N���1u�W/!DЈ&4#�^�`���%N��N�7 �<�y�Qܽ��}�ӊIT\���֦���n�5���U�>^5��CZS�����xE��c�'!��>L`�8�F1����E�1��S�3,��֜V�U��/��.vP�q���9�y�
����*��c�^)�/���\��5Ng�|Я%����\!�z�j?���5ω]�
��Q�Z)�Uj�������)oF�4�\�ǡ�~�W�sN�k����Ϊ? �}�޹3s�f���|�|u��w�C��ja"0ވb3j��K��,W������g�o��6��iIi	]��n�k<�۪1�
+p��]�s�^<O�b"
aq���}'��!�;���
+��6���m�KkSA��9qՕ�k��t�O��M�~���4�h/1�6=�Q�-�D�
+*���A�c[T�,�R�t�J��8ϐ!d��33�y�3s�13�9%	���P�E\���~`wp
�FRqc��JZ�s*��r2�,΢�kQk��
+�xgLt�8��{���9��i�:��;��8��.zh��Z�4_Yy�z|`�V��y�q5����;�P��+Ƣ�5d
+nM���w5��k�5����i)���.���)�;F����m�1��6�<������Q�D��q��/���ּ��@W빧�����
+�8���|�:n*�%�w����W�������j�V�lM/��ci����I]9���q�}�<:�k�y\����]W�&�ښ���v�ؽZ���j�6�^��dUs׃�|�_R��3��{
ϝ���ޟ���~�8>�=�� �����ݴ�'��a�?4�n%�
���ݰ�u��OSA��)nM��`玸1ᯀ���\�(��i��b�P�����Jh
+T�Vc���+7�v���~'7a�	�Μ9�p��s��oø�$ҁGw�-��1F�PĠ��U�D�ſ[��ꥐb��-��������}�}~�6~�֋�9)L�s�S��y���m��+w.���^�ڈ?qݼ��a�{�=�zp
]�EE3�ÔjY/��bϡ]3��G�E9����
�)�5~s���z�	z��foo��>���}"�w
8s�ߵ��p��]���b+����,WC�[��hv��P]���&��}�r;:�U��l��ߡ�OXV�u�]
�uGf4o�Pk%���BAl�/��m�~Y3.ɴ��–fYS����:���)=��d���=���gQ�i�Ɋ�'�%��������Ê����[�dp>���{}����?p��r�?�E��̰�u��JUQ����F��j���O ��@����G=^��������SD�JyAˉ(b
����D��K7|�{��_�u�fVbw��!�JT��T�+�G��F�ծ4$*��R&>�/�wx�Z$1^BqIa�hPy���	���wRq.��S��Z1�C�Hx�%�k��oQ�&���<d�=��K��生�)��*qyh�^Q����:�֓;#���)~=x�A�|�z4�.���Sr<C

+񄲟Z��a+��5��e�8�g%+n.�[�1��������w\mWo�����cK}McB}����~�\�/�Cy���k���7Ս)��_���i�G�)�kZ�k���ō�36���g���\�qX�!��s�*�v{��.�Ac���Ϩ�ݙM���u���?��]	�_W��р�bܘܙ�֜j�/.�����>&��^K�;�Xn�Q�
Yٰ�u��OSA��)V�l�ʖ?�=���ZLy#�ZAZ(B  �W��Y��(!�!Ix�$�%��{�o��MX|r;3�����u�ո�Zy*u���v�$�y">O�} ��lD+ZT�Y�fL��b���ML�:эQ|�%α���j�X�ϑ�V��
$��U�[��ݹH�s��:Wx��b��0�A�g��T��E����qcHu�Z�տU��h�U\���Ѽ�co�R��-����Y�o��Y|�6V��\f��<�;L�1}��Crzf���.cO�,�q�#|�fk57��\��5/ۓ9����F�e�Ð�sBFu�/uv��h�:ˤ�}�M�/�����tn��ޫ.�NbW�l�u��j�@:����=�Z4n�5�_�q�+�
+�EF��.������[^��������{\kMi�>>�]',Gm@8����h(�}��/���u��K[Q��НtQܸs�_�ҿ�U��jL'T�jL�q�c�g,�⬨���ƅ���]���]x}�Ň��޹��1ιZWT'�� q��#{���O�I�	)$�(��nFF��<��E/2��o�"����ChCKHJ�M;�Ї~�(�0�1�:_d+���e
��<�|5�
�kL����W}���~�NZ5���2T�Ts����m^_�M}0��@�)�k�l<�X�4f����.V��>�8�H	>j8�5�P���m�
/x�NT���X�S��L}�jT�V����y���[�Q�SV{8�w���������\�ϊ�q]���@ Ǵ�~h���ۯNW<��Ν�?;뭮x��y�1-���`��5��Ϫoy�]�|;�[�������a��\����&ܿw6�u���H\�S��{���b���������u��.Cq��?k/ 6ހ��O`����RcPc��SJ�f�b�6켆���{�������?�?��o�sqW���IkH"�'��xh��'Q�&��H~0n�閴lʩ�I�شɗs
R��'��>顾7�b���eX�$#��1$�y��j~ٳ��G���e_N�s�=�)�"��*�6Ϲ,��
+���eY�7k�D�de��u���˱�Ɂl�r�yz[�\E�bu��\�_��Į���ʻ|��^����Y���&i�Zֲ����|�|Η��e��2�����2G���M��,��\$w���3�[�<}�ٓ��]����J�Z�|[���o�*ꝫ��i�{���\�=
��qw2��(9����w���
S��&ʱ5�#s���%�)z�fo�(W��
��j���m��/CQ��[�?�/�O�5�R�PJ�C[�C�L�!�L�X�;K6��{�׸^,>y���{��=�\���L�>�*Oe �Bc�^Lu@8�Ǐ��^"R#~���bjьA��ùP
�gdЏi�0^��;�A;:Љ.��U9�^c	�1�I�٥<QiW\sX�*�q��6�k#���v1���Lh=i�ݭ�6OL5�aXu.j�yLi|8����2����1#�ʳ*[�Ǒ�w�筿�ٞ�K9Q��.��X�
n��>�s��;^��6�
+�J��+A)��(R��k�-��;͓ѺGu������z3���=��OTϺ���Ky9Sڇ�j��N+��I�?k�;���+�l�'�1��9��P��'�\6WR�&�l��ǖ��SL��ޯ��	�U-M��������ﻝ����-	+G\�H�n/��y?�O�7�W���u��OA��j�`"Áw/\<x#�C��ad�d�]�����}�a�!�(�9AH�����_e:D�tw���W���9W���%b�FT"�W��j�>���s�D�wuh�8�P{L�z���ہ�s�s\9��)�c�Ob�8�
RH���k�_�
��N�X��p�O�A��[�(-j�B&��46�
o0�9m�QLes�Q��9ޢm����#����]9ٸ�1��U[J,�i���r�\��G�Snj��m|V�7�`[X��m�{'�CZ�U�)�����Y{!���E�gSud��1~:��/�s����V�v���\��!�u�sN뷽�^�j;�q�i\���_�������+6Τ���Ψղ+��4�ݿr�o>��f�jo����dk�j|�޺���bI�[�Xִ�V�_+�;���������5.�_�]�\��@D��Q�I����o灝!�.w�D�Ïw���&���u��KTa��s��$Am���;Z�o���G�F2G3�_20�,���|CK�U��J3�A��)���{��p��vν�y�5�k�ou�G�p5!�KknV|M
j�%���F��[hF^q���}�v̢=��*�4+ۢ]K�$:ч"FpMh��]�Լv��K
��F�j\�y��W��b6i�k�N������9�ѫ�!L(�Y�_Ũ�{��z�.�	m�(�=��6��x$����
?��.��b/@mm�<#���q���)%x�i�S>_��%���S��.���j}��w�h�2}���>�f�/s�B���o�S\��	o�^E�__�vң}֙��cG�Ӳ
+�����T-C�ޓ~ǬjQ����Z�Y�|��[��z�'x����6�DgT��_�.�Et:��a}���I�wC$|g��
�_V}9;�_���$��	�\��������#�;�w o���m�;OTA��Y�A�B(��Pz:h()�|
+���r۰˲�\Y`��&�!	�j�D����DH ��V
+*��>''��sf�y�=gf�1&d�0�x刪݋K�xq��N\�'�~׊��������iS�{c��yPo�C�q}N����7�����Sה�3�z�7�8;v��Y����yY�"��N��+�ե�}>v޷�8>��O��_����N�i��5c9U����\�P��>��5��+~`G8�!v�S�Ӳ��=�	/P�Ze���g[�LaEsk�U�Oi�����qE�
+s�u���%�
8g�+�n�&��n��V�v�oz�]��s��ێ�{zk�/i�M�v�#P���������j2��$�9�ߤֲ���^͗�s�ؽ����8����1����:�hD!m��:�̶�I(��|l�=�-��9��}�'����v��Тܭ��3ֶ��GA���
8�*̰�m��K�A����J��V������ٶ=dk��y��Ԇ���v�h��DE� "��.���V���74,]|�}�y�gf�Y3�f�D �2������\?�?��&�x�p�k�ȡ7�xi���D
e|7�ޙ5��O\��2�(a�D���!������ֻ;��
+>✸�� �Mj��HQ
+������.���+���{�����Pn�ksx$��<��J�t��g��>`;��}|�.>���t�m
K�5�%^��Z���+.�&V�J��8�	�s�KUsk������Z�o���S�S�[Z����x�U
��۱�3q��5��xN�
+���	���tF�,*Z�"*�?�q�p�@^�ƈ��o�_���i���Iյ��X�9��J|F�3e��v4k_���������w�������{��w*x��b���q&�����/4�%|�4��e��u��J#A���g�(D�)����[�Mר����qCř���(�(��;zqE��z�[���4x�е��U�Um�)2)�b�
K�U��>?��'�����T�B��W9*рa<��>'��t�7Z�QԠ�#�S�1u��I1����ѡxa�mD��D3�>wL��bgc7k��xd�YH�|�q��[�5�I�V��A/�T��6����4�X�:N�N�dR~��p��c	#�B�:�1 ��lj̒r�����њ���W���������ڷ��W�<�=n��k��y��6IO^kJ9v��ҷ�KB�A�wM{�k;b�� ��ڜ\��Ю�ѡ�4��6�{�b�&uƢ���V-���&	͍+ߤ�蛏bW8�w�{^�!�5Ǟ{��)�ؼa�+L��ٻW�
�]v���jsD��y�Wܐ�٧�>������_���|$�����u�Y+�Q����F�
+�Jފ1�X��Xǖ�5{�E"�'��\H����ʍߙ��zz�ŧ�����YcL�Iȇ-��Q�ڃ>
��P"F�'^&��s�*�i�ʩ7H��ʾ���eQb�(�RI�
+Ƭ��^j�cc��[n�N4ѿ���L��#h`,�~�!aރ�#��$e%�O�=�����߅�b�e�ْ�c_l�R�ɦ1���r��r W���O�R��Z}S�-������ʱ�k�sX�6�Pn�Y^�Or&�|wL~;�{y`
78%�����+�ق��,l���#
���=kG'�`��*����=�7yg-�|e�i�:ϙE9��Qʍ����{W�Zbn^�E8�irعvK���yc�{1J�~Ʋ��ܣar����c�?�[u\ܽ��97�{��v�]��!ߘ��L���L'^��u��NSA��u�^��0��r���!�Jhiii��p��
4��0��TML��1��a�ِhXcX���w�D��'�{朙�sg�s�ے��>��;��c��;�i�bEd�V<��)��P��Tc�2*��
^�_��E����/���|eՔ�Ƣְ��9����FqW�eՖ�����m��й`!����c��:V5F
+j��b}
lj�&�┱�K�t��/���0�A�>�ޣ���7��I�ȿ��=���q^��^H[����R�*��"�o�F{�k��o���ݛ������j�w��XK�皋3�����w����x����Y/��w�š���ֱ,������[Q_�}���[(vN*��\ϊ����y党��qK�+)�����Kʫi>�O{f$�{h�ο��}��dZR��Z�����ڗ�W�r���~��xM�c������:���u�;O�A��󂕡4��ۙHGcAAE�_@����evWX���{��
+�& Xy)F
+c$�Xc�ϛ�lB��23gΜ�w3k�sM��;��[$q��ۆ� �4:Ѯ�.���w5��}����J�/�\}��[��V�S��w��I*hg��z�W2�k
�1�aL��}��!�g]C����w�u��>���e��K͝�8&0�Q��(n��C�wf��ר2+�<���}�{|1���c�8 �*jq���T�21�lG�|k`=[�{�6�E�5���g�����c���&�gQ|o�1�}k�{�=�'��܈����
��*~Z��sl3vK�~יkOu�~�����w�S̴���{^1݋)�z���Y�^����DFۯyq
9+�ͬ�YF���w��Ԕ��p��;�w�?����.���[�s=���/b/Q%�%՛�O�����:����o����)6�2���u��J\A��n7.V�q�p����AL�حm�m���JB��8�8��"�&
+ua���@\%��߅�b?�Uuϩ�1��dՅ��p{��4H���?�hAZ�{3�$&q��JB�A� ^0�Y�z0��8��*^�˓���)on�g���!�.|������!�Ė16���i���W)��S�~�%,c�Z˨��z�
h�pM\�%�iL��yϧ�}8�O9�m0��`\
jAn;�t�%8��ET#�~�Zdžr���B1�s25�9�%~�W��͢���ZӺf1��˳";x$>눖�s�pN���=��y�I�f�m+A=�R��G���-�<�4��+�gi����:�AO��ߩ�h����C1�7Z׀7�^�������)�>��'��P_P�i�w\�&��'���y����ƵkT����Zy�71/2$������d�K���^�g�`m�����KTQ�����������E�Z�+�h���c�L�hM��YJX��QD� 1���EJ/�&�E-\�&���������=�9g�s��3k�XkB�$�^�����ۧ�@g���t(��~ܯ���x�req��z��#�w>���ܜ�$��tk���^�JN�K҇x��f�I4� ���E;o�Z4�8����q������2������stc(�y�sI����Sķ����p�U|����G����%_{�p�v1����
z��X�?�kq�UTO�'�x�w �-��x��J��ĺ斵FI�<� {��1�Ģ#��w��������Lg��],���v��������(�����0�˪7<^�-K����C��5��cT�A���Zs��j��m^y�5��|������*��'��K����Q���;F��R��T�t�~���/���������Ι]K�G��}��K�Q�����m\����?�E�"7�m�L�a̗23������"T��BAM��M�#��P�+A�����>P�s_Ͻ�>�N�&�W��q�)9�р��x u��no��������>��P@�4F񼯠r,'��M��c=~�k�غ��
��zI��`��{C�PϒO�>�;�o�f��x��4F�#�k�aSQ����pH�2\�����5��g|�.v���A>�Ёl��o!\(�M�'�Y�Q�U�-��S�+��#��A�W�^��i��)�����%Uʃ�L���Y�/X+��w����;�
?���:��9��cC:�
�*�8;�
+���o{����C���@���Z������~Y3��\��]0.�Y$��þ!�$�i/��.<��9��vg��(���q�_7z4���o�߃���y{������^�,������[�w�k��H��h����?�歰����KVA����k㪕��Z��ĕ�H�	L�x�L"�B���FY�����(H�b.E�uH���78�`->̙�y�93��m�3�(w�H�Њ�8'�NՃ0.՘&I�3�UBA��]�Q�E:�ߍN�ۢ�q�|����0�i�$�r��b�k�rGq��%��&�O��j�q<V{
���?����Tycx���^���~���c�S)*Q�*C5n�����`\.O�i�Y�����
+[�/��|��dg���
^c
+/���I��7p��<e�q�:y$���U��cVV�W��;�b�q���pϵߣ��g�/9�z�^���{_�����#6��5z��`=6C�f���A����f�\0�m�;z�+���߲��g?�ݑN�3��;ճ��*?���>��1�ڋ��^�h���ݥ~��M�{g����K�����M���W:��m��KVA�����JQp]]�q'X;k���?��W�T��A�����]DJ�$Ȳ�҅$��B`�m\��;���ap�᜙y�˙9f�lf�h�i�fiQ{��E�҅� �S:����Ϸ���d�|��/�q~>N7z1���=�E�ڝ��ң|�y;��{'0�8v͒� >i�|�%����(�����x�/�X�²��a�~h�%ʧ��ĄLa��
+��^��=�_���8&o��(G�e��
�s�\睾����o������Z}�6�	�1�q߫nEk]Vy��'Sc��)�)㦕fE�̊�p��M���2}~i�Z>h��C�kфj�{x��x�<f����AN;�:
+sK.�;�k��#�bXFu��Z�o_k�Q���8	�*�;�<7+e��8��m;x�s���s�ϥ?�9��v7�Y����(�='Ox�;��=�����w����������u�KHQ���ܫ��⪍!.\�h�����mk�:�+���iR*�""�Ed��ZbEjO#�
+�Mb�}�w`<���������y����,�l�UrV�I+���
�Y�f���A<HZ$�qp�h���ۇ����Kzq/��qKu;��zu�%��6i��w��퉵�W�W��,:�G�y��a��!�`�q	Wpx�y,j�.�>&�zU�݈�cD5��s��3���m�>�'|�?ԫ�T�����_�*P�#8�Z�X��,��,Y�&�kV��x����i��+6����'��R���n��ߕd�KJ��ޘ����ߙ��#���T��-�����������ú�닸���#r8�c(ל��]�(���lЇ3��jj��:Ϊ�kZ��<'���+��1E��ngc{��=������<��߷����������c��ɟw&N��C������?�>'�w�
�(�b��u��KUQ��u��B!�A�4���,��/��3�M�j�^�Q�HE>%-{(IH (EQR��B�d&5)�X40�.�o��`������8k?�1�Z3;�s��F��-h@�J׌K��6%�s�Q�K����G�^o� &pWSy�'�%��Կ�̢J�Q����E.�
+zTvh���Oh�V�хN\L��5�)όp��WU^��!�P>}�����/���*���x��x�e���5��La\�ƿ�,��a:�C)��E8�c�K��u��K���J�mR���2�}�
꧈=�.�_�[,`���i���	d���<��fG@[
{��7��Ǭ�Y�_�=�]��
}������9?+���)��L"J#'��=�9����/e�;���|O>(6��]:w�߭3��|�|�s�&���1�IpƑ׫�-+�v��4W��
�A����'������#�O��$�����wj��-hK̛�a���r;�I��l
��c��u�MK�Q��sGň\eE���
+����w�&p%63�ڤ�ib!Y&�FI��%�"�=-��Ѕ�n
+�*$Q�{��.]�\|���w���{��1���]�4!�^��� �f\F'��.�k=+!OFr�F��t�~QZ�.�(�������E��K�4K�~.�B�>n�����J_�s������4��C5����M:�S�}��W�<�{Ǽ��O1�^���_1�A�g�������0������z����
|��;ٷ}�8�\~m!��p���x�����
��9�T�+fEf�o���d�!�;��+�y��S`ߎw�8�N�����yH��wӬ�>�dl0+�EgY��������nw���G�b~V}T߽����i;x��)��'x����{7u��]�N�q�	[R�G�����a��'�:K��k�����l�g��>��9�ņ�l����)�o����j���i-���)|_�?#{��Ց5�����KTQ��sG�\.��XH��h�	��ŜQg��i�)�i5m*�"_Ph�
A�VDAA/+qD/�~����Q�Ň{�s��sιι.��^$1�� ��ط<���B�z����ƹ(��Q���&�����)Ş�^a�0�z�=Ƌ������9/�XD�)�ikBYcZ9�qR�V9�>�rY�ZǠX�Q���6��2�x�m���??��-���*f1�ze�{�9��wl��,h,{�ዼ�
+汊����s�s�/�U��Zq�e+:�$΂�GN;�І�?"F�8m~c���z��o�[�Y����^����yp
+�?B�=��3޿c]^?��`K����>�Gq��G�'��[2�[�����{\g����չ���>��CA�K곢}����&����a�L<�s����z�&%-v�$|�M�Np7,/������^�YvG���4�������g<*��Sj�
�M�����KTQ��3��B(ZI��D�A�-��&t�g��4�V�2��Nּ���ɔ6`�HQ.�H1��E�p�"�{��.\�BZ|��s�}��<��k��o\����$0(q���,i>&	��#Q��/��o9�1�$1�I��#ֱ��Z����|	�!��ֻkL�"���}
e<�~� ���ʑV�ʗ�Zۃ�QM�tm��,/����wx�%PB�Z_�u��+�?����,�9�ZTۣ}��-�V;w���/ۼW�#7g���>U���pL]Wp�
�Rh
+�mL�����
\@3.����CM���C:Њ��������	#L�
k���_��'>��e�`C�ƞ���^��I^=�h}U����̪�6�+�g5��űy�S�a�6RS�-j�{l��))FQ�c�ט�;L���;�Z�ڞg{R�q{n
����q�߳р����C�""��b�ro��u��OA�� ��H1�bB�x������ƓG��n[Zʋ�%�(P[�B��%HQ������z�p |��M����'�����̳k��gBw%))�q_R�}CP����e$���������3��^@N��)&�0�����K��w��9V�	�\Q��}���5o@e>g[8�!���\�2�a�X���\9��a/#^+�[c)�5\��QŬ�1�zU�RQ�7XR�W*7������#�W߶��{:�������\ێ��;~�*n �xG�Z��r.��X��v��9g8�/���K��qܿ�lI�۸�^��
+���-]���}�~�glD޿&uYԽ���Y��|�>��h��h�\t�Xҙ�u�S�{b��\
��^fo̹�iL;��X6��{�'z���Qּ�r�����i棓��m>G][Ns\ɰi~Wn��>�1�o*�����?��v���o\&���������/�������m��/^A������Κ��Y4��������[���kP*��EiW"�i�n,ؔ�شbA"i�&|��ojrb��9g.�̙yf̬���cj����R�'Є��]���?��X�Z�S�t��z������v�k
+����]�$:ч!��k�K�A��oS�6�P�5�5�����]�a#x�=��161��a�cKHaB���X�
|ź�&4֘��T��O*�����7�aΏ��|W�5���}��.p�\)�g|�'l���W�j,���*Q�<A1rh{���8�i�<�P?��6�;:��+^��58�/�;Q��cE�0/s��Y��ρ��z���Zs�nT{?�}v��V{��Q�ڹ�|aNef��I6����,�Y�c��������M�CJc�\t9��6iw��4|���VK������iwyݪ~�|4�ϕ�s�P�?���h����{ŏ��~����?N����L	�ܰ�e�OH�A��y��� x�(�!��^:��Nṣ$��]w�u��2���V�j$*TB��Bx�.��Q<��w|C�����3�����:�],�d�|/!��/�	��]ϢO�ʝ69lߞC
E<�A�я^�/�7c��KNmY��L|4�F1l)�7�}�*�r.��2:y��f���>����5�c
+O����RR����=W܏�S�4B���=V�E�q�u��)�~a����#v��ޣ�hC=�]|�g�{��W�n�͸B���z���uh�,������Z#�}ı|��n�R<��|M��\�����bX�Z�)�]�ڗ�~+&^R�C��U�Y�w�zG��=Mh\%�k������s)֗��a�Ս��7~�6���<�������)Ȁ�sa�sQИ)���}?{.��{n���y
+�8�Οi��72�����(j�៓��Xg���x�x��m��KTQ���:�*"[���U�kآ���Z�����)�K������S�,5��V		Eh���;�{���.->����s�s�f�a�Nt!����x\F:�qw��湏~�EN�d�3�[;��Cx(�ރP�u'�VVc\��QPL2.��P�5�A�>����E	e|6jю&�߱���V��8��h���${�z�eՋ?��=c7�<�2�{~�q�pU��
X�[���
��
+Z(��
����&��Ne���/�\�L�����$���x���R�f�4O���f�C�w�z
��&u��1�
v��њnm���/�;�-��5�aZ�-�&U��9Ω�:{��G��r�����Y�Ū�(Gc�R�ͪ�k5�^�^O�K4��#g�ntF������=(H��roB^
+V�{����v��;�V�kN|�:%n��ڒw���Y���f�
k_�U�9�������=0��u��KUQ��u�T'��f�
�F�
:�kz�>4��+�jVAQ)e/ҁB�
+�����H ��.���ဃ����^{�}��fv�̒Vh�jb���:����Z�_G'��)�)�G�5"�fܔ��E�i�5HJ"9<�0�`�����H���|��j��7!���z�z0����`o��x�}����}��W�E�t�W����Xm^�]h�NŇs\��~o�F_�=>aJ���Y�Ņ߶�i��K��0~�f��_P�s%c���ט���N>�;V��U��2~��8�=(3+"�ɫf��і�\�5'.�{��ȕ����X�z^��yV�L�|���~M���������uvz��:�>�!ŹG��E��"�W����.us���}��-��.b��+8��j�g�ÿ��n��$+�V�ޟ>F8���t�|�&;�N�%ɟ�	���!���47�=�{iV_�?Ss��x�����u��KUQ��A����H��t�᰼W�U��#E-�b��Jm�c �o�2	*+�A�Qh�𻽿M��
>��k�}�Z�3k4�4��.�iII:R�X�b���Ϙ@�r���hE��ym�)ޢ��h�I+�s���ml`
+�Z�Y��goվ������c����+����Ő�>�+���uz���Ǵƽg�{����O4�=�G�:~�ײ�E�d�ԗO�ѻ��7���f��̒jP_w�*��cI�-c/�����������?p��uP����/�bVJ�/�䞔�㼧�����;P{�3�R������g�U���NnE��]����̩_ê}^�׹�RG�>ND}����0����F���j���*�@��"vʵ�-)����_i��{��a��
+g4��\t߉{�����gۿ�+�m��5/c���L�~F�$|�����sÜ�v��)r?J/~���u�?hSQ���"1�[W�W��u��ѭ�KG��柩�-�Ė$Q����D+���E�""8	�1��B�����~����s{ν1���%q��99+�?)��})��Y�1�����D�gpYrj�$#~M���im��
+/p�(�������wcS�"�<�/Wq��w��&*��T�����YV��Zd���Ʒ�!nimY��_��n`Q�+����;��q^c��	߱G�b�dq���x��˝���֕������U����8J��b����Z3;<a�8mD���F�
9
+�����x�Xı_�U���s�?�#��T;w>bZ7��k��,klQ�bE�ʵ�_W���H-����ݕ�r�u�vx�`�0F��j��NNK^�]�o��k
9����ϊ�vw��:�	��c��3��yi�������}���F��گ�A�+��
_�̰�u��KTa���8�ղ	�v-�����@���4s�i�4]f0���P�]� b�
+jQ:F�X��� MP7�B���w�0��}�y�w�,if}.K��o���@
+<ź����;&0�9W��� ')�%B�R�5n�~��Nk���G	5Lc
+���A\���KKF�/�5)(�]Lb?�
/Q����%�vk�����\�SU������V^��t���F0�|������'Z�shbV�]={�%�Q�.��	
ݶ�U��&~a9��s=��b��>�_s�(.�9����;8?�K��Y[�Y�o��yڗ���٣��9��)��E�|�_���^��y|�}'qZ�x�z׸��F祮ڌ㡾�������TϊjW
�k�WW]\��)��vinU{6��>�_�:G�3ܕL��>\ך��J��zQ��_����������Iۿ�%�+�ɵ��:�?�?B�`}0��}O���(9�����OA��Y��AN`��
� ��r5��h[l)��_��m���b0�K�)1JQƨ��1������~����>����g�}fv�1gM(�x�IH�?ܼ���2��"F0�FF���x���t}��#/\�:S�D�3�1=5�xnބb�xW0�:>��.i�����yy�z��UŴ�uT��j���9���Pƴ�TpS���ϱ�'����`ǘ`ߌi��^C/:��[x����{�|�g�X�x�u�ߐ��:��֍9��?Ž]4��ߌ
�܃Ϩ����`}���0������}�a<�xS�|�_ƻS'��i��wo��Pmna^���z?U�ܻ׵v�
�HY�h��6�+֢��>sԯjK�˚�����seϒ=������s����$k��1]�܂c��1��q��tX�V
����:6��~��+�Iz���<��h}���������_KTA��9��`�/�_@w]�*�/��"w�?k����Wmk��J�4�UWC7e��E���P��@��N���Ň�g���<3�Ƙ^s&��%	�@4��Iaw0����GZ�~��Ήsst�6W���gNmC�-!��K��
Ϡƅ�r��}���gx�9��Ƽ�9�b��ͯ�\��7�i<���Od���6��1%}��?;��:��=�F�j;0&h�cb��w���M��1���-��{�öԕ��q����G|#�eP��u����N�~F�h���_��D~��͸�2�t�
W$N�o��ĺ�r�\�/h�+�Ϝ�U\�rc�i�������_S����=�qeq����H����4T��X�K�׾?Й�P��꽪<��t���#�9�}#�-��eωMK��YQj���XwprZ���p�6�q�eXln{{=	O����q)s���-�����u��KTa���;��he�Ε7m�opQ�����8�X�Ԕ�S�6N9R�"ucQ��P"]A�$�i����� ��2ρ�Aμ���3f�0�nt�/w��]�r�)�� �G����H}XWH�~A���!ב��C�2j�������$#���b�YP���1�qw��׏���>A��~�<ĸ���i�cQ�UW�m�1�̱�;o��z~�7��?�����h�l�jVu��;ԑ�i��/x�Wx���ǒ2W��-e�/~b�R��<�/���|�&�6�IY~ƶC`[��h󏷀��=�<�V�C��������j�w��u���6��=���n
N�x���G`{��
��:�s�}1R��<����y��^�Pƴμ�s,�LKRy�~@w-k���_�JN}��U����甤%�w�̯썣��@��)��^�|7ᜌ������u�{OH��"q�����?�2F��m�;HA���SA�l��,�(D;��)���>z��Ө�9�'*�$� *�"ZH�mѼH�l#��~��-��Ň����3�3�ƘjcL5b�W?��XH0>+1��m�I�������
H�����;yq�:ѡx��ީ�T~\y�����r�K��6>����!�5�3f1���4��2��~�kܪ��ѭi��O�6��5l�.��
+�x
+�)7&�8��K�^�{�S��&vU���?���f\JP�|��kP��	���L�~��6�✘�k�C�Q�1�Ŭ��ͼ9܋,��_�'���7���_���Ǽ�G~�7��+Ư�k�g��l`F�a�kz�[گ���Τ_g<{��u���as��B��������Q���oCw�Cw-��&4K�r:%�~{�ƿ�Vp�����%h��GvO��j�wĎw�+���֫~‰E������>Gl��=q��e��m��K�Q���Z��r)A��&a���l�6�qg�45��mfs��jQ)�)ڕ�.�%��j��6�.�{���/��p�<�g��=ι^w��zO��c���}Q,�'�H�����ƭ�c��1��0")ŭ_I���!�}P���%�"�,���*f�O	�e��#����M�1���?�=�-`\�`s(���7T�*ʱ�%y���8��8W�
����<���	ﱎ��O|�_إ�.��]��;`�u'(�t3n�
+��B��՜�6���m2�$98ˣ����sG�Po"μ�?li�˚���V���/���N|fl{�Z���C�h/��ǻX�;��K�����b��Rҙ�OA3N������*IE�W�wp
ݻ��c�p���;�yd���g���bߍ���V��mm9�!�#Q#_<b ķ�o��{}����Uת�����K�A���h�5H����C�����-ݟ����n��?2��4"���~Q��%"=tQ;u1�v�����g�Ë���<����<����F�d@�HB�<7���<�0���~^�o�ϟB9��9�)��I+����c��l�?�"
+��FqS���1TpE&1��x����i\�3�u��2VPÂ��$�N5�܄ڪƼk��۸#K�h��Ϭ����~b�+:ʜoZ�[�K��'c-8�&����'q�a�|iYt��3�'v��z�G]{�~_\�U|���sy�ڴ�GP&�}�/;�q{�E<P��jG'��l�@��[��
�YEܞ�n{��|�3��<w~�
w'��r\�����:��+��_�~��kl`�u�úw���)����>و�ﳿ�)k|w��ۿ�]����|�#�G�d #n��w#���{�7���Z�a�����.A�����n��cx��h_f,cI�$�Xc�H�X�>����	'����v�*Z���tտ�w���1e�wUR��@��v��R*���w�;�]�ϩ�R�D�o�q���	;"�:�G#�Ђ��{<���F\z1�lbS��י��p�k�c^c:�!q�ѫ�F1��GeL�YI �Wc�bcBm�d��Bѯ>�C�[�:��A<�(gᵃ�w�9�}���9�\��F�1�ֻ�
v���>�c�oɦ��<��GNu�e��<��\���;��W���9�mF�]{ЇIl �s�3�X�tI\��v��u3��<�nR:c�5�kZy�h?��[�l�j��|ע
Ě�Ϝj(�|��Q�1?�{/l�G�o��?��U����(�~�yaͳ���R�ۣ����I+�Q���PVv��,lY�yvv���^c�<G]C"��!2$))��)ea��=��NO,,>=g�?���cL��]��"�i/W��J��9�?�׮��R�:4��Wy��5�\�Z����;�A4����d�Θ�x�!�1�v��氈Y�eT�d
+[�����~��YZ�S�0�L�l�0��a��w/ᒵf��T����������c�x�?��sb��\�#N}�ߍ�K�G�	HF��Xs�9��)�o�<�9�`_�=��ј�	�;�9�Y�����m����u�w��n�mEc&t�����,<�ly]:��wH��W��_���u�+�Qt1IH���W��}���������.U�{Ou/Vq�x���ˋ
+�3�\��w����������2O��?�ׅ��o7�寋��#��/�������J\A����[賸2���Fq�+�6�ݶ�F�Q��yĹ�N	�8 h 8!�"
+�ƅ ��Eׂ�ŏ[��SuϩncL���詖*��J�u~ԓ+Nx�h(fL�@
��f4�>����3��s�u���k�H�S�D
+�	
+����#���[D�b��CVdK��(���?��)�чo�����M���	��
R�)�^�6�8k%61���c�g�5��?0����rT����������
�U�O�E����/���$W��r�ܩ}�=�q�c`W���vtV��L��3��/�T=&1�q��5��}��Λ�<�oF0�5YT�^Ps�-i���>��t�^-��֭�v�[rR���R��꼃���&i0oﷻ�uj�9��Ş�޹�օ���{�7�W��D���>���������c��B�c�z�_�h�����K�Q��g�\�_��C��BZ�ܷQ3ǙQ����T�fI��/�%�+R�`h�6.�D.�6.��>��/S����<���Y�Eڪh��ۥZ\��
+��q�.�t�d$�"�!�ǽ�^t)�[19I+�	���[2�ߏ,�%͒�ͮ���6��lP7C�6��M��$�(���x���&��=�����P�:�U�ccMČ�|�IL��6�7�s����3���U,�^k=��m
�O6�	�p=�x�������	G`��+��Eczy���MjN���滥9~��:�����O3��u�(��R�><�}�(i��g:�V�^�j���sL�2�s+�,�L
+�+���()���7��&���W��=��e�o}�+~�����
<��^����tV��A��,Ą9d���vL�������G��
��)!G����?�h����u�9LTQ���Ğ*Z:	t$t�6TԢ0b���A6Q��
�!�d	LD�bK��5tD�-	���^�y���9��}3k��Wͣ��Y^���h�|y(��ц$:Ѓ~|�|�2�����_uS��G�*oG�x+����w����Y���I���
+���̍��(��Z�����8ß\_6�6��f�Q\�ڦ1�!qkİ�NbJ1������=
+�]�(nbE�y��|���%�>E�WP�g(F*QD�k��P���W�vO�Rԡ
�*?��%�9n`k����ۿ8�o�Y��nD1�����긳��3���Y���kߨ�WZ��YqPg4�MF�9ўq�Kܢ^�pw����|R�{�ĕ�eI�yo����s�$���[R��ާ{��m���ո�=�G��ƈ��J,�7n�!�(����_KTA���^Jx�7�ŗ�}����B�M�U�TBV�6�]���V�@
����+E�*A�Ho��7t<�x�av�<3��gf���Y�]����!�K���W��u"�^��0�X�'��,�	�'���0�I�cs�k����ѧoH�Ƒ�)�{oV��*��0���N)�+�[0�F���
[�V��Q�iqco���?cE��*��l9,�6K������˪�Yw���WlG���]
�/ ��?���('���O���s���k����5
�_VAK~�C����Qܾ��v�0�
+�������QlVu�V�����:g�,�z��|]�Lk���nj�.jW��!�:4�O��ތb�����
Ͽ�Υ;������3��ܝI��s��.�)�k^RqN�ݾ�Cү�������H��7��/�<�=�g��OD֎rkt��C��]�=h�A��{p�b#T��8vrҥ[�nqv:��I41i����AŒ*��&���B[TPDK���/`頃� �K����=2|x��������4��l�ڇĖS�HJҸ��j�ℒ�Г�\_F�
+(��9|��H0`L�1�n���@��e<�C��>�n+�ucƈ�ʫ^�q\FI*����N���_���}l�ׅ�8H}��j�u\��S[��M<�<Q�:���yEcj2+��@�Q�ܦbY�x�7x�?��z�A���,���G����w�����+6��E+_�7Q���΁��(o���������ʫQ��8�Xv�qgp�1����+G�=�A/���S���r�^U�J^���7qU�[�Ʀ��~c���5������|fs�bˣ&���\�V[Ϛ��X9��-�y9�ɪ�s���s������|w����i-�_/��a�O2������wZ����a�{��u��KUQ��u�Z(69
+�AAD��_�? M�f�zK�[)I��� �Դ��dO�B%z� ����Б�~�=�E��
>��X{���>g�Y��j���rI.J��� ��C+2�߇�{=�5i|RhkF�Ё)�6��q�,uެ����f������M�w<�S�Y�O�� 0���
�=�93��4�uܔ�����
+��p�z�)�^c��A���E���c#�,��L�O�B��W̸<���1�x��I�{�u�k�?���jpgPM���>b�j�KLQ^S�t�⸈��q�Gp��J�{��M�F����|%��A�wj�������������?��!UI�}�����@{,�:+?��s�'μG�ø_q��\�����m�a}%��+�-�I^B�*Z$#Y	m9�b���&����z�q��NK����.�y����p4�/����}]�E�غ�����G~��=�9qư�]�9O�Q���2#��@B�������b�����ufp�Yd
 !(�D1ƈ,nq�
+���

+B�������
7S�2��ν�.cfWm�	匄�e��,���5iA�Ѧ���f�x��S���^�B$/�}�el�%g�R5f���<fv`�l_-��h_���1&�c��q��w���ZG���V�u�-���\'���{�;(�k�!�c@�������� �)�C��^����4>)穨�Z��z߀=�|V��y&���f�
ȫ
+�1�$
Hkn���e��J��i�Y��}�̫챫Q�Ur��U���8�u�*�	�2��o1�ث�9*΁�)�N��
+�MXSN��|_��Y�3Ms����=P>��0�9����\:u��Rҽ��:�a��b�A#j��s+��S��87�[:p�v�+J���˒��~�������.���5G������aLN2���m�݆~��y�$S&[&��q��ݮR$��]��K�Q���}'I\-�	nm.ܷh�?R63���H"e]�EQ�)"*ސ���!]t��7���q~^f�a�sy����<g���Kh�%�o�?gЀ&�J;�у64*>#颶��Щ���Y����9�	l�Ef�K��S�R�tq���5�?�1{��a<�=O�'��
�k�ZSNkhѾ|�K�b� *�$">��o]��2 }�O���߬Gm�OsF��=�1<Ǥ��,�X�*�p�}�_�f5��u�i�sMa
�����k�q��U����\���o������kx~�����'��
+��紃#�ʼn�}�;���h��Z�ǟ����?g1?��S����o�\���7�g��]r�Kmҷ�}x�<�;������uF~���׹��!��:=$w5������|/a��'���^	���֦t�u���.��01�[��C<�׳ߥlB��9�qw$��0�(!6����w8�w8ćv�H�H�?��t�
�رx��m��K�A���j` x<K��cx0:�Gx�(�]͵�\]5��*��t(I;�K���`�!AШn��C(����gp�=���w�y���ΚY���P�Ŀ7�	q$��v<F+Z���3�Y㻐A'R��D��Ŷ)f3�nM��1+�F�Yl��[��c��=����~���]�R�t�O9��W�(�}CZOF�\�qmO1�9|_����X����1��asx��X�{�8�_�`A���[��_��M�~���&�����=.�YL�n��/��ߴ�#��+�j�QwTK�)~*.��]
��.j�����'�k��q���k�u5��B��s`#����mT�b�/�K�}�˲�k�&TC�G�����C�gu>i�i���γW���m�����	Zǂ�ߙ�X��t2���{qq�ڿ���*紾�a�u���;��d\�K��G�K�B�~�{�B�]��|�M��k�����U_���tK�����u��KTQ���:�h�&��ᮝ�j��"��N3��2���5M�-���ޥu �L!q#�B���+�E �����Mt�a�9���<�9猙����	�e�"�2�R_�ޗ���3?�Z�Q�)F�Bc�4�1��;f^	�1�;�}C;��&$����S��%�5NK�/O��i�8��Р�:�W'�/�1��ʵ��'�S~]���3�@F0�%�ѼilbS�+�+�=i�?�V��<���i�ĸY5�[5��[��ѿ����Ƭ��λ���|b����&���W��>�#rX
�"�
+�-��w��>cT��?�Kk_�-��
\EDk�)��qm�{ ��w���Y<��whϣS{�kߚt�ܞ��بߠ�U_���[�5�	��=)n����������F��7hUW�
�tAu�Yi�9�U�)Q��%!ɐ���ɘ�����Ԅrv��Z1�[/��O+���e����������e��K�Q��{���R��L���mmruޚF��&���BJ�!RӁ�2�T�Dİ�EQ�҈vA!��8��������<�美s��uU�qI �k�F
y��.�����ݡ�'#����N���9�`e��6�1�('��l�;i�n�_y9�-����U����L���"}�B͂��KA�JU���5&q�实Ǖ�����'�j<��.�<���`Z5�(�s���/���g|�݂˨�sM���.��������X�K�xl�6{�Y#�=s��o%���?�q����'q��?|S|K{k�x�9Mj.���*�7����,�%�PU{��	~b��}'vgpVcy��Ⱦ۾
�������$���
���{�>�����3Ή�+k�l��T��=�1/ig�{Rӻ)��;]����X�ޏ�����IG�s^�`w�μ�ǧ_Q���o�#�钬�;�5�j|�c�W����?���]��OA��bL�r�l�ś�^�7�b���E+���5�#B�&
+DES��� �A! �E������0��'۝>����ή1暩w=&OH
+
n��o��Zc���I���:���ǹ�vŤ�wCk�#�r�C�j�(.TN���ڡ�7�[�ǭ3��ޭ?���t͢Wu8�UO4g�Ƣ�]�]����0�a�����#���1�4N�{�(i�'�+yceLa��5���wk/2���}��.���쵽�s�laU����ec.����Ά��e����-�����z�>��O����ꡬ~��>b
�_ŋ��~���P���
�:涇p{C����+�Y���b�!/wt6��Y��H���+wLF����F�R}}�k��j�q��׳�����7~)wB��3�2��Z�9y����=	M��ɨ>��C=�]�U�L��:	o���I��
�}K\��V\���������}ԻK\A��s��]
+k;�4�'X��7�������W]u}k|"Q|��E�!�S��H �(���o`�"ŇYΝ93g�kfo,V#	��S+�hD���<w��5�wm�7��蔖 ��S'ɼ|��Һ�jK�My�0�[�K)W�jˠØ�>"�,��W�>`32���I�ƌ��c��&[��y�*��=]|	�q�s��s�A�>�X���E�Kp��w�B�xp�[�����<�B{�`�p��r�F*peVPiV��q��Y)�b���Ul�3�j��.~ʞ|��%ݑ���O��I�S|]y�T������8�-8���WT���{��u��z֧XW����(�#Y�i��@V=4������ط����G�~n�8V�W��0�E�q}~���������}/)��jҝ�QI�7v����Y��������d�7�5�y��'�٠M��]��J\A����`p�B|�@6��d��{���v_牴ġ�q�iѺ�%�9*&��A��	A�ԅ�Cʻ�q�֭�ԩ��{���N��
҈$Z%�h�@�q��MH!�4��u�qIID�������%�b�/�����o��Ӫ�S/1��Lb(������C1�wx�={5~_���U��b�Z���^�0�1��3v�����3�vZq�^S��2�7�[�x�W(�������6�-�X�N�w���|s��W�q�Q}�5�攧�g��i��1���19o�����;��)�j��pM�x��%��U��c�8�yJ��k����=d���Ow�Q
u���{X���hn���ڼrmg��s���gUOV�m._��'�X����8�x��O���W,V3�����m:�ռ��I>��rڿ��.�e����F��?"������y��<���m��KTQ��s+$f�`+7nۋ�����6����&u��q|����p��^T��	�,A��V
+Ѣ�(����..>�s�y{�9Ϲι�;u[Zp+��[ڥM�xkˠS��V�qC(�'���d�],�F��3y<@A�٠o����	d�9<T�O��(�J_�}�!�ae��Ǡ�>���~�k�.4���ű�7�z#*m�a�2ƹi�e��O�5��{��X�&>�+�X�*�c���U�h������lေWPG���'����7�ܑ��o��4wMs�����Y߰�wX�����X\U�i}�5��/�[buG���TOl7��t
�y������}Q{g��+E����|[��̫^йT��6�g:�Q���f��h���}S{T�|��]�
�9��ϼ�gk����7�S�ڣI}���!�,?�i���m(��,�ﺳ{���s�w<v��O�����O��!S��m��KUQ���"N��	5q�?���Լv��Դ�G��[�g��Y�� *�R
��
��"4'~��wpsu���\k�}�1�
+�TI%n��J�#�Y��ޖ@M l�R]�h@*���H⺤��:<�&<B���o2ƪ���G��?A�t�UڥU��ЋO8�,c]���K<�\�f9�82�͠�������Gc�C?ƣ�6����i�W�������G�y���/��7�����o��汄����u\��Oc��O]	n��c�j�YLco���m��u�`K��c?�ا���y�e/���[[�z�E�v���q#��>�2G�e��oi~_g��������gz��f;��Tש9<�/�uDg֧s���o�qˈ_JWq��ꊴ�i�͐��c����?-�,�~��Qy<��� �v�=�}�h-�7�>���c�k/|}�ʿM��;�'�~��K�ٿ����;N�C'��+���u��JA��D��
+ģ��|�.1��%Q#����[p'�E
+� ((� z=��+��49|�L�twMw��H����B�vƴ��Z��^|?
+a>�-m�ni�)�R*����u[4�����K� �0LI�c\�Z�{pJ�0Iz�|N�"��8O=T�^s~�5��%�=�l�}�a�sZt�Q�O���	�p	��<�z��<4�)�*�~�<�@�9���B
TBb��s��p�ys�MY^3�^��=�o�s�
+�;���-ۏ���VMP�\���7b�º�=����
�/��7�4õ���H�hLk�����?]�'���B�㦸�����
+��F��7$�E-8	�[���s/S�W��zպ�RD�u��955a�4�r�k�9wI�ܸ�e�cuqn�G��4�8�������g�k�jXy����7����4j"�����K�Q��g��;A������ݗ�c�h�6"��"j&�W4��"�
+A���q#J��\��q~S������{���^3�kf�H��AR���>�T�vdѩr2�� ����'%%M���}�\��HڤUmi�k���-x����uK�btJ6�V�O0(�2�)�Ăʡ~�,Q�:Ԣ��M<�0&��3ڪ����8�@Nq{�O�}O�sx��Bl{��j[P���aNE�p�w��Կ�f1�oW��}n��)��\��Z��s�x�e�cF�{��A9{�E�q~���9�����m5`o���8�|S�XF��ƝԸ;��r�����ĺ"��[�����O��
�k�_����7�P�֬�k�S���WX'ϯ_q������չo�����|��9��q�(���7A�>�߭����Ckժ�ý��8��}� ϴ�������N���}�KKBA�E_�}�>C��e�VA�쪙�aj�Ҵ�Z�������0"�hS�VA� h���`i��ޙ{�̙�w��xEāA!��A�ű�!1H��:���8��V>NJ��7�f^}�~��a�5�YOȊ�`���fô��a�7�8E)f�G��!
0�U��8�u��iȲ�)��Ĺt�>`��f ES��\˔�U�G�&h����+�ex�󌈻��]�v'���v8F�m�>��5��%�sJfme����1�׾
�,�}��̼�GGpO�ȹ��R]�Kkn
�w�vs��\p�,�Q�E�{��;P����n�I��~�̳k|g��O�dn���^���DP�����7���(�<�k�eH�g!�����,�s-25i�Q�
X�&����~Am����ĵ�9�����yv�Ӝ���=&N�S�_��^���u��.CA�9mB,lو�����hO[�R����j�X��-�Z�FB��B$�D�b���br��9�o�g�(�<J)B0L��/K�'�e?D!
cF�^���^�m� ���z��� ġK��yA�Mab~
+b\S���0E�?Q�9I�#ye�a,űt����,�@20�������+�	�P��h�
+F?y#>Ok����Ђ�8�2B�����^)W�;�z��an	6`�h��/3v\[�O}��$�va����#sx�/x�[�`�j�Wa?��|��	�����
�\q�"�<�=�b=ú)�o����C�}ȷ����=gi�ss�6W�{ޭ�17����F�[6�e�i�'gQq}��g��d�c�s�9�ٖ�f>#?Dr��k��;�sa� ��9I���~���}����X�q��	�Oy�
�J��u�K/�A���l���?E��JQ�uo��h+u����!���B���D"6�cމI�.�43s�̙�f��r)���?������$cA��^r[����ڞ:���^��B.�Nَr<hņ �4؂=�Cb��<d�˼8���`�R�ZkE���b�0�<��0��F��N��/؇M��
�a�{�"�m�`
+p������g��p�X�
�����	7�&U�2q�
��I�۠"c�$sw��^��ދ��Ф����	���8_��۬�N���o[`�rN/ܟ���s��0	�}��<�����I��4e�`.i�(}��#c�0��sJߡ����~8�wZy.��c�!�A����־��7�\�J��#����0���1�<���n4�@��U}��V��wo޻�?�����q�?��X�����u��N�A���ε;/��+�Xz
�kK��T����*��
tC�&*A����]�ʍ�����יoΙ3ә/��B8��ʣ����[=�:&g|�?�u��u�ͪs����1����x����^@�u�x��F��-�`|��K�cc��oٗ\u��(�h�8�:��>n۞0g��]��8�c�?`	۴��4N�?m|tӼ�pWO�����W���x�5��	��[�4]�#�5kZ�]O5<Čf1�y�S;��a-]8����->���5��[w]5����6�=�5k]����e�#������_*�_�{�U�����U���s�|㎍���z��ԈyƜ{����\-k�5�e\�9d�t��t���J���x��y.��b�þ��c��yc�J��m�8ǙI�_�u����G�-w{��
)���vи���?}z]��]�IJA��n��9\x�͜h�`"�ql��#qD�	A�("�A���"��2����^��<�ū� &)I#)Q�L�f�x��ٶ��8#N�5l�'O�f.��֊�M��T�q"Ӓe.q��.�|7�R�7��/��E�%wҩ�B����$�����[2��������`���eNF�5H�2�{�[ٖ=���㫏�#�R�+�9�r�R�yj��1���N6h[�m�R&&`�ǩQ�}_�X��M�\�ͽ���:�̩I��~�^>�L���e�, �\}�kdwY�"��l��|�n�e�=�C�q^ȷ|P{����-9���$�n�7�I���=^���3��=�su�أaƔ��Ĵ;��tϤ=c�κg���&&���+������Ɯ���ޥ<��"�rȘ3􍓧�~���(�w��+Rg�oB�et���]��.dA��baa�
<���ރ6�j��6!�wg�i���
3�gF"������J,fa����ĝ^|roݪ:u��S7��!�/�^��	ѧ�:%�g)�$��F��)fVm��R��~26�۞_w,v�5��U���1�#���l���.�B��g()�TLZ�1��@L*���tͼ
�a9��'���{˧�i�Qоl�.ֱ�m�m�J��\Р6���Y�/���̪��1K��[�OYs+��s��b�*O�q���ol�[�c�8o{�e�m���>ZІ&�78�79T���W��c[�A;�g�k\I���c<�N�x�aOת��},Ɠ�x��ֳ�~�{��+z��z/�p�k�i��<Yf�[-��򺰶ղեՐ���mN&�Τ�u�x�y�׬�����UT#Y�����b�8�ʳ���������������s?ϖc^�mZ�τ�����0�\�v<��m�KnA��f��AG`�d�#p�_3��q,+�
�c�$RH�B!�	$��%��
K���
+�%-�#?y�������+����Q��XF� &����X�s
��\@�+��'WAu�\E�EZ�����_�����7�Tw�� ��q=�Po
�b
o���
��Z}/uI��u�FG�7䲤ړ$�ͯ9������&�h��j*��;�7�-�����Q�P�����}ޞz��c��oy6�Tk�4��9߷彥����
^bKuz�'}�{�mLp�O���8�k�U�u��~{���`���{��|��9Qޏ�L�	,���o[}Z�?�9�j����wƏk���h��m�?k�Z�΁�;�U�
S�Dl,
$���)v��2
+�|�J0q���=��|�ƺ�����ޅZ���;��ٌ��gy��<p�{p�M��V���q����m��.�A�i�<������;д�޴Ջ-
qi�RUq���Z� �������I��_��fΜ�cB�e����� h����!�v �����I+��%��Q�ѱ�9�ۂ�k	��.1Ǡ
+u���'�l��؃I+W]C��!9�=�}ʸh{����4��>lC�mS�'9�3�l�	�:�/1�Wc<�(��g���Fe�.0n��U9�lX�����8W����9�	��I2���'h0v�����{�pļ�
+n��5��<�Hb6�^���a��I��1��~��ۋ���B�-����n�ߘO�{��6�߬�y�z�Yk��ro�L�~ʝLP�Eߊ�s\�¤��զ1b�Cۥ�󏠋�!�O�N3����3ߩ�{}�>�
�+��Y��ȽLY���=������ӿ/CQ����#�-l�X�b5�(��OiU5��V��6D��&"H0 �Dl��,�'�{��O�;��w�/�c&�/!�q����9W�g!��:G�E��.E��'�%��8�����_z,�
+,�<s3|.pl
r�`ʃ$%H�M1?EI�Ґ�<Ta����#��y���wYX��:��1�A�8�
�P�
X�ZU+.q�9�Sja���XW�/����
��f�{(s�k�i�A�C����9|"�=Ђ�v����%��-{�#�+��]{�dg��5ڡ��ߜp<KƲ�G�2�	g��O��	 ��5���0t ~����uo���W�Y�s�i�,�����wA�G�9�::�Zb�71+�5�1�sz��;�5�p������3?w2d��ϣ4Bh��_�9���\���
�
�)��}ӹJ1������"6>�/`mkg���:��x�	�-^x!�("
+ފ� b'�
+���8�@���L����O&1���HH�)I#Ԙ�@���./&��Mz�D����k�NՔ������0�gA��I���j��ߗ���7��wY)xs
b���6q�g�b�V�}�(֎?�5�q�LcR�"汆m���r��1�����uճ�K|Ԁ�������2v�|sXP
�xe����	e�=��r�'����ı�\T�7x�;^p�u��:��+�j����O�������*y�V���;�X�^�q
��٘�*��ˠ��[��S����Q�w������#�d�#�י薼w
+:3�|���KF�1�ߝ��'�~�����*>~�������ߝ����tw/~�]�Vi�6q�m�Oi�>�u$�|9�����?�p۰�mԻOTA��Yi��,)����'v�{Y�
d!A�(
�m���ȣM�Bj�2&����w�'7��{�3sf�	!���
��[z� ���eѕ��Dm칵/�����q�MwJ���\���}��!q}'����$���(I^��DZ�f���*;Ø�<V�Nq�C,�Fd�qB��xB�Wm~aK��0��X��e�X�,f�*Xr9����
��;�G_B�k�J�8��XQ����%ny߈V����ď�mxʳ8�g,�#��:�p�o��:m�����c���ms�}��7��1*ZO�no�w�D��וj��OE��W>GZ�wx���N�1�]Vm��?�j���w�c�l�Xpb�+�P��B��\޽+������)Y�i�nc]\p��;l��}uH�X�>7�w��B��л���	�
f�pذ�m�I/�Q��ۮ,-��>��m��b��k�k�1fjXH$"H�DBb%���t����sⶱ��{�=w<�s�d�K
+��F��FR�$-�����)��rtHJ�:����~�0�qj�.�N�k���g$�g�>�y ����Z�p�'
+�
|�QL霗��[��Jm�:�	,��z|;O��@j'��}��c��*��P�:e[��wC��]�F\3/������ğPP_r���=�6�(��}i�3���j�������6ߗ��np�C�ӱ��>v��q�����~4֟�����g�:�U���>ŧγ��tW3XQ��`�U����Ș�0�;7�;���Ɛ�����]��[��-��w����u���V�V�VWa}g��l��>W��#������V���?ٸd�+�~\�b~=˺��_	�|1��}��.CA�S���KH���ZmݖV��*Um��Q*>�B��`oec��Jb���I�MX�r�Ν9gfz�"R�y�B4�ylk�0)�c�a�Cf!1���?6.�8)(�>\�9	��8�d�4�mq�Ip�;o��=�I��>�S�ϴ3&�E�OP�t|
�`Na���X�w���
��t��^�
���o��ϥ
+{��Op�<�o���<�
�9��O��x�;��s߆f�=��u���_Ћo̧9�����k���e�-g=M:湬�{���}�=���3+��u�Uϥ�:�_d��]v�Z�
+���(;�ii��}�=��7��k#-�:L�Vl^�����<��tj�_˞�[���6������v��im]O�������c��?��{��!
+����Ag�͉rM�����x��u��.�A��)+��������ZUZm��V�ЈkEQq-�`#$؈���CH$��w����]|2ә3�L;35��1Y$ED��XT};6 aq���r���C<��?C�F��n�	������?��9�&���j'����c
�ˈ����w�k����j_�@-�f�XQ;�	)��w��1-�ƴ�����ۅ��&��XE	[��+�7W8�1�W����{԰����o�V��TkC�쩋���@���v�.��C�>RΊj��-k��:ǚ�^�o���Mլ*�uh�G�>���b^�����ٹ�ilYy7����iϤŝOA2:sw��sNg���ݙg5�Ӝ[�6w��1w�b�pw2�d�ͥT/�����-�w7�j�~R�t�ۗ5�������_��}�/�&����ݚ��]��/�"V��uԻNA��L|
+_�W���0�\V`
��"�x�x�Z�X5�vV���D����qŗ͞9s����HR��4�s����!
Y�!Ÿ�p�ȷ��e8�F�
+�0��T���:�p����c�T��%�}Zpd97�S�����k��q�eX�5��
+����3�8
_"CӸ����|�
ay�p��o@-��#�g�M�3��?���=@�L�q���\�	����o��1\Gq㺧p�e���^wY���a/m�8��k���zc�qk�}6a�����P��-�6�SHU��G��e�`��//����sZ�rt��yQ��9��ߤ~+��a�9��x����Ϋ���ZC�|kY�h<��K�3(3�������/�Р����p�����_c������.CA���$l$V��ŋؠT[���j���q��%D"DD���6Ć��x
�I���6������?gf�1S3�Ā�	��b�{m �4�Q�V1�scZz�jLkW���,cK���2�,�Ԗ���>�ŏ6`�<.GJ������������,��C
y��ʪw��ik�U���7s����ĝ(W^� �/�ςڷp�O��+�sc��"�5����~���چn�ǔ���^�8P��rW4������u�_�}l����x�>osi�7k�_7/y�~;�v]m�>��b���@��9���ւ[G9	�g�u���V�K��3�����)����+��]n��U=%՛ҷ1S߇��	t?��X����s�_��n��|�'Ρ_�9����u��.CA����l���-/@��k��)��]�[�oq	A\�@�@""���M29��'s����sf�c"����:�E��^�E���11�ю+x3��%<_��2L�U�nяf��<�hV�ta�j�4��P�Ҫ<�z�I�K���iYtkm����b��/�1cX�np��]�]�`��w�#��}�k��j�w{�{�e�O�rd���
�3���s��ߨ&��~��$VJ��s,j]#jm�'���<j�/q�-,a����/���>�6�qg
+g�P���kHk�j�CZS^5��Ϛĸ�]�d��|Ah��9ꔤ��{���RlP9�m��s��4�����r�g��n�ƌ���wŝww/Ғ�j��sw��ok�w<�����ߛ������9ߡ_"M��u�KKQ�O!Z����;���+���i�Xi^F-)���d*ZA�MEA�k�&hӲ�s�C�
3g�\�9gD$ ��6F(�FF-!
+�io�!�i�LA�E|����g�ų3��}'���6`f�Kటq���5�9H��E˓�N�W��$�H�Q�}��<{p��cX��ʰ%�'}�ƹi�uX�M8�K�qo�w��o�o�enU��g��)�{�h�Km1��U_3�cN:��mCN0v\�!c?2��������n��8G{�kۃxu��u���9������7l�/}
/���j���zK\G�ߦČ���:�U����"��w�zY~�8�=��Y�u8~��̳�1���3&����֘��ڰˑ6����3�f��{S�{&�Y0��-:�4�z:7�������8�f����i�G���v	��m��NSA��i�7.\��
|��ZK���B)-±R�J@�%��!�!�P�7�q�!�7��N��tr�⓹����r�cL���sIx���D���
+�H�eD��Y��5�����'�#���M�bu���(�^Fr�H�b����	y/&�vQ
+��!�ީ��ꎍ�E�a׬�2����7��RC��
`;��<{��Z����rr>�
+�X���\�x�7:�~|��d
㊵�h=e	�g���'s��=��;��h�����[��~�0��h/_pF�#�R��>�z�����gα��9���������I蝱kW�W�c#:���I�;�0�ŕu���ݓ���}VzweXg���os��[R{7ݷծ���d=�J�5�;���n݇������/w�4�� ��@{+y{q��}��@J}�$���8���º_l\z��m��JBQ�Ѡq�P�&A��[�����Ԏe��!��$]A� a4�Qэ�Y�"hРI
���6��}]{���1&h�	�,���%��1��}�#؂����s`V��߉1�t�u{P�,L�$�%�`L�)X�+��;(�_��/CiΗ`}�k�ȵ�9f��� �-c��P��=׬7e�g�
+��[�r������Љ�7��
gc�.�^Я���:�)g6�*����6�"�7Ǹ���̘7�~���=Ї�Ϸ��o�n3�����9�����������1u��3�[g��㑺�W���׬u޺���߯�|ѳ�{�K9i�sM�)�|�s��Qe�抴m3fك�Q�sN����C���}���ﲌ�>j�{��Y~c��E�����׹56��e�:��6��r��?���/s>�s�z�����ʎ��mԹ.DQ��c�4
+o���@���e��0�؃�b
!�J%!�*o ��������'w���{�:�ܷ4Z��htJ��HJz��k���fX�ɨ\:�W.�R��Y�G/}�>�'9�3�n�M����c�U?7��!`-�� =�/�-&#���޹�7�
+K�+�����dQ�e[�eMf�oZVeC։��w��gr$8�S��O�UJ�~?���M1��/'ϊ��}P�f�e����,�~߶���;�'�)�*���1r��_�j0�?�L^�_!�R��;�'��:�>��3<���G���P�����$��ɰ�8����H�I2ۜ��.��d�413��܈�a����p��}�;��E�u��kt��3��I"�lj����q�j���g���s?�Q[o#�z����;�h��o�0��e��.CQ�͕gp�m<�G����juL��S�L�c�Db�1].$$��x
��_�b�.��v���Z{:ι��뤀��!��05������49�($�
+��70Y>�)H3o��ìA���<xP�
��<��'q��/�Q�m�9�����0LásMm�5��t�{��M�:\p^ҷ�|��>L���
���p��������<-h���a��Ra}����Ƶ�5��\=�������}�+�݁U؄#���`��q�3!FM|��,��z��y~��`�8�]Xa}U�w
+f����3�T2{Zf_�</r���Y�����6��șJ4��S�ΐ�<i��:eI�w�%n��3*g8J��l���Z�s_=Ʋ1�ѼJ���6ù�[��L<[���;�w��{�������C�
��R��O����}��.CA��i<�xK��C�V��ZmO/�Z����X�6.ⶒ��΃����#,>9�����?3g�c�Ƙ�DCb��ԥ#M����p�.ט'��ۼ
��ț&���y6>�w�����Bҫ� &E����˜f�,�K��ܗ���K�)��DDs���I�dMN�U��QY�:Р}W��Y�"�/}z�!��]��\�%}�^�:��@�d�:5ƿ-/�?,�_�"#2��y�#�_�=5m�u֭A.W�I��7��gQVe_��{B��c��f?�Y���Wyno�m���ȷ����ïS ޲�����'C\v_T��C�PǶe��=>ON�\v�w�N���|�<1I���1�0�s�k`��k�%���Ϣ;O����C����Cq�!���O|K!����}�;N�@����r�@��$�$�
������£AQD<
+������/�#F+�������zbcL���#9X�"�!��d�{�J+��/+Y5n���^�㩸y%�(���[��&4!�:TXg�5V�M]8�S8�}�����po�
O|>��5%�5a�Wc&�af�v�<Z�{'�'Qut����r[S�{>��\�y�~��b�wp���0�����[�y5��j�;s$[�\��l��2�9滩�����q~��d�9���m�n+����"�u���_tI�ʼH�
�;r�}�\�l0NZk!ϵ�s�����9rr�+P���4��p,Py�|�'��,�ߍ��&5�[���
+|����ԻJA�_�ǰ�-|5�1��5���&�&D�
+���X��"Vډ�`%V��c�����̙����HVDf`feX��c�fb!�`�`�
��We�c�OY��6c��Nϑ!o�}�#���j��3��\�e��'p,���`"�)$�E���\��`�\�e�i~ס��!�G��\�ϵb�Ճ.c�MX��~	�5hp�
���g���5L���uy�W�^���k̓�٤:�s��ѼČ�<3?��O�ͳ�(�8=���xۙ?eL���w��Ux�����J�~J2�V��#��C��^�q:v������~����d^v��`����{p���˼�M��e̴-R�u}C�{�߼�G���-�����v=���u��.CA���ֻxK;�ނ��ӛK�ڣU�B�DD"��K� $"<�D����w��I��ę����̜�7�,ȼ�$-YII������˛\�%��r�O"�IR?C
�����b	o��0Nxk�|�g@�Ad�,�E,��my1fdR�DfeJ�eL��I���r(ix��'��#�`-�fY�R"�F΍��3w`k�ʦ�԰w����z�>��i1��l�v_�m�茌�yN�_��K��G����#iJUVPe]Ǯחc�\�as��߫|ɓ���#�rA�=�zv{�yBj��r&�ɸ���[�+�u��l��챀<rp� "�
���]=�^f��q�~�e�½Ke/�\�����s�wrJ}���;�K�{vܷ:�w�bCr����
�����}��.CA��X�7��^��X��^moi�Ki���ğ B��a�	ĚXYZ�I�)�Org�̙s��c�5?B)HI"I�����\�3�)�!�]���&�b��D��y䈓����+�\�i/��w�8�伜C�,�LIY��̘�Ϙ�Sc�����uCsw2,�Zs"[�5�I^�Vv���*�x^��=w���$�욺��V���Y�0��[D���˰�
�V]��(��_�w�ڕm9��e���?�9�B_��^����
+q�K�&���=��#�����ɦ�ӏ%ꈩ��\���3�Z.�y��\��߱�4Y�̸�gy^�y���w+�YNp1��Ǝ{�#�=�6��/ϳ����m.��<#b��E���Cҫ�#�ǜU�n�}g�[n����?�}�#���p��S���u��u�K/Q�3�G"_��ކ�/ �3Xh�:}�TK��z�#l4D,��R���D"�g�X����Ѵ�_f�ν��{Ν��4�A���]E 
%:�;8�2�8>ƾai�&�+J�1X�4��h�$�S���m�䲟ŷx.��#νxP�
+�ë��,҃��GD�>p?#E���)��m�`�/p5X�*Gy�[c.0i^��G��<��<���֦��?K�X���:��Z�ڇ`��p{�����
�!l1O%���h��1��<@v9���Kx�o�A�^@��8�z�FGs�������Ƚl���ucN�a��v��u��15�T���9*���W`>=�Vk�J�l�XK�Ti�X�m�y�~�6vΓ�:�9�E��7�IB��!�=5�9v���'����<��{���Z�Ǿ�hW��`��,��+L�'��Y��u��NSQ��ť��q�ء#���0�x������U�%VI�&Ł		��`������Ȉ�	�ߊ��0�%����:k�3{nw�0�ILa\�H&�=�iT��y�E)��I�pLJ{�3gP�yE���f�nL��A>y���=�t,~:�
+�U�	�����?f���}f�=f�#��3枘���>a{�������5N����.�z�'eB�߳x�E,�N��W�UE�sZ;��5%�Q�_j}o����>띪:���u��M�i���������hb[8��c��7u뢶����Y�.ud���~��;�Q~��OU�^��r�b���w~_�����%���5�����z��t��sާޓ~�~�����-����n*�(N.X��(֨�1����y���w!��M�ߨ
��������O�[7�.u�U�Y
+�9����c�&Ŀ�o��n��u��Ұ�u�;KA�'�Ieoe!؉��@�� B�Cs^^.���р��7���b�����_��������rh�cowgg�3;�"��_R r`��4��E�
��� M����eH��yV�����e|s�hQf�Ѫ��,�V9K��H[��-1�*h�m�*9�~���Ğ����>���:X:�� ���&����US�\��H��'b�*5���h�:�`���e����c��k��U�������18[�PcL�N�=p�q��Z�6G�w��9��[B�ku��0¦���7/�٦�Kp�x
ƮS�FFq�t�	|�#��{�M��k����u
���+����)Yk�t��`�s�H
+$l�Q���ܱFÕN��D{�!9��l��Fo�>0���;�E����"	�u<���Q[�w�K�?s-j�u������üO?6ߏ�.k��m��.Q�[*��s�Xx��l|tTG;�V[mi���W|�H���	���BDll�=����O�L,~�t��s�{�c�L`��9JCr��	p��j�����|�e�@f)A��$��qm�s>4_����+�R�/q�P�83&��ȷ1=o���/����r�
8���Wx��e�C��+��|yZ�f��k�5*���7�
�Ђ��\�u)Xq���K�U��p[|w]����|f��k|�2s��1\�
k�f�:5C�a�9e�j���E�h�Q�	���;�!���na��+���\�+�Q\������Pem/��Y���,>Ǵ&r�&����9����cTY�'�����u��B�Wz١p��\C����>�Tb�����Q�_l̘Aԫ��Q�
�F��<���dBuгA�='�>/k�z>�4I�3�F�Q��u��.CQ�W<������3^���-GO/�7��(���1(b�L\ffb$1�x���ӕ�|ٗ�׿�^�""�2 NVB$�ȃȁH
G��Gh����c���4Hr>�~�1S#�.�*��WC�����d����d���Hd
+L����.�0��
+��!h��Z�1��U��.8M���%�E�6�%�� ����3pv@�k���~���WT�^�Z=ƭ�u�_a-`����@i�pGL��5b�q�'�7����|#]��?�9̿���^�{pK�:�b��>���
�D��Ƌ�a�
�a4���Y3{'=��}YuO����7;��%i��]����	���
+���JÌ�]vd����&֬��󙗉��$C�p�ǧE&fE�0�
�;�T�a
�晛�þ='���G�f��`����3~
��I���}�9N�@�q��
8G����
+���	!�`��E,bA@�B�(�������G#ˡ�d���<��6�,��:-9l{X��W����<A}��-��y_Ֆ&i�Av���צVż��y:Х
���r؀BZ������x@v�M�;|�=�@߉M�F�:걦������׺�3&����zl�G�\�o����v��6��>\�s�s��'�>�sT{��g�6ƛ�Y�A�^���z\7u�;e����-�ϛ����X���N�wD�7�3��}뜨��8��{�O����k�=N�N����N���K�!��^�^����J�,�;����S���	5��r��U�W��U{�u���\�G(^�`�	��П_ĩ����ԹN�@��d�j�v�b!@�*
+�
�DA�@HT�@AG������(ő�yw�m�Y0�j�"��4�
>�
�]�B�B���!Z��&y�$ik�03f���/�cMK�P@�~C�C��Й#T�v>ټ��^����8u2��R�A�,k��]�S��3K�X�
p7p�ñMa�ks�����)c+�~{��
na�y#�u��_�ȼ��g̼Xvl{��
+��W�`퐙�\���QB�<P�C�~"睅ε��S/��)�ה뛳�o�=%�a˔{I�{Z�m]��v�wa�s���8w�����N�.Q�oH����{#���qȵ�#������u��԰�]�OK�@�|dkM�?��5���ZT
+zT<��ŋx��ū��7��<����;;;��$��A��!��)��h�q�I��L!�#�+,����A|�|f�u^�}ƔQ*2�(d���l�j)%v��� �����
��<�9̥W߿��	,`�c{�}72��x-�����p	��/p�"�?�,����C��5c����yž?���N������~��9-w�}Z�[{��[Ʈه���=.XӁ�9��=�Q�z�~J�k��{�g�3g�'��c3�X^�l����z����)ẚ=�;��Yp��W<�
�[�~/���e�#��gQ�v���X�������i�.��!��u��N�0P�1�6mӔ�y��P�P��A Ć����`��:X���3ǩsn�9ס�@"�SD=���i@:�
�u_�jHX�gh>��a�a
+)� ~��D�:����)e�S�����!��u�yt����<!�+1��N�}Nx>��s�����}��4�Q0���,Z؃��+��[��s8�9㶸��d�kA���������������^����V�C�P�s
��
��G9�M2P�>{�^�����yj���nפ�Ӽ�yϺ׊c�ۊM���;>4s�{ҹk�1�YȹOY�g�}�=���oc�^v�q��v���k��<�G�����e�X߭Ȥ��]�IJA�����s�Ƙ�t'1ck����u�".t-����\����xHz���JB�!�-�I]����:җB�d&9��Gqi���}�^R�ʑI�w�r#�r)����鑳����c�ʡ,�c��9���,�+�E�}݁���r�y��^�����j�y���6d]��e��<��u<����U�s�Y�3���\��M>䙵?a����0O�Lj�3j/P��Z�䔚��$/�*_�#��Hm��
Y���/��dmK�nIo��0�9||^|N��S�{�Għg(�g"��d�M�\ƿQ�3_���6���͊=X�7>��ٽ����3�&������yTcH\�_Ҥ�m԰�������V��m�9N�@��y8@�qlǎ��da1� �"6AACEDn@M��y��'��(>َg�ef�ܚsn6�=�K;��{T�5|��C�Ӈ��������1�r2�#��Fc�S�1�&���'�Jc�p�P�zl)k)yzV|��S�y#*L߉��y�ppS��ܹ�
+ FgϿp5s'�R�~j�(�n�9*^}�3^}
o�
?���)�L�
���,L�zd�2u���c�mد���g�y/���k�1�W{�����t�ؗ�s<q�|�=�64���^k]���=g��Y�s;ii/�w�?4Vg�һ���琵*����{���yT-���L�Il���G|Ws���b����un�6�y���Lİ�u�[J�P����N\�Kq�Z��4I��6��*��
/���%��\���2���#9gf��9�Y�E��&X�g�4��s`��LM�Y��k�
VA�FWi�н���=pvA�ZS����Y���W�Қn��
(hs�!a?9�Jjwhk��11�3je��ӧV�>#�9��>�����	�<���_��3Ol�ۺ3À�W���!ϡ�}�#p>�'x
��'g/'���[j�̝�utk�|�e���Yۙ��Ԉ�m�Zt�=j΂g�k|���}?��J����霸	���S�΄=����MB_�M�{��{m?:�aͿ!�]�w30k��ߙ������������?�p_�5bl �k����~�SPC��}��.A�����x	ZMO��ї1Cb�K���,\a1��ai�=<����Ig��K���s��㜛q���<D�
�s�w�ûsS0
��@	t����1F������ːq�Y�֩�S�����p-!�т%�.;%�Ї.�ܣ�[�;0n�}���8������O�[�\w`Vً<������֘S�ҚR�jS�3ك��S��|�O����	^��{�G����
+W�[r=g~=߲��aN�.�X��;�s�#�����qF�S�*���S��:�����gP��j���u��_Ω�;��}�&~L�����	��#�	_�x��-5M>{����b�k>]�o��b�Ѽ��h?�j�uh��ߠ��ڌ��m�O/CQů��/K�}���zZJiʂ �H��",���W�7g�L�d��/���Ν93�Na1�,;��<7A�4��
��0����� ���^bD }~M:$1��DܫO��&r�`��y��c�cCJ_B���[�������%&^��u������Ό^}E�l�9��`>�e.�xg�ߛ���ɓ��Vw����c2��o��y�����=�m�P2��/�
��R�u(k*�<�v��k���������|N4VIr�1gl9�
+>��g?�#�J���[�Wz�?k?u�v�;������-��}�]�8�P�
�VkgC�:����ym���t���{��m�~�q4���g]������L�԰�}�IN�@���cp�IO1�c��bF�,�,`��������K��œݝ�j��ܒ��<CMh�
+4 �!���CڌK c\�9dn��p{�9�c�h�#0t�mĬ��C�����^D��5|�<q�t�gd��z��⳸�usF�Ҿ�yuH��Xs'��~$�6�f]f�{j��p	o��pt�����",`�
؅}�쳧��C�Q�:b����57=������<��ِ�8d^��J9i��J�u9�Θk�{ٷ��g֔~7L��y	�����'e��6f����5�Y��̅�g_�z�u�A:_w��~K~|�����U1i�~��׫ۇ~��_�Z:\O��}�;N�@ॢ��#pN��$�;�IH'�%�W�x��p�#��r$����Q��d���3;�ua+����ԩ��d�G�Р&$����%��eX��7��	 7cNd�]c��گ���Ѓ
�n��	s�<�
���ؿ�1��%��
�}H9wb��vJ����JNS��s���]�)L~)��Cx��~�q�ŵ�����V`6���[8�z$�>�v[i]�Vg�W�넹���c]���8f�f���M���͚
+wD��1c�~b�W����MN����:m������������Y��Kޏ��݇v��ē��{����N��n��u�g�)K���k^�����/ј�l�Zv�l�YD��}��N�@�Č�s0�,��Ҕ�-IHӦ�
-110 ��l�0��, �[�-YV��ӝu>���B8
!�m!
=�8[��_
+.#�_!��p�|�'P����#3�7�Ѕ���}"�3P��|jp^�xa�
�/Y�e�U��h�
�!'C�q��s�[P{
�H�Vɵ"�ߐk�z��=?!�`������>R�����������W���b��i�ُI-}E���,�3c��P�W�Rg�}�52��"c��c��5�i�IC4W=�s`�K)��:��K�g�x]�Zb�����,ۀ����չ�9����);�#�������s$�����p.��`��u�IN�@E+\�5�#���&vll�$1	!!�H�G`�1�p$~)��JCO�Tu��:"2���	��{���D$=x�38�X��O�J��8`B�����Q_�x�������@C[���|
+�����l�3�:3��VsFM���ЯZG<kZ�#���f���lH�tLWm-�_�����x���o��Z�'�y}O�F�	c�\���c�uhN�,ٻ�,�k�定��\ҷ���:g��o�h����Yϙ�w����e��y_���︶����ǎT���я���L�l�<�L�y�e{�<67	�|�@�bFԴ��ߖ�e��R6�=?�7wZ��G���C��
UWr*��m�=N�@���KpB��I�6�C�@�P@ME�DOA�����"��ވa��SV3o�ww""}�� @��$�i<�@b��
+\��>�x'`
+�Y'1��q%��l@Ø��=L@�^��Ǧ^��^���Ԡ�~��fL}Ƶc�'g���4�35�F���r��;Kpĵ��|��-�ٙ�������}�sj�y!/-���W�[�{ԯ��������Ԭ��#��7�2=z�K��:�{�����M�j���~k�Ɍ���]��Q�=��'�
���5W�(�W�?1��Mx'�hy�K����Vߣ���2�����&%�Oj��7�?#:k���Q�oq<��Ȼ��oކ�=���5�!�S��y��ð�u�IN�@�ʎp�������`�$H� ,�`��������7�%J��x��k�"���@_��7h�CW�mJ �&ps8�#�;H)ᾈ4VLQ��W�N�y��IYC��8�/1�f���2vg��0`/?
�<ڧ��+'8�+3�F�g��c���p
7�%�[�u@ϽU�=�!t�.����j�3d�����9e�g����cTfN��1��.������=����fކ�c�֘~j�g�:J�����;����+|/�&?p����Z�������g��5�)���W���<4��ñɛ��K�߱���m���yK3;=�^|�w�
��sj�j��+����Q����6}-c��}��.Q��e�	<�0m������H��6H�DB��X ���HXI<�%O`�\s**7�ŗS���H[D���E�"��,R��Eң-']�'DcuH�}p
+^�8Ȩ�藚6����\��ϲD
+��������S�j����:S���f��7����܀[p
.�#��G�����V�:�C�������|�wp��k"=jh�~h��9
o�<��F�g�h슽�h�g��3�E]��}��9O<�L~�L��9��i��d�[;�Wr�!3���Pw�9�!g��w�cw���k��ss�;�303
+w]�P��%{��y�&?/�;���.�Ȃ8���9���w$��G�
f
+
�����JA�'���O!X�
+crwI.��h���?E����DQH+ZX�`-XYX�����
��{3�;����HE��D����L=l���A4A�4I"���T
+�UA��܁}�/�ƴT��W5*Q�i]m�-~�����|�m�r56����:5��Ь�'���i�k�
+���
[`lP�jUԷJ�m=��mp`��psg�S�4
f����<��=�1s\�7�^�)虾���>��'�)�&��
+df_��A���-29nE&�a����!�ؑ�}
I��!�r�n�kxd�����:��5�ߞ{L��e�ہ�廓�2d��
��3^����=����>�x�����6���괽r�牾m��k����h�����J�@�'_��G_��j���4�?j��?P<� �� ��œ x�
<y�,����?�l6�3�I�s��Hƪ0��*MPD7b�i���:�D�ЄR>c��z2�����\O�e\ϛ:�yj��̩��8
X�,2w���\��ག��15��4�cy�R֣����*y�=��
s
+&�Y
+�\/@�u����#5ta�8/�������!�b��r���_�VZ_��
+�6�w�h�dܟ��S`
'��|�a�w�j�@�G�A��T���'a�v\�Ǵg��[�
��/��pp�pļ����
�w������c��:_�]��><�+������s�?RW�{�2{��}������s��ߦ�#����|{cT��{�_w�N߰�m��JA�k@S_ħ�5L|�=�w���]�]�D�Dc�HL}	c�o�/�h
>������GDVE��`
d ')h��Q;��so��]�����I�:(�>�O�܂�	: �y��S����\�h��v>+��7��0���c�&D�4�.���2�3V��]m��\p��	�b��6��h~)cvLn�`F��|�x��$9�-ڏ�gh���n@�c��:߈D�{Q��励2sGzOV�j�2߾�w�p�uEºj�l�g�
��`�w�ѐ��&�9���2@M��_�2�^���W=�O������<���J^���7Pɴߴ�KƝ�N�d�Vc��Ɯ�K�3��Z�Z�w�o�;a�Vԗs�`
��s	,b�λ�[ߎj��7k����ɣ��u�9NCAD���K�r.�
l��7c��,�	�" 6	DH�-$D9w�Ʈ�Z#<��z��g�;�ι:h�l��z +�IV�S|��Y�
+P\ĠG�۹����"��dl�CZF�?=y�L���50`�^;1�l~���k;Dqm����{ܻ2:}����!eb�5��qi�.6y
+�1W_��^6He�5�')�2�!csƩ�(I�c�'��9f'��y�&^볠1��)���;�O?�NJ�1%����9݂���9������p���'�O-��|Ԑ��K�Iw߯���\�3�~Q��w�F`��SS�u��#8��Xxwr��~��a����wj�S7���߿��XK��W��z;�#|����7,/�h&��u��JAEK$+�/2q^�f�&ADD�'��p!n|l\�	"�����s/�C\�����vuטYdfm�
=���1(AR����c[Ĉ�C�_�M�9�
+������o}a��s�`
+���q�"3Y�3���C�Hq��wL=S�f��m��o�xLFԲL��oν=�74/ө\ءV�*87r��Tr�p�njQrm ]"�O���'�<�K0k䑞�Q���WI�G�u.�:��%}�����p��'����}0a�aF�j��W}�.G���?u��a˜��
+��ݷ���C�3Թ�-u�5��_g�o*0O����*������-
���Qc�x��z���/\��k�?A��vl��?���
���w��u��JQ�G������o`g�3�B���Mv���A��Q�Q�N+���|[=79��K,>�;;w��s�Y��� 	�!�h������l\��c>�F������͞��V���桥���2�}RG
+bֈ\�@���Φ�Μ*�	��X��N�c���kp��U�g� W;�w�
�	��)����6������5�9��{��җ�M��9t���e인3%��t).�ֶ��iH���ѓ
���қ��{��[\�Ԭ}�/�Ktx�c�a6����o�+��@�3����޻�W͒�Mu��܁�N�K�=����n�3xt��(v�5�=zַɻ�o&.��>�7|Y��[�{��|݀w�j��m2�zs�ʎu�u������/�XJذ�u�?/a�g"����E�*���[{��nw�C8�"�F":
+5Qk$J�B�y�31^���2���<��+"
Y$-��.�@hX�h=o=��ud`���"�#"cs"w�Cd�Sdh��`t@�:-ӧ����)�I<}�����i�����=8���d��ĤM
.�\�+p
+�Q���Ć�~e޹կ�:���������5�S�����:cWc���G�Kc�����v�>�����G;`�:+���������nM�}�׭~���>M�y0���Z
+�nj��'}/�G�^5Gk�w�9���j��"��=	��rn���ҿ�=��NdR��U�sz��{�����2د�����a
��
��m�����v��z_
ϥ��uԻ.a��J$:o��D��yv���ٙ����*�B%�P�Pi��I4�Η������|�=�e���f�A�}SD����(���}�"Z�
��k65o6�l6Ӄ
���j�h{�]�!�9#W��8��r\��y[��k�0�
��<5X�%@�=����ϟ0�\�<����yR�m���$��gҿ�>�3�\�r��P��k*d\s�2�)����~F���[sy�B�TL���=ȱ�>�n�:�Î䫢��9s9�{��>���
��S���D^�g�߁�_��Ѽ�sΥ_�/��{�`�9��'�7ܳv���Om�7�������
+���opl�w���s�wY���-���}�����q���u�9N�P�	���p
.�(�(8
$��Ď�% �����
�tZ.@KMO����hŧ�-����"��M�I��EC]H��߄cA��Pr½HcIdfMdvw����y�]@���\<�'f_jt
ͯ5o�.��c��G��z��`
}op;&Ol���B�����
+S�ݗ��9��H�um9k2��n�u�����`ފg�7�ߧSx�O��W8�m�Oɜ����֥c~��u�XӀ}�,��d.���m_�߿������ϯ��༒q�.�^�<�s���x��/)c��7c��<��^N��/]s��SO�$�_��������
+,���\��m���~S���vd�:�fn�ww=&��m�;N�0`�T��t\cK
+
+��Y'8�&l ���	DA�tPP!�@�8
��H�!�'9�=���8�ιMc�҈�v
+lA���il��Jh�^�ǹd�m��Pp��)׈��M���"S�
+�o����!s&po�k	07Y��7<�!k�u��/�9��c�Ǧ.-�οP�e\A]~SƼ�{�r�D�˰���9s��k��><c� ^�+x�
+�õjΛp/�"qK%���h�\��z�:�����H<�C����=��Ζqln���?
��e{n�:�s�q�r�3����z�^e��b�+��K�=�9�n���Oo�;�U|}v]]��_�
�֬'N�}���w�7,5�=t�c5w�B5V1��}��NAD������]lsc�!$D�8B� & &!#�ȩ�R1�OkO�t�13f�jf�d�����؏���A�o
�HB҈`�A
��>�����M�Kj��׈^%��d!�l�
�1FԞ�^J����W�>�#8d��?�+c��*����Z+u$��ӷ��8W�������=�*
�8�f���8��g�}��g(h�K�G�b͚u�ҋ��F�јy�����ؚ��ײ�{��n��_��|}~ރp�f`�~���ה=���&�{|��k�A7܍m�&ғ	�|�%�*јw'=�B�;rL��9��5nx+��з#-�ߑT���@�}�q���u��N�0�M_H�4M�Z�B�J��N\y	ހ+��Ẍ���x׳㵓�aa��g`
+2
��B��|*ϙ%�`N*Ё#p
+�`Z����ڂ���T�d~e~ƣ�#x�sC����`�ZS�ך�K����P��ǂ4̯��8���Z�S�\w��1o`�n�����5�1G�jC��W{���'ob�z����x����>�
5�ֳxF'<�>�c��ol~I|ߩ?��,��&=�/�9�i�<���
����{��[��K��}�X��5�߁w�
^��]O�����_��#��Gֹn�/�?"��4ի<�K�3��
WQ���u�MN�@��m8
+ǁ���$��
m�b��W�7@�H�H�IƤ�O�=��L�lef�䊬H
*Ђ�<����5���}Ij��@�O�kR����$�'��
�8����#m�@��:�8#��b��٤��6�ד6ب�Y�e���6��⫾;p��sj���Ěv����|�p
��f��c�'�n��}j~O��HrMy`����|x{��7�|���bd�ߑ�t����J��Ӗuh���S�9�W�b✞�[g��]�={��e-��;�.sF��
��.���P|[�	��(���_B������.���-�_��}��N1���P����n)��w@�����yN=w3�X,�O��v�5����}2#%hA�oA���8 q.�
+$�H��~I݂�ސ�(�%X����
\��
^�-}�	�����8QW{����넌��liS����2�kG��Sk�Q'�K�w��'؂wpC[r���<�gp6̻�Wc��q�ɝO���k?����QsC������V�X+��_���?�p����W���6n�����3��y�8�k`��kg02�:���y���[��k����KН�[�z����}�����~��d�����bwU�װ���AK�@�����f�6K��h� J[�xл��|���u���������&�p��e"T�(���\�s�r�L����<τ�ޏ����p4��
|�n����L���0���%��)��<�3<���1���V����^j�97^G��Ěc��sV�����
+?�o�i3�S�|��W�(��٬X����9{���'����N�����7��O��.���|K����s�񳒲���|/̣��~�K�S��w�.��T4��h��u���C���o�	�I�<�Ӱ�}�MN�0`H�&qSH���.�D�Uq
6�8
+'`ͳ����)�O����xR;��~d
+Q��s�/i�����
+Ƥ�Oq%�k��!t��a��`L͘�~'��2u�L��0od��&\k���ڑbgpŞ^�	���z�ԭ���|T7�^bV��07uZg/��q6�p
�
�I9���`ef{�ϙy7
����~:�Yw����<4O�=��W������9g�ϰ�K8b>;��<�`�9��7��ޙ�g?�O�e�+��w�
_�9pF:w����gLg�0�Z�ϔ���ڮ����{Nv��ݲG��y;MӰ�u��J�@��;��w�ЦicӦ1Vm�*hED��Q/E|
_���,��Gw�9��m�B؇=��$�B;��31���z��ڳ��^��b"NŅ8�>�U<�KQ�B������k���3q&n�Z,DE����s|j�|��Mܑ��H�=#z2J�6*�ċ���{�;ߊ��Q��mkbFIm��5�ĚK�O̺"���Z.��O���^��b��ַ�<�Ǿ된
s�3S�y"��~͌�AA��{�v����9��]�_�<%G���jh���ٿ�vĶοh�ҽJ���O��I��6�O�F����p�E�����ת��Bnw�����J�@��{I�41�%�����7�xA|
E\�K}
�\�������C���Й3gΜfBHB�Nkd�N���x
+=J%Vu)u1���2ȡ�C8�98v�p
ǰ#(�Ϛ�+����G����!t:x��)�攑���%L`����Ŝ�0����כ�ǖSɹ�5��������/X����y'����t�35��x�;x��e�Rj�~B�-���26f���d��ї�/`��)Şp������#|�'�3�bKֶ`�������b��>���{ߩ���i����{�vW�_�;mw�;���x۷��yOV�[Z��'i,��}�KNA���l��+2�Py(�h�o�W.L\��.ti<�~�����������!�v��m�����8m��A���E}�3Ǐ�El���B�r �2�����'R��eq���'N-cb<���)�%[?}ᐱ���k�׌;���X�vCm��̡BI�!�[�H.�^^�I�e��cuZ�{�y���w�~@�%y��S��Vf�M�.Y���E�c��Ӱs��]�yٷc��\.���|�1˰��1�ߛ��9�d���)&��g�b#~�V�w��7�@ޫ�:�v.�������{�'�:Y�t��;��#G�﾿�6��y_��{���|ֿ��
�÷g�����N�P�
LKBڤI�K�P
+�� $X`a`c����̱t,\���ro}}�}�+"����it�
������$�.(AEt��x##r��u��.O��,�	�0>ߢe93���Ѐ+��Ev^Dv_�;�?��N�u�_󯺇���sE��3�:wg��3W���g�S���#pV�
܃z0�e>-��Kj�s��P3���}��F���[���?��?Cǘ�N]=�7gf��
xw������}�}FŚ�����Y�8�3�O�ſ��7rw`u�{�>]Rk�;�3^���0���:m_W��Z�l2ٜ��
%ξ�t�g>��^�!OԳ����D5x"�����NAD��τ��6���-��#ABB��B�G@�P#UIMs��I�==]5=��UfV�����#s��X0
�`���r�)���8�
+qit`�Z}P����3�<�w���h6^������դ"%I�e�i�_yoB~\�P~���`l9:���}��Xc|��_��By
��I��'���Kp
��?f�z���-����2oƹ-��Q#�8�������
ܲ3���[36do�>kk�O
�&�N�'�u��qd�ϋ֛�w�������?��
�[�:%�[�]�V�Ϻ��SOԃ�6x�=���!�����ptְ���MJA�+[���2��;�d&�I&�� �E�A\z��k���n���=��.>f����^U��
ͬ2��Y`;�;��t��
�`�u��.�����m����n�=8e�~���u���#��f��
^�'���سE�*�N��G�_9[���e_�A��j0'�S�:�y��fdJ]
��yy�_�.�R�%�
�����fN����j!��Q�t5�9$���-��Y��<�k��	<0�Q��Oc���_��}�=U���{RM�NC�!��
��:��Y�*��m���E�4�wң|}������Y������ίe���-��_?w����}�;N1��Qq*.�H6���&�W�@
/!Z
+W��@4P�6-��[���$�'ye{��+"���A�6�
��.u�#6�t����\�5�QD�gtg��q��@
�/�#��u¼�{�5<�>���^�J�r�S�uR�5�Ҍ�L�Tl,�_�����F��a_e4�gvaK~�;e���W��
+�fir�s�����:��u�pŽT�����.�n��96�S���CxYZ�uX����w`�p^2�֢p��Z��u��861s�a�rw�N�0��Wa
�Oi�am�&������Vc�V��йzW���~���޼��!�����{�Z�?o�v%��}�=N�@�q��Sp9D��q��6ĀB QDI4 Q-��H��3�V�!�Q��S�;�o�v#"���Aװ��#����#�V�t�=���A�U�ڒ:�:���
����	n���>@
��-x
�`n�5�*ЂKp
������Ч A��y�]�|~9�V��Sp�u��������I�ߒu��7���R4�[{m�oٛ���9�m��z����'0c�o���qF?"[�`�Τf>A��\��^��K�������Q�u��g�^�|��Q�h���t������8�^4��NX���Uc�̹L��j��=L��7���_����ֽi��������������J�@�}cmS�l�6m�'<����R
+�*"x��������?����ff'�u�%ιm�fD�H<ߦ8^�Z�4�4ou����
�a	;��8J)�T0�C�c���q>�=�{x��s^k��+�����Ԗq�6��\c1n�(!'OϢz**(���	�M��g���Q^�S���&ľ淘��\��_p/�	�p�p�����؛G�����7��U_s�w{^�+w���Fqt~���}��&fi��=������7<��X1����{����iؓ����.sX[ʸZ��ޤ��ު�����Wu���a� ~�����JA��5���[֍�xA��
+!i���;�F��,|
�����
��a��2�!�Qa˱�|���"���}N���JЂpn�8�|l�X��:K�U�K� ��^�{�
��sw��7�S�c�����7�
o����GqS���#2�Y���q������j��]Ej�#�p��g�5��,z�u��+I�_q޷`��!��F��c3�M{U��O��	{�u��Q��w��z��TK�ﰠ��x���{ю;�a߽�y�y�9�w��b��4~�
�Oo��&��}���^8��o��W�&�����ANAE۳p�$�L"��
+�X�/�11��<�{~��c�2/������C���K.�j}/Cn�ҡ����>)HI�`n�
��k�~����D0Kp���/��+
��I������%���Og-�����kr*W�h4����˒��v�;2Lj(_e�k��?���8�f��{A߯���xd���;��T��ǜ���ȿt6i��˃�}��i�y�C��~��T��O��;������:*Ɣ圄��|��4���{Þ��D���E������Z:
+�ο!�>O
.�Ae����MN�0�́8
+W�u�64��.+�B$��X�����h��{b4J��S2��e��N�"tsI��/������C��U|C�$�
��-�����5�'��(V~��xspV�	<r>�h[}Qj\�O�>����1��!���3��;��φ�_�%Qs���5
���5�ߢ�Ie�^v$��F�%�a�kz�v`6`Mߋ�0�_���^M�Wn�C{�Uov�L������-�Cӧ�C�I�Yu���+�/��|y}�[j��AY7g�����c����w����Q�5��1�}���!��GB����u�;N1D��pε�~X���
+	�bDJ�D�8� ���J*5����v�].��1#'
��i��YBq��+� Zo�Pޒx�S�E�3Ox\:;0��th|G�D}��_��H�Y�܁7��vo���
x_h�<�s�!�uڿ���D��;Өq��������uK�~g9���H͹��!8��7x
W��g{��3x#�*�����B��tl
�R��H
c�E�'iҝ��k�x��^\S�����5���r��Swdʓ���a�/�7���F��{���ol����h�/����]J�P�����Sm���&R�� ��"E|7�|�=c
+>|�;��{&��8�����2�q����[��XY�U�!5�s(�=שnW��"kК��+�':W����5��S�؁/����sI�}��
}���{����g ���޳fk�u�}t��\��=J��q�`�����89gx�
���`���3x�N�[��}���>�G�P�S�G��fFkgN'i����y�,��u������b���k�f�X���_�;�w�w�坶����~y\�7����-�V��u�]N�0���&ı�(��
O�Kp����i�M>Uެww�v#bWd���5@����7+k�ﹷ�[pv�٥��q�Ot$����ZQ�ܓg/d$��uy��H%;�:��^�=��S}������S��#xϜiZ�;��\��O��h��|r]^���j:���5�3{�
~#..��>���7�~"G���X����,�u�������G�S��Sȷ¹��hs�Tc�����$}m�L���|v?����}.݁|����\�Z�8���c����n���}�_��0��=�M������q(��Ӂ���o�0�?�l�;�I��:��
�`�F4j��܊�W�1�����d|�V=f#T@ǥ��-�8y��1��wB<�=� o6~��x$�g4>@o�X�9�Cn��Ÿ7�h�^�@u?����	��w_k0`Og�h��$D�W���F<O��x�t|����@C���h_��Ï	k<��3�|$_]��u�|���W݄��|֘���<�F�t�_y��I��'?��廻�^o�~
+�wV��(� h����YN�@D�Đx^�#�N�� ��
8e�J*���������53)��J)��-H�r��<�i=��@�eNQ�z���j=��˸�HK�r^�|�o�>����߁s#����5��ɼگ�#�<����W�^���=
�z��C~��Ճ7��|���@�R��l-f
+���s,�'M�:�������u��[�����+��Eqٯ���Vs��M~��o��wE����Ej���*��=��zk��V��_��|��8mi����Kj�@D�ĉ��cYrdolY��
����UAQ���[L��gZJ)mRJ[�&t��A��X���P3��1�z�J���~&�K��R���y=�����Yރ���߰������`���}�׺��5&�@��܃[�#���\�h)�˷�>�3��Kp��	sZ������Ͻ�����S������5g���c�x���5�~�ܗ�+���9h��t��ι��������=��|�Z�p������Ȱ�}��n�0��Ɖ�Xr�_d,ڌd�%S�!���K������#i�)�e����o`#�����l�4geƀ�ֹ��P����>r�?�=4����`}5�����O�kp_�
���1�����p]�M�K�߄�)�n�|�{�Ϣ��X�S���>J�S�`/�q6{��\?�?~��v��+�N��D/Y���\����'ɩ;V$���M�m������Oo�ܜ���˴��.���e\��w���KT���v�J����K�0Dsc�KҖ�`��
+��pN�
+W� k���'9�c�ݤ!�&���1�V;�h�/����d��@/�_�넶�q�ϰ�����+}0^I�%��b܍��7�i����2�O����|TG�.���_�t\a��
+�T��r'�sHn?�z=�F?��W�$�3�����ڏ�zk��3�O��f>���$�����r�υ�Gc�j�[ѷ�5����;[C�i�ڿ�������Ѱ���Y�0DsbhK�.lb���\��p
+����Q���TŎ=���B4cz�AZЀ�@{7�0�Z��@u7���3{*�\��qp��}�����L ��{ŷ3���O�m|�������z�9��{��c���_��������E�h�0���It����'�'�a<��}ֳ�o&���x.��We�n�6?+}'?�����.틳i]?�(�ڮ��;���5��.��WX
��}u|
kVC�����I�0E}b(m�BK� ����p,��Z�`����;"R�H�,��5X�
+����8�k�������C�=
�Q9+;%���{�����3�n��u���奼��rA���8�{"�� 7{�BƟg��a�Ō�ϛ�S�[e��n����!����r�[s�.�g�iVk̫3q������#H��v���]�A^�t�w;�һb��?��n2���N�۵�۩����q~��?�3�{���n
+�������
+�0���jM���*E� x�<��nd�%K��AB��?���B5X;����qԯ����5�y�۳}��^�	�0"O,�_���hL`@m�"�7��`�{8w�!\QG���f�bI�k�
+�Ο���S3�o����z-b����W4~�t�;���-�kO���'x��`���=��.s^�GxO�ܰ�^UN΁�z�J{���s�>�P~;��w��U�ɿz�O-�\��_�����"����MN�0���m�v�҄���K�ܠ�
�W鎱���:�u�)vf�y~d���Ҙu����+aJ'���x6�9�E{�O��5�F����9�N��=PR���X���-3ui�	_&tK��:5��ԓ�Fj�m��0�hm-��Ѿ���|�ޮ3�\H���x3N����˸g��R�zUc��ߔ��?�'4?�w��L��=��Κu���g��fd�ɽz�N-A��D�ܜ�a�Z?����KN1D�;p�"'`&{>DR6K�B�}†KЎ���dG,�f��qW�6��̞@vB��
�NΈ�P�w�ș@�:�N/~��/��@�N���AKF_�7U88/�s�)�s�ˍ~�f��Fݲ�R�C�-}�U�W|3r��+�9�	�PW�@ݵ����8���L��s㺞��G��y�Z���|:?η��m��ɹ�=<:[g����@�La_j������:kq���Y�Sz��'���w���[���ӳk͠�w��?ō��}�Kn�@D�Mn�8Kl���
R�HQ��d�8
+j�j�(�Y<Y���]�qDT�N*�5j�~i�HFp0�ސ���Zh�[�y���ֱܽ�:�?JES��3�?������(v�����QSy����w�?�O����`:j��Zܜs֩z��Z�$�i��a&�ס=�=�����{��=�����<"V�č��W��7�
k���[�1Z^�M��[�'��O�^��?�;��=Y�w\[��~)����u-��K�'�+cP����1OA��+pܱ(�ƄPPQ�X�XYQ��,�������N�/w�;;���n)�\�!�H7����<�g�:�����������5e��ʗׅ�7d�C�Z�5XX���D��D�o�8�#ؘ?�o`G��Kc���m
i�q��gZjVoC��O��=q\O��/+�[Y���=�{��}�5��Wi_R�tT���_����J�s�Y��>���v�]O�YO�U�s|���лН�dzO��橿u�S�C�U[�w̵�wf���7~@|e����MN�@���
!�$m�@E�,X T$�3�,`�Y�,=��V��Ɍ���R��̈��H<W`V�7�<��|���&�~_0���0F��É~���+R�w
���?c!u9V�|�_p�������_��v��uP�*!�k�y�����W�~Lթe-�Ԡ��z�y�-;��[�;pG����z��)'��xk�\�l�l��~���Ӧa����|�w� 9՟QW���Ǽ��"]΃�FM�p��;�{�c:[:c=5�O��;��N�쿝���QR�����Mn�0��ꙸV��8@���
+��
+qv,Xr�^�/�u:MP����{3���"�$�c�HI
+ЀD�Ϡ��5Xs�gl���N��1[p;�̜N�'���܉/��/
9)�3R[�oK�8���Κ��U��,�r���j2�����WF[p�K�3wغ��۫�+�w�ٱ����<6��	��]5��sg^X�H/������>���zo<�5z"{1У�־�\W:W�����`�R�X�g�?~=�`��SoÎ=�nM�u�gd��}�;��O�)}�ܛ}b�/���������AO1�����߂ݥ�
+��x�D�̓	��oɛ8���×l�ә7oZ�Dd@�������ЂF����6��`V<W��p�����N��פ��пo���
	�;]��_���'�;���
���z��a}O̧u����S��h���D�Zjf���8�G�֚�Ƚ1�E���f�E�G5���g��wG��R��z���H��9�-k����o	�����rd�
��h�	I�Nt����*Ci������~��]��iM?6�1ܘ'�O)�Y}���
�A�ٰ���MJQ�;��V���L&3�?!�W�B���^A<��TA[:��`�OWw�뉈yĎ#2%ڟ҂��2q.���O��`ӟ%��'`��μα����?���ѐE|������3ֺ�ކk�=�g�^�=(�Ւ�y����ٲ7�z�k��2�ɺ]��<5�<�[�����޸1�Gk��}�;�Ny��z�y\���D���spM_W�4�W�j�3�19�39��ܥ���]Z��K�u?���+s�[�{��f[1��q�z���:Ӛ���c�c��>�Ց���\�/������AJAE+�2���q&3ݓIbE���7�W�#$�A�
�CQ����SEwuկ�1���.�"�W
�K�hAr,��2���sp{Ag��7n�HK����Oh��/[�Έ�(�VdN;�;�7��s-vO���:*�����I�o������y�f���7؂_���b�.B�D�_�7��c�b<����e�/z܂{��;'���
s:5;)�
t��xVq㬩Sf^�ip��)��g����Ms��ܿ����o���7�iF4�)���U����=Oԩ��5}��y�x����^#��u�;N1�	)8'��<���nx(
!�(�"E���)�@���������#�����1c{vbf��>��UZ;�-̨�sx6�l��`�	����@��~?�w���A�h�����6|G������
��̳���l.�>�N�
��qz�����x�
<�=����?��빢��?�o(���y�ַV��R��uL�ԧc�څ���k��j6E-���|c����c����S�{ޞ:�s�̗�,����;k}]�Q��U�?��8'����׾���9�������l�����kx�
+��^~
M��а���;KQ�'�����Gv7k��*T�J��&M E*�M҈�����3p�^->�;;�{f����o�Hɞ���5�c�6f�m|���
�{����U9^��:{�#0b�����΃D����7��ZL�����!ۘ�����uB~��~�	,�܂p^�'x��,�.�S��]��~�_~�����w���?�d�9k�r>p���]��{�>4����
�;��V���+�Gs�=���7�sJ����y����Ҩ��7�}j����q�]��Y�=��CW{�nz{����������O�����AN�@E
w�T,��L�!)E,(�M�
+���cq
+���c&�xj��|�?��Ml���!��Yy	t�����%@C��(w-5zpBf �q�祻OԟtKg���/�P3�)ѽ����s�u��M)Ԍ�Q_�$3�=i�qD4�x`
���=x�����>b��d�9b\���}���_j>Ր7=�ϜO>Ͷ^̶����"�
n��mvZ���%������N��{��j��;�]e���͚�~�����t�/c�~����3zS<�׶ٿ����6���%�����������]n�0���g)ΏI�o�Pj�x�2=Eoӱ:#-�X<|Jl�w'��"�yu,I)N륡
��l�� �/"����@=�'��BT�ts[0�����ݝi�ε�8��G��2y�r�t�Pg �{֓������VL��ij�����h߯[�}��x_g�K$��9�J�L���m��s�w��lfx�
7�>���1ϑ:�n[[˘q�y�o3𙜎�O���Ξ�����L��55��wp
�Ʒ=���7�Ǚ��x�2��7�����NA��qw`p
+Ac����w�H8�B^��U�T؍�/��W]�=�R�?F�\p��:�">�`Lj�KW�=N{on���|�5�R�"1f͵.�Ҟ�x����q��Q�܃
�7\+V��9�_�s0c>�r�<u&�{t���/������G���E�z,86��s3Ҙ�._�ݏ�KȻ��/���g���{����5z��
+��m�y�_}��=���5�z��"���KI�=���Pϖ��
|�4`�d��]|�}z����N�9����;R1D��	�d��ֲ���|"�(�@�5��
+-�.��z���~�Q�5����eB��)[g��)�cрf����|���#b���_��y��j��ֆtjO1|�rtFI�(�Ķ�y`n�
�/��5O�oCH��.���*��_�!���!M�D���[󽌬wԻ��ܓڿs�[�yҿK��=�5�\߆�_�^Q�|Ϻt����^�x��:z���3N���͵Z���5\8�5�M������#p�������خ�]�t�o]_E=톰���An�@EM�[n�Cp	�$T�U�R�]��ض;�+��J�Cla}e�œf<����LD�R��\��ܑ����/	o/@�䷠X����[d4g��������K='��J٭&+��{1��A*w��s�\_�[=M#�����I����e���y_��`����|j_kG����%5�Cu웗���<�V?�[��^����+�
;w���P?����=a��[���ֹ����#�6���������vG�"3��	�a��g_�E� ������揰���=NA��=h8H�BA�lf��(�H�P�-T4!$�
�I���ɳx�������=�cf3�Ȑ��$0�{Nc�@"�w
.H�U�+1^3�<�uN�؀s�}�+��~?��13�0W�_�u�֣�������'W7���>����}L�Wg�������W˄x<�׶/w�
|�/����I&�k/�K�����W�>/~o�1&q��o�������x�Z�o�P?t��_5�ބ�u�sj������zL�Cc��3�gn�3�i��o�xk�=��+�N[�%u��z=���?�M�"����KnAD
�C�p
��@�LB�Bb��#�5�pr��K����f4��Ic�۟j��M�lF���)��IFf����Ÿ�i"c=��{K�of�����]������<�Z��;�<�W��W��:��	�WAR����S��ߨ�_th�K���J�v�3g�"i�=8�+���2V�::g�^u���t���Y{b���'���b>ݏ�����}�Q��9T�w�:5YI��*��
������w;�_������������<����P��?g���/�@�����1n1E�{�"��5��� (ER$5 GHAC�s���(���R<�z<����l`f#R�����u]����0�XoLFB��
+����'xMДB�vM�e���3!I�p�G2�ZCA�q_��`
�AS��>����C����Xp�t5&��"|_�|�L����t?"]yz���)�^�o�	��g쯒X�m�'�ܗz�~izK���3q��7��9��z�ׅ����߂���7�>��o��8��G�^��{{�����
̬����]N1�s��6��n[�ԇ��hOQ����c�1���C6�={SJ���#h�X
���a}W����ʷ6�\��z�~`�7#�yJ�q���?g�Y�����K�]0�������'����Pg<�O�'���է,g�^��{Qj>��	���V�8�{�g;���m���#8"w�n��}e=��u;��I��f��Q]�暍�u��qo]�Bϩ�޻6�`��[���s�f���s���
���gp	��k��7�h���z�����������0D��-mӍ��!N,ߋ�f���OmǓq�BBX�
+���0��d���F4�[�^�bZ���ƈo���~!�ܹZ�;�
����;�l��>}=	��:3�A���b�5�O榎�m@�h2�꧁�͸'x�}h�G�=O���8GĤ���Ø5�}��R��������&��㾕z���K�'��n]},����xvj���\����gC&�}�؃W�e�q�|�[�I�b<�'��^|/��կ��g������K�0D}b(M��Xp
���$.���QJY<)MS{<�����*p*�ÿ�H
���j9����Mv���N�4�sFj̨�rvZԍdP�UB�Pߓ����u=A�fW=ڷ�/?�Ἔ��?ѓ�&h�����q��I
̃���׭}֧�p�hθ�'�C#={�9y^���G������5f��������"�`��X�wы��`,x��g/�_]r�m�����;�0��m}Pl���At��S�2|j����:�Vι�DC�����
O��^���G�"�
{�wG���ɭ�Q8	w�)܄=t�	�g���y��x��s'a+\��s�N��D�s��@�-|�j��O{4��1�t��Scuj}�y�}W�����l|�B�����+�'�eD�����S�mA�C7�
F/`�v����K3��=ro�(��E=O����x�f�w�/��������A
+�0Esb�m�Z�*
+�K7��!<��q��_�㐴�GIf2��3�97t�
�А���$�W_�3C<(Ia귱1X�
X�J��:�:'�HN
v�	��^�j���~�?�{"�[=�H�A�
+��
+��
�Cї����~�����
̕R?0w�w�;�|�޽��l����zo}_�O;'{�W�5zS�R�ٵ������HH��w�������߆���+
��ϋ�&6{Z�WSK����<�Y�X��c:co���|
K��O����KNA�.�<�@����q�K\zW�­�$V�ꤨ��/0W��G�
���1��(����H�=i���<�[0�N�$���k$����]�_��a�
/��N�S{��$�Z��������������;x�s-���������5�s`N+��4m�S[��z�������h��8�/;�
��{����k����(�Z1�Ff��K��f�$����<�-g�]�����{�?Y�����w��Z��o�����R���}�M
A�C9��iӔV�����,]����KI���fD:/�D��/bH�ACp�au�~��
�O`�<+cĹN��}����Qy�t�"ݻ�������	�|4��O�ǿ>2z�(��v��5�Tv�Ji���c�1���/�kA�OF����d�gy^���7���������\0��ÿ���'υu��>�����\n��g���}���n,Л����ύ��x�����i~F;���g���.p����}-1l�����m�@�����"��D��(M����%�
�hFY����'���;{N)��?��}n�������ە���_���_�]���'8�4;�T����@�x��)��O�r������7�n-~��cL�ѿ6d�Fѷe�n�/�s����[�:�_}h����G�W�!ˠQNg��܂pk����`\�c�:q��?Λ��{�
~ɉ�����������}I\_�{y�S�,�y�@TSyz���X����[�+K��������
1DM?4D|�]��'@�p�
���0AɌ6���3'1�������[��T`�=�@W�}���u]�QC�����w.�n�j�'x��^�
+���s��U�s$�)؀#8�؃��Us��C��@�w6z)��}F�}jQ�w��[����ܯ<�֙x����dz��O
+�}�^g�s�����_�a�!�#��x��=��<3��uV�ƹf��)�O�b}��[������g��YjV�;w�?�1�&V����M
+�0���ڦik
+*�� �B<�Wp�…Wq����qȈ�l�d�%�9�9�JN�gK	
������)\WO�95��c���U=����`'��^������џ�9��o�-i���w����������f���P�9D��p	{��D�O�K������xE���<�4���*:Ö~�|�������9�=0�O�?gl��O���r-���p�9���7\�,��Rg(%����}YS��T��e
k�%rXg�s|��
�Ob�����JA�;_ͷ�ٝ�I\M�
�@�c�
+y
��5P
M9#>ӝ��Y3���,���ɢA#X򷗺�넞t
��u���Uox��
|�w�M�Q�Vn:_I����<�o��98�'p��=�a�Ih���%I�]8ýV�v_�v���>׳ӽ�^���;�����T���J>k�^�p��e��uk�����s��y��DOE�w<�� s����ܸ�,5�%�߻�7T�e����������������_�Z�Z�Z����}�kNA�8
'�V����9��^BO�Oo�]���)g��e=ۏ�Z3���̉��#�
+
X�� ����4�>��ǽ�Z�ڷ�K�u�X��Z���kГ6�H!�2�k����f����/<����GG��׽�����*�g?�Op?�
�x��&+��?Tw������רS�-��3�
���O�xιbξ���zG�š;~�Yy_�Œ;X۵J{w���W��f�H��5����^���w_��O�+���
a��k��\�'����;�0D���@H�/|t�q
JJ�%�
4+��œ��zv=k�Yf_$K0"c2<>
%��D�UOשx.h�?$ς�BR}k���{�ٳk2���*��w�V߬}5�A�]�_`��(����|v���������<��X��7����X��7�o����f�7%K�a�:�P}�u�%g�`�����
���>��G!�ԏT}�w�����sb�H�D�tlF���z���5=��T�Mߺ�ӷ����!*��}�1�@
=�q��KH ���
+Q�A��v�YqSع��޳��a�%�@)0����@��ZO�\~!����A_��o�5X=�����?kgz��:)ܱq�f���x�ܝ���?��o�1V����Ҿu�����sv���p��k2y��P?�G��E�_���YKu�N�}'�W�H�!։�x�wN�߀}c�q_rscL[���B������v�߮�zS��2���z���ʻ�'�b����i
+�@�S�䵴�tZۺ�
+�W�@�^ <2��c�L�ID���h��{R����M�ⲿ-؀z$��0;���	tN�%}{�$��l-�Q9('e���o&�|D���P��Z��[�C��r
�#��ۛ���ܖ�G�1yGD�Y��\ �~f܍8�oQ}�~�_ޯɥ�+�s����_^�'���`;V��h�z�avؿ,�uWΐ'�z��s=��^�r�;턽�|D����~�/�O������Y�0D}ah�na��E
��p	>�SjK�(������ؓ���"R)�J��y�(�b�^�7U&J�q�$݇��>��{����|�U�r-�s��5��kb��g�o��
��X����}�������QQooz�D���)�{
`��������n<_I���ؿ���/��T����ֿ�c�|��4]�#����~4;�����+���Y�
�+��Qa��֬-��y0彜v����=���������
�0�	�M[T�K 8s��X��
`�[�_�z�Q�Ď����L��R�֙��R�J�ݟK|#�Dl��H�mq��O��|����
vp�
�a&�:S�1+؋%�&��{Ru��HCx��o����X�A�$G������lŜ�_q~</�<qu>�s<\?ϙׇ��^'��槑7Z���;��7x�0�~�7\���=N�m+o���8of�ܽ��z��P���������;
+�@�ѫx߂�XX	���
+6v6�+�^E�30��k��d�1�cD$�T�H"���
+���$#}մ��3��s��	���X����������	.��t��*4��-ߏ�1����yrE`���}q��渂=��k����S��/s�*��շ����OBw��s_���9�z����*k3�<EZ]XB�����[�}�;~���X�X���m!�^��
�L��6oH�����c��7���D����=AA��9��8��=�/��ӈJ�P)D�w�8��c&���(~�}������GDm"�("E�zLd4������E��-�Z���CqD'a<�C�I���\�
����
+�Lf�F�$���3v���3���
q>R;]g�����,���	��n�猭�~��;�5������~�wؼ���/h�T�35��#�mJ�}�u��ŝ)8�j�NT�c]��O�D�Q�
�ط`���
+�;W9z��������1�����?ȼ��������{��'R���ԱNA�_���&���/#�q�!�XIBK�6��!��l-l��?�I&�-��vvgwv�h��q2�+2��Ϸ�R룸���zF.����>������94�'�iBK����^b^��W�܍k���^��M�T�;z�9�d��[��94��К�d��_
+�6��<=O)���_�}�o_G�O��k%�9���B�`(�Z�]ߗ9������8k�+����\\�W@�h�0���;-�=�>����z'�������S�����x����(O�����;<�����1NBA�"x+o���O�#��$j�@�)lL�I���������O�N޲_2�;;���f
�\�+G/C�?��|�8)����F���¯�~N�����⎌�\�����݋c��d�����_�?��I��3y'�Hg꾯s�����z}����-�ԗ��'7�T�c}��g��Mu���n~�{)��2:��sJV@�tH��
����/��h��%�<[���������s�~���o�쩧M.h��HS�.���������ݰ
\ No newline at end of file
diff --git a/Tests/images/multiple_exif.jpg b/Tests/images/multiple_exif.jpg
index 32e0aa301a9..f9f343507e7 100644
Binary files a/Tests/images/multiple_exif.jpg and b/Tests/images/multiple_exif.jpg differ
diff --git a/Tests/images/negative_top_left_layer.psd b/Tests/images/negative_top_left_layer.psd
new file mode 100644
index 00000000000..be9d9d6d03e
Binary files /dev/null and b/Tests/images/negative_top_left_layer.psd differ
diff --git a/Tests/images/p_16.png b/Tests/images/p_16.png
index e3588641277..458f7138e80 100644
Binary files a/Tests/images/p_16.png and b/Tests/images/p_16.png differ
diff --git a/Tests/images/p_8.tga b/Tests/images/p_8.tga
new file mode 100644
index 00000000000..73759a28224
Binary files /dev/null and b/Tests/images/p_8.tga differ
diff --git a/Tests/images/rgba16.tga b/Tests/images/rgba16.tga
new file mode 100644
index 00000000000..3918647a23c
Binary files /dev/null and b/Tests/images/rgba16.tga differ
diff --git a/Tests/images/seek_too_large.tif b/Tests/images/seek_too_large.tif
new file mode 100644
index 00000000000..094c3057c86
Binary files /dev/null and b/Tests/images/seek_too_large.tif differ
diff --git a/Tests/images/sugarshack_frame_size.mpo b/Tests/images/sugarshack_frame_size.mpo
index 009280a79a6..abff98ea57d 100644
Binary files a/Tests/images/sugarshack_frame_size.mpo and b/Tests/images/sugarshack_frame_size.mpo differ
diff --git a/Tests/images/test_extents_transparency.gif b/Tests/images/test_extents_transparency.gif
new file mode 100644
index 00000000000..739c82ad47c
Binary files /dev/null and b/Tests/images/test_extents_transparency.gif differ
diff --git a/Tests/images/truncated_end_chunk.png b/Tests/images/truncated_end_chunk.png
new file mode 100644
index 00000000000..5e88c5e4fa2
Binary files /dev/null and b/Tests/images/truncated_end_chunk.png differ
diff --git a/Tests/images/ultrahdr.jpg b/Tests/images/ultrahdr.jpg
new file mode 100644
index 00000000000..34f615b61aa
Binary files /dev/null and b/Tests/images/ultrahdr.jpg differ
diff --git a/Tests/images/unknown_compression_method.png b/Tests/images/unknown_compression_method.png
new file mode 100644
index 00000000000..e1614a731a5
Binary files /dev/null and b/Tests/images/unknown_compression_method.png differ
diff --git a/Tests/images/unknown_mode.j2k b/Tests/images/unknown_mode.j2k
new file mode 100644
index 00000000000..38719fe2561
Binary files /dev/null and b/Tests/images/unknown_mode.j2k differ
diff --git a/Tests/oss-fuzz/fuzz_font.py b/Tests/oss-fuzz/fuzz_font.py
index bc2ba9a7e27..f4e40ea3671 100755
--- a/Tests/oss-fuzz/fuzz_font.py
+++ b/Tests/oss-fuzz/fuzz_font.py
@@ -16,14 +16,15 @@
 
 
 import atheris
+from atheris.import_hook import instrument_imports
 
-with atheris.instrument_imports():
+with instrument_imports():
     import sys
 
     import fuzzers
 
 
-def TestOneInput(data):
+def TestOneInput(data: bytes) -> None:
     try:
         fuzzers.fuzz_font(data)
     except Exception:
@@ -32,7 +33,7 @@ def TestOneInput(data):
         pass
 
 
-def main():
+def main() -> None:
     fuzzers.enable_decompressionbomb_error()
     atheris.Setup(sys.argv, TestOneInput)
     atheris.Fuzz()
diff --git a/Tests/oss-fuzz/fuzz_pillow.py b/Tests/oss-fuzz/fuzz_pillow.py
index 545daccb680..d58a6f0150d 100644
--- a/Tests/oss-fuzz/fuzz_pillow.py
+++ b/Tests/oss-fuzz/fuzz_pillow.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python3
-
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,14 +14,15 @@
 
 
 import atheris
+from atheris.import_hook import instrument_imports
 
-with atheris.instrument_imports():
+with instrument_imports():
     import sys
 
     import fuzzers
 
 
-def TestOneInput(data):
+def TestOneInput(data: bytes) -> None:
     try:
         fuzzers.fuzz_image(data)
     except Exception:
@@ -32,7 +31,7 @@ def TestOneInput(data):
         pass
 
 
-def main():
+def main() -> None:
     fuzzers.enable_decompressionbomb_error()
     atheris.Setup(sys.argv, TestOneInput)
     atheris.Fuzz()
diff --git a/Tests/oss-fuzz/fuzzers.py b/Tests/oss-fuzz/fuzzers.py
index 3f3c1e38833..d6c1fab714b 100644
--- a/Tests/oss-fuzz/fuzzers.py
+++ b/Tests/oss-fuzz/fuzzers.py
@@ -1,22 +1,23 @@
 from __future__ import annotations
+
 import io
 import warnings
 
 from PIL import Image, ImageDraw, ImageFile, ImageFilter, ImageFont
 
 
-def enable_decompressionbomb_error():
+def enable_decompressionbomb_error() -> None:
     ImageFile.LOAD_TRUNCATED_IMAGES = True
     warnings.filterwarnings("ignore")
     warnings.simplefilter("error", Image.DecompressionBombWarning)
 
 
-def disable_decompressionbomb_error():
+def disable_decompressionbomb_error() -> None:
     ImageFile.LOAD_TRUNCATED_IMAGES = False
     warnings.resetwarnings()
 
 
-def fuzz_image(data):
+def fuzz_image(data: bytes) -> None:
     # This will fail on some images in the corpus, as we have many
     # invalid images in the test suite.
     with Image.open(io.BytesIO(data)) as im:
@@ -25,7 +26,7 @@ def fuzz_image(data):
         im.save(io.BytesIO(), "BMP")
 
 
-def fuzz_font(data):
+def fuzz_font(data: bytes) -> None:
     wrapper = io.BytesIO(data)
     try:
         font = ImageFont.truetype(wrapper)
diff --git a/Tests/oss-fuzz/python.supp b/Tests/oss-fuzz/python.supp
index 94cc87db97d..36385d67266 100644
--- a/Tests/oss-fuzz/python.supp
+++ b/Tests/oss-fuzz/python.supp
@@ -1,5 +1,5 @@
 {
-   <py3_8_encode_current_locale>
+   <py3_10_encode_current_locale>
    Memcheck:Cond
    ...
    fun:encode_current_locale
diff --git a/Tests/oss-fuzz/test_fuzzers.py b/Tests/oss-fuzz/test_fuzzers.py
index 68834045a52..90eb8713a8b 100644
--- a/Tests/oss-fuzz/test_fuzzers.py
+++ b/Tests/oss-fuzz/test_fuzzers.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import subprocess
 import sys
 
@@ -6,13 +7,14 @@
 import packaging
 import pytest
 
-from PIL import Image, features
+from PIL import Image, UnidentifiedImageError, features
 from Tests.helper import skip_unless_feature
 
 if sys.platform.startswith("win32"):
     pytest.skip("Fuzzer is linux only", allow_module_level=True)
-if features.check("libjpeg_turbo"):
-    version = packaging.version.parse(features.version("libjpeg_turbo"))
+libjpeg_turbo_version = features.version("libjpeg_turbo")
+if libjpeg_turbo_version is not None:
+    version = packaging.version.parse(libjpeg_turbo_version)
     if version.major == 2 and version.minor == 0:
         pytestmark = pytest.mark.valgrind_known_error(
             reason="Known failing with libjpeg_turbo 2.0"
@@ -23,7 +25,7 @@
     "path",
     subprocess.check_output("find Tests/images -type f", shell=True).split(b"\n"),
 )
-def test_fuzz_images(path):
+def test_fuzz_images(path: str) -> None:
     fuzzers.enable_decompressionbomb_error()
     try:
         with open(path, "rb") as f:
@@ -42,7 +44,7 @@ def test_fuzz_images(path):
     except (
         Image.DecompressionBombError,
         Image.DecompressionBombWarning,
-        Image.UnidentifiedImageError,
+        UnidentifiedImageError,
     ):
         # Known Image.* exceptions
         assert True
@@ -54,7 +56,7 @@ def test_fuzz_images(path):
 @pytest.mark.parametrize(
     "path", subprocess.check_output("find Tests/fonts -type f", shell=True).split(b"\n")
 )
-def test_fuzz_fonts(path):
+def test_fuzz_fonts(path: str) -> None:
     if not path:
         return
     with open(path, "rb") as f:
diff --git a/Tests/test_000_sanity.py b/Tests/test_000_sanity.py
index c582dfad3e4..c3926250f7b 100644
--- a/Tests/test_000_sanity.py
+++ b/Tests/test_000_sanity.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
+
 from PIL import Image
 
 
-def test_sanity():
+def test_sanity() -> None:
     # Make sure we have the binary extension
     Image.core.new("L", (100, 100))
 
diff --git a/Tests/test_binary.py b/Tests/test_binary.py
index 62da2663668..d19799a095c 100644
--- a/Tests/test_binary.py
+++ b/Tests/test_binary.py
@@ -1,13 +1,14 @@
 from __future__ import annotations
+
 from PIL import _binary
 
 
-def test_standard():
+def test_standard() -> None:
     assert _binary.i8(b"*") == 42
     assert _binary.o8(42) == b"*"
 
 
-def test_little_endian():
+def test_little_endian() -> None:
     assert _binary.i16le(b"\xff\xff\x00\x00") == 65535
     assert _binary.i32le(b"\xff\xff\x00\x00") == 65535
 
@@ -15,7 +16,7 @@ def test_little_endian():
     assert _binary.o32le(65535) == b"\xff\xff\x00\x00"
 
 
-def test_big_endian():
+def test_big_endian() -> None:
     assert _binary.i16be(b"\x00\x00\xff\xff") == 0
     assert _binary.i32be(b"\x00\x00\xff\xff") == 65535
 
diff --git a/Tests/test_bmp_reference.py b/Tests/test_bmp_reference.py
index bed8dc3a899..7f848792131 100644
--- a/Tests/test_bmp_reference.py
+++ b/Tests/test_bmp_reference.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import os
 import warnings
 
@@ -9,13 +10,13 @@
 base = os.path.join("Tests", "images", "bmp")
 
 
-def get_files(d, ext=".bmp"):
+def get_files(d: str, ext: str = ".bmp") -> list[str]:
     return [
         os.path.join(base, d, f) for f in os.listdir(os.path.join(base, d)) if ext in f
     ]
 
 
-def test_bad():
+def test_bad() -> None:
     """These shouldn't crash/dos, but they shouldn't return anything
     either"""
     for f in get_files("b"):
@@ -28,7 +29,7 @@ def test_bad():
                 pass
 
 
-def test_questionable():
+def test_questionable() -> None:
     """These shouldn't crash/dos, but it's not well defined that these
     are in spec"""
     supported = [
@@ -43,6 +44,9 @@ def test_questionable():
         "pal8os2sp.bmp",
         "pal8rletrns.bmp",
         "rgb32bf-xbgr.bmp",
+        "rgba32.bmp",
+        "rgb32h52.bmp",
+        "rgba32h56.bmp",
     ]
     for f in get_files("q"):
         try:
@@ -55,7 +59,7 @@ def test_questionable():
                 raise
 
 
-def test_good():
+def test_good() -> None:
     """These should all work. There's a set of target files in the
     html directory that we can compare against."""
 
@@ -79,7 +83,7 @@ def test_good():
         "rgb32bf.bmp": "rgb24.png",
     }
 
-    def get_compare(f):
+    def get_compare(f: str) -> str:
         name = os.path.split(f)[1]
         if name in file_map:
             return os.path.join(base, "html", file_map[name])
diff --git a/Tests/test_box_blur.py b/Tests/test_box_blur.py
index e798cba3d4f..cb267b2048f 100644
--- a/Tests/test_box_blur.py
+++ b/Tests/test_box_blur.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageFilter
@@ -15,18 +16,18 @@
 # fmt: on
 
 
-def test_imageops_box_blur():
+def test_imageops_box_blur() -> None:
     i = sample.filter(ImageFilter.BoxBlur(1))
     assert i.mode == sample.mode
     assert i.size == sample.size
     assert isinstance(i, Image.Image)
 
 
-def box_blur(image, radius=1, n=1):
+def box_blur(image: Image.Image, radius: float = 1, n: int = 1) -> Image.Image:
     return image._new(image.im.box_blur((radius, radius), n))
 
 
-def assert_image(im, data, delta=0):
+def assert_image(im: Image.Image, data: list[list[int]], delta: int = 0) -> None:
     it = iter(im.getdata())
     for data_row in data:
         im_row = [next(it) for _ in range(im.size[0])]
@@ -36,7 +37,13 @@ def assert_image(im, data, delta=0):
         next(it)
 
 
-def assert_blur(im, radius, data, passes=1, delta=0):
+def assert_blur(
+    im: Image.Image,
+    radius: float,
+    data: list[list[int]],
+    passes: int = 1,
+    delta: int = 0,
+) -> None:
     # check grayscale image
     assert_image(box_blur(im, radius, passes), data, delta)
     rgba = Image.merge("RGBA", (im, im, im, im))
@@ -44,7 +51,7 @@ def assert_blur(im, radius, data, passes=1, delta=0):
         assert_image(band, data, delta)
 
 
-def test_color_modes():
+def test_color_modes() -> None:
     with pytest.raises(ValueError):
         box_blur(sample.convert("1"))
     with pytest.raises(ValueError):
@@ -64,7 +71,12 @@ def test_color_modes():
         box_blur(sample.convert("YCbCr"))
 
 
-def test_radius_0():
+@pytest.mark.parametrize("size", ((0, 1), (1, 0)))
+def test_zero_dimension(size: tuple[int, int]) -> None:
+    assert box_blur(Image.new("L", size)).size == size
+
+
+def test_radius_0() -> None:
     assert_blur(
         sample,
         0,
@@ -80,7 +92,7 @@ def test_radius_0():
     )
 
 
-def test_radius_0_02():
+def test_radius_0_02() -> None:
     assert_blur(
         sample,
         0.02,
@@ -97,7 +109,7 @@ def test_radius_0_02():
     )
 
 
-def test_radius_0_05():
+def test_radius_0_05() -> None:
     assert_blur(
         sample,
         0.05,
@@ -114,7 +126,7 @@ def test_radius_0_05():
     )
 
 
-def test_radius_0_1():
+def test_radius_0_1() -> None:
     assert_blur(
         sample,
         0.1,
@@ -131,7 +143,7 @@ def test_radius_0_1():
     )
 
 
-def test_radius_0_5():
+def test_radius_0_5() -> None:
     assert_blur(
         sample,
         0.5,
@@ -148,7 +160,7 @@ def test_radius_0_5():
     )
 
 
-def test_radius_1():
+def test_radius_1() -> None:
     assert_blur(
         sample,
         1,
@@ -165,7 +177,7 @@ def test_radius_1():
     )
 
 
-def test_radius_1_5():
+def test_radius_1_5() -> None:
     assert_blur(
         sample,
         1.5,
@@ -182,7 +194,7 @@ def test_radius_1_5():
     )
 
 
-def test_radius_bigger_then_half():
+def test_radius_bigger_then_half() -> None:
     assert_blur(
         sample,
         3,
@@ -199,7 +211,7 @@ def test_radius_bigger_then_half():
     )
 
 
-def test_radius_bigger_then_width():
+def test_radius_bigger_then_width() -> None:
     assert_blur(
         sample,
         10,
@@ -214,7 +226,7 @@ def test_radius_bigger_then_width():
     )
 
 
-def test_extreme_large_radius():
+def test_extreme_large_radius() -> None:
     assert_blur(
         sample,
         600,
@@ -229,7 +241,7 @@ def test_extreme_large_radius():
     )
 
 
-def test_two_passes():
+def test_two_passes() -> None:
     assert_blur(
         sample,
         1,
@@ -247,7 +259,7 @@ def test_two_passes():
     )
 
 
-def test_three_passes():
+def test_three_passes() -> None:
     assert_blur(
         sample,
         1,
diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py
index 448ba2fac80..36ab187f261 100644
--- a/Tests/test_color_lut.py
+++ b/Tests/test_color_lut.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 from array import array
+from types import ModuleType
 
 import pytest
 
@@ -7,6 +9,7 @@
 
 from .helper import assert_image_equal
 
+numpy: ModuleType | None
 try:
     import numpy
 except ImportError:
@@ -14,7 +17,9 @@
 
 
 class TestColorLut3DCoreAPI:
-    def generate_identity_table(self, channels, size):
+    def generate_identity_table(
+        self, channels: int, size: int | tuple[int, int, int]
+    ) -> tuple[int, int, int, int, list[float]]:
         if isinstance(size, tuple):
             size_1d, size_2d, size_3d = size
         else:
@@ -40,7 +45,7 @@ def generate_identity_table(self, channels, size):
             [item for sublist in table for item in sublist],
         )
 
-    def test_wrong_args(self):
+    def test_wrong_args(self) -> None:
         im = Image.new("RGB", (10, 10), 0)
 
         with pytest.raises(ValueError, match="filter"):
@@ -100,94 +105,68 @@ def test_wrong_args(self):
         with pytest.raises(TypeError):
             im.im.color_lut_3d("RGB", Image.Resampling.BILINEAR, 3, 2, 2, 2, 16)
 
-    def test_correct_args(self):
+    @pytest.mark.parametrize(
+        "lut_mode, table_channels, table_size",
+        [
+            ("RGB", 3, 3),
+            ("CMYK", 4, 3),
+            ("RGB", 3, (2, 3, 3)),
+            ("RGB", 3, (65, 3, 3)),
+            ("RGB", 3, (3, 65, 3)),
+            ("RGB", 3, (2, 3, 65)),
+        ],
+    )
+    def test_correct_args(
+        self, lut_mode: str, table_channels: int, table_size: int | tuple[int, int, int]
+    ) -> None:
         im = Image.new("RGB", (10, 10), 0)
-
-        im.im.color_lut_3d(
-            "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3)
-        )
-
-        im.im.color_lut_3d(
-            "CMYK", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3)
-        )
-
-        im.im.color_lut_3d(
-            "RGB",
-            Image.Resampling.BILINEAR,
-            *self.generate_identity_table(3, (2, 3, 3)),
-        )
-
-        im.im.color_lut_3d(
-            "RGB",
-            Image.Resampling.BILINEAR,
-            *self.generate_identity_table(3, (65, 3, 3)),
-        )
-
-        im.im.color_lut_3d(
-            "RGB",
-            Image.Resampling.BILINEAR,
-            *self.generate_identity_table(3, (3, 65, 3)),
-        )
-
         im.im.color_lut_3d(
-            "RGB",
+            lut_mode,
             Image.Resampling.BILINEAR,
-            *self.generate_identity_table(3, (3, 3, 65)),
-        )
-
-    def test_wrong_mode(self):
+            *self.generate_identity_table(table_channels, table_size),
+        )
+
+    @pytest.mark.parametrize(
+        "image_mode, lut_mode, table_channels, table_size",
+        [
+            ("L", "RGB", 3, 3),
+            ("RGB", "L", 3, 3),
+            ("L", "L", 3, 3),
+            ("RGB", "RGBA", 3, 3),
+            ("RGB", "RGB", 4, 3),
+        ],
+    )
+    def test_wrong_mode(
+        self, image_mode: str, lut_mode: str, table_channels: int, table_size: int
+    ) -> None:
         with pytest.raises(ValueError, match="wrong mode"):
-            im = Image.new("L", (10, 10), 0)
+            im = Image.new(image_mode, (10, 10), 0)
             im.im.color_lut_3d(
-                "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3)
-            )
-
-        with pytest.raises(ValueError, match="wrong mode"):
-            im = Image.new("RGB", (10, 10), 0)
-            im.im.color_lut_3d(
-                "L", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3)
-            )
-
-        with pytest.raises(ValueError, match="wrong mode"):
-            im = Image.new("L", (10, 10), 0)
-            im.im.color_lut_3d(
-                "L", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3)
-            )
-
-        with pytest.raises(ValueError, match="wrong mode"):
-            im = Image.new("RGB", (10, 10), 0)
-            im.im.color_lut_3d(
-                "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3)
-            )
-
-        with pytest.raises(ValueError, match="wrong mode"):
-            im = Image.new("RGB", (10, 10), 0)
-            im.im.color_lut_3d(
-                "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3)
+                lut_mode,
+                Image.Resampling.BILINEAR,
+                *self.generate_identity_table(table_channels, table_size),
             )
 
-    def test_correct_mode(self):
-        im = Image.new("RGBA", (10, 10), 0)
-        im.im.color_lut_3d(
-            "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3)
-        )
-
-        im = Image.new("RGBA", (10, 10), 0)
+    @pytest.mark.parametrize(
+        "image_mode, lut_mode, table_channels, table_size",
+        [
+            ("RGBA", "RGBA", 3, 3),
+            ("RGBA", "RGBA", 4, 3),
+            ("RGB", "HSV", 3, 3),
+            ("RGB", "RGBA", 4, 3),
+        ],
+    )
+    def test_correct_mode(
+        self, image_mode: str, lut_mode: str, table_channels: int, table_size: int
+    ) -> None:
+        im = Image.new(image_mode, (10, 10), 0)
         im.im.color_lut_3d(
-            "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3)
-        )
-
-        im = Image.new("RGB", (10, 10), 0)
-        im.im.color_lut_3d(
-            "HSV", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3)
-        )
-
-        im = Image.new("RGB", (10, 10), 0)
-        im.im.color_lut_3d(
-            "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3)
+            lut_mode,
+            Image.Resampling.BILINEAR,
+            *self.generate_identity_table(table_channels, table_size),
         )
 
-    def test_identities(self):
+    def test_identities(self) -> None:
         g = Image.linear_gradient("L")
         im = Image.merge(
             "RGB",
@@ -223,7 +202,7 @@ def test_identities(self):
             ),
         )
 
-    def test_identities_4_channels(self):
+    def test_identities_4_channels(self) -> None:
         g = Image.linear_gradient("L")
         im = Image.merge(
             "RGB",
@@ -246,7 +225,7 @@ def test_identities_4_channels(self):
             ),
         )
 
-    def test_copy_alpha_channel(self):
+    def test_copy_alpha_channel(self) -> None:
         g = Image.linear_gradient("L")
         im = Image.merge(
             "RGBA",
@@ -269,7 +248,7 @@ def test_copy_alpha_channel(self):
             ),
         )
 
-    def test_channels_order(self):
+    def test_channels_order(self) -> None:
         g = Image.linear_gradient("L")
         im = Image.merge(
             "RGB",
@@ -294,7 +273,7 @@ def test_channels_order(self):
                     ])))
         # fmt: on
 
-    def test_overflow(self):
+    def test_overflow(self) -> None:
         g = Image.linear_gradient("L")
         im = Image.merge(
             "RGB",
@@ -316,6 +295,7 @@ def test_overflow(self):
                                   -1,  2,  2,   2,  2,  2,
                               ])).load()
         # fmt: on
+        assert transformed is not None
         assert transformed[0, 0] == (0, 0, 255)
         assert transformed[50, 50] == (0, 0, 255)
         assert transformed[255, 0] == (0, 255, 255)
@@ -336,6 +316,7 @@ def test_overflow(self):
                                   -3,  5,  5,   5,  5,  5,
                               ])).load()
         # fmt: on
+        assert transformed is not None
         assert transformed[0, 0] == (0, 0, 255)
         assert transformed[50, 50] == (0, 0, 255)
         assert transformed[255, 0] == (0, 255, 255)
@@ -347,12 +328,12 @@ def test_overflow(self):
 
 
 class TestColorLut3DFilter:
-    def test_wrong_args(self):
+    def test_wrong_args(self) -> None:
         with pytest.raises(ValueError, match="should be either an integer"):
-            ImageFilter.Color3DLUT("small", [1])
+            ImageFilter.Color3DLUT("small", [1])  # type: ignore[arg-type]
 
         with pytest.raises(ValueError, match="should be either an integer"):
-            ImageFilter.Color3DLUT((11, 11), [1])
+            ImageFilter.Color3DLUT((11, 11), [1])  # type: ignore[arg-type]
 
         with pytest.raises(ValueError, match=r"in \[2, 65\] range"):
             ImageFilter.Color3DLUT((11, 11, 1), [1])
@@ -375,7 +356,7 @@ def test_wrong_args(self):
         with pytest.raises(ValueError, match="Only 3 or 4 output"):
             ImageFilter.Color3DLUT((2, 2, 2), [[1, 1]] * 8, channels=2)
 
-    def test_convert_table(self):
+    def test_convert_table(self) -> None:
         lut = ImageFilter.Color3DLUT(2, [0, 1, 2] * 8)
         assert tuple(lut.size) == (2, 2, 2)
         assert lut.name == "Color 3D LUT"
@@ -393,7 +374,8 @@ def test_convert_table(self):
         assert lut.table == list(range(4)) * 8
 
     @pytest.mark.skipif(numpy is None, reason="NumPy not installed")
-    def test_numpy_sources(self):
+    def test_numpy_sources(self) -> None:
+        assert numpy is not None
         table = numpy.ones((5, 6, 7, 3), dtype=numpy.float16)
         with pytest.raises(ValueError, match="should have either channels"):
             lut = ImageFilter.Color3DLUT((5, 6, 7), table)
@@ -426,7 +408,8 @@ def test_numpy_sources(self):
         assert lut.table[0] == 33
 
     @pytest.mark.skipif(numpy is None, reason="NumPy not installed")
-    def test_numpy_formats(self):
+    def test_numpy_formats(self) -> None:
+        assert numpy is not None
         g = Image.linear_gradient("L")
         im = Image.merge(
             "RGB",
@@ -465,7 +448,7 @@ def test_numpy_formats(self):
         lut.table = numpy.array(lut.table, dtype=numpy.int8)
         im.filter(lut)
 
-    def test_repr(self):
+    def test_repr(self) -> None:
         lut = ImageFilter.Color3DLUT(2, [0, 1, 2] * 8)
         assert repr(lut) == "<Color3DLUT from list size=2x2x2 channels=3>"
 
@@ -483,7 +466,7 @@ def test_repr(self):
 
 
 class TestGenerateColorLut3D:
-    def test_wrong_channels_count(self):
+    def test_wrong_channels_count(self) -> None:
         with pytest.raises(ValueError, match="3 or 4 output channels"):
             ImageFilter.Color3DLUT.generate(
                 5, channels=2, callback=lambda r, g, b: (r, g, b)
@@ -497,7 +480,7 @@ def test_wrong_channels_count(self):
                 5, channels=4, callback=lambda r, g, b: (r, g, b)
             )
 
-    def test_3_channels(self):
+    def test_3_channels(self) -> None:
         lut = ImageFilter.Color3DLUT.generate(5, lambda r, g, b: (r, g, b))
         assert tuple(lut.size) == (5, 5, 5)
         assert lut.name == "Color 3D LUT"
@@ -507,7 +490,7 @@ def test_3_channels(self):
             1.0, 0.0, 0.0,  0.0, 0.25, 0.0,  0.25, 0.25, 0.0,  0.5, 0.25, 0.0]
         # fmt: on
 
-    def test_4_channels(self):
+    def test_4_channels(self) -> None:
         lut = ImageFilter.Color3DLUT.generate(
             5, channels=4, callback=lambda r, g, b: (b, r, g, (r + g + b) / 2)
         )
@@ -520,7 +503,7 @@ def test_4_channels(self):
         ]
         # fmt: on
 
-    def test_apply(self):
+    def test_apply(self) -> None:
         lut = ImageFilter.Color3DLUT.generate(5, lambda r, g, b: (r, g, b))
 
         g = Image.linear_gradient("L")
@@ -536,7 +519,7 @@ def test_apply(self):
 
 
 class TestTransformColorLut3D:
-    def test_wrong_args(self):
+    def test_wrong_args(self) -> None:
         source = ImageFilter.Color3DLUT.generate(5, lambda r, g, b: (r, g, b))
 
         with pytest.raises(ValueError, match="Only 3 or 4 output"):
@@ -551,7 +534,7 @@ def test_wrong_args(self):
         with pytest.raises(TypeError):
             source.transform(lambda r, g, b, a: (r, g, b))
 
-    def test_target_mode(self):
+    def test_target_mode(self) -> None:
         source = ImageFilter.Color3DLUT.generate(
             2, lambda r, g, b: (r, g, b), target_mode="HSV"
         )
@@ -562,7 +545,7 @@ def test_target_mode(self):
         lut = source.transform(lambda r, g, b: (r, g, b), target_mode="RGB")
         assert lut.mode == "RGB"
 
-    def test_3_to_3_channels(self):
+    def test_3_to_3_channels(self) -> None:
         source = ImageFilter.Color3DLUT.generate((3, 4, 5), lambda r, g, b: (r, g, b))
         lut = source.transform(lambda r, g, b: (r * r, g * g, b * b))
         assert tuple(lut.size) == tuple(source.size)
@@ -570,7 +553,7 @@ def test_3_to_3_channels(self):
         assert lut.table != source.table
         assert lut.table[:10] == [0.0, 0.0, 0.0, 0.25, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0]
 
-    def test_3_to_4_channels(self):
+    def test_3_to_4_channels(self) -> None:
         source = ImageFilter.Color3DLUT.generate((6, 5, 4), lambda r, g, b: (r, g, b))
         lut = source.transform(lambda r, g, b: (r * r, g * g, b * b, 1), channels=4)
         assert tuple(lut.size) == tuple(source.size)
@@ -582,7 +565,7 @@ def test_3_to_4_channels(self):
             0.4**2, 0.0, 0.0, 1,  0.6**2, 0.0, 0.0, 1]
         # fmt: on
 
-    def test_4_to_3_channels(self):
+    def test_4_to_3_channels(self) -> None:
         source = ImageFilter.Color3DLUT.generate(
             (3, 6, 5), lambda r, g, b: (r, g, b, 1), channels=4
         )
@@ -598,7 +581,7 @@ def test_4_to_3_channels(self):
             1.0, 0.96, 1.0,  0.75, 0.96, 1.0,  0.0, 0.96, 1.0]
         # fmt: on
 
-    def test_4_to_4_channels(self):
+    def test_4_to_4_channels(self) -> None:
         source = ImageFilter.Color3DLUT.generate(
             (6, 5, 4), lambda r, g, b: (r, g, b, 1), channels=4
         )
@@ -612,7 +595,7 @@ def test_4_to_4_channels(self):
             0.4**2, 0.0, 0.0, 0.5,  0.6**2, 0.0, 0.0, 0.5]
         # fmt: on
 
-    def test_with_normals_3_channels(self):
+    def test_with_normals_3_channels(self) -> None:
         source = ImageFilter.Color3DLUT.generate(
             (6, 5, 4), lambda r, g, b: (r * r, g * g, b * b)
         )
@@ -628,7 +611,7 @@ def test_with_normals_3_channels(self):
             0.24, 0.0, 0.0,  0.8 - (0.8**2), 0, 0,  0, 0, 0]
         # fmt: on
 
-    def test_with_normals_4_channels(self):
+    def test_with_normals_4_channels(self) -> None:
         source = ImageFilter.Color3DLUT.generate(
             (3, 6, 5), lambda r, g, b: (r * r, g * g, b * b, 1), channels=4
         )
diff --git a/Tests/test_core_resources.py b/Tests/test_core_resources.py
index 5275652f66a..2c1de8bc3d2 100644
--- a/Tests/test_core_resources.py
+++ b/Tests/test_core_resources.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import sys
 
 import pytest
@@ -8,7 +9,7 @@
 from .helper import is_pypy
 
 
-def test_get_stats():
+def test_get_stats() -> None:
     # Create at least one image
     Image.new("RGB", (10, 10))
 
@@ -21,7 +22,7 @@ def test_get_stats():
     assert "blocks_cached" in stats
 
 
-def test_reset_stats():
+def test_reset_stats() -> None:
     Image.core.reset_stats()
 
     stats = Image.core.get_stats()
@@ -34,19 +35,19 @@ def test_reset_stats():
 
 
 class TestCoreMemory:
-    def teardown_method(self):
+    def teardown_method(self) -> None:
         # Restore default values
         Image.core.set_alignment(1)
         Image.core.set_block_size(1024 * 1024)
         Image.core.set_blocks_max(0)
         Image.core.clear_cache()
 
-    def test_get_alignment(self):
+    def test_get_alignment(self) -> None:
         alignment = Image.core.get_alignment()
 
         assert alignment > 0
 
-    def test_set_alignment(self):
+    def test_set_alignment(self) -> None:
         for i in [1, 2, 4, 8, 16, 32]:
             Image.core.set_alignment(i)
             alignment = Image.core.get_alignment()
@@ -62,12 +63,12 @@ def test_set_alignment(self):
         with pytest.raises(ValueError):
             Image.core.set_alignment(3)
 
-    def test_get_block_size(self):
+    def test_get_block_size(self) -> None:
         block_size = Image.core.get_block_size()
 
         assert block_size >= 4096
 
-    def test_set_block_size(self):
+    def test_set_block_size(self) -> None:
         for i in [4096, 2 * 4096, 3 * 4096]:
             Image.core.set_block_size(i)
             block_size = Image.core.get_block_size()
@@ -83,7 +84,7 @@ def test_set_block_size(self):
         with pytest.raises(ValueError):
             Image.core.set_block_size(4000)
 
-    def test_set_block_size_stats(self):
+    def test_set_block_size_stats(self) -> None:
         Image.core.reset_stats()
         Image.core.set_blocks_max(0)
         Image.core.set_block_size(4096)
@@ -95,12 +96,12 @@ def test_set_block_size_stats(self):
         if not is_pypy():
             assert stats["freed_blocks"] >= 64
 
-    def test_get_blocks_max(self):
+    def test_get_blocks_max(self) -> None:
         blocks_max = Image.core.get_blocks_max()
 
         assert blocks_max >= 0
 
-    def test_set_blocks_max(self):
+    def test_set_blocks_max(self) -> None:
         for i in [0, 1, 10]:
             Image.core.set_blocks_max(i)
             blocks_max = Image.core.get_blocks_max()
@@ -116,7 +117,7 @@ def test_set_blocks_max(self):
                 Image.core.set_blocks_max(2**29)
 
     @pytest.mark.skipif(is_pypy(), reason="Images not collected")
-    def test_set_blocks_max_stats(self):
+    def test_set_blocks_max_stats(self) -> None:
         Image.core.reset_stats()
         Image.core.set_blocks_max(128)
         Image.core.set_block_size(4096)
@@ -131,7 +132,7 @@ def test_set_blocks_max_stats(self):
         assert stats["blocks_cached"] == 64
 
     @pytest.mark.skipif(is_pypy(), reason="Images not collected")
-    def test_clear_cache_stats(self):
+    def test_clear_cache_stats(self) -> None:
         Image.core.reset_stats()
         Image.core.clear_cache()
         Image.core.set_blocks_max(128)
@@ -148,7 +149,7 @@ def test_clear_cache_stats(self):
         assert stats["freed_blocks"] >= 48
         assert stats["blocks_cached"] == 16
 
-    def test_large_images(self):
+    def test_large_images(self) -> None:
         Image.core.reset_stats()
         Image.core.set_blocks_max(0)
         Image.core.set_block_size(4096)
@@ -165,14 +166,14 @@ def test_large_images(self):
 
 
 class TestEnvVars:
-    def teardown_method(self):
+    def teardown_method(self) -> None:
         # Restore default values
         Image.core.set_alignment(1)
         Image.core.set_block_size(1024 * 1024)
         Image.core.set_blocks_max(0)
         Image.core.clear_cache()
 
-    def test_units(self):
+    def test_units(self) -> None:
         Image._apply_env_variables({"PILLOW_BLOCKS_MAX": "2K"})
         assert Image.core.get_blocks_max() == 2 * 1024
         Image._apply_env_variables({"PILLOW_BLOCK_SIZE": "2m"})
@@ -186,6 +187,6 @@ def test_units(self):
             {"PILLOW_BLOCKS_MAX": "wat"},
         ),
     )
-    def test_warnings(self, var):
+    def test_warnings(self, var: dict[str, str]) -> None:
         with pytest.warns(UserWarning):
             Image._apply_env_variables(var)
diff --git a/Tests/test_decompression_bomb.py b/Tests/test_decompression_bomb.py
index 391948d40c7..c140156f9ea 100644
--- a/Tests/test_decompression_bomb.py
+++ b/Tests/test_decompression_bomb.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -11,16 +12,16 @@
 
 
 class TestDecompressionBomb:
-    def teardown_method(self, method):
+    def teardown_method(self) -> None:
         Image.MAX_IMAGE_PIXELS = ORIGINAL_LIMIT
 
-    def test_no_warning_small_file(self):
+    def test_no_warning_small_file(self) -> None:
         # Implicit assert: no warning.
         # A warning would cause a failure.
         with Image.open(TEST_FILE):
             pass
 
-    def test_no_warning_no_limit(self):
+    def test_no_warning_no_limit(self) -> None:
         # Arrange
         # Turn limit off
         Image.MAX_IMAGE_PIXELS = None
@@ -32,7 +33,7 @@ def test_no_warning_no_limit(self):
         with Image.open(TEST_FILE):
             pass
 
-    def test_warning(self):
+    def test_warning(self) -> None:
         # Set limit to trigger warning on the test file
         Image.MAX_IMAGE_PIXELS = 128 * 128 - 1
         assert Image.MAX_IMAGE_PIXELS == 128 * 128 - 1
@@ -41,7 +42,7 @@ def test_warning(self):
             with Image.open(TEST_FILE):
                 pass
 
-    def test_exception(self):
+    def test_exception(self) -> None:
         # Set limit to trigger exception on the test file
         Image.MAX_IMAGE_PIXELS = 64 * 128 - 1
         assert Image.MAX_IMAGE_PIXELS == 64 * 128 - 1
@@ -50,22 +51,22 @@ def test_exception(self):
             with Image.open(TEST_FILE):
                 pass
 
-    def test_exception_ico(self):
+    def test_exception_ico(self) -> None:
         with pytest.raises(Image.DecompressionBombError):
             with Image.open("Tests/images/decompression_bomb.ico"):
                 pass
 
-    def test_exception_gif(self):
+    def test_exception_gif(self) -> None:
         with pytest.raises(Image.DecompressionBombError):
             with Image.open("Tests/images/decompression_bomb.gif"):
                 pass
 
-    def test_exception_gif_extents(self):
+    def test_exception_gif_extents(self) -> None:
         with Image.open("Tests/images/decompression_bomb_extents.gif") as im:
             with pytest.raises(Image.DecompressionBombError):
                 im.seek(1)
 
-    def test_exception_gif_zero_width(self):
+    def test_exception_gif_zero_width(self) -> None:
         # Set limit to trigger exception on the test file
         Image.MAX_IMAGE_PIXELS = 4 * 64 * 128
         assert Image.MAX_IMAGE_PIXELS == 4 * 64 * 128
@@ -74,7 +75,7 @@ def test_exception_gif_zero_width(self):
             with Image.open("Tests/images/zero_width.gif"):
                 pass
 
-    def test_exception_bmp(self):
+    def test_exception_bmp(self) -> None:
         with pytest.raises(Image.DecompressionBombError):
             with Image.open("Tests/images/bmp/b/reallybig.bmp"):
                 pass
@@ -82,15 +83,15 @@ def test_exception_bmp(self):
 
 class TestDecompressionCrop:
     @classmethod
-    def setup_class(cls):
+    def setup_class(cls) -> None:
         width, height = 128, 128
         Image.MAX_IMAGE_PIXELS = height * width * 4 - 1
 
     @classmethod
-    def teardown_class(cls):
+    def teardown_class(cls) -> None:
         Image.MAX_IMAGE_PIXELS = ORIGINAL_LIMIT
 
-    def test_enlarge_crop(self):
+    def test_enlarge_crop(self) -> None:
         # Crops can extend the extents, therefore we should have the
         # same decompression bomb warnings on them.
         with hopper() as src:
@@ -98,7 +99,7 @@ def test_enlarge_crop(self):
             with pytest.warns(Image.DecompressionBombWarning):
                 src.crop(box)
 
-    def test_crop_decompression_checks(self):
+    def test_crop_decompression_checks(self) -> None:
         im = Image.new("RGB", (100, 100))
 
         for value in ((-9999, -9999, -9990, -9990), (-999, -999, -990, -990)):
diff --git a/Tests/test_deprecate.py b/Tests/test_deprecate.py
index d45a6603c54..82ff14181a3 100644
--- a/Tests/test_deprecate.py
+++ b/Tests/test_deprecate.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import _deprecate
@@ -8,9 +9,9 @@
     "version, expected",
     [
         (
-            11,
-            "Old thing is deprecated and will be removed in Pillow 11 "
-            r"\(2024-10-15\)\. Use new thing instead\.",
+            12,
+            "Old thing is deprecated and will be removed in Pillow 12 "
+            r"\(2025-10-15\)\. Use new thing instead\.",
         ),
         (
             None,
@@ -19,12 +20,12 @@
         ),
     ],
 )
-def test_version(version, expected):
+def test_version(version: int | None, expected: str) -> None:
     with pytest.warns(DeprecationWarning, match=expected):
         _deprecate.deprecate("Old thing", version, "new thing")
 
 
-def test_unknown_version():
+def test_unknown_version() -> None:
     expected = r"Unknown removal version: 12345. Update PIL\._deprecate\?"
     with pytest.raises(ValueError, match=expected):
         _deprecate.deprecate("Old thing", 12345, "new thing")
@@ -45,26 +46,26 @@ def test_unknown_version():
         ),
     ],
 )
-def test_old_version(deprecated, plural, expected):
+def test_old_version(deprecated: str, plural: bool, expected: str) -> None:
     expected = r""
     with pytest.raises(RuntimeError, match=expected):
         _deprecate.deprecate(deprecated, 1, plural=plural)
 
 
-def test_plural():
+def test_plural() -> None:
     expected = (
-        r"Old things are deprecated and will be removed in Pillow 11 \(2024-10-15\)\. "
+        r"Old things are deprecated and will be removed in Pillow 12 \(2025-10-15\)\. "
         r"Use new thing instead\."
     )
     with pytest.warns(DeprecationWarning, match=expected):
-        _deprecate.deprecate("Old things", 11, "new thing", plural=True)
+        _deprecate.deprecate("Old things", 12, "new thing", plural=True)
 
 
-def test_replacement_and_action():
+def test_replacement_and_action() -> None:
     expected = "Use only one of 'replacement' and 'action'"
     with pytest.raises(ValueError, match=expected):
         _deprecate.deprecate(
-            "Old thing", 11, replacement="new thing", action="Upgrade to new thing"
+            "Old thing", 12, replacement="new thing", action="Upgrade to new thing"
         )
 
 
@@ -75,18 +76,18 @@ def test_replacement_and_action():
         "Upgrade to new thing.",
     ],
 )
-def test_action(action):
+def test_action(action: str) -> None:
     expected = (
-        r"Old thing is deprecated and will be removed in Pillow 11 \(2024-10-15\)\. "
+        r"Old thing is deprecated and will be removed in Pillow 12 \(2025-10-15\)\. "
         r"Upgrade to new thing\."
     )
     with pytest.warns(DeprecationWarning, match=expected):
-        _deprecate.deprecate("Old thing", 11, action=action)
+        _deprecate.deprecate("Old thing", 12, action=action)
 
 
-def test_no_replacement_or_action():
+def test_no_replacement_or_action() -> None:
     expected = (
-        r"Old thing is deprecated and will be removed in Pillow 11 \(2024-10-15\)"
+        r"Old thing is deprecated and will be removed in Pillow 12 \(2025-10-15\)"
     )
     with pytest.warns(DeprecationWarning, match=expected):
-        _deprecate.deprecate("Old thing", 11)
+        _deprecate.deprecate("Old thing", 12)
diff --git a/Tests/test_features.py b/Tests/test_features.py
index 8f0e4b4184a..ed792997376 100644
--- a/Tests/test_features.py
+++ b/Tests/test_features.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
+
 import io
 import re
+from typing import Callable
 
 import pytest
 
@@ -8,33 +10,36 @@
 
 from .helper import skip_unless_feature
 
-try:
-    from PIL import _webp
-except ImportError:
-    pass
-
 
-def test_check():
+def test_check() -> None:
     # Check the correctness of the convenience function
     for module in features.modules:
         assert features.check_module(module) == features.check(module)
     for codec in features.codecs:
         assert features.check_codec(codec) == features.check(codec)
     for feature in features.features:
-        assert features.check_feature(feature) == features.check(feature)
+        if "webp" in feature:
+            with pytest.warns(DeprecationWarning):
+                assert features.check_feature(feature) == features.check(feature)
+        else:
+            assert features.check_feature(feature) == features.check(feature)
 
 
-def test_version():
+def test_version() -> None:
     # Check the correctness of the convenience function
     # and the format of version numbers
 
-    def test(name, function):
+    def test(name: str, function: Callable[[str], str | None]) -> None:
         version = features.version(name)
         if not features.check(name):
             assert version is None
         else:
             assert function(name) == version
             if name != "PIL":
+                if name == "zlib" and version is not None:
+                    version = re.sub(".zlib-ng$", "", version)
+                elif name == "libtiff" and version is not None:
+                    version = re.sub("t$", "", version)
                 assert version is None or re.search(r"\d+(\.\d+)*$", version)
 
     for module in features.modules:
@@ -42,60 +47,67 @@ def test(name, function):
     for codec in features.codecs:
         test(codec, features.version_codec)
     for feature in features.features:
-        test(feature, features.version_feature)
+        if "webp" in feature:
+            with pytest.warns(DeprecationWarning):
+                test(feature, features.version_feature)
+        else:
+            test(feature, features.version_feature)
 
 
-@skip_unless_feature("webp")
-def test_webp_transparency():
-    assert features.check("transp_webp") != _webp.WebPDecoderBuggyAlpha()
-    assert features.check("transp_webp") == _webp.HAVE_TRANSPARENCY
+def test_webp_transparency() -> None:
+    with pytest.warns(DeprecationWarning):
+        assert (features.check("transp_webp") or False) == features.check_module("webp")
 
 
-@skip_unless_feature("webp")
-def test_webp_mux():
-    assert features.check("webp_mux") == _webp.HAVE_WEBPMUX
+def test_webp_mux() -> None:
+    with pytest.warns(DeprecationWarning):
+        assert (features.check("webp_mux") or False) == features.check_module("webp")
 
 
-@skip_unless_feature("webp")
-def test_webp_anim():
-    assert features.check("webp_anim") == _webp.HAVE_WEBPANIM
+def test_webp_anim() -> None:
+    with pytest.warns(DeprecationWarning):
+        assert (features.check("webp_anim") or False) == features.check_module("webp")
 
 
 @skip_unless_feature("libjpeg_turbo")
-def test_libjpeg_turbo_version():
-    assert re.search(r"\d+\.\d+\.\d+$", features.version("libjpeg_turbo"))
+def test_libjpeg_turbo_version() -> None:
+    version = features.version("libjpeg_turbo")
+    assert version is not None
+    assert re.search(r"\d+\.\d+\.\d+$", version)
 
 
 @skip_unless_feature("libimagequant")
-def test_libimagequant_version():
-    assert re.search(r"\d+\.\d+\.\d+$", features.version("libimagequant"))
+def test_libimagequant_version() -> None:
+    version = features.version("libimagequant")
+    assert version is not None
+    assert re.search(r"\d+\.\d+\.\d+$", version)
 
 
 @pytest.mark.parametrize("feature", features.modules)
-def test_check_modules(feature):
+def test_check_modules(feature: str) -> None:
     assert features.check_module(feature) in [True, False]
 
 
 @pytest.mark.parametrize("feature", features.codecs)
-def test_check_codecs(feature):
+def test_check_codecs(feature: str) -> None:
     assert features.check_codec(feature) in [True, False]
 
 
-def test_check_warns_on_nonexistent():
+def test_check_warns_on_nonexistent() -> None:
     with pytest.warns(UserWarning) as cm:
         has_feature = features.check("typo")
     assert has_feature is False
     assert str(cm[-1].message) == "Unknown feature 'typo'."
 
 
-def test_supported_modules():
+def test_supported_modules() -> None:
     assert isinstance(features.get_supported_modules(), list)
     assert isinstance(features.get_supported_codecs(), list)
     assert isinstance(features.get_supported_features(), list)
     assert isinstance(features.get_supported(), list)
 
 
-def test_unsupported_codec():
+def test_unsupported_codec() -> None:
     # Arrange
     codec = "unsupported_codec"
     # Act / Assert
@@ -105,7 +117,7 @@ def test_unsupported_codec():
         features.version_codec(codec)
 
 
-def test_unsupported_module():
+def test_unsupported_module() -> None:
     # Arrange
     module = "unsupported_module"
     # Act / Assert
@@ -115,9 +127,10 @@ def test_unsupported_module():
         features.version_module(module)
 
 
-def test_pilinfo():
+@pytest.mark.parametrize("supported_formats", (True, False))
+def test_pilinfo(supported_formats: bool) -> None:
     buf = io.StringIO()
-    features.pilinfo(buf)
+    features.pilinfo(buf, supported_formats=supported_formats)
     out = buf.getvalue()
     lines = out.splitlines()
     assert lines[0] == "-" * 68
@@ -127,9 +140,15 @@ def test_pilinfo():
     while lines[0].startswith("    "):
         lines = lines[1:]
     assert lines[0] == "-" * 68
-    assert lines[1].startswith("Python modules loaded from ")
-    assert lines[2].startswith("Binary modules loaded from ")
-    assert lines[3] == "-" * 68
+    assert lines[1].startswith("Python executable is")
+    lines = lines[2:]
+    if lines[0].startswith("Environment Python files loaded from"):
+        lines = lines[1:]
+    assert lines[0].startswith("System Python files loaded from")
+    assert lines[1] == "-" * 68
+    assert lines[2].startswith("Python Pillow modules loaded from ")
+    assert lines[3].startswith("Binary Pillow modules loaded from ")
+    assert lines[4] == "-" * 68
     jpeg = (
         "\n"
         + "-" * 68
@@ -140,4 +159,4 @@ def test_pilinfo():
         + "-" * 68
         + "\n"
     )
-    assert jpeg in out
+    assert supported_formats == (jpeg in out)
diff --git a/Tests/test_file_apng.py b/Tests/test_file_apng.py
index 60d951636e8..ee6c867c3ca 100644
--- a/Tests/test_file_apng.py
+++ b/Tests/test_file_apng.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image, ImageSequence, PngImagePlugin
@@ -7,7 +10,7 @@
 # APNG browser support tests and fixtures via:
 # https://philip.html5.org/tests/apng/tests.html
 # (referenced from https://wiki.mozilla.org/APNG_Specification)
-def test_apng_basic():
+def test_apng_basic() -> None:
     with Image.open("Tests/images/apng/single_frame.png") as im:
         assert not im.is_animated
         assert im.n_frames == 1
@@ -44,14 +47,14 @@ def test_apng_basic():
     "filename",
     ("Tests/images/apng/split_fdat.png", "Tests/images/apng/split_fdat_zero_chunk.png"),
 )
-def test_apng_fdat(filename):
+def test_apng_fdat(filename: str) -> None:
     with Image.open(filename) as im:
         im.seek(im.n_frames - 1)
         assert im.getpixel((0, 0)) == (0, 255, 0, 255)
         assert im.getpixel((64, 32)) == (0, 255, 0, 255)
 
 
-def test_apng_dispose():
+def test_apng_dispose() -> None:
     with Image.open("Tests/images/apng/dispose_op_none.png") as im:
         im.seek(im.n_frames - 1)
         assert im.getpixel((0, 0)) == (0, 255, 0, 255)
@@ -83,7 +86,7 @@ def test_apng_dispose():
         assert im.getpixel((64, 32)) == (0, 0, 0, 0)
 
 
-def test_apng_dispose_region():
+def test_apng_dispose_region() -> None:
     with Image.open("Tests/images/apng/dispose_op_none_region.png") as im:
         im.seek(im.n_frames - 1)
         assert im.getpixel((0, 0)) == (0, 255, 0, 255)
@@ -105,7 +108,7 @@ def test_apng_dispose_region():
         assert im.getpixel((64, 32)) == (0, 255, 0, 255)
 
 
-def test_apng_dispose_op_previous_frame():
+def test_apng_dispose_op_previous_frame() -> None:
     # Test that the dispose settings being used are from the previous frame
     #
     # Image created with:
@@ -130,14 +133,14 @@ def test_apng_dispose_op_previous_frame():
         assert im.getpixel((0, 0)) == (255, 0, 0, 255)
 
 
-def test_apng_dispose_op_background_p_mode():
+def test_apng_dispose_op_background_p_mode() -> None:
     with Image.open("Tests/images/apng/dispose_op_background_p_mode.png") as im:
         im.seek(1)
         im.load()
         assert im.size == (128, 64)
 
 
-def test_apng_blend():
+def test_apng_blend() -> None:
     with Image.open("Tests/images/apng/blend_op_source_solid.png") as im:
         im.seek(im.n_frames - 1)
         assert im.getpixel((0, 0)) == (0, 255, 0, 255)
@@ -164,20 +167,20 @@ def test_apng_blend():
         assert im.getpixel((64, 32)) == (0, 255, 0, 255)
 
 
-def test_apng_blend_transparency():
+def test_apng_blend_transparency() -> None:
     with Image.open("Tests/images/blend_transparency.png") as im:
         im.seek(1)
         assert im.getpixel((0, 0)) == (255, 0, 0)
 
 
-def test_apng_chunk_order():
+def test_apng_chunk_order() -> None:
     with Image.open("Tests/images/apng/fctl_actl.png") as im:
         im.seek(im.n_frames - 1)
         assert im.getpixel((0, 0)) == (0, 255, 0, 255)
         assert im.getpixel((64, 32)) == (0, 255, 0, 255)
 
 
-def test_apng_delay():
+def test_apng_delay() -> None:
     with Image.open("Tests/images/apng/delay.png") as im:
         im.seek(1)
         assert im.info.get("duration") == 500.0
@@ -217,7 +220,7 @@ def test_apng_delay():
         assert im.info.get("duration") == 1000.0
 
 
-def test_apng_num_plays():
+def test_apng_num_plays() -> None:
     with Image.open("Tests/images/apng/num_plays.png") as im:
         assert im.info.get("loop") == 0
 
@@ -225,7 +228,7 @@ def test_apng_num_plays():
         assert im.info.get("loop") == 1
 
 
-def test_apng_mode():
+def test_apng_mode() -> None:
     with Image.open("Tests/images/apng/mode_16bit.png") as im:
         assert im.mode == "RGBA"
         im.seek(im.n_frames - 1)
@@ -255,8 +258,8 @@ def test_apng_mode():
         assert im.mode == "P"
         im.seek(im.n_frames - 1)
         im = im.convert("RGBA")
-        assert im.getpixel((0, 0)) == (255, 0, 0, 0)
-        assert im.getpixel((64, 32)) == (255, 0, 0, 0)
+        assert im.getpixel((0, 0)) == (0, 255, 0, 255)
+        assert im.getpixel((64, 32)) == (0, 255, 0, 255)
 
     with Image.open("Tests/images/apng/mode_palette_1bit_alpha.png") as im:
         assert im.mode == "P"
@@ -266,7 +269,7 @@ def test_apng_mode():
         assert im.getpixel((64, 32)) == (0, 0, 255, 128)
 
 
-def test_apng_chunk_errors():
+def test_apng_chunk_errors() -> None:
     with Image.open("Tests/images/apng/chunk_no_actl.png") as im:
         assert not im.is_animated
 
@@ -291,7 +294,7 @@ def test_apng_chunk_errors():
             im.seek(im.n_frames - 1)
 
 
-def test_apng_syntax_errors():
+def test_apng_syntax_errors() -> None:
     with pytest.warns(UserWarning):
         with Image.open("Tests/images/apng/syntax_num_frames_zero.png") as im:
             assert not im.is_animated
@@ -335,14 +338,14 @@ def test_apng_syntax_errors():
         "sequence_fdat_fctl.png",
     ),
 )
-def test_apng_sequence_errors(test_file):
+def test_apng_sequence_errors(test_file: str) -> None:
     with pytest.raises(SyntaxError):
         with Image.open(f"Tests/images/apng/{test_file}") as im:
             im.seek(im.n_frames - 1)
             im.load()
 
 
-def test_apng_save(tmp_path):
+def test_apng_save(tmp_path: Path) -> None:
     with Image.open("Tests/images/apng/single_frame.png") as im:
         test_file = str(tmp_path / "temp.png")
         im.save(test_file, save_all=True)
@@ -373,7 +376,7 @@ def test_apng_save(tmp_path):
         assert im.getpixel((64, 32)) == (0, 255, 0, 255)
 
 
-def test_apng_save_alpha(tmp_path):
+def test_apng_save_alpha(tmp_path: Path) -> None:
     test_file = str(tmp_path / "temp.png")
 
     im = Image.new("RGBA", (1, 1), (255, 0, 0, 255))
@@ -387,7 +390,7 @@ def test_apng_save_alpha(tmp_path):
         assert reloaded.getpixel((0, 0)) == (255, 0, 0, 127)
 
 
-def test_apng_save_split_fdat(tmp_path):
+def test_apng_save_split_fdat(tmp_path: Path) -> None:
     # test to make sure we do not generate sequence errors when writing
     # frames with image data spanning multiple fdAT chunks (in this case
     # both the default image and first animation frame will span multiple
@@ -411,7 +414,7 @@ def test_apng_save_split_fdat(tmp_path):
         assert exception is None
 
 
-def test_apng_save_duration_loop(tmp_path):
+def test_apng_save_duration_loop(tmp_path: Path) -> None:
     test_file = str(tmp_path / "temp.png")
     with Image.open("Tests/images/apng/delay.png") as im:
         frames = []
@@ -474,7 +477,7 @@ def test_apng_save_duration_loop(tmp_path):
         assert im.info["duration"] == 600
 
 
-def test_apng_save_disposal(tmp_path):
+def test_apng_save_disposal(tmp_path: Path) -> None:
     test_file = str(tmp_path / "temp.png")
     size = (128, 64)
     red = Image.new("RGBA", size, (255, 0, 0, 255))
@@ -575,7 +578,7 @@ def test_apng_save_disposal(tmp_path):
         assert im.getpixel((64, 32)) == (0, 0, 0, 0)
 
 
-def test_apng_save_disposal_previous(tmp_path):
+def test_apng_save_disposal_previous(tmp_path: Path) -> None:
     test_file = str(tmp_path / "temp.png")
     size = (128, 64)
     blue = Image.new("RGBA", size, (0, 0, 255, 255))
@@ -597,7 +600,7 @@ def test_apng_save_disposal_previous(tmp_path):
         assert im.getpixel((64, 32)) == (0, 255, 0, 255)
 
 
-def test_apng_save_blend(tmp_path):
+def test_apng_save_blend(tmp_path: Path) -> None:
     test_file = str(tmp_path / "temp.png")
     size = (128, 64)
     red = Image.new("RGBA", size, (255, 0, 0, 255))
@@ -665,7 +668,17 @@ def test_apng_save_blend(tmp_path):
         assert im.getpixel((0, 0)) == (0, 255, 0, 255)
 
 
-def test_seek_after_close():
+def test_apng_save_size(tmp_path: Path) -> None:
+    test_file = str(tmp_path / "temp.png")
+
+    im = Image.new("L", (100, 100))
+    im.save(test_file, save_all=True, append_images=[Image.new("L", (200, 200))])
+
+    with Image.open(test_file) as reloaded:
+        assert reloaded.size == (200, 200)
+
+
+def test_seek_after_close() -> None:
     im = Image.open("Tests/images/apng/delay.png")
     im.seek(1)
     im.close()
@@ -677,7 +690,9 @@ def test_seek_after_close():
 @pytest.mark.parametrize("mode", ("RGBA", "RGB", "P"))
 @pytest.mark.parametrize("default_image", (True, False))
 @pytest.mark.parametrize("duplicate", (True, False))
-def test_different_modes_in_later_frames(mode, default_image, duplicate, tmp_path):
+def test_different_modes_in_later_frames(
+    mode: str, default_image: bool, duplicate: bool, tmp_path: Path
+) -> None:
     test_file = str(tmp_path / "temp.png")
 
     im = Image.new("L", (1, 1))
@@ -689,3 +704,23 @@ def test_different_modes_in_later_frames(mode, default_image, duplicate, tmp_pat
     )
     with Image.open(test_file) as reloaded:
         assert reloaded.mode == mode
+
+
+def test_different_durations(tmp_path: Path) -> None:
+    test_file = str(tmp_path / "temp.png")
+
+    with Image.open("Tests/images/apng/different_durations.png") as im:
+        for _ in range(3):
+            im.seek(0)
+            assert im.info["duration"] == 4000
+
+            im.seek(1)
+            assert im.info["duration"] == 1000
+
+        im.save(test_file, save_all=True)
+
+    with Image.open(test_file) as reloaded:
+        assert reloaded.info["duration"] == 4000
+
+        reloaded.seek(1)
+        assert reloaded.info["duration"] == 1000
diff --git a/Tests/test_file_blp.py b/Tests/test_file_blp.py
index 4c1e38d1ddf..1e2f20c407b 100644
--- a/Tests/test_file_blp.py
+++ b/Tests/test_file_blp.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image
@@ -11,7 +14,7 @@
 )
 
 
-def test_load_blp1():
+def test_load_blp1() -> None:
     with Image.open("Tests/images/blp/blp1_jpeg.blp") as im:
         assert_image_equal_tofile(im, "Tests/images/blp/blp1_jpeg.png")
 
@@ -19,22 +22,22 @@ def test_load_blp1():
         im.load()
 
 
-def test_load_blp2_raw():
+def test_load_blp2_raw() -> None:
     with Image.open("Tests/images/blp/blp2_raw.blp") as im:
         assert_image_equal_tofile(im, "Tests/images/blp/blp2_raw.png")
 
 
-def test_load_blp2_dxt1():
+def test_load_blp2_dxt1() -> None:
     with Image.open("Tests/images/blp/blp2_dxt1.blp") as im:
         assert_image_equal_tofile(im, "Tests/images/blp/blp2_dxt1.png")
 
 
-def test_load_blp2_dxt1a():
+def test_load_blp2_dxt1a() -> None:
     with Image.open("Tests/images/blp/blp2_dxt1a.blp") as im:
         assert_image_equal_tofile(im, "Tests/images/blp/blp2_dxt1a.png")
 
 
-def test_save(tmp_path):
+def test_save(tmp_path: Path) -> None:
     f = str(tmp_path / "temp.blp")
 
     for version in ("BLP1", "BLP2"):
@@ -68,7 +71,7 @@ def test_save(tmp_path):
         "Tests/images/timeout-ef9112a065e7183fa7faa2e18929b03e44ee16bf.blp",
     ],
 )
-def test_crashes(test_file):
+def test_crashes(test_file: str) -> None:
     with open(test_file, "rb") as f:
         with Image.open(f) as im:
             with pytest.raises(OSError):
diff --git a/Tests/test_file_bmp.py b/Tests/test_file_bmp.py
index 4cc92c5f684..2ff4160bd71 100644
--- a/Tests/test_file_bmp.py
+++ b/Tests/test_file_bmp.py
@@ -1,9 +1,11 @@
 from __future__ import annotations
+
 import io
+from pathlib import Path
 
 import pytest
 
-from PIL import BmpImagePlugin, Image
+from PIL import BmpImagePlugin, Image, _binary
 
 from .helper import (
     assert_image_equal,
@@ -13,8 +15,8 @@
 )
 
 
-def test_sanity(tmp_path):
-    def roundtrip(im):
+def test_sanity(tmp_path: Path) -> None:
+    def roundtrip(im: Image.Image) -> None:
         outfile = str(tmp_path / "temp.bmp")
 
         im.save(outfile, "BMP")
@@ -34,20 +36,20 @@ def roundtrip(im):
     roundtrip(hopper("RGB"))
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     with open("Tests/images/flower.jpg", "rb") as fp:
         with pytest.raises(SyntaxError):
             BmpImagePlugin.BmpImageFile(fp)
 
 
-def test_fallback_if_mmap_errors():
+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")
 
 
-def test_save_to_bytes():
+def test_save_to_bytes() -> None:
     output = io.BytesIO()
     im = hopper()
     im.save(output, "BMP")
@@ -59,7 +61,7 @@ def test_save_to_bytes():
         assert reloaded.format == "BMP"
 
 
-def test_small_palette(tmp_path):
+def test_small_palette(tmp_path: Path) -> None:
     im = Image.new("P", (1, 1))
     colors = [0, 0, 0, 125, 125, 125, 255, 255, 255]
     im.putpalette(colors)
@@ -71,7 +73,7 @@ def test_small_palette(tmp_path):
         assert reloaded.getpalette() == colors
 
 
-def test_save_too_large(tmp_path):
+def test_save_too_large(tmp_path: Path) -> None:
     outfile = str(tmp_path / "temp.bmp")
     with Image.new("RGB", (1, 1)) as im:
         im._size = (37838, 37838)
@@ -79,7 +81,7 @@ def test_save_too_large(tmp_path):
             im.save(outfile)
 
 
-def test_dpi():
+def test_dpi() -> None:
     dpi = (72, 72)
 
     output = io.BytesIO()
@@ -91,7 +93,7 @@ def test_dpi():
         assert reloaded.info["dpi"] == (72.008961115161, 72.008961115161)
 
 
-def test_save_bmp_with_dpi(tmp_path):
+def test_save_bmp_with_dpi(tmp_path: Path) -> None:
     # Test for #1301
     # Arrange
     outfile = str(tmp_path / "temp.jpg")
@@ -109,7 +111,7 @@ def test_save_bmp_with_dpi(tmp_path):
             assert reloaded.format == "JPEG"
 
 
-def test_save_float_dpi(tmp_path):
+def test_save_float_dpi(tmp_path: Path) -> None:
     outfile = str(tmp_path / "temp.bmp")
     with Image.open("Tests/images/hopper.bmp") as im:
         im.save(outfile, dpi=(72.21216100543306, 72.21216100543306))
@@ -117,7 +119,7 @@ def test_save_float_dpi(tmp_path):
             assert reloaded.info["dpi"] == (72.21216100543306, 72.21216100543306)
 
 
-def test_load_dib():
+def test_load_dib() -> None:
     # test for #1293, Imagegrab returning Unsupported Bitfields Format
     with Image.open("Tests/images/clipboard.dib") as im:
         assert im.format == "DIB"
@@ -126,7 +128,30 @@ def test_load_dib():
         assert_image_equal_tofile(im, "Tests/images/clipboard_target.png")
 
 
-def test_save_dib(tmp_path):
+@pytest.mark.parametrize(
+    "header_size, path",
+    (
+        (12, "g/pal8os2.bmp"),
+        (40, "g/pal1.bmp"),
+        (52, "q/rgb32h52.bmp"),
+        (56, "q/rgba32h56.bmp"),
+        (64, "q/pal8os2v2.bmp"),
+        (108, "g/pal8v4.bmp"),
+        (124, "g/pal8v5.bmp"),
+    ),
+)
+def test_dib_header_size(header_size: int, path: str) -> None:
+    image_path = "Tests/images/bmp/" + path
+    with open(image_path, "rb") as fp:
+        data = fp.read()[14:]
+    assert _binary.i32le(data) == header_size
+
+    dib = io.BytesIO(data)
+    with Image.open(dib) as im:
+        im.load()
+
+
+def test_save_dib(tmp_path: Path) -> None:
     outfile = str(tmp_path / "temp.dib")
 
     with Image.open("Tests/images/clipboard.dib") as im:
@@ -138,7 +163,7 @@ def test_save_dib(tmp_path):
             assert_image_equal(im, reloaded)
 
 
-def test_rgba_bitfields():
+def test_rgba_bitfields() -> None:
     # This test image has been manually hexedited
     # to change the bitfield compression in the header from XBGR to RGBA
     with Image.open("Tests/images/rgb32bf-rgba.bmp") as im:
@@ -156,7 +181,7 @@ def test_rgba_bitfields():
         )
 
 
-def test_rle8():
+def test_rle8() -> None:
     with Image.open("Tests/images/hopper_rle8.bmp") as im:
         assert_image_similar_tofile(im.convert("RGB"), "Tests/images/hopper.bmp", 12)
 
@@ -176,7 +201,7 @@ def test_rle8():
                 im.load()
 
 
-def test_rle4():
+def test_rle4() -> None:
     with Image.open("Tests/images/bmp/g/pal4rle.bmp") as im:
         assert_image_similar_tofile(im, "Tests/images/bmp/g/pal4.bmp", 12)
 
@@ -192,7 +217,7 @@ def test_rle4():
         ("Tests/images/bmp/g/pal8rle.bmp", 1064),
     ),
 )
-def test_rle8_eof(file_name, length):
+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:
@@ -200,7 +225,7 @@ def test_rle8_eof(file_name, length):
                 im.load()
 
 
-def test_offset():
+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:
diff --git a/Tests/test_file_bufrstub.py b/Tests/test_file_bufrstub.py
index 5780232a2d6..77ee5b0ea12 100644
--- a/Tests/test_file_bufrstub.py
+++ b/Tests/test_file_bufrstub.py
@@ -1,14 +1,18 @@
 from __future__ import annotations
+
+from pathlib import Path
+from typing import IO
+
 import pytest
 
-from PIL import BufrStubImagePlugin, Image
+from PIL import BufrStubImagePlugin, Image, ImageFile
 
 from .helper import hopper
 
 TEST_FILE = "Tests/images/gfs.t06z.rassda.tm00.bufr_d"
 
 
-def test_open():
+def test_open() -> None:
     # Act
     with Image.open(TEST_FILE) as im:
         # Assert
@@ -19,7 +23,7 @@ def test_open():
         assert im.size == (1, 1)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     # Arrange
     invalid_file = "Tests/images/flower.jpg"
 
@@ -28,7 +32,7 @@ def test_invalid_file():
         BufrStubImagePlugin.BufrStubImageFile(invalid_file)
 
 
-def test_load():
+def test_load() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         # Act / Assert: stub cannot load without an implemented handler
@@ -36,7 +40,7 @@ def test_load():
             im.load()
 
 
-def test_save(tmp_path):
+def test_save(tmp_path: Path) -> None:
     # Arrange
     im = hopper()
     tmpfile = str(tmp_path / "temp.bufr")
@@ -46,31 +50,34 @@ def test_save(tmp_path):
         im.save(tmpfile)
 
 
-def test_handler(tmp_path):
-    class TestHandler:
+def test_handler(tmp_path: Path) -> None:
+    class TestHandler(ImageFile.StubHandler):
         opened = False
         loaded = False
         saved = False
 
-        def open(self, im):
+        def open(self, im: ImageFile.StubImageFile) -> None:
             self.opened = True
 
-        def load(self, im):
+        def load(self, im: ImageFile.StubImageFile) -> Image.Image:
             self.loaded = True
             im.fp.close()
             return Image.new("RGB", (1, 1))
 
-        def save(self, im, fp, filename):
+        def is_loaded(self) -> bool:
+            return self.loaded
+
+        def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None:
             self.saved = True
 
     handler = TestHandler()
     BufrStubImagePlugin.register_handler(handler)
     with Image.open(TEST_FILE) as im:
         assert handler.opened
-        assert not handler.loaded
+        assert not handler.is_loaded()
 
         im.load()
-        assert handler.loaded
+        assert handler.is_loaded()
 
         temp_file = str(tmp_path / "temp.bufr")
         im.save(temp_file)
diff --git a/Tests/test_file_container.py b/Tests/test_file_container.py
index 0da5d3824b0..237045acc7b 100644
--- a/Tests/test_file_container.py
+++ b/Tests/test_file_container.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import ContainerIO, Image
@@ -8,35 +9,35 @@
 TEST_FILE = "Tests/images/dummy.container"
 
 
-def test_sanity():
+def test_sanity() -> None:
     dir(Image)
     dir(ContainerIO)
 
 
-def test_isatty():
+def test_isatty() -> None:
     with hopper() as im:
         container = ContainerIO.ContainerIO(im, 0, 0)
 
     assert container.isatty() is False
 
 
-def test_seek_mode_0():
-    # Arrange
-    mode = 0
-    with open(TEST_FILE, "rb") as fh:
-        container = ContainerIO.ContainerIO(fh, 22, 100)
-
-        # Act
-        container.seek(33, mode)
-        container.seek(33, mode)
+def test_seekable() -> None:
+    with hopper() as im:
+        container = ContainerIO.ContainerIO(im, 0, 0)
 
-        # Assert
-        assert container.tell() == 33
+    assert container.seekable() is True
 
 
-def test_seek_mode_1():
+@pytest.mark.parametrize(
+    "mode, expected_position",
+    (
+        (0, 33),
+        (1, 66),
+        (2, 100),
+    ),
+)
+def test_seek_mode(mode: int, expected_position: int) -> None:
     # Arrange
-    mode = 1
     with open(TEST_FILE, "rb") as fh:
         container = ContainerIO.ContainerIO(fh, 22, 100)
 
@@ -45,31 +46,25 @@ def test_seek_mode_1():
         container.seek(33, mode)
 
         # Assert
-        assert container.tell() == 66
+        assert container.tell() == expected_position
 
 
-def test_seek_mode_2():
-    # Arrange
-    mode = 2
-    with open(TEST_FILE, "rb") as fh:
-        container = ContainerIO.ContainerIO(fh, 22, 100)
-
-        # Act
-        container.seek(33, mode)
-        container.seek(33, mode)
+@pytest.mark.parametrize("bytesmode", (True, False))
+def test_readable(bytesmode: bool) -> None:
+    with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
+        container = ContainerIO.ContainerIO(fh, 0, 120)
 
-        # Assert
-        assert container.tell() == 100
+    assert container.readable() is True
 
 
 @pytest.mark.parametrize("bytesmode", (True, False))
-def test_read_n0(bytesmode):
+def test_read_n0(bytesmode: bool) -> None:
     # Arrange
     with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
         container = ContainerIO.ContainerIO(fh, 22, 100)
 
         # Act
-        container.seek(81)
+        assert container.seek(81) == 81
         data = container.read()
 
         # Assert
@@ -79,13 +74,13 @@ def test_read_n0(bytesmode):
 
 
 @pytest.mark.parametrize("bytesmode", (True, False))
-def test_read_n(bytesmode):
+def test_read_n(bytesmode: bool) -> None:
     # Arrange
     with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
         container = ContainerIO.ContainerIO(fh, 22, 100)
 
         # Act
-        container.seek(81)
+        assert container.seek(81) == 81
         data = container.read(3)
 
         # Assert
@@ -95,13 +90,13 @@ def test_read_n(bytesmode):
 
 
 @pytest.mark.parametrize("bytesmode", (True, False))
-def test_read_eof(bytesmode):
+def test_read_eof(bytesmode: bool) -> None:
     # Arrange
     with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
         container = ContainerIO.ContainerIO(fh, 22, 100)
 
         # Act
-        container.seek(100)
+        assert container.seek(100) == 100
         data = container.read()
 
         # Assert
@@ -111,22 +106,66 @@ def test_read_eof(bytesmode):
 
 
 @pytest.mark.parametrize("bytesmode", (True, False))
-def test_readline(bytesmode):
-    # Arrange
+def test_readline(bytesmode: bool) -> None:
     with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
         container = ContainerIO.ContainerIO(fh, 0, 120)
 
-        # Act
         data = container.readline()
-
-        # Assert
         if bytesmode:
             data = data.decode()
         assert data == "This is line 1\n"
 
+        data = container.readline(4)
+        if bytesmode:
+            data = data.decode()
+        assert data == "This"
+
 
 @pytest.mark.parametrize("bytesmode", (True, False))
-def test_readlines(bytesmode):
+def test_readlines(bytesmode: bool) -> None:
+    expected = [
+        "This is line 1\n",
+        "This is line 2\n",
+        "This is line 3\n",
+        "This is line 4\n",
+        "This is line 5\n",
+        "This is line 6\n",
+        "This is line 7\n",
+        "This is line 8\n",
+    ]
+    with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
+        container = ContainerIO.ContainerIO(fh, 0, 120)
+
+        data = container.readlines()
+        if bytesmode:
+            data = [line.decode() for line in data]
+        assert data == expected
+
+        assert container.seek(0) == 0
+
+        data = container.readlines(2)
+        if bytesmode:
+            data = [line.decode() for line in data]
+        assert data == expected[:2]
+
+
+@pytest.mark.parametrize("bytesmode", (True, False))
+def test_write(bytesmode: bool) -> None:
+    with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
+        container = ContainerIO.ContainerIO(fh, 0, 120)
+
+        assert container.writable() is False
+
+        with pytest.raises(NotImplementedError):
+            container.write(b"" if bytesmode else "")
+        with pytest.raises(NotImplementedError):
+            container.writelines([])
+        with pytest.raises(NotImplementedError):
+            container.truncate()
+
+
+@pytest.mark.parametrize("bytesmode", (True, False))
+def test_iter(bytesmode: bool) -> None:
     # Arrange
     expected = [
         "This is line 1\n",
@@ -142,9 +181,21 @@ def test_readlines(bytesmode):
         container = ContainerIO.ContainerIO(fh, 0, 120)
 
         # Act
-        data = container.readlines()
+        data = []
+        for line in container:
+            data.append(line)
 
         # Assert
         if bytesmode:
             data = [line.decode() for line in data]
         assert data == expected
+
+
+@pytest.mark.parametrize("bytesmode", (True, False))
+def test_file(bytesmode: bool) -> None:
+    with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
+        container = ContainerIO.ContainerIO(fh, 0, 120)
+
+        assert isinstance(container.fileno(), int)
+        container.flush()
+        container.close()
diff --git a/Tests/test_file_cur.py b/Tests/test_file_cur.py
index 08c3257f9d1..dbf1b866d7f 100644
--- a/Tests/test_file_cur.py
+++ b/Tests/test_file_cur.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import CurImagePlugin, Image
@@ -6,7 +7,7 @@
 TEST_FILE = "Tests/images/deerstalker.cur"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_FILE) as im:
         assert im.size == (32, 32)
         assert isinstance(im, CurImagePlugin.CurImageFile)
@@ -16,7 +17,7 @@ def test_sanity():
         assert im.getpixel((16, 16)) == (84, 87, 86, 255)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
diff --git a/Tests/test_file_dcx.py b/Tests/test_file_dcx.py
index 25e4badbc92..65337cad9b1 100644
--- a/Tests/test_file_dcx.py
+++ b/Tests/test_file_dcx.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import warnings
 
 import pytest
@@ -11,7 +12,7 @@
 TEST_FILE = "Tests/images/hopper.dcx"
 
 
-def test_sanity():
+def test_sanity() -> None:
     # Arrange
 
     # Act
@@ -24,8 +25,8 @@ def test_sanity():
 
 
 @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-def test_unclosed_file():
-    def open():
+def test_unclosed_file() -> None:
+    def open() -> None:
         im = Image.open(TEST_FILE)
         im.load()
 
@@ -33,26 +34,26 @@ def open():
         open()
 
 
-def test_closed_file():
+def test_closed_file() -> None:
     with warnings.catch_warnings():
         im = Image.open(TEST_FILE)
         im.load()
         im.close()
 
 
-def test_context_manager():
+def test_context_manager() -> None:
     with warnings.catch_warnings():
         with Image.open(TEST_FILE) as im:
             im.load()
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     with open("Tests/images/flower.jpg", "rb") as fp:
         with pytest.raises(SyntaxError):
             DcxImagePlugin.DcxImageFile(fp)
 
 
-def test_tell():
+def test_tell() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         # Act
@@ -62,13 +63,13 @@ def test_tell():
         assert frame == 0
 
 
-def test_n_frames():
+def test_n_frames() -> None:
     with Image.open(TEST_FILE) as im:
         assert im.n_frames == 1
         assert not im.is_animated
 
 
-def test_eoferror():
+def test_eoferror() -> None:
     with Image.open(TEST_FILE) as im:
         n_frames = im.n_frames
 
@@ -81,7 +82,7 @@ def test_eoferror():
         im.seek(n_frames - 1)
 
 
-def test_seek_too_far():
+def test_seek_too_far() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         frame = 999  # too big on purpose
diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py
index a605c8399d8..9a826ebe8ca 100644
--- a/Tests/test_file_dds.py
+++ b/Tests/test_file_dds.py
@@ -1,6 +1,9 @@
 """Test DdsImagePlugin"""
+
 from __future__ import annotations
+
 from io import BytesIO
+from pathlib import Path
 
 import pytest
 
@@ -45,7 +48,7 @@
         TEST_FILE_DX10_BC1_TYPELESS,
     ),
 )
-def test_sanity_dxt1_bc1(image_path):
+def test_sanity_dxt1_bc1(image_path: str) -> None:
     """Check DXT1 and BC1 images can be opened"""
     with Image.open(TEST_FILE_DXT1.replace(".dds", ".png")) as target:
         target = target.convert("RGBA")
@@ -59,7 +62,7 @@ def test_sanity_dxt1_bc1(image_path):
         assert_image_equal(im, target)
 
 
-def test_sanity_dxt3():
+def test_sanity_dxt3() -> None:
     """Check DXT3 images can be opened"""
 
     with Image.open(TEST_FILE_DXT3) as im:
@@ -72,7 +75,7 @@ def test_sanity_dxt3():
         assert_image_equal_tofile(im, TEST_FILE_DXT3.replace(".dds", ".png"))
 
 
-def test_sanity_dxt5():
+def test_sanity_dxt5() -> None:
     """Check DXT5 images can be opened"""
 
     with Image.open(TEST_FILE_DXT5) as im:
@@ -93,7 +96,7 @@ def test_sanity_dxt5():
         TEST_FILE_BC4U,
     ),
 )
-def test_sanity_ati1_bc4u(image_path):
+def test_sanity_ati1_bc4u(image_path: str) -> None:
     """Check ATI1 and BC4U images can be opened"""
 
     with Image.open(image_path) as im:
@@ -114,7 +117,7 @@ def test_sanity_ati1_bc4u(image_path):
         TEST_FILE_DX10_BC4_TYPELESS,
     ),
 )
-def test_dx10_bc4(image_path):
+def test_dx10_bc4(image_path: str) -> None:
     """Check DX10 BC4 images can be opened"""
 
     with Image.open(image_path) as im:
@@ -135,7 +138,7 @@ def test_dx10_bc4(image_path):
         TEST_FILE_BC5U,
     ),
 )
-def test_sanity_ati2_bc5u(image_path):
+def test_sanity_ati2_bc5u(image_path: str) -> None:
     """Check ATI2 and BC5U images can be opened"""
 
     with Image.open(image_path) as im:
@@ -149,7 +152,7 @@ def test_sanity_ati2_bc5u(image_path):
 
 
 @pytest.mark.parametrize(
-    ("image_path", "expected_path"),
+    "image_path, expected_path",
     (
         # hexeditted to be typeless
         (TEST_FILE_DX10_BC5_TYPELESS, TEST_FILE_DX10_BC5_UNORM),
@@ -159,7 +162,7 @@ def test_sanity_ati2_bc5u(image_path):
         (TEST_FILE_BC5S, TEST_FILE_BC5S),
     ),
 )
-def test_dx10_bc5(image_path, expected_path):
+def test_dx10_bc5(image_path: str, expected_path: str) -> None:
     """Check DX10 BC5 images can be opened"""
 
     with Image.open(image_path) as im:
@@ -173,7 +176,7 @@ def test_dx10_bc5(image_path, expected_path):
 
 
 @pytest.mark.parametrize("image_path", (TEST_FILE_BC6H, TEST_FILE_BC6HS))
-def test_dx10_bc6h(image_path):
+def test_dx10_bc6h(image_path: str) -> None:
     """Check DX10 BC6H/BC6HS images can be opened"""
 
     with Image.open(image_path) as im:
@@ -186,7 +189,7 @@ def test_dx10_bc6h(image_path):
         assert_image_equal_tofile(im, image_path.replace(".dds", ".png"))
 
 
-def test_dx10_bc7():
+def test_dx10_bc7() -> None:
     """Check DX10 images can be opened"""
 
     with Image.open(TEST_FILE_DX10_BC7) as im:
@@ -199,7 +202,7 @@ def test_dx10_bc7():
         assert_image_equal_tofile(im, TEST_FILE_DX10_BC7.replace(".dds", ".png"))
 
 
-def test_dx10_bc7_unorm_srgb():
+def test_dx10_bc7_unorm_srgb() -> None:
     """Check DX10 unsigned normalized integer images can be opened"""
 
     with Image.open(TEST_FILE_DX10_BC7_UNORM_SRGB) as im:
@@ -215,7 +218,7 @@ def test_dx10_bc7_unorm_srgb():
         )
 
 
-def test_dx10_r8g8b8a8():
+def test_dx10_r8g8b8a8() -> None:
     """Check DX10 images can be opened"""
 
     with Image.open(TEST_FILE_DX10_R8G8B8A8) as im:
@@ -228,7 +231,7 @@ def test_dx10_r8g8b8a8():
         assert_image_equal_tofile(im, TEST_FILE_DX10_R8G8B8A8.replace(".dds", ".png"))
 
 
-def test_dx10_r8g8b8a8_unorm_srgb():
+def test_dx10_r8g8b8a8_unorm_srgb() -> None:
     """Check DX10 unsigned normalized integer images can be opened"""
 
     with Image.open(TEST_FILE_DX10_R8G8B8A8_UNORM_SRGB) as im:
@@ -245,7 +248,7 @@ def test_dx10_r8g8b8a8_unorm_srgb():
 
 
 @pytest.mark.parametrize(
-    ("mode", "size", "test_file"),
+    "mode, size, test_file",
     [
         ("L", (128, 128), TEST_FILE_UNCOMPRESSED_L),
         ("LA", (128, 128), TEST_FILE_UNCOMPRESSED_L_WITH_ALPHA),
@@ -254,7 +257,7 @@ def test_dx10_r8g8b8a8_unorm_srgb():
         ("RGBA", (800, 600), TEST_FILE_UNCOMPRESSED_RGB_WITH_ALPHA),
     ],
 )
-def test_uncompressed(mode, size, test_file):
+def test_uncompressed(mode: str, size: tuple[int, int], test_file: str) -> None:
     """Check uncompressed images can be opened"""
 
     with Image.open(test_file) as im:
@@ -265,7 +268,7 @@ def test_uncompressed(mode, size, test_file):
         assert_image_equal_tofile(im, test_file.replace(".dds", ".png"))
 
 
-def test__accept_true():
+def test__accept_true() -> None:
     """Check valid prefix"""
     # Arrange
     prefix = b"DDS etc"
@@ -277,7 +280,7 @@ def test__accept_true():
     assert output
 
 
-def test__accept_false():
+def test__accept_false() -> None:
     """Check invalid prefix"""
     # Arrange
     prefix = b"something invalid"
@@ -289,19 +292,19 @@ def test__accept_false():
     assert not output
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         DdsImagePlugin.DdsImageFile(invalid_file)
 
 
-def test_short_header():
+def test_short_header() -> None:
     """Check a short header"""
     with open(TEST_FILE_DXT5, "rb") as f:
         img_file = f.read()
 
-    def short_header():
+    def short_header() -> None:
         with Image.open(BytesIO(img_file[:119])):
             pass  # pragma: no cover
 
@@ -309,13 +312,13 @@ def short_header():
         short_header()
 
 
-def test_short_file():
+def test_short_file() -> None:
     """Check that the appropriate error is thrown for a short file"""
 
     with open(TEST_FILE_DXT5, "rb") as f:
         img_file = f.read()
 
-    def short_file():
+    def short_file() -> None:
         with Image.open(BytesIO(img_file[:-100])) as im:
             im.load()
 
@@ -323,7 +326,7 @@ def short_file():
         short_file()
 
 
-def test_dxt5_colorblock_alpha_issue_4142():
+def test_dxt5_colorblock_alpha_issue_4142() -> None:
     """Check that colorblocks are decoded correctly in DXT5"""
 
     with Image.open("Tests/images/dxt5-colorblock-alpha-issue-4142.dds") as im:
@@ -338,12 +341,12 @@ def test_dxt5_colorblock_alpha_issue_4142():
         assert px[2] != 0
 
 
-def test_palette():
+def test_palette() -> None:
     with Image.open("Tests/images/palette.dds") as im:
         assert_image_equal_tofile(im, "Tests/images/transparent.gif")
 
 
-def test_unsupported_bitcount():
+def test_unsupported_bitcount() -> None:
     with pytest.raises(OSError):
         with Image.open("Tests/images/unsupported_bitcount.dds"):
             pass
@@ -356,13 +359,13 @@ def test_unsupported_bitcount():
         "Tests/images/unimplemented_pfflags.dds",
     ),
 )
-def test_not_implemented(test_file):
+def test_not_implemented(test_file: str) -> None:
     with pytest.raises(NotImplementedError):
         with Image.open(test_file):
             pass
 
 
-def test_save_unsupported_mode(tmp_path):
+def test_save_unsupported_mode(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.dds")
     im = hopper("HSV")
     with pytest.raises(OSError):
@@ -370,7 +373,7 @@ def test_save_unsupported_mode(tmp_path):
 
 
 @pytest.mark.parametrize(
-    ("mode", "test_file"),
+    "mode, test_file",
     [
         ("L", "Tests/images/linear_gradient.png"),
         ("LA", "Tests/images/uncompressed_la.png"),
@@ -378,7 +381,7 @@ def test_save_unsupported_mode(tmp_path):
         ("RGBA", "Tests/images/pil123rgba.png"),
     ],
 )
-def test_save(mode, test_file, tmp_path):
+def test_save(mode: str, test_file: str, tmp_path: Path) -> None:
     out = str(tmp_path / "temp.dds")
     with Image.open(test_file) as im:
         assert im.mode == mode
diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index c479c384a76..672c04a4d4f 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -1,11 +1,14 @@
 from __future__ import annotations
+
 import io
+from pathlib import Path
 
 import pytest
 
-from PIL import EpsImagePlugin, Image, features
+from PIL import EpsImagePlugin, Image, UnidentifiedImageError, features
 
 from .helper import (
+    assert_image_equal_tofile,
     assert_image_similar,
     assert_image_similar_tofile,
     hopper,
@@ -17,18 +20,18 @@
 HAS_GHOSTSCRIPT = EpsImagePlugin.has_ghostscript()
 
 # Our two EPS test files (they are identical except for their bounding boxes)
-FILE1 = "Tests/images/zero_bb.eps"
-FILE2 = "Tests/images/non_zero_bb.eps"
+FILE1 = "Tests/images/eps/zero_bb.eps"
+FILE2 = "Tests/images/eps/non_zero_bb.eps"
 
 # Due to palletization, we'll need to convert these to RGB after load
-FILE1_COMPARE = "Tests/images/zero_bb.png"
-FILE1_COMPARE_SCALE2 = "Tests/images/zero_bb_scale2.png"
+FILE1_COMPARE = "Tests/images/eps/zero_bb.png"
+FILE1_COMPARE_SCALE2 = "Tests/images/eps/zero_bb_scale2.png"
 
-FILE2_COMPARE = "Tests/images/non_zero_bb.png"
-FILE2_COMPARE_SCALE2 = "Tests/images/non_zero_bb_scale2.png"
+FILE2_COMPARE = "Tests/images/eps/non_zero_bb.png"
+FILE2_COMPARE_SCALE2 = "Tests/images/eps/non_zero_bb_scale2.png"
 
 # EPS test files with binary preview
-FILE3 = "Tests/images/binary_preview_map.eps"
+FILE3 = "Tests/images/eps/binary_preview_map.eps"
 
 # Three unsigned 32bit little-endian values:
 #   0xC6D3D0C5 magic number
@@ -78,11 +81,9 @@
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-@pytest.mark.parametrize(
-    ("filename", "size"), ((FILE1, (460, 352)), (FILE2, (360, 252)))
-)
+@pytest.mark.parametrize("filename, size", ((FILE1, (460, 352)), (FILE2, (360, 252))))
 @pytest.mark.parametrize("scale", (1, 2))
-def test_sanity(filename, size, scale):
+def test_sanity(filename: str, size: tuple[int, int], scale: int) -> None:
     expected_size = tuple(s * scale for s in size)
     with Image.open(filename) as image:
         image.load(scale=scale)
@@ -92,7 +93,7 @@ def test_sanity(filename, size, scale):
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-def test_load():
+def test_load() -> None:
     with Image.open(FILE1) as im:
         assert im.load()[0, 0] == (255, 255, 255)
 
@@ -100,7 +101,7 @@ def test_load():
         assert im.load()[0, 0] == (255, 255, 255)
 
 
-def test_binary():
+def test_binary() -> None:
     if HAS_GHOSTSCRIPT:
         assert EpsImagePlugin.gs_binary is not None
     else:
@@ -114,70 +115,77 @@ def test_binary():
         assert EpsImagePlugin.gs_windows_binary is not None
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
     with pytest.raises(SyntaxError):
         EpsImagePlugin.EpsImageFile(invalid_file)
 
 
-def test_binary_header_only():
+def test_binary_header_only() -> None:
     data = io.BytesIO(simple_binary_header)
     with pytest.raises(SyntaxError, match='EPS header missing "%!PS-Adobe" comment'):
         EpsImagePlugin.EpsImageFile(data)
 
 
 @pytest.mark.parametrize("prefix", (b"", simple_binary_header))
-def test_missing_version_comment(prefix):
+def test_simple_eps_file(prefix: bytes) -> None:
+    data = io.BytesIO(prefix + b"\n".join(simple_eps_file))
+    with Image.open(data) as img:
+        assert img.mode == "RGB"
+        assert img.size == (100, 100)
+        assert img.format == "EPS"
+
+
+@pytest.mark.parametrize("prefix", (b"", simple_binary_header))
+def test_missing_version_comment(prefix: bytes) -> None:
     data = io.BytesIO(prefix + b"\n".join(simple_eps_file_without_version))
     with pytest.raises(SyntaxError):
         EpsImagePlugin.EpsImageFile(data)
 
 
 @pytest.mark.parametrize("prefix", (b"", simple_binary_header))
-def test_missing_boundingbox_comment(prefix):
+def test_missing_boundingbox_comment(prefix: bytes) -> None:
     data = io.BytesIO(prefix + b"\n".join(simple_eps_file_without_boundingbox))
     with pytest.raises(SyntaxError, match='EPS header missing "%%BoundingBox" comment'):
         EpsImagePlugin.EpsImageFile(data)
 
 
 @pytest.mark.parametrize("prefix", (b"", simple_binary_header))
-def test_invalid_boundingbox_comment(prefix):
-    data = io.BytesIO(prefix + b"\n".join(simple_eps_file_with_invalid_boundingbox))
+@pytest.mark.parametrize(
+    "file_lines",
+    (
+        simple_eps_file_with_invalid_boundingbox,
+        simple_eps_file_with_invalid_boundingbox_valid_imagedata,
+    ),
+)
+def test_invalid_boundingbox_comment(
+    prefix: bytes, file_lines: tuple[bytes, ...]
+) -> None:
+    data = io.BytesIO(prefix + b"\n".join(file_lines))
     with pytest.raises(OSError, match="cannot determine EPS bounding box"):
         EpsImagePlugin.EpsImageFile(data)
 
 
 @pytest.mark.parametrize("prefix", (b"", simple_binary_header))
-def test_invalid_boundingbox_comment_valid_imagedata_comment(prefix):
-    data = io.BytesIO(
-        prefix + b"\n".join(simple_eps_file_with_invalid_boundingbox_valid_imagedata)
-    )
-    with Image.open(data) as img:
-        assert img.mode == "RGB"
-        assert img.size == (100, 100)
-        assert img.format == "EPS"
-
-
-@pytest.mark.parametrize("prefix", (b"", simple_binary_header))
-def test_ascii_comment_too_long(prefix):
+def test_ascii_comment_too_long(prefix: bytes) -> None:
     data = io.BytesIO(prefix + b"\n".join(simple_eps_file_with_long_ascii_comment))
     with pytest.raises(SyntaxError, match="not an EPS file"):
         EpsImagePlugin.EpsImageFile(data)
 
 
 @pytest.mark.parametrize("prefix", (b"", simple_binary_header))
-def test_long_binary_data(prefix):
+def test_long_binary_data(prefix: bytes) -> None:
     data = io.BytesIO(prefix + b"\n".join(simple_eps_file_with_long_binary_data))
     EpsImagePlugin.EpsImageFile(data)
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
 @pytest.mark.parametrize("prefix", (b"", simple_binary_header))
-def test_load_long_binary_data(prefix):
+def test_load_long_binary_data(prefix: bytes) -> None:
     data = io.BytesIO(prefix + b"\n".join(simple_eps_file_with_long_binary_data))
     with Image.open(data) as img:
         img.load()
-        assert img.mode == "RGB"
+        assert img.mode == "1"
         assert img.size == (100, 100)
         assert img.format == "EPS"
 
@@ -186,8 +194,8 @@ def test_load_long_binary_data(prefix):
     pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
 )
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-def test_cmyk():
-    with Image.open("Tests/images/pil_sample_cmyk.eps") as cmyk_image:
+def test_cmyk() -> None:
+    with Image.open("Tests/images/eps/pil_sample_cmyk.eps") as cmyk_image:
         assert cmyk_image.mode == "CMYK"
         assert cmyk_image.size == (100, 100)
         assert cmyk_image.format == "EPS"
@@ -202,10 +210,10 @@ def test_cmyk():
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-def test_showpage():
+def test_showpage() -> None:
     # See https://github.com/python-pillow/Pillow/issues/2615
-    with Image.open("Tests/images/reqd_showpage.eps") as plot_image:
-        with Image.open("Tests/images/reqd_showpage.png") as target:
+    with Image.open("Tests/images/eps/reqd_showpage.eps") as plot_image:
+        with Image.open("Tests/images/eps/reqd_showpage.png") as target:
             # should not crash/hang
             plot_image.load()
             # fonts could be slightly different
@@ -213,18 +221,18 @@ def test_showpage():
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-def test_transparency():
-    with Image.open("Tests/images/reqd_showpage.eps") as plot_image:
+def test_transparency() -> None:
+    with Image.open("Tests/images/eps/reqd_showpage.eps") as plot_image:
         plot_image.load(transparency=True)
         assert plot_image.mode == "RGBA"
 
-        with Image.open("Tests/images/reqd_showpage_transparency.png") as target:
+        with Image.open("Tests/images/eps/reqd_showpage_transparency.png") as target:
             # fonts could be slightly different
             assert_image_similar(plot_image, target, 6)
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-def test_file_object(tmp_path):
+def test_file_object(tmp_path: Path) -> None:
     # issue 479
     with Image.open(FILE1) as image1:
         with open(str(tmp_path / "temp.eps"), "wb") as fh:
@@ -232,7 +240,7 @@ def test_file_object(tmp_path):
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-def test_bytesio_object():
+def test_bytesio_object() -> None:
     with open(FILE1, "rb") as f:
         img_bytes = io.BytesIO(f.read())
 
@@ -245,12 +253,22 @@ def test_bytesio_object():
         assert_image_similar(img, image1_scale1_compare, 5)
 
 
-def test_1_mode():
-    with Image.open("Tests/images/1.eps") as im:
-        assert im.mode == "1"
+@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
+@pytest.mark.parametrize(
+    # These images have an "ImageData" descriptor.
+    "filename",
+    (
+        "Tests/images/eps/1.eps",
+        "Tests/images/eps/1_boundingbox_after_imagedata.eps",
+        "Tests/images/eps/1_second_imagedata.eps",
+    ),
+)
+def test_1(filename: str) -> None:
+    with Image.open(filename) as im:
+        assert_image_equal_tofile(im, "Tests/images/eps/1.bmp")
 
 
-def test_image_mode_not_supported(tmp_path):
+def test_image_mode_not_supported(tmp_path: Path) -> None:
     im = hopper("RGBA")
     tmpfile = str(tmp_path / "temp.eps")
     with pytest.raises(ValueError):
@@ -259,7 +277,7 @@ def test_image_mode_not_supported(tmp_path):
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
 @skip_unless_feature("zlib")
-def test_render_scale1():
+def test_render_scale1() -> None:
     # We need png support for these render test
 
     # Zero bounding box
@@ -270,7 +288,7 @@ def test_render_scale1():
         image1_scale1_compare.load()
         assert_image_similar(image1_scale1, image1_scale1_compare, 5)
 
-    # Non-Zero bounding box
+    # Non-zero bounding box
     with Image.open(FILE2) as image2_scale1:
         image2_scale1.load()
         with Image.open(FILE2_COMPARE) as image2_scale1_compare:
@@ -281,7 +299,7 @@ def test_render_scale1():
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
 @skip_unless_feature("zlib")
-def test_render_scale2():
+def test_render_scale2() -> None:
     # We need png support for these render test
 
     # Zero bounding box
@@ -292,7 +310,7 @@ def test_render_scale2():
         image1_scale2_compare.load()
         assert_image_similar(image1_scale2, image1_scale2_compare, 5)
 
-    # Non-Zero bounding box
+    # Non-zero bounding box
     with Image.open(FILE2) as image2_scale2:
         image2_scale2.load(scale=2)
         with Image.open(FILE2_COMPARE_SCALE2) as image2_scale2_compare:
@@ -302,8 +320,10 @@ def test_render_scale2():
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-@pytest.mark.parametrize("filename", (FILE1, FILE2, "Tests/images/illu10_preview.eps"))
-def test_resize(filename):
+@pytest.mark.parametrize(
+    "filename", (FILE1, FILE2, "Tests/images/eps/illu10_preview.eps")
+)
+def test_resize(filename: str) -> None:
     with Image.open(filename) as im:
         new_size = (100, 100)
         im = im.resize(new_size)
@@ -312,7 +332,7 @@ def test_resize(filename):
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
 @pytest.mark.parametrize("filename", (FILE1, FILE2))
-def test_thumbnail(filename):
+def test_thumbnail(filename: str) -> None:
     # Issue #619
     with Image.open(filename) as im:
         new_size = (100, 100)
@@ -320,61 +340,19 @@ def test_thumbnail(filename):
         assert max(im.size) == max(new_size)
 
 
-def test_read_binary_preview():
+def test_read_binary_preview() -> None:
     # Issue 302
     # open image with binary preview
     with Image.open(FILE3):
         pass
 
 
-def test_readline_psfile(tmp_path):
-    # check all the freaking line endings possible from the spec
-    # test_string = u'something\r\nelse\n\rbaz\rbif\n'
-    line_endings = ["\r\n", "\n", "\n\r", "\r"]
-    strings = ["something", "else", "baz", "bif"]
-
-    def _test_readline(t, ending):
-        ending = "Failure with line ending: %s" % (
-            "".join("%s" % ord(s) for s in ending)
-        )
-        assert t.readline().strip("\r\n") == "something", ending
-        assert t.readline().strip("\r\n") == "else", ending
-        assert t.readline().strip("\r\n") == "baz", ending
-        assert t.readline().strip("\r\n") == "bif", ending
-
-    def _test_readline_io_psfile(test_string, ending):
-        f = io.BytesIO(test_string.encode("latin-1"))
-        with pytest.warns(DeprecationWarning):
-            t = EpsImagePlugin.PSFile(f)
-        _test_readline(t, ending)
-
-    def _test_readline_file_psfile(test_string, ending):
-        f = str(tmp_path / "temp.txt")
-        with open(f, "wb") as w:
-            w.write(test_string.encode("latin-1"))
-
-        with open(f, "rb") as r:
-            with pytest.warns(DeprecationWarning):
-                t = EpsImagePlugin.PSFile(r)
-            _test_readline(t, ending)
-
-    for ending in line_endings:
-        s = ending.join(strings)
-        _test_readline_io_psfile(s, ending)
-        _test_readline_file_psfile(s, ending)
-
-
-def test_psfile_deprecation():
-    with pytest.warns(DeprecationWarning):
-        EpsImagePlugin.PSFile(None)
-
-
 @pytest.mark.parametrize("prefix", (b"", simple_binary_header))
 @pytest.mark.parametrize(
     "line_ending",
     (b"\r\n", b"\n", b"\n\r", b"\r"),
 )
-def test_readline(prefix, line_ending):
+def test_readline(prefix: bytes, line_ending: bytes) -> None:
     simple_file = prefix + line_ending.join(simple_eps_file_with_comments)
     data = io.BytesIO(simple_file)
     test_file = EpsImagePlugin.EpsImageFile(data)
@@ -386,22 +364,22 @@ def test_readline(prefix, line_ending):
 @pytest.mark.parametrize(
     "filename",
     (
-        "Tests/images/illu10_no_preview.eps",
-        "Tests/images/illu10_preview.eps",
-        "Tests/images/illuCS6_no_preview.eps",
-        "Tests/images/illuCS6_preview.eps",
+        "Tests/images/eps/illu10_no_preview.eps",
+        "Tests/images/eps/illu10_preview.eps",
+        "Tests/images/eps/illuCS6_no_preview.eps",
+        "Tests/images/eps/illuCS6_preview.eps",
     ),
 )
-def test_open_eps(filename):
+def test_open_eps(filename: str) -> None:
     # https://github.com/python-pillow/Pillow/issues/1104
     with Image.open(filename) as img:
         assert img.mode == "RGB"
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-def test_emptyline():
+def test_emptyline() -> None:
     # Test file includes an empty line in the header data
-    emptyline_file = "Tests/images/zero_bb_emptyline.eps"
+    emptyline_file = "Tests/images/eps/zero_bb_emptyline.eps"
 
     with Image.open(emptyline_file) as image:
         image.load()
@@ -413,25 +391,34 @@ def test_emptyline():
 @pytest.mark.timeout(timeout=5)
 @pytest.mark.parametrize(
     "test_file",
-    ["Tests/images/timeout-d675703545fee17acab56e5fec644c19979175de.eps"],
+    ["Tests/images/eps/timeout-d675703545fee17acab56e5fec644c19979175de.eps"],
 )
-def test_timeout(test_file):
+def test_timeout(test_file: str) -> None:
     with open(test_file, "rb") as f:
-        with pytest.raises(Image.UnidentifiedImageError):
+        with pytest.raises(UnidentifiedImageError):
             with Image.open(f):
                 pass
 
 
-def test_bounding_box_in_trailer():
+def test_bounding_box_in_trailer() -> None:
     # Check bounding boxes are parsed in the same way
     # when specified in the header and the trailer
-    with Image.open("Tests/images/zero_bb_trailer.eps") as trailer_image, Image.open(
-        FILE1
-    ) as header_image:
+    with (
+        Image.open("Tests/images/eps/zero_bb_trailer.eps") as trailer_image,
+        Image.open(FILE1) as header_image,
+    ):
         assert trailer_image.size == header_image.size
 
 
-def test_eof_before_bounding_box():
+def test_eof_before_bounding_box() -> None:
     with pytest.raises(OSError):
-        with Image.open("Tests/images/zero_bb_eof_before_boundingbox.eps"):
+        with Image.open("Tests/images/eps/zero_bb_eof_before_boundingbox.eps"):
             pass
+
+
+def test_invalid_data_after_eof() -> None:
+    with open("Tests/images/eps/illuCS6_preview.eps", "rb") as f:
+        img_bytes = io.BytesIO(f.read() + b"\r\n%" + (b" " * 255))
+
+    with Image.open(img_bytes) as img:
+        assert img.mode == "RGB"
diff --git a/Tests/test_file_fits.py b/Tests/test_file_fits.py
index 1383f9c5ca3..1c1df0d980d 100644
--- a/Tests/test_file_fits.py
+++ b/Tests/test_file_fits.py
@@ -1,16 +1,17 @@
 from __future__ import annotations
+
 from io import BytesIO
 
 import pytest
 
 from PIL import FitsImagePlugin, Image
 
-from .helper import assert_image_equal, hopper
+from .helper import assert_image_equal, assert_image_equal_tofile, hopper
 
 TEST_FILE = "Tests/images/hopper.fits"
 
 
-def test_open():
+def test_open() -> None:
     # Act
     with Image.open(TEST_FILE) as im:
         # Assert
@@ -21,7 +22,12 @@ def test_open():
         assert_image_equal(im, hopper("L"))
 
 
-def test_invalid_file():
+def test_gzip1() -> None:
+    with Image.open("Tests/images/m13_gzip.fits") as im:
+        assert_image_equal_tofile(im, "Tests/images/m13.fits")
+
+
+def test_invalid_file() -> None:
     # Arrange
     invalid_file = "Tests/images/flower.jpg"
 
@@ -30,14 +36,14 @@ def test_invalid_file():
         FitsImagePlugin.FitsImageFile(invalid_file)
 
 
-def test_truncated_fits():
+def test_truncated_fits() -> None:
     # No END to headers
     image_data = b"SIMPLE  =                    T" + b" " * 50 + b"TRUNCATE"
     with pytest.raises(OSError):
         FitsImagePlugin.FitsImageFile(BytesIO(image_data))
 
 
-def test_naxis_zero():
+def test_naxis_zero() -> None:
     # This test image has been manually hexedited
     # to set the number of data axes to zero
     with pytest.raises(ValueError):
@@ -45,7 +51,7 @@ def test_naxis_zero():
             pass
 
 
-def test_comment():
+def test_comment() -> None:
     image_data = b"SIMPLE  =                    T / comment string"
     with pytest.raises(OSError):
         FitsImagePlugin.FitsImageFile(BytesIO(image_data))
diff --git a/Tests/test_file_fli.py b/Tests/test_file_fli.py
index 10bf36cc290..f86fb8d0925 100644
--- a/Tests/test_file_fli.py
+++ b/Tests/test_file_fli.py
@@ -1,9 +1,10 @@
 from __future__ import annotations
+
 import warnings
 
 import pytest
 
-from PIL import FliImagePlugin, Image
+from PIL import FliImagePlugin, Image, ImageFile
 
 from .helper import assert_image_equal, assert_image_equal_tofile, is_pypy
 
@@ -11,11 +12,14 @@
 # save as...-> hopper.fli, default options.
 static_test_file = "Tests/images/hopper.fli"
 
-# From https://samples.libav.org/fli-flc/
+# From https://samples.ffmpeg.org/fli-flc/
 animated_test_file = "Tests/images/a.fli"
 
+# From https://samples.ffmpeg.org/fli-flc/
+animated_test_file_with_prefix_chunk = "Tests/images/2422.flc"
+
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(static_test_file) as im:
         im.load()
         assert im.mode == "P"
@@ -31,9 +35,27 @@ def test_sanity():
         assert im.is_animated
 
 
+def test_prefix_chunk() -> None:
+    ImageFile.LOAD_TRUNCATED_IMAGES = True
+    try:
+        with Image.open(animated_test_file_with_prefix_chunk) as im:
+            assert im.mode == "P"
+            assert im.size == (320, 200)
+            assert im.format == "FLI"
+            assert im.info["duration"] == 171
+            assert im.is_animated
+
+            palette = im.getpalette()
+            assert palette[3:6] == [255, 255, 255]
+            assert palette[381:384] == [204, 204, 12]
+            assert palette[765:] == [252, 0, 0]
+    finally:
+        ImageFile.LOAD_TRUNCATED_IMAGES = False
+
+
 @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-def test_unclosed_file():
-    def open():
+def test_unclosed_file() -> None:
+    def open() -> None:
         im = Image.open(static_test_file)
         im.load()
 
@@ -41,14 +63,14 @@ def open():
         open()
 
 
-def test_closed_file():
+def test_closed_file() -> None:
     with warnings.catch_warnings():
         im = Image.open(static_test_file)
         im.load()
         im.close()
 
 
-def test_seek_after_close():
+def test_seek_after_close() -> None:
     im = Image.open(animated_test_file)
     im.seek(1)
     im.close()
@@ -57,13 +79,13 @@ def test_seek_after_close():
         im.seek(0)
 
 
-def test_context_manager():
+def test_context_manager() -> None:
     with warnings.catch_warnings():
         with Image.open(static_test_file) as im:
             im.load()
 
 
-def test_tell():
+def test_tell() -> None:
     # Arrange
     with Image.open(static_test_file) as im:
         # Act
@@ -73,20 +95,20 @@ def test_tell():
         assert frame == 0
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         FliImagePlugin.FliImageFile(invalid_file)
 
 
-def test_palette_chunk_second():
+def test_palette_chunk_second() -> None:
     with Image.open("Tests/images/hopper_palette_chunk_second.fli") as im:
         with Image.open(static_test_file) as expected:
             assert_image_equal(im.convert("RGB"), expected.convert("RGB"))
 
 
-def test_n_frames():
+def test_n_frames() -> None:
     with Image.open(static_test_file) as im:
         assert im.n_frames == 1
         assert not im.is_animated
@@ -96,7 +118,7 @@ def test_n_frames():
         assert im.is_animated
 
 
-def test_eoferror():
+def test_eoferror() -> None:
     with Image.open(animated_test_file) as im:
         n_frames = im.n_frames
 
@@ -109,7 +131,7 @@ def test_eoferror():
         im.seek(n_frames - 1)
 
 
-def test_seek_tell():
+def test_seek_tell() -> None:
     with Image.open(animated_test_file) as im:
         layer_number = im.tell()
         assert layer_number == 0
@@ -131,7 +153,7 @@ def test_seek_tell():
         assert layer_number == 1
 
 
-def test_seek():
+def test_seek() -> None:
     with Image.open(animated_test_file) as im:
         im.seek(50)
 
@@ -146,7 +168,7 @@ def test_seek():
     ],
 )
 @pytest.mark.timeout(timeout=3)
-def test_timeouts(test_file):
+def test_timeouts(test_file: str) -> None:
     with open(test_file, "rb") as f:
         with Image.open(f) as im:
             with pytest.raises(OSError):
@@ -159,7 +181,7 @@ def test_timeouts(test_file):
         "Tests/images/crash-5762152299364352.fli",
     ],
 )
-def test_crash(test_file):
+def test_crash(test_file: str) -> None:
     with open(test_file, "rb") as f:
         with Image.open(f) as im:
             with pytest.raises(OSError):
diff --git a/Tests/test_file_fpx.py b/Tests/test_file_fpx.py
index af3b7981561..e32f30a0123 100644
--- a/Tests/test_file_fpx.py
+++ b/Tests/test_file_fpx.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -10,7 +11,7 @@
 )
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open("Tests/images/input_bw_one_band.fpx") as im:
         assert im.mode == "L"
         assert im.size == (70, 46)
@@ -19,7 +20,7 @@ def test_sanity():
         assert_image_equal_tofile(im, "Tests/images/input_bw_one_band.png")
 
 
-def test_close():
+def test_close() -> None:
     with Image.open("Tests/images/input_bw_one_band.fpx") as im:
         pass
     assert im.ole.fp.closed
@@ -29,7 +30,7 @@ def test_close():
     assert im.ole.fp.closed
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     # Test an invalid OLE file
     invalid_file = "Tests/images/flower.jpg"
     with pytest.raises(SyntaxError):
@@ -41,7 +42,7 @@ def test_invalid_file():
         FpxImagePlugin.FpxImageFile(ole_file)
 
 
-def test_fpx_invalid_number_of_bands():
+def test_fpx_invalid_number_of_bands() -> None:
     with pytest.raises(OSError, match="Invalid number of bands"):
         with Image.open("Tests/images/input_bw_five_bands.fpx"):
             pass
diff --git a/Tests/test_file_ftex.py b/Tests/test_file_ftex.py
index a494c8029c9..0c544245a9f 100644
--- a/Tests/test_file_ftex.py
+++ b/Tests/test_file_ftex.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import FtexImagePlugin, Image
@@ -6,18 +7,18 @@
 from .helper import assert_image_equal_tofile, assert_image_similar
 
 
-def test_load_raw():
+def test_load_raw() -> None:
     with Image.open("Tests/images/ftex_uncompressed.ftu") as im:
         assert_image_equal_tofile(im, "Tests/images/ftex_uncompressed.png")
 
 
-def test_load_dxt1():
+def test_load_dxt1() -> None:
     with Image.open("Tests/images/ftex_dxt1.ftc") as im:
         with Image.open("Tests/images/ftex_dxt1.png") as target:
             assert_image_similar(im, target.convert("RGBA"), 15)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
diff --git a/Tests/test_file_gbr.py b/Tests/test_file_gbr.py
index 7dfe0539673..be98b08f2ad 100644
--- a/Tests/test_file_gbr.py
+++ b/Tests/test_file_gbr.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import GbrImagePlugin, Image
@@ -6,12 +7,12 @@
 from .helper import assert_image_equal_tofile
 
 
-def test_gbr_file():
+def test_gbr_file() -> None:
     with Image.open("Tests/images/gbr.gbr") as im:
         assert_image_equal_tofile(im, "Tests/images/gbr.png")
 
 
-def test_load():
+def test_load() -> None:
     with Image.open("Tests/images/gbr.gbr") as im:
         assert im.load()[0, 0] == (0, 0, 0, 0)
 
@@ -19,14 +20,14 @@ def test_load():
         assert im.load()[0, 0] == (0, 0, 0, 0)
 
 
-def test_multiple_load_operations():
+def test_multiple_load_operations() -> None:
     with Image.open("Tests/images/gbr.gbr") as im:
         im.load()
         im.load()
         assert_image_equal_tofile(im, "Tests/images/gbr.png")
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
diff --git a/Tests/test_file_gd.py b/Tests/test_file_gd.py
index ec80c54a122..d512df284e1 100644
--- a/Tests/test_file_gd.py
+++ b/Tests/test_file_gd.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import GdImageFile, UnidentifiedImageError
@@ -6,18 +7,18 @@
 TEST_GD_FILE = "Tests/images/hopper.gd"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with GdImageFile.open(TEST_GD_FILE) as im:
         assert im.size == (128, 128)
         assert im.format == "GD"
 
 
-def test_bad_mode():
+def test_bad_mode() -> None:
     with pytest.raises(ValueError):
         GdImageFile.open(TEST_GD_FILE, "bad mode")
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(UnidentifiedImageError):
diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py
index 78b77e9743a..16c8466f331 100644
--- a/Tests/test_file_gif.py
+++ b/Tests/test_file_gif.py
@@ -1,6 +1,9 @@
 from __future__ import annotations
+
 import warnings
+from collections.abc import Generator
 from io import BytesIO
+from pathlib import Path
 
 import pytest
 
@@ -22,7 +25,7 @@
     data = f.read()
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_GIF) as im:
         im.load()
         assert im.mode == "P"
@@ -32,8 +35,8 @@ def test_sanity():
 
 
 @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-def test_unclosed_file():
-    def open():
+def test_unclosed_file() -> None:
+    def open() -> None:
         im = Image.open(TEST_GIF)
         im.load()
 
@@ -41,15 +44,16 @@ def open():
         open()
 
 
-def test_closed_file():
+def test_closed_file() -> None:
     with warnings.catch_warnings():
         im = Image.open(TEST_GIF)
         im.load()
         im.close()
 
 
-def test_seek_after_close():
+def test_seek_after_close() -> None:
     im = Image.open("Tests/images/iss634.gif")
+    assert isinstance(im, GifImagePlugin.GifImageFile)
     im.load()
     im.close()
 
@@ -61,20 +65,20 @@ def test_seek_after_close():
         im.seek(1)
 
 
-def test_context_manager():
+def test_context_manager() -> None:
     with warnings.catch_warnings():
         with Image.open(TEST_GIF) as im:
             im.load()
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         GifImagePlugin.GifImageFile(invalid_file)
 
 
-def test_l_mode_transparency():
+def test_l_mode_transparency() -> None:
     with Image.open("Tests/images/no_palette_with_transparency.gif") as im:
         assert im.mode == "L"
         assert im.load()[0, 0] == 128
@@ -85,7 +89,7 @@ def test_l_mode_transparency():
         assert im.load()[0, 0] == 128
 
 
-def test_l_mode_after_rgb():
+def test_l_mode_after_rgb() -> None:
     with Image.open("Tests/images/no_palette_after_rgb.gif") as im:
         im.seek(1)
         assert im.mode == "RGB"
@@ -94,13 +98,13 @@ def test_l_mode_after_rgb():
         assert im.mode == "RGB"
 
 
-def test_palette_not_needed_for_second_frame():
+def test_palette_not_needed_for_second_frame() -> None:
     with Image.open("Tests/images/palette_not_needed_for_second_frame.gif") as im:
         im.seek(1)
         assert_image_similar(im, hopper("L").convert("RGB"), 8)
 
 
-def test_strategy():
+def test_strategy() -> None:
     with Image.open("Tests/images/iss634.gif") as im:
         expected_rgb_always = im.convert("RGB")
 
@@ -141,14 +145,14 @@ def test_strategy():
         GifImagePlugin.LOADING_STRATEGY = GifImagePlugin.LoadingStrategy.RGB_AFTER_FIRST
 
 
-def test_optimize():
-    def test_grayscale(optimize):
+def test_optimize() -> None:
+    def test_grayscale(optimize: int) -> int:
         im = Image.new("L", (1, 1), 0)
         filename = BytesIO()
         im.save(filename, "GIF", optimize=optimize)
         return len(filename.getvalue())
 
-    def test_bilevel(optimize):
+    def test_bilevel(optimize: int) -> int:
         im = Image.new("1", (1, 1), 0)
         test_file = BytesIO()
         im.save(test_file, "GIF", optimize=optimize)
@@ -176,7 +180,9 @@ def test_bilevel(optimize):
         (4, 513, 256),
     ),
 )
-def test_optimize_correctness(colors, size, expected_palette_length):
+def test_optimize_correctness(
+    colors: int, size: int, expected_palette_length: int
+) -> None:
     # 256 color Palette image, posterize to > 128 and < 128 levels.
     # Size bigger and smaller than 512x512.
     # Check the palette for number of colors allocated.
@@ -198,14 +204,14 @@ def test_optimize_correctness(colors, size, expected_palette_length):
         assert_image_equal(im.convert("RGB"), reloaded.convert("RGB"))
 
 
-def test_optimize_full_l():
+def test_optimize_full_l() -> None:
     im = Image.frombytes("L", (16, 16), bytes(range(256)))
     test_file = BytesIO()
     im.save(test_file, "GIF", optimize=True)
     assert im.mode == "L"
 
 
-def test_optimize_if_palette_can_be_reduced_by_half():
+def test_optimize_if_palette_can_be_reduced_by_half() -> None:
     im = Image.new("P", (8, 1))
     im.palette = ImagePalette.raw("RGB", bytes((0, 0, 0) * 150))
     for i in range(8):
@@ -218,7 +224,7 @@ def test_optimize_if_palette_can_be_reduced_by_half():
             assert len(reloaded.palette.palette) // 3 == colors
 
 
-def test_full_palette_second_frame(tmp_path):
+def test_full_palette_second_frame(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     im = Image.new("P", (1, 256))
 
@@ -239,7 +245,7 @@ def test_full_palette_second_frame(tmp_path):
             reloaded.getpixel((0, i)) == i
 
 
-def test_roundtrip(tmp_path):
+def test_roundtrip(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     im = hopper()
     im.save(out)
@@ -247,7 +253,7 @@ def test_roundtrip(tmp_path):
         assert_image_similar(reread.convert("RGB"), im, 50)
 
 
-def test_roundtrip2(tmp_path):
+def test_roundtrip2(tmp_path: Path) -> None:
     # see https://github.com/python-pillow/Pillow/issues/403
     out = str(tmp_path / "temp.gif")
     with Image.open(TEST_GIF) as im:
@@ -257,7 +263,7 @@ def test_roundtrip2(tmp_path):
         assert_image_similar(reread.convert("RGB"), hopper(), 50)
 
 
-def test_roundtrip_save_all(tmp_path):
+def test_roundtrip_save_all(tmp_path: Path) -> None:
     # Single frame image
     out = str(tmp_path / "temp.gif")
     im = hopper()
@@ -274,7 +280,7 @@ def test_roundtrip_save_all(tmp_path):
         assert reread.n_frames == 5
 
 
-def test_roundtrip_save_all_1(tmp_path):
+def test_roundtrip_save_all_1(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     im = Image.new("1", (1, 1))
     im2 = Image.new("1", (1, 1), 1)
@@ -295,7 +301,7 @@ def test_roundtrip_save_all_1(tmp_path):
         ("Tests/images/dispose_bgnd_rgba.gif", "RGBA"),
     ),
 )
-def test_loading_multiple_palettes(path, mode):
+def test_loading_multiple_palettes(path: str, mode: str) -> None:
     with Image.open(path) as im:
         assert im.mode == "P"
         first_frame_colors = im.palette.colors.keys()
@@ -313,7 +319,7 @@ def test_loading_multiple_palettes(path, mode):
         assert im.load()[24, 24] not in first_frame_colors
 
 
-def test_headers_saving_for_animated_gifs(tmp_path):
+def test_headers_saving_for_animated_gifs(tmp_path: Path) -> None:
     important_headers = ["background", "version", "duration", "loop"]
     # Multiframe image
     with Image.open("Tests/images/dispose_bgnd.gif") as im:
@@ -326,7 +332,7 @@ def test_headers_saving_for_animated_gifs(tmp_path):
             assert info[header] == reread.info[header]
 
 
-def test_palette_handling(tmp_path):
+def test_palette_handling(tmp_path: Path) -> None:
     # see https://github.com/python-pillow/Pillow/issues/513
 
     with Image.open(TEST_GIF) as im:
@@ -342,12 +348,12 @@ def test_palette_handling(tmp_path):
         assert_image_similar(im, reloaded.convert("RGB"), 10)
 
 
-def test_palette_434(tmp_path):
+def test_palette_434(tmp_path: Path) -> None:
     # see https://github.com/python-pillow/Pillow/issues/434
 
-    def roundtrip(im, *args, **kwargs):
+    def roundtrip(im: Image.Image, **kwargs: bool) -> Image.Image:
         out = str(tmp_path / "temp.gif")
-        im.copy().save(out, *args, **kwargs)
+        im.copy().save(out, "GIF", **kwargs)
         reloaded = Image.open(out)
 
         return reloaded
@@ -367,28 +373,30 @@ def roundtrip(im, *args, **kwargs):
 
 
 @pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
-def test_save_netpbm_bmp_mode(tmp_path):
+def test_save_netpbm_bmp_mode(tmp_path: Path) -> None:
     with Image.open(TEST_GIF) as img:
         img = img.convert("RGB")
 
         tempfile = str(tmp_path / "temp.gif")
-        GifImagePlugin._save_netpbm(img, 0, tempfile)
+        b = BytesIO()
+        GifImagePlugin._save_netpbm(img, b, tempfile)
         with Image.open(tempfile) as reloaded:
             assert_image_similar(img, reloaded.convert("RGB"), 0)
 
 
 @pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
-def test_save_netpbm_l_mode(tmp_path):
+def test_save_netpbm_l_mode(tmp_path: Path) -> None:
     with Image.open(TEST_GIF) as img:
         img = img.convert("L")
 
         tempfile = str(tmp_path / "temp.gif")
-        GifImagePlugin._save_netpbm(img, 0, tempfile)
+        b = BytesIO()
+        GifImagePlugin._save_netpbm(img, b, tempfile)
         with Image.open(tempfile) as reloaded:
             assert_image_similar(img, reloaded.convert("L"), 0)
 
 
-def test_seek():
+def test_seek() -> None:
     with Image.open("Tests/images/dispose_none.gif") as img:
         frame_count = 0
         try:
@@ -399,7 +407,7 @@ def test_seek():
             assert frame_count == 5
 
 
-def test_seek_info():
+def test_seek_info() -> None:
     with Image.open("Tests/images/iss634.gif") as im:
         info = im.info.copy()
 
@@ -409,7 +417,7 @@ def test_seek_info():
         assert im.info == info
 
 
-def test_seek_rewind():
+def test_seek_rewind() -> None:
     with Image.open("Tests/images/iss634.gif") as im:
         im.seek(2)
         im.seek(1)
@@ -427,7 +435,7 @@ def test_seek_rewind():
         ("Tests/images/iss634.gif", 42),
     ),
 )
-def test_n_frames(path, n_frames):
+def test_n_frames(path: str, n_frames: int) -> None:
     # Test is_animated before n_frames
     with Image.open(path) as im:
         assert im.is_animated == (n_frames != 1)
@@ -438,7 +446,7 @@ def test_n_frames(path, n_frames):
         assert im.is_animated == (n_frames != 1)
 
 
-def test_no_change():
+def test_no_change() -> None:
     # Test n_frames does not change the image
     with Image.open("Tests/images/dispose_bgnd.gif") as im:
         im.seek(1)
@@ -459,7 +467,7 @@ def test_no_change():
         assert_image_equal(im, expected)
 
 
-def test_eoferror():
+def test_eoferror() -> None:
     with Image.open(TEST_GIF) as im:
         n_frames = im.n_frames
 
@@ -472,13 +480,13 @@ def test_eoferror():
         im.seek(n_frames - 1)
 
 
-def test_first_frame_transparency():
+def test_first_frame_transparency() -> None:
     with Image.open("Tests/images/first_frame_transparency.gif") as im:
         px = im.load()
         assert px[0, 0] == im.info["transparency"]
 
 
-def test_dispose_none():
+def test_dispose_none() -> None:
     with Image.open("Tests/images/dispose_none.gif") as img:
         try:
             while True:
@@ -488,7 +496,7 @@ def test_dispose_none():
             pass
 
 
-def test_dispose_none_load_end():
+def test_dispose_none_load_end() -> None:
     # Test image created with:
     #
     # im = Image.open("transparent.gif")
@@ -501,7 +509,7 @@ def test_dispose_none_load_end():
         assert_image_equal_tofile(img, "Tests/images/dispose_none_load_end_second.png")
 
 
-def test_dispose_background():
+def test_dispose_background() -> None:
     with Image.open("Tests/images/dispose_bgnd.gif") as img:
         try:
             while True:
@@ -511,7 +519,7 @@ def test_dispose_background():
             pass
 
 
-def test_dispose_background_transparency():
+def test_dispose_background_transparency() -> None:
     with Image.open("Tests/images/dispose_bgnd_transparency.gif") as img:
         img.seek(2)
         px = img.load()
@@ -539,7 +547,10 @@ def test_dispose_background_transparency():
         ),
     ),
 )
-def test_transparent_dispose(loading_strategy, expected_colors):
+def test_transparent_dispose(
+    loading_strategy: GifImagePlugin.LoadingStrategy,
+    expected_colors: tuple[tuple[int | tuple[int, int, int, int], ...]],
+) -> None:
     GifImagePlugin.LOADING_STRATEGY = loading_strategy
     try:
         with Image.open("Tests/images/transparent_dispose.gif") as img:
@@ -552,7 +563,7 @@ def test_transparent_dispose(loading_strategy, expected_colors):
         GifImagePlugin.LOADING_STRATEGY = GifImagePlugin.LoadingStrategy.RGB_AFTER_FIRST
 
 
-def test_dispose_previous():
+def test_dispose_previous() -> None:
     with Image.open("Tests/images/dispose_prev.gif") as img:
         try:
             while True:
@@ -562,7 +573,7 @@ def test_dispose_previous():
             pass
 
 
-def test_dispose_previous_first_frame():
+def test_dispose_previous_first_frame() -> None:
     with Image.open("Tests/images/dispose_prev_first_frame.gif") as im:
         im.seek(1)
         assert_image_equal_tofile(
@@ -570,7 +581,7 @@ def test_dispose_previous_first_frame():
         )
 
 
-def test_previous_frame_loaded():
+def test_previous_frame_loaded() -> None:
     with Image.open("Tests/images/dispose_none.gif") as img:
         img.load()
         img.seek(1)
@@ -581,7 +592,7 @@ def test_previous_frame_loaded():
             assert_image_equal(img_skipped, img)
 
 
-def test_save_dispose(tmp_path):
+def test_save_dispose(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     im_list = [
         Image.new("L", (100, 100), "#000"),
@@ -609,7 +620,7 @@ def test_save_dispose(tmp_path):
             assert img.disposal_method == i + 1
 
 
-def test_dispose2_palette(tmp_path):
+def test_dispose2_palette(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     # Four colors: white, gray, black, red
@@ -639,8 +650,11 @@ def test_dispose2_palette(tmp_path):
             # Center remains red every frame
             assert rgb_img.getpixel((50, 50)) == circle
 
+            # Check that frame transparency wasn't added unnecessarily
+            assert getattr(img, "_frame_transparency") is None
+
 
-def test_dispose2_diff(tmp_path):
+def test_dispose2_diff(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     # 4 frames: red/blue, red/red, blue/blue, red/blue
@@ -682,7 +696,7 @@ def test_dispose2_diff(tmp_path):
             assert rgb_img.getpixel((1, 1)) == (255, 255, 255, 0)
 
 
-def test_dispose2_background(tmp_path):
+def test_dispose2_background(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     im_list = []
@@ -708,7 +722,7 @@ def test_dispose2_background(tmp_path):
         assert im.getpixel((0, 0)) == (255, 0, 0)
 
 
-def test_dispose2_background_frame(tmp_path):
+def test_dispose2_background_frame(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     im_list = [Image.new("RGBA", (1, 20))]
@@ -726,7 +740,26 @@ def test_dispose2_background_frame(tmp_path):
         assert im.n_frames == 3
 
 
-def test_transparency_in_second_frame(tmp_path):
+def test_dispose2_previous_frame(tmp_path: Path) -> None:
+    out = str(tmp_path / "temp.gif")
+
+    im = Image.new("P", (100, 100))
+    im.info["transparency"] = 0
+    d = ImageDraw.Draw(im)
+    d.rectangle([(0, 0), (100, 50)], 1)
+    im.putpalette((0, 0, 0, 255, 0, 0))
+
+    im2 = Image.new("P", (100, 100))
+    im2.putpalette((0, 0, 0))
+
+    im.save(out, save_all=True, append_images=[im2], disposal=[0, 2])
+
+    with Image.open(out) as im:
+        im.seek(1)
+        assert im.getpixel((0, 0)) == (0, 0, 0, 255)
+
+
+def test_transparency_in_second_frame(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     with Image.open("Tests/images/different_transparency.gif") as im:
         assert im.info["transparency"] == 0
@@ -746,7 +779,7 @@ def test_transparency_in_second_frame(tmp_path):
         )
 
 
-def test_no_transparency_in_second_frame():
+def test_no_transparency_in_second_frame() -> None:
     with Image.open("Tests/images/iss634.gif") as img:
         # Seek to the second frame
         img.seek(img.tell() + 1)
@@ -756,7 +789,7 @@ def test_no_transparency_in_second_frame():
         assert img.histogram()[255] == 0
 
 
-def test_remapped_transparency(tmp_path):
+def test_remapped_transparency(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     im = Image.new("P", (1, 2))
@@ -772,7 +805,7 @@ def test_remapped_transparency(tmp_path):
         assert reloaded.info["transparency"] == reloaded.getpixel((0, 1))
 
 
-def test_duration(tmp_path):
+def test_duration(tmp_path: Path) -> None:
     duration = 1000
 
     out = str(tmp_path / "temp.gif")
@@ -786,7 +819,7 @@ def test_duration(tmp_path):
         assert reread.info["duration"] == duration
 
 
-def test_multiple_duration(tmp_path):
+def test_multiple_duration(tmp_path: Path) -> None:
     duration_list = [1000, 2000, 3000]
 
     out = str(tmp_path / "temp.gif")
@@ -821,7 +854,7 @@ def test_multiple_duration(tmp_path):
                 pass
 
 
-def test_roundtrip_info_duration(tmp_path):
+def test_roundtrip_info_duration(tmp_path: Path) -> None:
     duration_list = [100, 500, 500]
 
     out = str(tmp_path / "temp.gif")
@@ -838,7 +871,7 @@ def test_roundtrip_info_duration(tmp_path):
         ] == duration_list
 
 
-def test_roundtrip_info_duration_combined(tmp_path):
+def test_roundtrip_info_duration_combined(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     with Image.open("Tests/images/duplicate_frame.gif") as im:
         assert [frame.info["duration"] for frame in ImageSequence.Iterator(im)] == [
@@ -854,7 +887,7 @@ def test_roundtrip_info_duration_combined(tmp_path):
         ] == [1000, 2000]
 
 
-def test_identical_frames(tmp_path):
+def test_identical_frames(tmp_path: Path) -> None:
     duration_list = [1000, 1500, 2000, 4000]
 
     out = str(tmp_path / "temp.gif")
@@ -887,7 +920,9 @@ def test_identical_frames(tmp_path):
         1500,
     ),
 )
-def test_identical_frames_to_single_frame(duration, tmp_path):
+def test_identical_frames_to_single_frame(
+    duration: int | list[int], tmp_path: Path
+) -> None:
     out = str(tmp_path / "temp.gif")
     im_list = [
         Image.new("L", (100, 100), "#000"),
@@ -904,7 +939,7 @@ def test_identical_frames_to_single_frame(duration, tmp_path):
         assert reread.info["duration"] == 4500
 
 
-def test_loop_none(tmp_path):
+def test_loop_none(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     im = Image.new("L", (100, 100), "#000")
     im.save(out, loop=None)
@@ -912,7 +947,7 @@ def test_loop_none(tmp_path):
         assert "loop" not in reread.info
 
 
-def test_number_of_loops(tmp_path):
+def test_number_of_loops(tmp_path: Path) -> None:
     number_of_loops = 2
 
     out = str(tmp_path / "temp.gif")
@@ -930,7 +965,7 @@ def test_number_of_loops(tmp_path):
         assert im.info["loop"] == 2
 
 
-def test_background(tmp_path):
+def test_background(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     im = Image.new("L", (100, 100), "#000")
     im.info["background"] = 1
@@ -939,11 +974,11 @@ def test_background(tmp_path):
         assert reread.info["background"] == im.info["background"]
 
 
-def test_webp_background(tmp_path):
+def test_webp_background(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     # Test opaque WebP background
-    if features.check("webp") and features.check("webp_anim"):
+    if features.check("webp"):
         with Image.open("Tests/images/hopper.webp") as im:
             assert im.info["background"] == (255, 255, 255, 255)
             im.save(out)
@@ -954,7 +989,7 @@ def test_webp_background(tmp_path):
     im.save(out)
 
 
-def test_comment(tmp_path):
+def test_comment(tmp_path: Path) -> None:
     with Image.open(TEST_GIF) as im:
         assert im.info["comment"] == b"File written by Adobe Photoshop\xa8 4.0"
 
@@ -974,7 +1009,7 @@ def test_comment(tmp_path):
         assert reread.info["version"] == b"GIF89a"
 
 
-def test_comment_over_255(tmp_path):
+def test_comment_over_255(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     im = Image.new("L", (100, 100), "#000")
     comment = b"Test comment text"
@@ -989,18 +1024,18 @@ def test_comment_over_255(tmp_path):
         assert reread.info["version"] == b"GIF89a"
 
 
-def test_zero_comment_subblocks():
+def test_zero_comment_subblocks() -> None:
     with Image.open("Tests/images/hopper_zero_comment_subblocks.gif") as im:
         assert_image_equal_tofile(im, TEST_GIF)
 
 
-def test_read_multiple_comment_blocks():
+def test_read_multiple_comment_blocks() -> None:
     with Image.open("Tests/images/multiple_comments.gif") as im:
         # Multiple comment blocks in a frame are separated not concatenated
         assert im.info["comment"] == b"Test comment 1\nTest comment 2"
 
 
-def test_empty_string_comment(tmp_path):
+def test_empty_string_comment(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     with Image.open("Tests/images/chi.gif") as im:
         assert "comment" in im.info
@@ -1013,7 +1048,7 @@ def test_empty_string_comment(tmp_path):
             assert "comment" not in frame.info
 
 
-def test_retain_comment_in_subsequent_frames(tmp_path):
+def test_retain_comment_in_subsequent_frames(tmp_path: Path) -> None:
     # Test that a comment block at the beginning is kept
     with Image.open("Tests/images/chi.gif") as im:
         for frame in ImageSequence.Iterator(im):
@@ -1044,10 +1079,10 @@ def test_retain_comment_in_subsequent_frames(tmp_path):
             assert frame.info["comment"] == b"Test"
 
 
-def test_version(tmp_path):
+def test_version(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
-    def assert_version_after_save(im, version):
+    def assert_version_after_save(im: Image.Image, version: bytes) -> None:
         im.save(out)
         with Image.open(out) as reread:
             assert reread.info["version"] == version
@@ -1074,7 +1109,7 @@ def assert_version_after_save(im, version):
         assert_version_after_save(im, b"GIF87a")
 
 
-def test_append_images(tmp_path):
+def test_append_images(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     # Test appending single frame images
@@ -1086,7 +1121,7 @@ def test_append_images(tmp_path):
         assert reread.n_frames == 3
 
     # Tests appending using a generator
-    def im_generator(ims):
+    def im_generator(ims: list[Image.Image]) -> Generator[Image.Image, None, None]:
         yield from ims
 
     im.save(out, save_all=True, append_images=im_generator(ims))
@@ -1103,7 +1138,22 @@ def im_generator(ims):
         assert reread.n_frames == 10
 
 
-def test_transparent_optimize(tmp_path):
+def test_append_different_size_image(tmp_path: Path) -> None:
+    out = str(tmp_path / "temp.gif")
+
+    im = Image.new("RGB", (100, 100))
+    bigger_im = Image.new("RGB", (200, 200), "#f00")
+
+    im.save(out, save_all=True, append_images=[bigger_im])
+
+    with Image.open(out) as reread:
+        assert reread.size == (100, 100)
+
+        reread.seek(1)
+        assert reread.size == (100, 100)
+
+
+def test_transparent_optimize(tmp_path: Path) -> None:
     # From issue #2195, if the transparent color is incorrectly optimized out, GIF loses
     # transparency.
     # Need a palette that isn't using the 0 color,
@@ -1123,7 +1173,7 @@ def test_transparent_optimize(tmp_path):
         assert reloaded.info["transparency"] == reloaded.getpixel((252, 0))
 
 
-def test_removed_transparency(tmp_path):
+def test_removed_transparency(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     im = Image.new("RGB", (256, 1))
 
@@ -1138,7 +1188,7 @@ def test_removed_transparency(tmp_path):
         assert "transparency" not in reloaded.info
 
 
-def test_rgb_transparency(tmp_path):
+def test_rgb_transparency(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     # Single frame
@@ -1160,7 +1210,7 @@ def test_rgb_transparency(tmp_path):
         assert "transparency" not in reloaded.info
 
 
-def test_rgba_transparency(tmp_path):
+def test_rgba_transparency(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     im = hopper("P")
@@ -1171,13 +1221,13 @@ def test_rgba_transparency(tmp_path):
         assert_image_equal(hopper("P").convert("RGB"), reloaded)
 
 
-def test_background_outside_palettte(tmp_path):
+def test_background_outside_palettte(tmp_path: Path) -> None:
     with Image.open("Tests/images/background_outside_palette.gif") as im:
         im.seek(1)
         assert im.info["background"] == 255
 
 
-def test_bbox(tmp_path):
+def test_bbox(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     im = Image.new("RGB", (100, 100), "#fff")
@@ -1188,7 +1238,7 @@ def test_bbox(tmp_path):
         assert reread.n_frames == 2
 
 
-def test_bbox_alpha(tmp_path):
+def test_bbox_alpha(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
 
     im = Image.new("RGBA", (1, 2), (255, 0, 0, 255))
@@ -1200,21 +1250,22 @@ def test_bbox_alpha(tmp_path):
         assert reread.n_frames == 2
 
 
-def test_palette_save_L(tmp_path):
+def test_palette_save_L(tmp_path: Path) -> None:
     # Generate an L mode image with a separate palette
 
     im = hopper("P")
     im_l = Image.frombytes("L", im.size, im.tobytes())
-    palette = bytes(im.getpalette())
+    palette = im.getpalette()
+    assert palette is not None
 
     out = str(tmp_path / "temp.gif")
-    im_l.save(out, palette=palette)
+    im_l.save(out, palette=bytes(palette))
 
     with Image.open(out) as reloaded:
         assert_image_equal(reloaded.convert("RGB"), im.convert("RGB"))
 
 
-def test_palette_save_P(tmp_path):
+def test_palette_save_P(tmp_path: Path) -> None:
     im = Image.new("P", (1, 2))
     im.putpixel((0, 1), 1)
 
@@ -1228,7 +1279,7 @@ def test_palette_save_P(tmp_path):
         assert reloaded_rgb.getpixel((0, 1)) == (4, 5, 6)
 
 
-def test_palette_save_duplicate_entries(tmp_path):
+def test_palette_save_duplicate_entries(tmp_path: Path) -> None:
     im = Image.new("P", (1, 2))
     im.putpixel((0, 1), 1)
 
@@ -1241,7 +1292,7 @@ def test_palette_save_duplicate_entries(tmp_path):
         assert reloaded.convert("RGB").getpixel((0, 1)) == (0, 0, 0)
 
 
-def test_palette_save_all_P(tmp_path):
+def test_palette_save_all_P(tmp_path: Path) -> None:
     frames = []
     colors = ((255, 0, 0), (0, 255, 0))
     for color in colors:
@@ -1264,7 +1315,7 @@ def test_palette_save_all_P(tmp_path):
         assert im.palette.palette == im.global_palette.palette
 
 
-def test_palette_save_ImagePalette(tmp_path):
+def test_palette_save_ImagePalette(tmp_path: Path) -> None:
     # Pass in a different palette, as an ImagePalette.ImagePalette
     # effectively the same as test_palette_save_P
 
@@ -1279,7 +1330,7 @@ def test_palette_save_ImagePalette(tmp_path):
         assert_image_equal(reloaded.convert("RGB"), im.convert("RGB"))
 
 
-def test_save_I(tmp_path):
+def test_save_I(tmp_path: Path) -> None:
     # Test saving something that would trigger the auto-convert to 'L'
 
     im = hopper("I")
@@ -1291,7 +1342,7 @@ def test_save_I(tmp_path):
         assert_image_equal(reloaded.convert("L"), im.convert("L"))
 
 
-def test_getdata():
+def test_getdata() -> None:
     # Test getheader/getdata against legacy values.
     # Create a 'P' image with holes in the palette.
     im = Image._wedge().resize((16, 16), Image.Resampling.NEAREST)
@@ -1319,7 +1370,7 @@ def test_getdata():
         GifImagePlugin._FORCE_OPTIMIZE = False
 
 
-def test_lzw_bits():
+def test_lzw_bits() -> None:
     # see https://github.com/python-pillow/Pillow/issues/2811
     with Image.open("Tests/images/issue_2811.gif") as im:
         assert im.tile[0][3][0] == 11  # LZW bits
@@ -1327,19 +1378,42 @@ def test_lzw_bits():
         im.load()
 
 
-def test_extents():
-    with Image.open("Tests/images/test_extents.gif") as im:
-        assert im.size == (100, 100)
+@pytest.mark.parametrize(
+    "test_file, loading_strategy",
+    (
+        ("test_extents.gif", GifImagePlugin.LoadingStrategy.RGB_AFTER_FIRST),
+        (
+            "test_extents.gif",
+            GifImagePlugin.LoadingStrategy.RGB_AFTER_DIFFERENT_PALETTE_ONLY,
+        ),
+        (
+            "test_extents_transparency.gif",
+            GifImagePlugin.LoadingStrategy.RGB_AFTER_FIRST,
+        ),
+    ),
+)
+def test_extents(
+    test_file: str, loading_strategy: GifImagePlugin.LoadingStrategy
+) -> None:
+    GifImagePlugin.LOADING_STRATEGY = loading_strategy
+    try:
+        with Image.open("Tests/images/" + test_file) as im:
+            assert im.size == (100, 100)
 
-        # Check that n_frames does not change the size
-        assert im.n_frames == 2
-        assert im.size == (100, 100)
+            # Check that n_frames does not change the size
+            assert im.n_frames == 2
+            assert im.size == (100, 100)
 
-        im.seek(1)
-        assert im.size == (150, 150)
+            im.seek(1)
+            assert im.size == (150, 150)
+
+            im.load()
+            assert im.im.size == (150, 150)
+    finally:
+        GifImagePlugin.LOADING_STRATEGY = GifImagePlugin.LoadingStrategy.RGB_AFTER_FIRST
 
 
-def test_missing_background():
+def test_missing_background() -> None:
     # The Global Color Table Flag isn't set, so there is no background color index,
     # but the disposal method is "Restore to background color"
     with Image.open("Tests/images/missing_background.gif") as im:
@@ -1347,7 +1421,7 @@ def test_missing_background():
         assert_image_equal_tofile(im, "Tests/images/missing_background_first_frame.png")
 
 
-def test_saving_rgba(tmp_path):
+def test_saving_rgba(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.gif")
     with Image.open("Tests/images/transparent.png") as im:
         im.save(out)
@@ -1355,3 +1429,21 @@ def test_saving_rgba(tmp_path):
     with Image.open(out) as reloaded:
         reloaded_rgba = reloaded.convert("RGBA")
         assert reloaded_rgba.load()[0, 0][3] == 0
+
+
+def test_optimizing_p_rgba(tmp_path: Path) -> None:
+    out = str(tmp_path / "temp.gif")
+
+    im1 = Image.new("P", (100, 100))
+    d = ImageDraw.Draw(im1)
+    d.ellipse([(40, 40), (60, 60)], fill=1)
+    data = [0, 0, 0, 0, 0, 0, 0, 255] + [0, 0, 0, 0] * 254
+    im1.putpalette(data, "RGBA")
+
+    im2 = Image.new("P", (100, 100))
+    im2.putpalette(data, "RGBA")
+
+    im1.save(out, save_all=True, append_images=[im2])
+
+    with Image.open(out) as reloaded:
+        assert reloaded.n_frames == 2
diff --git a/Tests/test_file_gimpgradient.py b/Tests/test_file_gimpgradient.py
index d5be46dc39e..006ee952d43 100644
--- a/Tests/test_file_gimpgradient.py
+++ b/Tests/test_file_gimpgradient.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
+
 from PIL import GimpGradientFile, ImagePalette
 
 
-def test_linear_pos_le_middle():
+def test_linear_pos_le_middle() -> None:
     # Arrange
     middle = 0.5
     pos = 0.25
@@ -14,7 +15,7 @@ def test_linear_pos_le_middle():
     assert ret == 0.25
 
 
-def test_linear_pos_le_small_middle():
+def test_linear_pos_le_small_middle() -> None:
     # Arrange
     middle = 1e-11
     pos = 1e-12
@@ -26,7 +27,7 @@ def test_linear_pos_le_small_middle():
     assert ret == 0.0
 
 
-def test_linear_pos_gt_middle():
+def test_linear_pos_gt_middle() -> None:
     # Arrange
     middle = 0.5
     pos = 0.75
@@ -38,7 +39,7 @@ def test_linear_pos_gt_middle():
     assert ret == 0.75
 
 
-def test_linear_pos_gt_small_middle():
+def test_linear_pos_gt_small_middle() -> None:
     # Arrange
     middle = 1 - 1e-11
     pos = 1 - 1e-12
@@ -50,7 +51,7 @@ def test_linear_pos_gt_small_middle():
     assert ret == 1.0
 
 
-def test_curved():
+def test_curved() -> None:
     # Arrange
     middle = 0.5
     pos = 0.75
@@ -62,7 +63,7 @@ def test_curved():
     assert ret == 0.75
 
 
-def test_sine():
+def test_sine() -> None:
     # Arrange
     middle = 0.5
     pos = 0.75
@@ -74,7 +75,7 @@ def test_sine():
     assert ret == 0.8535533905932737
 
 
-def test_sphere_increasing():
+def test_sphere_increasing() -> None:
     # Arrange
     middle = 0.5
     pos = 0.75
@@ -86,7 +87,7 @@ def test_sphere_increasing():
     assert round(abs(ret - 0.9682458365518543), 7) == 0
 
 
-def test_sphere_decreasing():
+def test_sphere_decreasing() -> None:
     # Arrange
     middle = 0.5
     pos = 0.75
@@ -98,7 +99,7 @@ def test_sphere_decreasing():
     assert ret == 0.3385621722338523
 
 
-def test_load_via_imagepalette():
+def test_load_via_imagepalette() -> None:
     # Arrange
     test_file = "Tests/images/gimp_gradient.ggr"
 
@@ -111,7 +112,7 @@ def test_load_via_imagepalette():
     assert palette[1] == "RGBA"
 
 
-def test_load_1_3_via_imagepalette():
+def test_load_1_3_via_imagepalette() -> None:
     # Arrange
     # GIMP 1.3 gradient files contain a name field
     test_file = "Tests/images/gimp_gradient_with_name.ggr"
diff --git a/Tests/test_file_gimppalette.py b/Tests/test_file_gimppalette.py
index 775d3b7cdae..e8d5f170506 100644
--- a/Tests/test_file_gimppalette.py
+++ b/Tests/test_file_gimppalette.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL.GimpPaletteFile import GimpPaletteFile
 
 
-def test_sanity():
+def test_sanity() -> None:
     with open("Tests/images/test.gpl", "rb") as fp:
         GimpPaletteFile(fp)
 
@@ -21,7 +22,7 @@ def test_sanity():
             GimpPaletteFile(fp)
 
 
-def test_get_palette():
+def test_get_palette() -> None:
     # Arrange
     with open("Tests/images/custom_gimp_palette.gpl", "rb") as fp:
         palette_file = GimpPaletteFile(fp)
diff --git a/Tests/test_file_gribstub.py b/Tests/test_file_gribstub.py
index d962e85a436..aba473d24d0 100644
--- a/Tests/test_file_gribstub.py
+++ b/Tests/test_file_gribstub.py
@@ -1,14 +1,18 @@
 from __future__ import annotations
+
+from pathlib import Path
+from typing import IO
+
 import pytest
 
-from PIL import GribStubImagePlugin, Image
+from PIL import GribStubImagePlugin, Image, ImageFile
 
 from .helper import hopper
 
 TEST_FILE = "Tests/images/WAlaska.wind.7days.grb"
 
 
-def test_open():
+def test_open() -> None:
     # Act
     with Image.open(TEST_FILE) as im:
         # Assert
@@ -19,7 +23,7 @@ def test_open():
         assert im.size == (1, 1)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     # Arrange
     invalid_file = "Tests/images/flower.jpg"
 
@@ -28,7 +32,7 @@ def test_invalid_file():
         GribStubImagePlugin.GribStubImageFile(invalid_file)
 
 
-def test_load():
+def test_load() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         # Act / Assert: stub cannot load without an implemented handler
@@ -36,7 +40,7 @@ def test_load():
             im.load()
 
 
-def test_save(tmp_path):
+def test_save(tmp_path: Path) -> None:
     # Arrange
     im = hopper()
     tmpfile = str(tmp_path / "temp.grib")
@@ -46,31 +50,34 @@ def test_save(tmp_path):
         im.save(tmpfile)
 
 
-def test_handler(tmp_path):
-    class TestHandler:
+def test_handler(tmp_path: Path) -> None:
+    class TestHandler(ImageFile.StubHandler):
         opened = False
         loaded = False
         saved = False
 
-        def open(self, im):
+        def open(self, im: Image.Image) -> None:
             self.opened = True
 
-        def load(self, im):
+        def load(self, im: Image.Image) -> Image.Image:
             self.loaded = True
             im.fp.close()
             return Image.new("RGB", (1, 1))
 
-        def save(self, im, fp, filename):
+        def is_loaded(self) -> bool:
+            return self.loaded
+
+        def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None:
             self.saved = True
 
     handler = TestHandler()
     GribStubImagePlugin.register_handler(handler)
     with Image.open(TEST_FILE) as im:
         assert handler.opened
-        assert not handler.loaded
+        assert not handler.is_loaded()
 
         im.load()
-        assert handler.loaded
+        assert handler.is_loaded()
 
         temp_file = str(tmp_path / "temp.grib")
         im.save(temp_file)
diff --git a/Tests/test_file_hdf5stub.py b/Tests/test_file_hdf5stub.py
index 9c776b712ee..8275bd0d890 100644
--- a/Tests/test_file_hdf5stub.py
+++ b/Tests/test_file_hdf5stub.py
@@ -1,12 +1,17 @@
 from __future__ import annotations
+
+from io import BytesIO
+from pathlib import Path
+from typing import IO
+
 import pytest
 
-from PIL import Hdf5StubImagePlugin, Image
+from PIL import Hdf5StubImagePlugin, Image, ImageFile
 
 TEST_FILE = "Tests/images/hdf5.h5"
 
 
-def test_open():
+def test_open() -> None:
     # Act
     with Image.open(TEST_FILE) as im:
         # Assert
@@ -17,7 +22,7 @@ def test_open():
         assert im.size == (1, 1)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     # Arrange
     invalid_file = "Tests/images/flower.jpg"
 
@@ -26,7 +31,7 @@ def test_invalid_file():
         Hdf5StubImagePlugin.HDF5StubImageFile(invalid_file)
 
 
-def test_load():
+def test_load() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         # Act / Assert: stub cannot load without an implemented handler
@@ -34,10 +39,10 @@ def test_load():
             im.load()
 
 
-def test_save():
+def test_save() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
-        dummy_fp = None
+        dummy_fp = BytesIO()
         dummy_filename = "dummy.filename"
 
         # Act / Assert: stub cannot save without an implemented handler
@@ -47,31 +52,34 @@ def test_save():
             Hdf5StubImagePlugin._save(im, dummy_fp, dummy_filename)
 
 
-def test_handler(tmp_path):
-    class TestHandler:
+def test_handler(tmp_path: Path) -> None:
+    class TestHandler(ImageFile.StubHandler):
         opened = False
         loaded = False
         saved = False
 
-        def open(self, im):
+        def open(self, im: Image.Image) -> None:
             self.opened = True
 
-        def load(self, im):
+        def load(self, im: Image.Image) -> Image.Image:
             self.loaded = True
             im.fp.close()
             return Image.new("RGB", (1, 1))
 
-        def save(self, im, fp, filename):
+        def is_loaded(self) -> bool:
+            return self.loaded
+
+        def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None:
             self.saved = True
 
     handler = TestHandler()
     Hdf5StubImagePlugin.register_handler(handler)
     with Image.open(TEST_FILE) as im:
         assert handler.opened
-        assert not handler.loaded
+        assert not handler.is_loaded()
 
         im.load()
-        assert handler.loaded
+        assert handler.is_loaded()
 
         temp_file = str(tmp_path / "temp.h5")
         im.save(temp_file)
diff --git a/Tests/test_file_icns.py b/Tests/test_file_icns.py
index c62fffc5be8..16f6b36516d 100644
--- a/Tests/test_file_icns.py
+++ b/Tests/test_file_icns.py
@@ -1,7 +1,9 @@
 from __future__ import annotations
+
 import io
 import os
 import warnings
+from pathlib import Path
 
 import pytest
 
@@ -13,7 +15,7 @@
 TEST_FILE = "Tests/images/pillow.icns"
 
 
-def test_sanity():
+def test_sanity() -> None:
     # Loading this icon by default should result in the largest size
     # (512x512@2x) being loaded
     with Image.open(TEST_FILE) as im:
@@ -26,7 +28,7 @@ def test_sanity():
         assert im.format == "ICNS"
 
 
-def test_load():
+def test_load() -> None:
     with Image.open(TEST_FILE) as im:
         assert im.load()[0, 0] == (0, 0, 0, 0)
 
@@ -34,7 +36,7 @@ def test_load():
         assert im.load()[0, 0] == (0, 0, 0, 0)
 
 
-def test_save(tmp_path):
+def test_save(tmp_path: Path) -> None:
     temp_file = str(tmp_path / "temp.icns")
 
     with Image.open(TEST_FILE) as im:
@@ -51,7 +53,7 @@ def test_save(tmp_path):
         assert _binary.i32be(fp.read(4)) == file_length
 
 
-def test_save_append_images(tmp_path):
+def test_save_append_images(tmp_path: Path) -> None:
     temp_file = str(tmp_path / "temp.icns")
     provided_im = Image.new("RGBA", (32, 32), (255, 0, 0, 128))
 
@@ -61,12 +63,12 @@ def test_save_append_images(tmp_path):
         assert_image_similar_tofile(im, temp_file, 1)
 
         with Image.open(temp_file) as reread:
-            reread.size = (16, 16, 2)
-            reread.load()
+            reread.size = (16, 16)
+            reread.load(2)
             assert_image_equal(reread, provided_im)
 
 
-def test_save_fp():
+def test_save_fp() -> None:
     fp = io.BytesIO()
 
     with Image.open(TEST_FILE) as im:
@@ -78,24 +80,31 @@ def test_save_fp():
         assert reread.format == "ICNS"
 
 
-def test_sizes():
+def test_sizes() -> None:
     # Check that we can load all of the sizes, and that the final pixel
     # dimensions are as expected
     with Image.open(TEST_FILE) as im:
         for w, h, r in im.info["sizes"]:
             wr = w * r
             hr = h * r
-            im.size = (w, h, r)
+            with pytest.warns(DeprecationWarning):
+                im.size = (w, h, r)
             im.load()
             assert im.mode == "RGBA"
             assert im.size == (wr, hr)
 
+            # Test using load() with scale
+            im.size = (w, h)
+            im.load(scale=r)
+            assert im.mode == "RGBA"
+            assert im.size == (wr, hr)
+
         # Check that we cannot load an incorrect size
         with pytest.raises(ValueError):
-            im.size = (1, 1)
+            im.size = (1, 2)
 
 
-def test_older_icon():
+def test_older_icon() -> None:
     # This icon was made with Icon Composer rather than iconutil; it still
     # uses PNG rather than JP2, however (since it was made on 10.9).
     with Image.open("Tests/images/pillow2.icns") as im:
@@ -103,14 +112,14 @@ def test_older_icon():
             wr = w * r
             hr = h * r
             with Image.open("Tests/images/pillow2.icns") as im2:
-                im2.size = (w, h, r)
-                im2.load()
+                im2.size = (w, h)
+                im2.load(r)
                 assert im2.mode == "RGBA"
                 assert im2.size == (wr, hr)
 
 
 @skip_unless_feature("jpg_2000")
-def test_jp2_icon():
+def test_jp2_icon() -> None:
     # This icon uses JPEG 2000 images instead of the PNG images.
     # The advantage of doing this is that OS X 10.5 supports JPEG 2000
     # but not PNG; some commercial software therefore does just this.
@@ -120,13 +129,13 @@ def test_jp2_icon():
             wr = w * r
             hr = h * r
             with Image.open("Tests/images/pillow3.icns") as im2:
-                im2.size = (w, h, r)
-                im2.load()
+                im2.size = (w, h)
+                im2.load(r)
                 assert im2.mode == "RGBA"
                 assert im2.size == (wr, hr)
 
 
-def test_getimage():
+def test_getimage() -> None:
     with open(TEST_FILE, "rb") as fp:
         icns_file = IcnsImagePlugin.IcnsFile(fp)
 
@@ -139,14 +148,14 @@ def test_getimage():
         assert im.size == (512, 512)
 
 
-def test_not_an_icns_file():
+def test_not_an_icns_file() -> None:
     with io.BytesIO(b"invalid\n") as fp:
         with pytest.raises(SyntaxError):
             IcnsImagePlugin.IcnsFile(fp)
 
 
 @skip_unless_feature("jpg_2000")
-def test_icns_decompression_bomb():
+def test_icns_decompression_bomb() -> None:
     with Image.open(
         "Tests/images/oom-8ed3316a4109213ca96fb8a256a0bfefdece1461.icns"
     ) as im:
diff --git a/Tests/test_file_ico.py b/Tests/test_file_ico.py
index de9fa353adb..37770498a0a 100644
--- a/Tests/test_file_ico.py
+++ b/Tests/test_file_ico.py
@@ -1,17 +1,19 @@
 from __future__ import annotations
+
 import io
 import os
+from pathlib import Path
 
 import pytest
 
-from PIL import IcoImagePlugin, Image, ImageDraw
+from PIL import IcoImagePlugin, Image, ImageDraw, ImageFile
 
 from .helper import assert_image_equal, assert_image_equal_tofile, hopper
 
 TEST_ICO_FILE = "Tests/images/hopper.ico"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_ICO_FILE) as im:
         im.load()
     assert im.mode == "RGBA"
@@ -20,29 +22,40 @@ def test_sanity():
     assert im.get_format_mimetype() == "image/x-icon"
 
 
-def test_load():
+def test_load() -> None:
     with Image.open(TEST_ICO_FILE) as im:
         assert im.load()[0, 0] == (1, 1, 9, 255)
 
 
-def test_mask():
+def test_mask() -> None:
     with Image.open("Tests/images/hopper_mask.ico") as im:
         assert_image_equal_tofile(im, "Tests/images/hopper_mask.png")
 
 
-def test_black_and_white():
+def test_black_and_white() -> None:
     with Image.open("Tests/images/black_and_white.ico") as im:
         assert im.mode == "RGBA"
         assert im.size == (16, 16)
 
 
-def test_invalid_file():
+def test_palette(tmp_path: Path) -> None:
+    temp_file = str(tmp_path / "temp.ico")
+
+    im = Image.new("P", (16, 16))
+    im.save(temp_file)
+
+    with Image.open(temp_file) as reloaded:
+        assert reloaded.mode == "P"
+        assert reloaded.palette is not None
+
+
+def test_invalid_file() -> None:
     with open("Tests/images/flower.jpg", "rb") as fp:
         with pytest.raises(SyntaxError):
             IcoImagePlugin.IcoImageFile(fp)
 
 
-def test_save_to_bytes():
+def test_save_to_bytes() -> None:
     output = io.BytesIO()
     im = hopper()
     im.save(output, "ico", sizes=[(32, 32), (64, 64)])
@@ -72,7 +85,7 @@ def test_save_to_bytes():
         )
 
 
-def test_getpixel(tmp_path):
+def test_getpixel(tmp_path: Path) -> None:
     temp_file = str(tmp_path / "temp.ico")
 
     im = hopper()
@@ -85,7 +98,7 @@ def test_getpixel(tmp_path):
         assert reloaded.getpixel((0, 0)) == (18, 20, 62)
 
 
-def test_no_duplicates(tmp_path):
+def test_no_duplicates(tmp_path: Path) -> None:
     temp_file = str(tmp_path / "temp.ico")
     temp_file2 = str(tmp_path / "temp2.ico")
 
@@ -99,7 +112,7 @@ def test_no_duplicates(tmp_path):
     assert os.path.getsize(temp_file) == os.path.getsize(temp_file2)
 
 
-def test_different_bit_depths(tmp_path):
+def test_different_bit_depths(tmp_path: Path) -> None:
     temp_file = str(tmp_path / "temp.ico")
     temp_file2 = str(tmp_path / "temp2.ico")
 
@@ -133,7 +146,7 @@ def test_different_bit_depths(tmp_path):
 
 
 @pytest.mark.parametrize("mode", ("1", "L", "P", "RGB", "RGBA"))
-def test_save_to_bytes_bmp(mode):
+def test_save_to_bytes_bmp(mode: str) -> None:
     output = io.BytesIO()
     im = hopper(mode)
     im.save(output, "ico", bitmap_format="bmp", sizes=[(32, 32), (64, 64)])
@@ -161,13 +174,13 @@ def test_save_to_bytes_bmp(mode):
         assert_image_equal(reloaded, im)
 
 
-def test_incorrect_size():
+def test_incorrect_size() -> None:
     with Image.open(TEST_ICO_FILE) as im:
         with pytest.raises(ValueError):
             im.size = (1, 1)
 
 
-def test_save_256x256(tmp_path):
+def test_save_256x256(tmp_path: Path) -> None:
     """Issue #2264 https://github.com/python-pillow/Pillow/issues/2264"""
     # Arrange
     with Image.open("Tests/images/hopper_256x256.ico") as im:
@@ -180,7 +193,7 @@ def test_save_256x256(tmp_path):
         assert im_saved.size == (256, 256)
 
 
-def test_only_save_relevant_sizes(tmp_path):
+def test_only_save_relevant_sizes(tmp_path: Path) -> None:
     """Issue #2266 https://github.com/python-pillow/Pillow/issues/2266
     Should save in 16x16, 24x24, 32x32, 48x48 sizes
     and not in 16x16, 24x24, 32x32, 48x48, 48x48, 48x48, 48x48 sizes
@@ -196,7 +209,7 @@ def test_only_save_relevant_sizes(tmp_path):
         assert im_saved.info["sizes"] == {(16, 16), (24, 24), (32, 32), (48, 48)}
 
 
-def test_save_append_images(tmp_path):
+def test_save_append_images(tmp_path: Path) -> None:
     # append_images should be used for scaled down versions of the image
     im = hopper("RGBA")
     provided_im = Image.new("RGBA", (32, 32), (255, 0, 0))
@@ -210,7 +223,7 @@ def test_save_append_images(tmp_path):
         assert_image_equal(reread, provided_im)
 
 
-def test_unexpected_size():
+def test_unexpected_size() -> None:
     # This image has been manually hexedited to state that it is 16x32
     # while the image within is still 16x16
     with pytest.warns(UserWarning):
@@ -218,7 +231,7 @@ def test_unexpected_size():
             assert im.size == (16, 16)
 
 
-def test_draw_reloaded(tmp_path):
+def test_draw_reloaded(tmp_path: Path) -> None:
     with Image.open(TEST_ICO_FILE) as im:
         outfile = str(tmp_path / "temp_saved_hopper_draw.ico")
 
@@ -228,3 +241,29 @@ def test_draw_reloaded(tmp_path):
 
     with Image.open(outfile) as im:
         assert_image_equal_tofile(im, "Tests/images/hopper_draw.ico")
+
+
+def test_truncated_mask() -> None:
+    # 1 bpp
+    with open("Tests/images/hopper_mask.ico", "rb") as fp:
+        data = fp.read()
+
+    ImageFile.LOAD_TRUNCATED_IMAGES = True
+    data = data[:-3]
+
+    try:
+        with Image.open(io.BytesIO(data)) as im:
+            with Image.open("Tests/images/hopper_mask.png") as expected:
+                assert im.mode == "1"
+
+        # 32 bpp
+        output = io.BytesIO()
+        expected = hopper("RGBA")
+        expected.save(output, "ico", bitmap_format="bmp")
+
+        data = output.getvalue()[:-1]
+
+        with Image.open(io.BytesIO(data)) as im:
+            assert im.mode == "RGB"
+    finally:
+        ImageFile.LOAD_TRUNCATED_IMAGES = False
diff --git a/Tests/test_file_im.py b/Tests/test_file_im.py
index 0cb26d06a51..036965bf5d8 100644
--- a/Tests/test_file_im.py
+++ b/Tests/test_file_im.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
+
 import filecmp
 import warnings
+from pathlib import Path
 
 import pytest
 
@@ -12,7 +14,7 @@
 TEST_IM = "Tests/images/hopper.im"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_IM) as im:
         im.load()
         assert im.mode == "RGB"
@@ -20,7 +22,7 @@ def test_sanity():
         assert im.format == "IM"
 
 
-def test_name_limit(tmp_path):
+def test_name_limit(tmp_path: Path) -> None:
     out = str(tmp_path / ("name_limit_test" * 7 + ".im"))
     with Image.open(TEST_IM) as im:
         im.save(out)
@@ -28,8 +30,8 @@ def test_name_limit(tmp_path):
 
 
 @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-def test_unclosed_file():
-    def open():
+def test_unclosed_file() -> None:
+    def open() -> None:
         im = Image.open(TEST_IM)
         im.load()
 
@@ -37,20 +39,20 @@ def open():
         open()
 
 
-def test_closed_file():
+def test_closed_file() -> None:
     with warnings.catch_warnings():
         im = Image.open(TEST_IM)
         im.load()
         im.close()
 
 
-def test_context_manager():
+def test_context_manager() -> None:
     with warnings.catch_warnings():
         with Image.open(TEST_IM) as im:
             im.load()
 
 
-def test_tell():
+def test_tell() -> None:
     # Arrange
     with Image.open(TEST_IM) as im:
         # Act
@@ -60,13 +62,13 @@ def test_tell():
     assert frame == 0
 
 
-def test_n_frames():
+def test_n_frames() -> None:
     with Image.open(TEST_IM) as im:
         assert im.n_frames == 1
         assert not im.is_animated
 
 
-def test_eoferror():
+def test_eoferror() -> None:
     with Image.open(TEST_IM) as im:
         n_frames = im.n_frames
 
@@ -80,14 +82,14 @@ def test_eoferror():
 
 
 @pytest.mark.parametrize("mode", ("RGB", "P", "PA"))
-def test_roundtrip(mode, tmp_path):
+def test_roundtrip(mode: str, tmp_path: Path) -> None:
     out = str(tmp_path / "temp.im")
     im = hopper(mode)
     im.save(out)
     assert_image_equal_tofile(im, out)
 
 
-def test_small_palette(tmp_path):
+def test_small_palette(tmp_path: Path) -> None:
     im = Image.new("P", (1, 1))
     colors = [0, 1, 2]
     im.putpalette(colors)
@@ -99,19 +101,19 @@ def test_small_palette(tmp_path):
         assert reloaded.getpalette() == colors + [0] * 765
 
 
-def test_save_unsupported_mode(tmp_path):
+def test_save_unsupported_mode(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.im")
     im = hopper("HSV")
     with pytest.raises(ValueError):
         im.save(out)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         ImImagePlugin.ImImageFile(invalid_file)
 
 
-def test_number():
+def test_number() -> None:
     assert ImImagePlugin.number("1.2") == 1.2
diff --git a/Tests/test_file_imt.py b/Tests/test_file_imt.py
index 3db4885586a..6957dfa0ac5 100644
--- a/Tests/test_file_imt.py
+++ b/Tests/test_file_imt.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import io
 
 import pytest
@@ -8,13 +9,13 @@
 from .helper import assert_image_equal_tofile
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open("Tests/images/bw_gradient.imt") as im:
         assert_image_equal_tofile(im, "Tests/images/bw_gradient.png")
 
 
 @pytest.mark.parametrize("data", (b"\n", b"\n-", b"width 1\n"))
-def test_invalid_file(data):
+def test_invalid_file(data: bytes) -> None:
     with io.BytesIO(data) as fp:
         with pytest.raises(SyntaxError):
             ImtImagePlugin.ImtImageFile(fp)
diff --git a/Tests/test_file_iptc.py b/Tests/test_file_iptc.py
index c44a08f526a..8a7c59fb150 100644
--- a/Tests/test_file_iptc.py
+++ b/Tests/test_file_iptc.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import sys
 from io import BytesIO, StringIO
 
@@ -11,7 +12,7 @@
 TEST_FILE = "Tests/images/iptc.jpg"
 
 
-def test_open():
+def test_open() -> None:
     expected = Image.new("L", (1, 1))
 
     f = BytesIO(
@@ -23,7 +24,7 @@ def test_open():
         assert_image_equal(im, expected)
 
 
-def test_getiptcinfo_jpg_none():
+def test_getiptcinfo_jpg_none() -> None:
     # Arrange
     with hopper() as im:
         # Act
@@ -33,7 +34,7 @@ def test_getiptcinfo_jpg_none():
     assert iptc is None
 
 
-def test_getiptcinfo_jpg_found():
+def test_getiptcinfo_jpg_found() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         # Act
@@ -45,7 +46,7 @@ def test_getiptcinfo_jpg_found():
     assert iptc[(2, 101)] == b"Hungary"
 
 
-def test_getiptcinfo_fotostation():
+def test_getiptcinfo_fotostation() -> None:
     # Arrange
     with open(TEST_FILE, "rb") as fp:
         data = bytearray(fp.read())
@@ -56,13 +57,14 @@ def test_getiptcinfo_fotostation():
         iptc = IptcImagePlugin.getiptcinfo(im)
 
     # Assert
+    assert iptc is not None
     for tag in iptc.keys():
         if tag[0] == 240:
             return
     pytest.fail("FotoStation tag not found")
 
 
-def test_getiptcinfo_zero_padding():
+def test_getiptcinfo_zero_padding() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         im.info["photoshop"][0x0404] += b"\x00\x00\x00"
@@ -75,7 +77,17 @@ def test_getiptcinfo_zero_padding():
     assert len(iptc) == 3
 
 
-def test_getiptcinfo_tiff_none():
+def test_getiptcinfo_tiff() -> None:
+    # Arrange
+    with Image.open("Tests/images/hopper.Lab.tif") as im:
+        # Act
+        iptc = IptcImagePlugin.getiptcinfo(im)
+
+    # Assert
+    assert iptc == {(1, 90): b"\x1b%G", (2, 0): b"\xcf\xc0"}
+
+
+def test_getiptcinfo_tiff_none() -> None:
     # Arrange
     with Image.open("Tests/images/hopper.tif") as im:
         # Act
@@ -85,7 +97,7 @@ def test_getiptcinfo_tiff_none():
     assert iptc is None
 
 
-def test_i():
+def test_i() -> None:
     # Arrange
     c = b"a"
 
@@ -97,7 +109,7 @@ def test_i():
     assert ret == 97
 
 
-def test_dump(monkeypatch):
+def test_dump(monkeypatch: pytest.MonkeyPatch) -> None:
     # Arrange
     c = b"abc"
     # Temporarily redirect stdout
@@ -112,6 +124,6 @@ def test_dump(monkeypatch):
     assert mystdout.getvalue() == "61 62 63 \n"
 
 
-def test_pad_deprecation():
+def test_pad_deprecation() -> None:
     with pytest.warns(DeprecationWarning):
         assert IptcImagePlugin.PAD == b"\0\0\0\0"
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index 979c7e33d00..cde951395a7 100644
--- a/Tests/test_file_jpeg.py
+++ b/Tests/test_file_jpeg.py
@@ -1,8 +1,12 @@
 from __future__ import annotations
+
 import os
 import re
 import warnings
 from io import BytesIO
+from pathlib import Path
+from types import ModuleType
+from typing import Any, cast
 
 import pytest
 
@@ -30,6 +34,7 @@
     skip_unless_feature,
 )
 
+ElementTree: ModuleType | None
 try:
     from defusedxml import ElementTree
 except ImportError:
@@ -40,16 +45,22 @@
 
 @skip_unless_feature("jpg")
 class TestFileJpeg:
-    def roundtrip(self, im, **options):
+    def roundtrip_with_bytes(
+        self, im: Image.Image, **options: Any
+    ) -> tuple[JpegImagePlugin.JpegImageFile, int]:
         out = BytesIO()
         im.save(out, "JPEG", **options)
         test_bytes = out.tell()
         out.seek(0)
-        im = Image.open(out)
-        im.bytes = test_bytes  # for testing only
-        return im
+        reloaded = cast(JpegImagePlugin.JpegImageFile, Image.open(out))
+        return reloaded, test_bytes
+
+    def roundtrip(
+        self, im: Image.Image, **options: Any
+    ) -> JpegImagePlugin.JpegImageFile:
+        return self.roundtrip_with_bytes(im, **options)[0]
 
-    def gen_random_image(self, size, mode="RGB"):
+    def gen_random_image(self, size: tuple[int, int], mode: str = "RGB") -> Image.Image:
         """Generates a very hard to compress file
         :param size: tuple
         :param mode: optional image mode
@@ -57,9 +68,11 @@ def gen_random_image(self, size, mode="RGB"):
         """
         return Image.frombytes(mode, size, os.urandom(size[0] * size[1] * len(mode)))
 
-    def test_sanity(self):
+    def test_sanity(self) -> None:
         # internal version number
-        assert re.search(r"\d+\.\d+$", features.version_codec("jpg"))
+        version = features.version_codec("jpg")
+        assert version is not None
+        assert re.search(r"\d+\.\d+$", version)
 
         with Image.open(TEST_FILE) as im:
             im.load()
@@ -69,13 +82,13 @@ def test_sanity(self):
             assert im.get_format_mimetype() == "image/jpeg"
 
     @pytest.mark.parametrize("size", ((1, 0), (0, 1), (0, 0)))
-    def test_zero(self, size, tmp_path):
+    def test_zero(self, size: tuple[int, int], tmp_path: Path) -> None:
         f = str(tmp_path / "temp.jpg")
         im = Image.new("RGB", size)
         with pytest.raises(ValueError):
             im.save(f)
 
-    def test_app(self):
+    def test_app(self) -> None:
         # Test APP/COM reader (@PIL135)
         with Image.open(TEST_FILE) as im:
             assert im.applist[0] == ("APP0", b"JFIF\x00\x01\x01\x01\x00`\x00`\x00\x00")
@@ -88,7 +101,7 @@ def test_app(self):
             assert im.info["comment"] == b"File written by Adobe Photoshop\xa8 4.0\x00"
             assert im.app["COM"] == im.info["comment"]
 
-    def test_comment_write(self):
+    def test_comment_write(self) -> None:
         with Image.open(TEST_FILE) as im:
             assert im.info["comment"] == b"File written by Adobe Photoshop\xa8 4.0\x00"
 
@@ -106,15 +119,13 @@ def test_comment_write(self):
                     assert "comment" not in reloaded.info
 
             # Test that a comment argument overrides the default comment
-            for comment in ("Test comment text", b"Text comment text"):
+            for comment in ("Test comment text", b"Test comment text"):
                 out = BytesIO()
                 im.save(out, format="JPEG", comment=comment)
                 with Image.open(out) as reloaded:
-                    if not isinstance(comment, bytes):
-                        comment = comment.encode()
-                    assert reloaded.info["comment"] == comment
+                    assert reloaded.info["comment"] == b"Test comment text"
 
-    def test_cmyk(self):
+    def test_cmyk(self) -> None:
         # Test CMYK handling.  Thanks to Tim and Charlie for test data,
         # Michael for getting me to look one more time.
         f = "Tests/images/pil_sample_cmyk.jpg"
@@ -142,8 +153,8 @@ def test_cmyk(self):
             )
             assert k > 0.9
 
-    def test_rgb(self):
-        def getchannels(im):
+    def test_rgb(self) -> None:
+        def getchannels(im: JpegImagePlugin.JpegImageFile) -> tuple[int, ...]:
             return tuple(v[0] for v in im.layer)
 
         im = hopper()
@@ -159,8 +170,8 @@ def getchannels(im):
         "test_image_path",
         [TEST_FILE, "Tests/images/pil_sample_cmyk.jpg"],
     )
-    def test_dpi(self, test_image_path):
-        def test(xdpi, ydpi=None):
+    def test_dpi(self, test_image_path: str) -> None:
+        def test(xdpi: int, ydpi: int | None = None) -> tuple[int, int] | None:
             with Image.open(test_image_path) as im:
                 im = self.roundtrip(im, dpi=(xdpi, ydpi or xdpi))
             return im.info.get("dpi")
@@ -173,7 +184,7 @@ def test(xdpi, ydpi=None):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_icc(self, tmp_path):
+    def test_icc(self, tmp_path: Path) -> None:
         # Test ICC support
         with Image.open("Tests/images/rgb.jpg") as im1:
             icc_profile = im1.info["icc_profile"]
@@ -205,7 +216,7 @@ def test_icc(self, tmp_path):
             ImageFile.MAXBLOCK * 4 + 3,  # large block
         ),
     )
-    def test_icc_big(self, n):
+    def test_icc_big(self, n: int) -> None:
         # Make sure that the "extra" support handles large blocks
         # The ICC APP marker can store 65519 bytes per marker, so
         # using a 4-byte test code should allow us to detect out of
@@ -218,7 +229,7 @@ def test_icc_big(self, n):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_large_icc_meta(self, tmp_path):
+    def test_large_icc_meta(self, tmp_path: Path) -> None:
         # https://github.com/python-pillow/Pillow/issues/148
         # Sometimes the meta data on the icc_profile block is bigger than
         # Image.MAXBLOCK or the image size.
@@ -242,52 +253,52 @@ def test_large_icc_meta(self, tmp_path):
             f = str(tmp_path / "temp3.jpg")
             im.save(f, progressive=True, quality=94, exif=b" " * 43668)
 
-    def test_optimize(self):
-        im1 = self.roundtrip(hopper())
-        im2 = self.roundtrip(hopper(), optimize=0)
-        im3 = self.roundtrip(hopper(), optimize=1)
+    def test_optimize(self) -> None:
+        im1, im1_bytes = self.roundtrip_with_bytes(hopper())
+        im2, im2_bytes = self.roundtrip_with_bytes(hopper(), optimize=0)
+        im3, im3_bytes = self.roundtrip_with_bytes(hopper(), optimize=1)
         assert_image_equal(im1, im2)
         assert_image_equal(im1, im3)
-        assert im1.bytes >= im2.bytes
-        assert im1.bytes >= im3.bytes
+        assert im1_bytes >= im2_bytes
+        assert im1_bytes >= im3_bytes
 
-    def test_optimize_large_buffer(self, tmp_path):
+    def test_optimize_large_buffer(self, tmp_path: Path) -> None:
         # https://github.com/python-pillow/Pillow/issues/148
         f = str(tmp_path / "temp.jpg")
         # this requires ~ 1.5x Image.MAXBLOCK
         im = Image.new("RGB", (4096, 4096), 0xFF3333)
         im.save(f, format="JPEG", optimize=True)
 
-    def test_progressive(self):
-        im1 = self.roundtrip(hopper())
+    def test_progressive(self) -> None:
+        im1, im1_bytes = self.roundtrip_with_bytes(hopper())
         im2 = self.roundtrip(hopper(), progressive=False)
-        im3 = self.roundtrip(hopper(), progressive=True)
+        im3, im3_bytes = self.roundtrip_with_bytes(hopper(), progressive=True)
         assert not im1.info.get("progressive")
         assert not im2.info.get("progressive")
         assert im3.info.get("progressive")
 
         assert_image_equal(im1, im3)
-        assert im1.bytes >= im3.bytes
+        assert im1_bytes >= im3_bytes
 
-    def test_progressive_large_buffer(self, tmp_path):
+    def test_progressive_large_buffer(self, tmp_path: Path) -> None:
         f = str(tmp_path / "temp.jpg")
         # this requires ~ 1.5x Image.MAXBLOCK
         im = Image.new("RGB", (4096, 4096), 0xFF3333)
         im.save(f, format="JPEG", progressive=True)
 
-    def test_progressive_large_buffer_highest_quality(self, tmp_path):
+    def test_progressive_large_buffer_highest_quality(self, tmp_path: Path) -> None:
         f = str(tmp_path / "temp.jpg")
         im = self.gen_random_image((255, 255))
         # this requires more bytes than pixels in the image
         im.save(f, format="JPEG", progressive=True, quality=100)
 
-    def test_progressive_cmyk_buffer(self):
+    def test_progressive_cmyk_buffer(self) -> None:
         # Issue 2272, quality 90 cmyk image is tripping the large buffer bug.
         f = BytesIO()
         im = self.gen_random_image((256, 256), "CMYK")
         im.save(f, format="JPEG", progressive=True, quality=94)
 
-    def test_large_exif(self, tmp_path):
+    def test_large_exif(self, tmp_path: Path) -> None:
         # https://github.com/python-pillow/Pillow/issues/148
         f = str(tmp_path / "temp.jpg")
         im = hopper()
@@ -296,12 +307,12 @@ def test_large_exif(self, tmp_path):
         with pytest.raises(ValueError):
             im.save(f, "JPEG", quality=90, exif=b"1" * 65534)
 
-    def test_exif_typeerror(self):
+    def test_exif_typeerror(self) -> None:
         with Image.open("Tests/images/exif_typeerror.jpg") as im:
             # Should not raise a TypeError
             im._getexif()
 
-    def test_exif_gps(self, tmp_path):
+    def test_exif_gps(self, tmp_path: Path) -> None:
         expected_exif_gps = {
             0: b"\x00\x00\x00\x01",
             2: 4294967295,
@@ -326,7 +337,7 @@ def test_exif_gps(self, tmp_path):
             exif = reloaded._getexif()
             assert exif[gps_index] == expected_exif_gps
 
-    def test_empty_exif_gps(self):
+    def test_empty_exif_gps(self) -> None:
         with Image.open("Tests/images/empty_gps_ifd.jpg") as im:
             exif = im.getexif()
             del exif[0x8769]
@@ -338,13 +349,14 @@ def test_empty_exif_gps(self):
             assert exif.get_ifd(0x8825) == {}
 
             transposed = ImageOps.exif_transpose(im)
+        assert transposed is not None
         exif = transposed.getexif()
         assert exif.get_ifd(0x8825) == {}
 
         # Assert that it was transposed
         assert 0x0112 not in exif
 
-    def test_exif_equality(self):
+    def test_exif_equality(self) -> None:
         # In 7.2.0, Exif rationals were changed to be read as
         # TiffImagePlugin.IFDRational. This class had a bug in __eq__,
         # breaking the self-equality of Exif data
@@ -354,7 +366,7 @@ def test_exif_equality(self):
                 exifs.append(im._getexif())
         assert exifs[0] == exifs[1]
 
-    def test_exif_rollback(self):
+    def test_exif_rollback(self) -> None:
         # rolling back exif support in 3.1 to pre-3.0 formatting.
         # expected from 2.9, with b/u qualifiers switched for 3.2 compatibility
         # this test passes on 2.9 and 3.1, but not 3.0
@@ -389,12 +401,12 @@ def test_exif_rollback(self):
         for tag, value in expected_exif.items():
             assert value == exif[tag]
 
-    def test_exif_gps_typeerror(self):
+    def test_exif_gps_typeerror(self) -> None:
         with Image.open("Tests/images/exif_gps_typeerror.jpg") as im:
             # Should not raise a TypeError
             im._getexif()
 
-    def test_progressive_compat(self):
+    def test_progressive_compat(self) -> None:
         im1 = self.roundtrip(hopper())
         assert not im1.info.get("progressive")
         assert not im1.info.get("progression")
@@ -415,23 +427,25 @@ def test_progressive_compat(self):
         assert im3.info.get("progressive")
         assert im3.info.get("progression")
 
-    def test_quality(self):
-        im1 = self.roundtrip(hopper())
-        im2 = self.roundtrip(hopper(), quality=50)
+    def test_quality(self) -> None:
+        im1, im1_bytes = self.roundtrip_with_bytes(hopper())
+        im2, im2_bytes = self.roundtrip_with_bytes(hopper(), quality=50)
         assert_image(im1, im2.mode, im2.size)
-        assert im1.bytes >= im2.bytes
+        assert im1_bytes >= im2_bytes
 
-        im3 = self.roundtrip(hopper(), quality=0)
+        im3, im3_bytes = self.roundtrip_with_bytes(hopper(), quality=0)
         assert_image(im1, im3.mode, im3.size)
-        assert im2.bytes > im3.bytes
+        assert im2_bytes > im3_bytes
 
-    def test_smooth(self):
+    def test_smooth(self) -> None:
         im1 = self.roundtrip(hopper())
         im2 = self.roundtrip(hopper(), smooth=100)
         assert_image(im1, im2.mode, im2.size)
 
-    def test_subsampling(self):
-        def getsampling(im):
+    def test_subsampling(self) -> None:
+        def getsampling(
+            im: JpegImagePlugin.JpegImageFile,
+        ) -> tuple[int, int, int, int, int, int]:
             layer = im.layer
             return layer[0][1:3] + layer[1][1:3] + layer[2][1:3]
 
@@ -439,46 +453,46 @@ def getsampling(im):
         for subsampling in (-1, 3):  # (default, invalid)
             im = self.roundtrip(hopper(), subsampling=subsampling)
             assert getsampling(im) == (2, 2, 1, 1, 1, 1)
-        for subsampling in (0, "4:4:4"):
-            im = self.roundtrip(hopper(), subsampling=subsampling)
+        for subsampling1 in (0, "4:4:4"):
+            im = self.roundtrip(hopper(), subsampling=subsampling1)
             assert getsampling(im) == (1, 1, 1, 1, 1, 1)
-        for subsampling in (1, "4:2:2"):
-            im = self.roundtrip(hopper(), subsampling=subsampling)
+        for subsampling1 in (1, "4:2:2"):
+            im = self.roundtrip(hopper(), subsampling=subsampling1)
             assert getsampling(im) == (2, 1, 1, 1, 1, 1)
-        for subsampling in (2, "4:2:0", "4:1:1"):
-            im = self.roundtrip(hopper(), subsampling=subsampling)
+        for subsampling1 in (2, "4:2:0", "4:1:1"):
+            im = self.roundtrip(hopper(), subsampling=subsampling1)
             assert getsampling(im) == (2, 2, 1, 1, 1, 1)
 
         # RGB colorspace
-        for subsampling in (-1, 0, "4:4:4"):
+        for subsampling1 in (-1, 0, "4:4:4"):
             # "4:4:4" doesn't really make sense for RGB, but the conversion
             # to an integer happens at a higher level
-            im = self.roundtrip(hopper(), keep_rgb=True, subsampling=subsampling)
+            im = self.roundtrip(hopper(), keep_rgb=True, subsampling=subsampling1)
             assert getsampling(im) == (1, 1, 1, 1, 1, 1)
-        for subsampling in (1, "4:2:2", 2, "4:2:0", 3):
+        for subsampling1 in (1, "4:2:2", 2, "4:2:0", 3):
             with pytest.raises(OSError):
-                self.roundtrip(hopper(), keep_rgb=True, subsampling=subsampling)
+                self.roundtrip(hopper(), keep_rgb=True, subsampling=subsampling1)
 
         with pytest.raises(TypeError):
             self.roundtrip(hopper(), subsampling="1:1:1")
 
-    def test_exif(self):
+    def test_exif(self) -> None:
         with Image.open("Tests/images/pil_sample_rgb.jpg") as im:
             info = im._getexif()
             assert info[305] == "Adobe Photoshop CS Macintosh"
 
-    def test_get_child_images(self):
+    def test_get_child_images(self) -> None:
         with Image.open("Tests/images/flower.jpg") as im:
             ims = im.get_child_images()
 
         assert len(ims) == 1
         assert_image_similar_tofile(ims[0], "Tests/images/flower_thumbnail.png", 2.1)
 
-    def test_mp(self):
+    def test_mp(self) -> None:
         with Image.open("Tests/images/pil_sample_rgb.jpg") as im:
             assert im._getmp() is None
 
-    def test_quality_keep(self, tmp_path):
+    def test_quality_keep(self, tmp_path: Path) -> None:
         # RGB
         with Image.open("Tests/images/hopper.jpg") as im:
             f = str(tmp_path / "temp.jpg")
@@ -492,13 +506,13 @@ def test_quality_keep(self, tmp_path):
             f = str(tmp_path / "temp.jpg")
             im.save(f, quality="keep")
 
-    def test_junk_jpeg_header(self):
+    def test_junk_jpeg_header(self) -> None:
         # https://github.com/python-pillow/Pillow/issues/630
         filename = "Tests/images/junk_jpeg_header.jpg"
         with Image.open(filename):
             pass
 
-    def test_ff00_jpeg_header(self):
+    def test_ff00_jpeg_header(self) -> None:
         filename = "Tests/images/jpeg_ff00_header.jpg"
         with Image.open(filename):
             pass
@@ -506,7 +520,7 @@ def test_ff00_jpeg_header(self):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_truncated_jpeg_should_read_all_the_data(self):
+    def test_truncated_jpeg_should_read_all_the_data(self) -> None:
         filename = "Tests/images/truncated_jpeg.jpg"
         ImageFile.LOAD_TRUNCATED_IMAGES = True
         with Image.open(filename) as im:
@@ -514,7 +528,7 @@ def test_truncated_jpeg_should_read_all_the_data(self):
             ImageFile.LOAD_TRUNCATED_IMAGES = False
             assert im.getbbox() is not None
 
-    def test_truncated_jpeg_throws_oserror(self):
+    def test_truncated_jpeg_throws_oserror(self) -> None:
         filename = "Tests/images/truncated_jpeg.jpg"
         with Image.open(filename) as im:
             with pytest.raises(OSError):
@@ -527,8 +541,8 @@ def test_truncated_jpeg_throws_oserror(self):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_qtables(self, tmp_path):
-        def _n_qtables_helper(n, test_file):
+    def test_qtables(self, tmp_path: Path) -> None:
+        def _n_qtables_helper(n: int, test_file: str) -> None:
             with Image.open(test_file) as im:
                 f = str(tmp_path / "temp.jpg")
                 im.save(f, qtables=[[n] * 64] * n)
@@ -636,24 +650,24 @@ def _n_qtables_helper(n, test_file):
             with pytest.raises(ValueError):
                 self.roundtrip(im, qtables=[[1, 2, 3, 4]])
 
-    def test_load_16bit_qtables(self):
+    def test_load_16bit_qtables(self) -> None:
         with Image.open("Tests/images/hopper_16bit_qtables.jpg") as im:
             assert len(im.quantization) == 2
             assert len(im.quantization[0]) == 64
             assert max(im.quantization[0]) > 255
 
-    def test_save_multiple_16bit_qtables(self):
+    def test_save_multiple_16bit_qtables(self) -> None:
         with Image.open("Tests/images/hopper_16bit_qtables.jpg") as im:
             im2 = self.roundtrip(im, qtables="keep")
             assert im.quantization == im2.quantization
 
-    def test_save_single_16bit_qtable(self):
+    def test_save_single_16bit_qtable(self) -> None:
         with Image.open("Tests/images/hopper_16bit_qtables.jpg") as im:
             im2 = self.roundtrip(im, qtables={0: im.quantization[0]})
             assert len(im2.quantization) == 1
             assert im2.quantization[0] == im.quantization[0]
 
-    def test_save_low_quality_baseline_qtables(self):
+    def test_save_low_quality_baseline_qtables(self) -> None:
         with Image.open(TEST_FILE) as im:
             im2 = self.roundtrip(im, quality=10)
             assert len(im2.quantization) == 2
@@ -664,7 +678,7 @@ def test_save_low_quality_baseline_qtables(self):
         "blocks, rows, markers",
         ((0, 0, 0), (1, 0, 15), (3, 0, 5), (8, 0, 1), (0, 1, 3), (0, 2, 1)),
     )
-    def test_restart_markers(self, blocks, rows, markers):
+    def test_restart_markers(self, blocks: int, rows: int, markers: int) -> None:
         im = Image.new("RGB", (32, 32))  # 16 MCUs
         out = BytesIO()
         im.save(
@@ -678,20 +692,20 @@ def test_restart_markers(self, blocks, rows, markers):
         assert len(re.findall(b"\xff[\xd0-\xd7]", out.getvalue())) == markers
 
     @pytest.mark.skipif(not djpeg_available(), reason="djpeg not available")
-    def test_load_djpeg(self):
+    def test_load_djpeg(self) -> None:
         with Image.open(TEST_FILE) as img:
             img.load_djpeg()
             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):
+    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, 0, tempfile)
+            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):
+    def test_no_duplicate_0x1001_tag(self) -> None:
         # Arrange
         tag_ids = {v: k for k, v in ExifTags.TAGS.items()}
 
@@ -699,7 +713,7 @@ def test_no_duplicate_0x1001_tag(self):
         assert tag_ids["RelatedImageWidth"] == 0x1001
         assert tag_ids["RelatedImageLength"] == 0x1002
 
-    def test_MAXBLOCK_scaling(self, tmp_path):
+    def test_MAXBLOCK_scaling(self, tmp_path: Path) -> None:
         im = self.gen_random_image((512, 512))
         f = str(tmp_path / "temp.jpeg")
         im.save(f, quality=100, optimize=True)
@@ -710,7 +724,7 @@ def test_MAXBLOCK_scaling(self, tmp_path):
             reloaded.save(f, quality="keep", progressive=True)
             reloaded.save(f, quality="keep", optimize=True)
 
-    def test_bad_mpo_header(self):
+    def test_bad_mpo_header(self) -> None:
         """Treat unknown MPO as JPEG"""
         # Arrange
 
@@ -722,20 +736,20 @@ def test_bad_mpo_header(self):
             assert im.format == "JPEG"
 
     @pytest.mark.parametrize("mode", ("1", "L", "RGB", "RGBX", "CMYK", "YCbCr"))
-    def test_save_correct_modes(self, mode):
+    def test_save_correct_modes(self, mode: str) -> None:
         out = BytesIO()
         img = Image.new(mode, (20, 20))
         img.save(out, "JPEG")
 
     @pytest.mark.parametrize("mode", ("LA", "La", "RGBA", "RGBa", "P"))
-    def test_save_wrong_modes(self, mode):
+    def test_save_wrong_modes(self, mode: str) -> None:
         # ref https://github.com/python-pillow/Pillow/issues/2005
         out = BytesIO()
         img = Image.new(mode, (20, 20))
         with pytest.raises(OSError):
             img.save(out, "JPEG")
 
-    def test_save_tiff_with_dpi(self, tmp_path):
+    def test_save_tiff_with_dpi(self, tmp_path: Path) -> None:
         # Arrange
         outfile = str(tmp_path / "temp.tif")
         with Image.open("Tests/images/hopper.tif") as im:
@@ -747,7 +761,7 @@ def test_save_tiff_with_dpi(self, tmp_path):
                 reloaded.load()
                 assert im.info["dpi"] == reloaded.info["dpi"]
 
-    def test_save_dpi_rounding(self, tmp_path):
+    def test_save_dpi_rounding(self, tmp_path: Path) -> None:
         outfile = str(tmp_path / "temp.jpg")
         with Image.open("Tests/images/hopper.jpg") as im:
             im.save(outfile, dpi=(72.2, 72.2))
@@ -760,7 +774,7 @@ def test_save_dpi_rounding(self, tmp_path):
         with Image.open(outfile) as reloaded:
             assert reloaded.info["dpi"] == (73, 73)
 
-    def test_dpi_tuple_from_exif(self):
+    def test_dpi_tuple_from_exif(self) -> None:
         # Arrange
         # This Photoshop CC 2017 image has DPI in EXIF not metadata
         # EXIF XResolution is (2000000, 10000)
@@ -768,7 +782,7 @@ def test_dpi_tuple_from_exif(self):
             # Act / Assert
             assert im.info.get("dpi") == (200, 200)
 
-    def test_dpi_int_from_exif(self):
+    def test_dpi_int_from_exif(self) -> None:
         # Arrange
         # This image has DPI in EXIF not metadata
         # EXIF XResolution is 72
@@ -776,7 +790,7 @@ def test_dpi_int_from_exif(self):
             # Act / Assert
             assert im.info.get("dpi") == (72, 72)
 
-    def test_dpi_from_dpcm_exif(self):
+    def test_dpi_from_dpcm_exif(self) -> None:
         # Arrange
         # This is photoshop-200dpi.jpg with EXIF resolution unit set to cm:
         # exiftool -exif:ResolutionUnit=cm photoshop-200dpi.jpg
@@ -784,7 +798,7 @@ def test_dpi_from_dpcm_exif(self):
             # Act / Assert
             assert im.info.get("dpi") == (508, 508)
 
-    def test_dpi_exif_zero_division(self):
+    def test_dpi_exif_zero_division(self) -> None:
         # Arrange
         # This is photoshop-200dpi.jpg with EXIF resolution set to 0/0:
         # exiftool -XResolution=0/0 -YResolution=0/0 photoshop-200dpi.jpg
@@ -793,7 +807,7 @@ def test_dpi_exif_zero_division(self):
             # This should return the default, and not raise a ZeroDivisionError
             assert im.info.get("dpi") == (72, 72)
 
-    def test_dpi_exif_string(self):
+    def test_dpi_exif_string(self) -> None:
         # Arrange
         # 0x011A tag in this exif contains string '300300\x02'
         with Image.open("Tests/images/broken_exif_dpi.jpg") as im:
@@ -801,14 +815,14 @@ def test_dpi_exif_string(self):
             # This should return the default
             assert im.info.get("dpi") == (72, 72)
 
-    def test_dpi_exif_truncated(self):
+    def test_dpi_exif_truncated(self) -> None:
         # Arrange
         with Image.open("Tests/images/truncated_exif_dpi.jpg") as im:
             # Act / Assert
             # This should return the default
             assert im.info.get("dpi") == (72, 72)
 
-    def test_no_dpi_in_exif(self):
+    def test_no_dpi_in_exif(self) -> None:
         # Arrange
         # This is photoshop-200dpi.jpg with resolution removed from EXIF:
         # exiftool "-*resolution*"= photoshop-200dpi.jpg
@@ -818,7 +832,7 @@ def test_no_dpi_in_exif(self):
             # https://exiv2.org/tags.html
             assert im.info.get("dpi") == (72, 72)
 
-    def test_invalid_exif(self):
+    def test_invalid_exif(self) -> None:
         # This is no-dpi-in-exif with the tiff header of the exif block
         # hexedited from MM * to FF FF FF FF
         with Image.open("Tests/images/invalid-exif.jpg") as im:
@@ -829,7 +843,7 @@ def test_invalid_exif(self):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_exif_x_resolution(self, tmp_path):
+    def test_exif_x_resolution(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/flower.jpg") as im:
             exif = im.getexif()
             assert exif[282] == 180
@@ -841,14 +855,14 @@ def test_exif_x_resolution(self, tmp_path):
         with Image.open(out) as reloaded:
             assert reloaded.getexif()[282] == 180
 
-    def test_invalid_exif_x_resolution(self):
+    def test_invalid_exif_x_resolution(self) -> None:
         # When no x or y resolution is defined in EXIF
         with Image.open("Tests/images/invalid-exif-without-x-resolution.jpg") as im:
             # This should return the default, and not a ValueError or
             # OSError for an unidentified image.
             assert im.info.get("dpi") == (72, 72)
 
-    def test_ifd_offset_exif(self):
+    def test_ifd_offset_exif(self) -> None:
         # Arrange
         # This image has been manually hexedited to have an IFD offset of 10,
         # in contrast to normal 8
@@ -856,14 +870,14 @@ def test_ifd_offset_exif(self):
             # Act / Assert
             assert im._getexif()[306] == "2017:03:13 23:03:09"
 
-    def test_multiple_exif(self):
+    def test_multiple_exif(self) -> None:
         with Image.open("Tests/images/multiple_exif.jpg") as im:
-            assert im.info["exif"] == b"Exif\x00\x00firstsecond"
+            assert im.getexif()[270] == "firstsecond"
 
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_photoshop(self):
+    def test_photoshop(self) -> None:
         with Image.open("Tests/images/photoshop-200dpi.jpg") as im:
             assert im.info["photoshop"][0x03ED] == {
                 "XResolution": 200.0,
@@ -880,14 +894,14 @@ def test_photoshop(self):
         with Image.open("Tests/images/app13.jpg") as im:
             assert "photoshop" not in im.info
 
-    def test_photoshop_malformed_and_multiple(self):
+    def test_photoshop_malformed_and_multiple(self) -> None:
         with Image.open("Tests/images/app13-multiple.jpg") as im:
             assert "photoshop" in im.info
             assert 24 == len(im.info["photoshop"])
             apps_13_lengths = [len(v) for k, v in im.applist if k == "APP13"]
             assert [65504, 24] == apps_13_lengths
 
-    def test_adobe_transform(self):
+    def test_adobe_transform(self) -> None:
         with Image.open("Tests/images/pil_sample_rgb.jpg") as im:
             assert im.info["adobe_transform"] == 1
 
@@ -901,30 +915,31 @@ def test_adobe_transform(self):
             assert "adobe" in im.info
             assert "adobe_transform" not in im.info
 
-    def test_icc_after_SOF(self):
+    def test_icc_after_SOF(self) -> None:
         with Image.open("Tests/images/icc-after-SOF.jpg") as im:
             assert im.info["icc_profile"] == b"profile"
 
-    def test_jpeg_magic_number(self):
+    def test_jpeg_magic_number(self, monkeypatch: pytest.MonkeyPatch) -> None:
         size = 4097
         buffer = BytesIO(b"\xFF" * size)  # Many xFF bytes
-        buffer.max_pos = 0
+        max_pos = 0
         orig_read = buffer.read
 
-        def read(n=-1):
+        def read(n: int | None = -1) -> bytes:
+            nonlocal max_pos
             res = orig_read(n)
-            buffer.max_pos = max(buffer.max_pos, buffer.tell())
+            max_pos = max(max_pos, buffer.tell())
             return res
 
-        buffer.read = read
+        monkeypatch.setattr(buffer, "read", read)
         with pytest.raises(UnidentifiedImageError):
             with Image.open(buffer):
                 pass
 
         # Assert the entire file has not been read
-        assert 0 < buffer.max_pos < size
+        assert 0 < max_pos < size
 
-    def test_getxmp(self):
+    def test_getxmp(self) -> None:
         with Image.open("Tests/images/xmp_test.jpg") as im:
             if ElementTree is None:
                 with pytest.warns(
@@ -933,6 +948,7 @@ def test_getxmp(self):
                 ):
                     assert im.getxmp() == {}
             else:
+                assert "xmp" in im.info
                 xmp = im.getxmp()
 
                 description = xmp["xmpmeta"]["RDF"]["Description"]
@@ -953,7 +969,7 @@ def test_getxmp(self):
             with Image.open("Tests/images/hopper.jpg") as im:
                 assert im.getxmp() == {}
 
-    def test_getxmp_no_prefix(self):
+    def test_getxmp_no_prefix(self) -> None:
         with Image.open("Tests/images/xmp_no_prefix.jpg") as im:
             if ElementTree is None:
                 with pytest.warns(
@@ -964,7 +980,7 @@ def test_getxmp_no_prefix(self):
             else:
                 assert im.getxmp() == {"xmpmeta": {"key": "value"}}
 
-    def test_getxmp_padded(self):
+    def test_getxmp_padded(self) -> None:
         with Image.open("Tests/images/xmp_padded.jpg") as im:
             if ElementTree is None:
                 with pytest.warns(
@@ -975,21 +991,32 @@ def test_getxmp_padded(self):
             else:
                 assert im.getxmp() == {"xmpmeta": None}
 
+    def test_save_xmp(self, tmp_path: Path) -> None:
+        f = str(tmp_path / "temp.jpg")
+        im = hopper()
+        im.save(f, xmp=b"XMP test")
+        with Image.open(f) as reloaded:
+            assert reloaded.info["xmp"] == b"XMP test"
+
+        im.info["xmp"] = b"1" * 65504
+        im.save(f)
+        with Image.open(f) as reloaded:
+            assert reloaded.info["xmp"] == b"1" * 65504
+
+        with pytest.raises(ValueError):
+            im.save(f, xmp=b"1" * 65505)
+
     @pytest.mark.timeout(timeout=1)
-    def test_eof(self):
+    def test_eof(self) -> None:
         # Even though this decoder never says that it is finished
         # the image should still end when there is no new data
         class InfiniteMockPyDecoder(ImageFile.PyDecoder):
-            def decode(self, buffer):
+            def decode(
+                self, buffer: bytes | Image.SupportsArrayInterface
+            ) -> tuple[int, int]:
                 return 0, 0
 
-        decoder = InfiniteMockPyDecoder(None)
-
-        def closure(mode, *args):
-            decoder.__init__(mode, *args)
-            return decoder
-
-        Image.register_decoder("INFINITE", closure)
+        Image.register_decoder("INFINITE", InfiniteMockPyDecoder)
 
         with Image.open(TEST_FILE) as im:
             im.tile = [
@@ -999,7 +1026,7 @@ def closure(mode, *args):
             im.load()
             ImageFile.LOAD_TRUNCATED_IMAGES = False
 
-    def test_separate_tables(self):
+    def test_separate_tables(self) -> None:
         im = hopper()
         data = []  # [interchange, tables-only, image-only]
         for streamtype in range(3):
@@ -1009,35 +1036,47 @@ def test_separate_tables(self):
 
         # SOI, EOI
         for marker in b"\xff\xd8", b"\xff\xd9":
-            assert marker in data[1] and marker in data[2]
+            assert marker in data[1]
+            assert marker in data[2]
         # DHT, DQT
         for marker in b"\xff\xc4", b"\xff\xdb":
-            assert marker in data[1] and marker not in data[2]
+            assert marker in data[1]
+            assert marker not in data[2]
         # SOF0, SOS, APP0 (JFIF header)
         for marker in b"\xff\xc0", b"\xff\xda", b"\xff\xe0":
-            assert marker not in data[1] and marker in data[2]
+            assert marker not in data[1]
+            assert marker in data[2]
 
         with Image.open(BytesIO(data[0])) as interchange_im:
             with Image.open(BytesIO(data[1] + data[2])) as combined_im:
                 assert_image_equal(interchange_im, combined_im)
 
-    def test_repr_jpeg(self):
+    def test_repr_jpeg(self) -> None:
         im = hopper()
+        b = im._repr_jpeg_()
+        assert b is not None
 
-        with Image.open(BytesIO(im._repr_jpeg_())) as repr_jpeg:
+        with Image.open(BytesIO(b)) as repr_jpeg:
             assert repr_jpeg.format == "JPEG"
             assert_image_similar(im, repr_jpeg, 17)
 
-    def test_repr_jpeg_error_returns_none(self):
+    def test_repr_jpeg_error_returns_none(self) -> None:
         im = hopper("F")
 
         assert im._repr_jpeg_() is None
 
+    def test_deprecation(self) -> None:
+        with Image.open(TEST_FILE) as im:
+            with pytest.warns(DeprecationWarning):
+                assert im.huffman_ac == {}
+            with pytest.warns(DeprecationWarning):
+                assert im.huffman_dc == {}
+
 
 @pytest.mark.skipif(not is_win32(), reason="Windows only")
 @skip_unless_feature("jpg")
 class TestFileCloseW32:
-    def test_fd_leak(self, tmp_path):
+    def test_fd_leak(self, tmp_path: Path) -> None:
         tmpfile = str(tmp_path / "temp.jpg")
 
         with Image.open("Tests/images/hopper.jpg") as im:
diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
index aaa4104e57c..26b085601b6 100644
--- a/Tests/test_file_jpeg2k.py
+++ b/Tests/test_file_jpeg2k.py
@@ -1,7 +1,10 @@
 from __future__ import annotations
+
 import os
 import re
 from io import BytesIO
+from pathlib import Path
+from typing import Any
 
 import pytest
 
@@ -34,20 +37,20 @@
 # 'Not enough memory to handle tile data'
 
 
-def roundtrip(im, **options):
+def roundtrip(im: Image.Image, **options: Any) -> Image.Image:
     out = BytesIO()
     im.save(out, "JPEG2000", **options)
-    test_bytes = out.tell()
     out.seek(0)
     with Image.open(out) as im:
-        im.bytes = test_bytes  # for testing only
         im.load()
     return im
 
 
-def test_sanity():
+def test_sanity() -> None:
     # Internal version number
-    assert re.search(r"\d+\.\d+\.\d+$", features.version_codec("jpg_2000"))
+    version = features.version_codec("jpg_2000")
+    assert version is not None
+    assert re.search(r"\d+\.\d+\.\d+$", version)
 
     with Image.open("Tests/images/test-card-lossless.jp2") as im:
         px = im.load()
@@ -58,30 +61,32 @@ def test_sanity():
         assert im.get_format_mimetype() == "image/jp2"
 
 
-def test_jpf():
+def test_jpf() -> None:
     with Image.open("Tests/images/balloon.jpf") as im:
         assert im.format == "JPEG2000"
         assert im.get_format_mimetype() == "image/jpx"
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         Jpeg2KImagePlugin.Jpeg2KImageFile(invalid_file)
 
 
-def test_bytesio():
+def test_bytesio() -> None:
     with open("Tests/images/test-card-lossless.jp2", "rb") as f:
         data = BytesIO(f.read())
-    assert_image_similar_tofile(test_card, data, 1.0e-3)
+    with Image.open(data) as im:
+        im.load()
+        assert_image_similar(im, test_card, 1.0e-3)
 
 
 # These two test pre-written JPEG 2000 files that were not written with
 # PIL (they were made using Adobe Photoshop)
 
 
-def test_lossless(tmp_path):
+def test_lossless(tmp_path: Path) -> None:
     with Image.open("Tests/images/test-card-lossless.jp2") as im:
         im.load()
         outfile = str(tmp_path / "temp_test-card.png")
@@ -89,54 +94,54 @@ def test_lossless(tmp_path):
     assert_image_similar(im, test_card, 1.0e-3)
 
 
-def test_lossy_tiled():
+def test_lossy_tiled() -> None:
     assert_image_similar_tofile(
         test_card, "Tests/images/test-card-lossy-tiled.jp2", 2.0
     )
 
 
-def test_lossless_rt():
+def test_lossless_rt() -> None:
     im = roundtrip(test_card)
     assert_image_equal(im, test_card)
 
 
-def test_lossy_rt():
+def test_lossy_rt() -> None:
     im = roundtrip(test_card, quality_layers=[20])
     assert_image_similar(im, test_card, 2.0)
 
 
-def test_tiled_rt():
+def test_tiled_rt() -> None:
     im = roundtrip(test_card, tile_size=(128, 128))
     assert_image_equal(im, test_card)
 
 
-def test_tiled_offset_rt():
+def test_tiled_offset_rt() -> None:
     im = roundtrip(test_card, tile_size=(128, 128), tile_offset=(0, 0), offset=(32, 32))
     assert_image_equal(im, test_card)
 
 
-def test_tiled_offset_too_small():
+def test_tiled_offset_too_small() -> None:
     with pytest.raises(ValueError):
         roundtrip(test_card, tile_size=(128, 128), tile_offset=(0, 0), offset=(128, 32))
 
 
-def test_irreversible_rt():
+def test_irreversible_rt() -> None:
     im = roundtrip(test_card, irreversible=True, quality_layers=[20])
     assert_image_similar(im, test_card, 2.0)
 
 
-def test_prog_qual_rt():
+def test_prog_qual_rt() -> None:
     im = roundtrip(test_card, quality_layers=[60, 40, 20], progression="LRCP")
     assert_image_similar(im, test_card, 2.0)
 
 
-def test_prog_res_rt():
+def test_prog_res_rt() -> None:
     im = roundtrip(test_card, num_resolutions=8, progression="RLCP")
     assert_image_equal(im, test_card)
 
 
 @pytest.mark.parametrize("num_resolutions", range(2, 6))
-def test_default_num_resolutions(num_resolutions):
+def test_default_num_resolutions(num_resolutions: int) -> None:
     d = 1 << (num_resolutions - 1)
     im = test_card.resize((d - 1, d - 1))
     with pytest.raises(OSError):
@@ -145,7 +150,7 @@ def test_default_num_resolutions(num_resolutions):
     assert_image_equal(im, reloaded)
 
 
-def test_reduce():
+def test_reduce() -> None:
     with Image.open("Tests/images/test-card-lossless.jp2") as im:
         assert callable(im.reduce)
 
@@ -159,7 +164,7 @@ def test_reduce():
         assert im.size == (40, 30)
 
 
-def test_load_dpi():
+def test_load_dpi() -> None:
     with Image.open("Tests/images/test-card-lossless.jp2") as im:
         assert im.info["dpi"] == (71.9836, 71.9836)
 
@@ -167,7 +172,7 @@ def test_load_dpi():
         assert "dpi" not in im.info
 
 
-def test_restricted_icc_profile():
+def test_restricted_icc_profile() -> None:
     ImageFile.LOAD_TRUNCATED_IMAGES = True
     try:
         # JPEG2000 image with a restricted ICC profile and a known colorspace
@@ -177,7 +182,16 @@ def test_restricted_icc_profile():
         ImageFile.LOAD_TRUNCATED_IMAGES = False
 
 
-def test_header_errors():
+@pytest.mark.skipif(
+    not os.path.exists(EXTRA_DIR), reason="Extra image files not installed"
+)
+def test_unknown_colorspace() -> None:
+    with Image.open(f"{EXTRA_DIR}/file8.jp2") as im:
+        im.load()
+        assert im.mode == "L"
+
+
+def test_header_errors() -> None:
     for path in (
         "Tests/images/invalid_header_length.jp2",
         "Tests/images/not_enough_data.jp2",
@@ -191,17 +205,17 @@ def test_header_errors():
             pass
 
 
-def test_layers_type(tmp_path):
+def test_layers_type(tmp_path: Path) -> None:
     outfile = str(tmp_path / "temp_layers.jp2")
     for quality_layers in [[100, 50, 10], (100, 50, 10), None]:
         test_card.save(outfile, quality_layers=quality_layers)
 
-    for quality_layers in ["quality_layers", ("100", "50", "10")]:
+    for quality_layers_str in ["quality_layers", ("100", "50", "10")]:
         with pytest.raises(ValueError):
-            test_card.save(outfile, quality_layers=quality_layers)
+            test_card.save(outfile, quality_layers=quality_layers_str)
 
 
-def test_layers():
+def test_layers() -> None:
     out = BytesIO()
     test_card.save(out, "JPEG2000", quality_layers=[100, 50, 10], progression="LRCP")
     out.seek(0)
@@ -228,10 +242,10 @@ def test_layers():
         ("foo.jp2", {"no_jp2": True}, 0, b"\xff\x4f"),
         ("foo.j2k", {"no_jp2": False}, 0, b"\xff\x4f"),
         ("foo.jp2", {"no_jp2": False}, 4, b"jP"),
-        ("foo.jp2", {"no_jp2": False}, 4, b"jP"),
+        (None, {"no_jp2": False}, 4, b"jP"),
     ),
 )
-def test_no_jp2(name, args, offset, data):
+def test_no_jp2(name: str, args: dict[str, bool], offset: int, data: bytes) -> None:
     out = BytesIO()
     if name:
         out.name = name
@@ -240,7 +254,7 @@ def test_no_jp2(name, args, offset, data):
     assert out.read(2) == data
 
 
-def test_mct():
+def test_mct() -> None:
     # Three component
     for val in (0, 1):
         out = BytesIO()
@@ -261,7 +275,7 @@ def test_mct():
             assert_image_similar(im, jp2, 1.0e-3)
 
 
-def test_sgnd(tmp_path):
+def test_sgnd(tmp_path: Path) -> None:
     outfile = str(tmp_path / "temp.jp2")
 
     im = Image.new("L", (1, 1))
@@ -276,7 +290,7 @@ def test_sgnd(tmp_path):
 
 
 @pytest.mark.parametrize("ext", (".j2k", ".jp2"))
-def test_rgba(ext):
+def test_rgba(ext: str) -> None:
     # Arrange
     with Image.open("Tests/images/rgb_trns_ycbc" + ext) as im:
         # Act
@@ -286,48 +300,64 @@ def test_rgba(ext):
         assert im.mode == "RGBA"
 
 
+@pytest.mark.skipif(
+    not os.path.exists(EXTRA_DIR), reason="Extra image files not installed"
+)
+@skip_unless_feature_version("jpg_2000", "2.5.1")
+def test_cmyk() -> None:
+    with Image.open(f"{EXTRA_DIR}/issue205.jp2") as im:
+        assert im.mode == "CMYK"
+        assert im.getpixel((0, 0)) == (185, 134, 0, 0)
+
+
 @pytest.mark.parametrize("ext", (".j2k", ".jp2"))
-def test_16bit_monochrome_has_correct_mode(ext):
+def test_16bit_monochrome_has_correct_mode(ext: str) -> None:
     with Image.open("Tests/images/16bit.cropped" + ext) as im:
         im.load()
         assert im.mode == "I;16"
 
 
-def test_16bit_monochrome_jp2_like_tiff():
+def test_16bit_monochrome_jp2_like_tiff() -> None:
     with Image.open("Tests/images/16bit.cropped.tif") as tiff_16bit:
         assert_image_similar_tofile(tiff_16bit, "Tests/images/16bit.cropped.jp2", 1e-3)
 
 
-def test_16bit_monochrome_j2k_like_tiff():
+def test_16bit_monochrome_j2k_like_tiff() -> None:
     with Image.open("Tests/images/16bit.cropped.tif") as tiff_16bit:
         assert_image_similar_tofile(tiff_16bit, "Tests/images/16bit.cropped.j2k", 1e-3)
 
 
-def test_16bit_j2k_roundtrips():
+def test_16bit_j2k_roundtrips() -> None:
     with Image.open("Tests/images/16bit.cropped.j2k") as j2k:
         im = roundtrip(j2k)
         assert_image_equal(im, j2k)
 
 
-def test_16bit_jp2_roundtrips():
+def test_16bit_jp2_roundtrips() -> None:
     with Image.open("Tests/images/16bit.cropped.jp2") as jp2:
         im = roundtrip(jp2)
         assert_image_equal(im, jp2)
 
 
-def test_issue_6194():
+def test_issue_6194() -> None:
     with Image.open("Tests/images/issue_6194.j2k") as im:
         assert im.getpixel((5, 5)) == 31
 
 
-def test_unbound_local():
+def test_unknown_j2k_mode() -> None:
+    with pytest.raises(UnidentifiedImageError):
+        with Image.open("Tests/images/unknown_mode.j2k"):
+            pass
+
+
+def test_unbound_local() -> None:
     # prepatch, a malformed jp2 file could cause an UnboundLocalError exception.
-    with pytest.raises(OSError):
+    with pytest.raises(UnidentifiedImageError):
         with Image.open("Tests/images/unbound_variable.jp2"):
             pass
 
 
-def test_parser_feed():
+def test_parser_feed() -> None:
     # Arrange
     with open("Tests/images/test-card-lossless.jp2", "rb") as f:
         data = f.read()
@@ -337,6 +367,7 @@ def test_parser_feed():
     p.feed(data)
 
     # Assert
+    assert p.image is not None
     assert p.image.size == (640, 480)
 
 
@@ -344,12 +375,12 @@ def test_parser_feed():
     not os.path.exists(EXTRA_DIR), reason="Extra image files not installed"
 )
 @pytest.mark.parametrize("name", ("subsampling_1", "subsampling_2", "zoo1", "zoo2"))
-def test_subsampling_decode(name):
+def test_subsampling_decode(name: str) -> None:
     test = f"{EXTRA_DIR}/{name}.jp2"
     reference = f"{EXTRA_DIR}/{name}.ppm"
 
     with Image.open(test) as im:
-        epsilon = 3  # for YCbCr images
+        epsilon = 3.0  # for YCbCr images
         with Image.open(reference) as im2:
             width, height = im2.size
             if name[-1] == "2":
@@ -360,7 +391,24 @@ def test_subsampling_decode(name):
         assert_image_similar(im, expected, epsilon)
 
 
-def test_comment():
+@pytest.mark.skipif(
+    not os.path.exists(EXTRA_DIR), reason="Extra image files not installed"
+)
+def test_pclr() -> None:
+    with Image.open(f"{EXTRA_DIR}/issue104_jpxstream.jp2") as im:
+        assert im.mode == "P"
+        assert len(im.palette.colors) == 256
+        assert im.palette.colors[(255, 255, 255)] == 0
+
+    with Image.open(
+        f"{EXTRA_DIR}/147af3f1083de4393666b7d99b01b58b_signal_sigsegv_130c531_6155_5136.jp2"
+    ) as im:
+        assert im.mode == "P"
+        assert len(im.palette.colors) == 139
+        assert im.palette.colors[(0, 0, 0, 0)] == 0
+
+
+def test_comment() -> None:
     with Image.open("Tests/images/comment.jp2") as im:
         assert im.info["comment"] == b"Created by OpenJPEG version 2.5.0"
 
@@ -371,7 +419,7 @@ def test_comment():
             pass
 
 
-def test_save_comment():
+def test_save_comment() -> None:
     for comment in ("Created by Pillow", b"Created by Pillow"):
         out = BytesIO()
         test_card.save(out, "JPEG2000", comment=comment)
@@ -398,7 +446,7 @@ def test_save_comment():
         "Tests/images/crash-d2c93af851d3ab9a19e34503626368b2ecde9c03.j2k",
     ],
 )
-def test_crashes(test_file):
+def test_crashes(test_file: str) -> None:
     with open(test_file, "rb") as f:
         with Image.open(f) as im:
             # Valgrind should not complain here
@@ -409,7 +457,7 @@ def test_crashes(test_file):
 
 
 @skip_unless_feature_version("jpg_2000", "2.4.0")
-def test_plt_marker():
+def test_plt_marker() -> None:
     # Search the start of the codesteam for PLT
     out = BytesIO()
     test_card.save(out, "JPEG2000", no_jp2=True, plt=True)
@@ -432,3 +480,9 @@ def test_plt_marker():
         hdr = out.read(2)
         length = _binary.i16be(hdr)
         out.seek(length - 2, os.SEEK_CUR)
+
+
+def test_9bit() -> None:
+    with Image.open("Tests/images/9bit.j2k") as im:
+        assert im.mode == "I;16"
+        assert im.size == (128, 128)
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
index 65adf449dcc..62f8719af53 100644
--- a/Tests/test_file_libtiff.py
+++ b/Tests/test_file_libtiff.py
@@ -1,16 +1,18 @@
 from __future__ import annotations
+
 import base64
 import io
 import itertools
 import os
 import re
 import sys
-from collections import namedtuple
+from pathlib import Path
+from typing import Any, NamedTuple
 
 import pytest
 
 from PIL import Image, ImageFilter, ImageOps, TiffImagePlugin, TiffTags, features
-from PIL.TiffImagePlugin import SAMPLEFORMAT, STRIPOFFSETS, SUBIFD
+from PIL.TiffImagePlugin import OSUBFILETYPE, SAMPLEFORMAT, STRIPOFFSETS, SUBIFD
 
 from .helper import (
     assert_image_equal,
@@ -25,7 +27,7 @@
 
 @skip_unless_feature("libtiff")
 class LibTiffTestCase:
-    def _assert_noerr(self, tmp_path, im):
+    def _assert_noerr(self, tmp_path: Path, im: TiffImagePlugin.TiffImageFile) -> None:
         """Helper tests that assert basic sanity about the g4 tiff reading"""
         # 1 bit
         assert im.mode == "1"
@@ -49,10 +51,12 @@ def _assert_noerr(self, tmp_path, im):
 
 
 class TestFileLibTiff(LibTiffTestCase):
-    def test_version(self):
-        assert re.search(r"\d+\.\d+\.\d+$", features.version_codec("libtiff"))
+    def test_version(self) -> None:
+        version = features.version_codec("libtiff")
+        assert version is not None
+        assert re.search(r"\d+\.\d+\.\d+t?$", version)
 
-    def test_g4_tiff(self, tmp_path):
+    def test_g4_tiff(self, tmp_path: Path) -> None:
         """Test the ordinary file path load path"""
 
         test_file = "Tests/images/hopper_g4_500.tif"
@@ -60,12 +64,12 @@ def test_g4_tiff(self, tmp_path):
             assert im.size == (500, 500)
             self._assert_noerr(tmp_path, im)
 
-    def test_g4_large(self, tmp_path):
+    def test_g4_large(self, tmp_path: Path) -> None:
         test_file = "Tests/images/pport_g4.tif"
         with Image.open(test_file) as im:
             self._assert_noerr(tmp_path, im)
 
-    def test_g4_tiff_file(self, tmp_path):
+    def test_g4_tiff_file(self, tmp_path: Path) -> None:
         """Testing the string load path"""
 
         test_file = "Tests/images/hopper_g4_500.tif"
@@ -74,7 +78,7 @@ def test_g4_tiff_file(self, tmp_path):
                 assert im.size == (500, 500)
                 self._assert_noerr(tmp_path, im)
 
-    def test_g4_tiff_bytesio(self, tmp_path):
+    def test_g4_tiff_bytesio(self, tmp_path: Path) -> None:
         """Testing the stringio loading code path"""
         test_file = "Tests/images/hopper_g4_500.tif"
         s = io.BytesIO()
@@ -85,30 +89,41 @@ def test_g4_tiff_bytesio(self, tmp_path):
             assert im.size == (500, 500)
             self._assert_noerr(tmp_path, im)
 
-    def test_g4_non_disk_file_object(self, tmp_path):
+    def test_g4_non_disk_file_object(self, tmp_path: Path) -> None:
         """Testing loading from non-disk non-BytesIO file object"""
         test_file = "Tests/images/hopper_g4_500.tif"
-        s = io.BytesIO()
         with open(test_file, "rb") as f:
-            s.write(f.read())
-            s.seek(0)
-        r = io.BufferedReader(s)
+            data = f.read()
+
+        class NonBytesIO(io.RawIOBase):
+            def read(self, size: int = -1) -> bytes:
+                nonlocal data
+                if size == -1:
+                    size = len(data)
+                result = data[:size]
+                data = data[size:]
+                return result
+
+            def readable(self) -> bool:
+                return True
+
+        r = io.BufferedReader(NonBytesIO())
         with Image.open(r) as im:
             assert im.size == (500, 500)
             self._assert_noerr(tmp_path, im)
 
-    def test_g4_eq_png(self):
+    def test_g4_eq_png(self) -> None:
         """Checking that we're actually getting the data that we expect"""
         with Image.open("Tests/images/hopper_bw_500.png") as png:
             assert_image_equal_tofile(png, "Tests/images/hopper_g4_500.tif")
 
     # see https://github.com/python-pillow/Pillow/issues/279
-    def test_g4_fillorder_eq_png(self):
+    def test_g4_fillorder_eq_png(self) -> None:
         """Checking that we're actually getting the data that we expect"""
         with Image.open("Tests/images/g4-fillorder-test.tif") as g4:
             assert_image_equal_tofile(g4, "Tests/images/g4-fillorder-test.png")
 
-    def test_g4_write(self, tmp_path):
+    def test_g4_write(self, tmp_path: Path) -> None:
         """Checking to see that the saved image is the same as what we wrote"""
         test_file = "Tests/images/hopper_g4_500.tif"
         with Image.open(test_file) as orig:
@@ -127,7 +142,7 @@ def test_g4_write(self, tmp_path):
 
                 assert orig.tobytes() != reread.tobytes()
 
-    def test_adobe_deflate_tiff(self):
+    def test_adobe_deflate_tiff(self) -> None:
         test_file = "Tests/images/tiff_adobe_deflate.tif"
         with Image.open(test_file) as im:
             assert im.mode == "RGB"
@@ -138,7 +153,7 @@ def test_adobe_deflate_tiff(self):
             assert_image_equal_tofile(im, "Tests/images/tiff_adobe_deflate.png")
 
     @pytest.mark.parametrize("legacy_api", (False, True))
-    def test_write_metadata(self, legacy_api, tmp_path):
+    def test_write_metadata(self, legacy_api: bool, tmp_path: Path) -> None:
         """Test metadata writing through libtiff"""
         f = str(tmp_path / "temp.tiff")
         with Image.open("Tests/images/hopper_g4.tif") as img:
@@ -183,7 +198,9 @@ def test_write_metadata(self, legacy_api, tmp_path):
             assert field in reloaded, f"{field} not in metadata"
 
     @pytest.mark.valgrind_known_error(reason="Known invalid metadata")
-    def test_additional_metadata(self, tmp_path):
+    def test_additional_metadata(
+        self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+    ) -> None:
         # these should not crash. Seriously dummy data, most of it doesn't make
         # any sense, so we're running up against limits where we're asking
         # libtiff to do stupid things.
@@ -223,9 +240,10 @@ def test_additional_metadata(self, tmp_path):
 
             new_ifd = TiffImagePlugin.ImageFileDirectory_v2()
             for tag, info in core_items.items():
+                assert info.type is not None
                 if info.length == 1:
                     new_ifd[tag] = values[info.type]
-                if info.length == 0:
+                elif not info.length:
                     new_ifd[tag] = tuple(values[info.type] for _ in range(3))
                 else:
                     new_ifd[tag] = tuple(values[info.type] for _ in range(info.length))
@@ -234,94 +252,111 @@ def test_additional_metadata(self, tmp_path):
             del new_ifd[338]
 
             out = str(tmp_path / "temp.tif")
-            TiffImagePlugin.WRITE_LIBTIFF = True
+            monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
 
             im.save(out, tiffinfo=new_ifd)
 
-        TiffImagePlugin.WRITE_LIBTIFF = False
+    @pytest.mark.parametrize(
+        "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(
+        self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool
+    ) -> None:
+        monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", libtiff)
+
+        class Tc(NamedTuple):
+            value: Any
+            type: int
+            supported_by_default: bool
 
-    def test_custom_metadata(self, tmp_path):
-        tc = namedtuple("test_case", "value,type,supported_by_default")
         custom = {
             37000 + k: v
             for k, v in enumerate(
                 [
-                    tc(4, TiffTags.SHORT, True),
-                    tc(123456789, TiffTags.LONG, True),
-                    tc(-4, TiffTags.SIGNED_BYTE, False),
-                    tc(-4, TiffTags.SIGNED_SHORT, False),
-                    tc(-123456789, TiffTags.SIGNED_LONG, False),
-                    tc(TiffImagePlugin.IFDRational(4, 7), TiffTags.RATIONAL, True),
-                    tc(4.25, TiffTags.FLOAT, True),
-                    tc(4.25, TiffTags.DOUBLE, True),
-                    tc("custom tag value", TiffTags.ASCII, True),
-                    tc(b"custom tag value", TiffTags.BYTE, True),
-                    tc((4, 5, 6), TiffTags.SHORT, True),
-                    tc((123456789, 9, 34, 234, 219387, 92432323), TiffTags.LONG, True),
-                    tc((-4, 9, 10), TiffTags.SIGNED_BYTE, False),
-                    tc((-4, 5, 6), TiffTags.SIGNED_SHORT, False),
-                    tc(
+                    Tc(4, TiffTags.SHORT, True),
+                    Tc(123456789, TiffTags.LONG, True),
+                    Tc(-4, TiffTags.SIGNED_BYTE, False),
+                    Tc(-4, TiffTags.SIGNED_SHORT, False),
+                    Tc(-123456789, TiffTags.SIGNED_LONG, False),
+                    Tc(TiffImagePlugin.IFDRational(4, 7), TiffTags.RATIONAL, True),
+                    Tc(4.25, TiffTags.FLOAT, True),
+                    Tc(4.25, TiffTags.DOUBLE, True),
+                    Tc("custom tag value", TiffTags.ASCII, True),
+                    Tc(b"custom tag value", TiffTags.BYTE, True),
+                    Tc((4, 5, 6), TiffTags.SHORT, True),
+                    Tc((123456789, 9, 34, 234, 219387, 92432323), TiffTags.LONG, True),
+                    Tc((-4, 9, 10), TiffTags.SIGNED_BYTE, False),
+                    Tc((-4, 5, 6), TiffTags.SIGNED_SHORT, False),
+                    Tc(
                         (-123456789, 9, 34, 234, 219387, -92432323),
                         TiffTags.SIGNED_LONG,
                         False,
                     ),
-                    tc((4.25, 5.25), TiffTags.FLOAT, True),
-                    tc((4.25, 5.25), TiffTags.DOUBLE, True),
+                    Tc((4.25, 5.25), TiffTags.FLOAT, True),
+                    Tc((4.25, 5.25), TiffTags.DOUBLE, True),
                     # array of TIFF_BYTE requires bytes instead of tuple for backwards
                     # compatibility
-                    tc(bytes([4]), TiffTags.BYTE, True),
-                    tc(bytes((4, 9, 10)), TiffTags.BYTE, True),
+                    Tc(bytes([4]), TiffTags.BYTE, True),
+                    Tc(bytes((4, 9, 10)), TiffTags.BYTE, True),
                 ]
             )
         }
 
-        libtiffs = [False]
-        if Image.core.libtiff_support_custom_tags:
-            libtiffs.append(True)
-
-        for libtiff in libtiffs:
-            TiffImagePlugin.WRITE_LIBTIFF = libtiff
-
-            def check_tags(tiffinfo):
-                im = hopper()
-
-                out = str(tmp_path / "temp.tif")
-                im.save(out, tiffinfo=tiffinfo)
-
-                with Image.open(out) as reloaded:
-                    for tag, value in tiffinfo.items():
-                        reloaded_value = reloaded.tag_v2[tag]
-                        if (
-                            isinstance(reloaded_value, TiffImagePlugin.IFDRational)
-                            and libtiff
-                        ):
-                            # libtiff does not support real RATIONALS
-                            assert (
-                                round(abs(float(reloaded_value) - float(value)), 7) == 0
-                            )
-                            continue
-
-                        assert reloaded_value == value
-
-            # Test with types
-            ifd = TiffImagePlugin.ImageFileDirectory_v2()
-            for tag, tagdata in custom.items():
-                ifd[tag] = tagdata.value
-                ifd.tagtype[tag] = tagdata.type
-            check_tags(ifd)
-
-            # Test without types. This only works for some types, int for example are
-            # always encoded as LONG and not SIGNED_LONG.
-            check_tags(
-                {
-                    tag: tagdata.value
-                    for tag, tagdata in custom.items()
-                    if tagdata.supported_by_default
-                }
-            )
-        TiffImagePlugin.WRITE_LIBTIFF = False
+        def check_tags(
+            tiffinfo: TiffImagePlugin.ImageFileDirectory_v2 | dict[int, str]
+        ) -> None:
+            im = hopper()
+
+            out = str(tmp_path / "temp.tif")
+            im.save(out, tiffinfo=tiffinfo)
+
+            with Image.open(out) as reloaded:
+                for tag, value in tiffinfo.items():
+                    reloaded_value = reloaded.tag_v2[tag]
+                    if (
+                        isinstance(reloaded_value, TiffImagePlugin.IFDRational)
+                        and libtiff
+                    ):
+                        # libtiff does not support real RATIONALS
+                        assert round(abs(float(reloaded_value) - float(value)), 7) == 0
+                        continue
+
+                    assert reloaded_value == value
+
+        # Test with types
+        ifd = TiffImagePlugin.ImageFileDirectory_v2()
+        for tag, tagdata in custom.items():
+            ifd[tag] = tagdata.value
+            ifd.tagtype[tag] = tagdata.type
+        check_tags(ifd)
+
+        # Test without types. This only works for some types, int for example are
+        # always encoded as LONG and not SIGNED_LONG.
+        check_tags(
+            {
+                tag: tagdata.value
+                for tag, tagdata in custom.items()
+                if tagdata.supported_by_default
+            }
+        )
+
+    def test_osubfiletype(self, tmp_path: Path) -> None:
+        outfile = str(tmp_path / "temp.tif")
+        with Image.open("Tests/images/g4_orientation_6.tif") as im:
+            im.tag_v2[OSUBFILETYPE] = 1
+            im.save(outfile)
 
-    def test_subifd(self, tmp_path):
+    def test_subifd(self, tmp_path: Path) -> None:
         outfile = str(tmp_path / "temp.tif")
         with Image.open("Tests/images/g4_orientation_6.tif") as im:
             im.tag_v2[SUBIFD] = 10000
@@ -329,28 +364,28 @@ def test_subifd(self, tmp_path):
             # Should not segfault
             im.save(outfile)
 
-    def test_xmlpacket_tag(self, tmp_path):
-        TiffImagePlugin.WRITE_LIBTIFF = True
+    def test_xmlpacket_tag(
+        self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+    ) -> None:
+        monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
 
         out = str(tmp_path / "temp.tif")
         hopper().save(out, tiffinfo={700: b"xmlpacket tag"})
-        TiffImagePlugin.WRITE_LIBTIFF = False
 
         with Image.open(out) as reloaded:
             if 700 in reloaded.tag_v2:
                 assert reloaded.tag_v2[700] == b"xmlpacket tag"
 
-    def test_int_dpi(self, tmp_path):
+    def test_int_dpi(self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
         # issue #1765
         im = hopper("RGB")
         out = str(tmp_path / "temp.tif")
-        TiffImagePlugin.WRITE_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
         im.save(out, dpi=(72, 72))
-        TiffImagePlugin.WRITE_LIBTIFF = False
         with Image.open(out) as reloaded:
             assert reloaded.info["dpi"] == (72.0, 72.0)
 
-    def test_g3_compression(self, tmp_path):
+    def test_g3_compression(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/hopper_g4_500.tif") as i:
             out = str(tmp_path / "temp.tif")
             i.save(out, compression="group3")
@@ -359,7 +394,7 @@ def test_g3_compression(self, tmp_path):
                 assert reread.info["compression"] == "group3"
                 assert_image_equal(reread, i)
 
-    def test_little_endian(self, tmp_path):
+    def test_little_endian(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/16bit.deflate.tif") as im:
             assert im.getpixel((0, 0)) == 480
             assert im.mode == "I;16"
@@ -378,7 +413,7 @@ def test_little_endian(self, tmp_path):
         # UNDONE - libtiff defaults to writing in native endian, so
         # on big endian, we'll get back mode = 'I;16B' here.
 
-    def test_big_endian(self, tmp_path):
+    def test_big_endian(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/16bit.MM.deflate.tif") as im:
             assert im.getpixel((0, 0)) == 480
             assert im.mode == "I;16B"
@@ -395,7 +430,7 @@ def test_big_endian(self, tmp_path):
                 assert reread.info["compression"] == im.info["compression"]
                 assert reread.getpixel((0, 0)) == 480
 
-    def test_g4_string_info(self, tmp_path):
+    def test_g4_string_info(self, tmp_path: Path) -> None:
         """Tests String data in info directory"""
         test_file = "Tests/images/hopper_g4_500.tif"
         with Image.open(test_file) as orig:
@@ -408,13 +443,13 @@ def test_g4_string_info(self, tmp_path):
             assert "temp.tif" == reread.tag_v2[269]
             assert "temp.tif" == reread.tag[269][0]
 
-    def test_12bit_rawmode(self):
+    def test_12bit_rawmode(self, monkeypatch: pytest.MonkeyPatch) -> None:
         """Are we generating the same interpretation
         of the image as Imagemagick is?"""
-        TiffImagePlugin.READ_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
         with Image.open("Tests/images/12bit.cropped.tif") as im:
             im.load()
-            TiffImagePlugin.READ_LIBTIFF = False
+            monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", False)
             # to make the target --
             # convert 12bit.cropped.tif -depth 16 tmp.tif
             # convert tmp.tif -evaluate RightShift 4 12in16bit2.tif
@@ -423,7 +458,7 @@ def test_12bit_rawmode(self):
 
             assert_image_equal_tofile(im, "Tests/images/12in16bit.tif")
 
-    def test_blur(self, tmp_path):
+    def test_blur(self, tmp_path: Path) -> None:
         # test case from irc, how to do blur on b/w image
         # and save to compressed tif.
         out = str(tmp_path / "temp.tif")
@@ -435,7 +470,7 @@ def test_blur(self, tmp_path):
 
         assert_image_equal_tofile(im, out)
 
-    def test_compressions(self, tmp_path):
+    def test_compressions(self, tmp_path: Path) -> None:
         # Test various tiff compressions and assert similar image content but reduced
         # file sizes.
         im = hopper("RGB")
@@ -461,7 +496,7 @@ def test_compressions(self, tmp_path):
         assert size_compressed > size_jpeg
         assert size_jpeg > size_jpeg_30
 
-    def test_tiff_jpeg_compression(self, tmp_path):
+    def test_tiff_jpeg_compression(self, tmp_path: Path) -> None:
         im = hopper("RGB")
         out = str(tmp_path / "temp.tif")
         im.save(out, compression="tiff_jpeg")
@@ -469,7 +504,7 @@ def test_tiff_jpeg_compression(self, tmp_path):
         with Image.open(out) as reloaded:
             assert reloaded.info["compression"] == "jpeg"
 
-    def test_tiff_deflate_compression(self, tmp_path):
+    def test_tiff_deflate_compression(self, tmp_path: Path) -> None:
         im = hopper("RGB")
         out = str(tmp_path / "temp.tif")
         im.save(out, compression="tiff_deflate")
@@ -477,7 +512,7 @@ def test_tiff_deflate_compression(self, tmp_path):
         with Image.open(out) as reloaded:
             assert reloaded.info["compression"] == "tiff_adobe_deflate"
 
-    def test_quality(self, tmp_path):
+    def test_quality(self, tmp_path: Path) -> None:
         im = hopper("RGB")
         out = str(tmp_path / "temp.tif")
 
@@ -492,7 +527,7 @@ def test_quality(self, tmp_path):
         im.save(out, compression="jpeg", quality=0)
         im.save(out, compression="jpeg", quality=100)
 
-    def test_cmyk_save(self, tmp_path):
+    def test_cmyk_save(self, tmp_path: Path) -> None:
         im = hopper("CMYK")
         out = str(tmp_path / "temp.tif")
 
@@ -500,27 +535,29 @@ def test_cmyk_save(self, tmp_path):
         assert_image_equal_tofile(im, out)
 
     @pytest.mark.parametrize("im", (hopper("P"), Image.new("P", (1, 1), "#000")))
-    def test_palette_save(self, im, tmp_path):
+    def test_palette_save(
+        self, im: Image.Image, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+    ) -> None:
         out = str(tmp_path / "temp.tif")
 
-        TiffImagePlugin.WRITE_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
         im.save(out)
-        TiffImagePlugin.WRITE_LIBTIFF = False
 
         with Image.open(out) as reloaded:
             # colormap/palette tag
             assert len(reloaded.tag_v2[320]) == 768
 
     @pytest.mark.parametrize("compression", ("tiff_ccitt", "group3", "group4"))
-    def test_bw_compression_w_rgb(self, compression, tmp_path):
+    def test_bw_compression_w_rgb(self, compression: str, tmp_path: Path) -> None:
         im = hopper("RGB")
         out = str(tmp_path / "temp.tif")
 
         with pytest.raises(OSError):
             im.save(out, compression=compression)
 
-    def test_fp_leak(self):
-        im = Image.open("Tests/images/hopper_g4_500.tif")
+    def test_fp_leak(self) -> None:
+        im: Image.Image | None = Image.open("Tests/images/hopper_g4_500.tif")
+        assert im is not None
         fn = im.fp.fileno()
 
         os.fstat(fn)
@@ -533,9 +570,9 @@ def test_fp_leak(self):
         with pytest.raises(OSError):
             os.close(fn)
 
-    def test_multipage(self):
+    def test_multipage(self, monkeypatch: pytest.MonkeyPatch) -> None:
         # issue #862
-        TiffImagePlugin.READ_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
         with Image.open("Tests/images/multipage.tiff") as im:
             # file is a multipage tiff,  10x10 green, 10x10 red, 20x20 blue
 
@@ -554,11 +591,9 @@ def test_multipage(self):
             assert im.size == (20, 20)
             assert im.convert("RGB").getpixel((0, 0)) == (0, 0, 255)
 
-        TiffImagePlugin.READ_LIBTIFF = False
-
-    def test_multipage_nframes(self):
+    def test_multipage_nframes(self, monkeypatch: pytest.MonkeyPatch) -> None:
         # issue #862
-        TiffImagePlugin.READ_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
         with Image.open("Tests/images/multipage.tiff") as im:
             frames = im.n_frames
             assert frames == 3
@@ -567,10 +602,8 @@ def test_multipage_nframes(self):
                 # Should not raise ValueError: I/O operation on closed file
                 im.load()
 
-        TiffImagePlugin.READ_LIBTIFF = False
-
-    def test_multipage_seek_backwards(self):
-        TiffImagePlugin.READ_LIBTIFF = True
+    def test_multipage_seek_backwards(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
         with Image.open("Tests/images/multipage.tiff") as im:
             im.seek(1)
             im.load()
@@ -578,31 +611,28 @@ def test_multipage_seek_backwards(self):
             im.seek(0)
             assert im.convert("RGB").getpixel((0, 0)) == (0, 128, 0)
 
-        TiffImagePlugin.READ_LIBTIFF = False
-
-    def test__next(self):
-        TiffImagePlugin.READ_LIBTIFF = True
+    def test__next(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
         with Image.open("Tests/images/hopper.tif") as im:
             assert not im.tag.next
             im.load()
             assert not im.tag.next
 
-    def test_4bit(self):
+    def test_4bit(self, monkeypatch: pytest.MonkeyPatch) -> None:
         # Arrange
         test_file = "Tests/images/hopper_gray_4bpp.tif"
         original = hopper("L")
 
         # Act
-        TiffImagePlugin.READ_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
         with Image.open(test_file) as im:
-            TiffImagePlugin.READ_LIBTIFF = False
 
             # Assert
             assert im.size == (128, 128)
             assert im.mode == "L"
             assert_image_similar(im, original, 7.3)
 
-    def test_gray_semibyte_per_pixel(self):
+    def test_gray_semibyte_per_pixel(self) -> None:
         test_files = (
             (
                 24.8,  # epsilon
@@ -635,32 +665,30 @@ def test_gray_semibyte_per_pixel(self):
                     assert im2.mode == "L"
                     assert_image_equal(im, im2)
 
-    def test_save_bytesio(self):
+    def test_save_bytesio(self, monkeypatch: pytest.MonkeyPatch) -> None:
         # PR 1011
         # Test TIFF saving to io.BytesIO() object.
 
-        TiffImagePlugin.WRITE_LIBTIFF = True
-        TiffImagePlugin.READ_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
 
         # Generate test image
         pilim = hopper()
 
-        def save_bytesio(compression=None):
+        def save_bytesio(compression: str | None = None) -> None:
             buffer_io = io.BytesIO()
             pilim.save(buffer_io, format="tiff", compression=compression)
             buffer_io.seek(0)
 
-            assert_image_similar_tofile(pilim, buffer_io, 0)
+            with Image.open(buffer_io) as saved_im:
+                assert_image_similar(pilim, saved_im, 0)
 
         save_bytesio()
         save_bytesio("raw")
         save_bytesio("packbits")
         save_bytesio("tiff_lzw")
 
-        TiffImagePlugin.WRITE_LIBTIFF = False
-        TiffImagePlugin.READ_LIBTIFF = False
-
-    def test_save_ycbcr(self, tmp_path):
+    def test_save_ycbcr(self, tmp_path: Path) -> None:
         im = hopper("YCbCr")
         outfile = str(tmp_path / "temp.tif")
         im.save(outfile, compression="jpeg")
@@ -669,27 +697,33 @@ def test_save_ycbcr(self, tmp_path):
             assert reloaded.tag_v2[530] == (1, 1)
             assert reloaded.tag_v2[532] == (0, 255, 128, 255, 128, 255)
 
-    def test_exif_ifd(self, tmp_path):
-        outfile = str(tmp_path / "temp.tif")
+    def test_exif_ifd(self) -> None:
+        out = io.BytesIO()
         with Image.open("Tests/images/tiff_adobe_deflate.tif") as im:
             assert im.tag_v2[34665] == 125456
-            im.save(outfile)
+            im.save(out, "TIFF")
 
-        with Image.open(outfile) as reloaded:
+            with Image.open(out) as reloaded:
+                assert 34665 not in reloaded.tag_v2
+
+            im.save(out, "TIFF", tiffinfo={34665: 125456})
+
+        with Image.open(out) as reloaded:
             if Image.core.libtiff_support_custom_tags:
                 assert reloaded.tag_v2[34665] == 125456
 
-    def test_crashing_metadata(self, tmp_path):
+    def test_crashing_metadata(
+        self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+    ) -> None:
         # issue 1597
         with Image.open("Tests/images/rdf.tif") as im:
             out = str(tmp_path / "temp.tif")
 
-            TiffImagePlugin.WRITE_LIBTIFF = True
+            monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
             # this shouldn't crash
             im.save(out, format="TIFF")
-        TiffImagePlugin.WRITE_LIBTIFF = False
 
-    def test_page_number_x_0(self, tmp_path):
+    def test_page_number_x_0(self, tmp_path: Path) -> None:
         # Issue 973
         # Test TIFF with tag 297 (Page Number) having value of 0 0.
         # The first number is the current page number.
@@ -703,7 +737,7 @@ def test_page_number_x_0(self, tmp_path):
             # Should not divide by zero
             im.save(outfile)
 
-    def test_fd_duplication(self, tmp_path):
+    def test_fd_duplication(self, tmp_path: Path) -> None:
         # https://github.com/python-pillow/Pillow/issues/1651
 
         tmpfile = str(tmp_path / "temp.tif")
@@ -712,43 +746,49 @@ def test_fd_duplication(self, tmp_path):
                 f.write(src.read())
 
         im = Image.open(tmpfile)
+        assert isinstance(im, TiffImagePlugin.TiffImageFile)
         im.n_frames
         im.close()
         # Should not raise PermissionError.
         os.remove(tmpfile)
 
-    def test_read_icc(self):
+    def test_read_icc(self, monkeypatch: pytest.MonkeyPatch) -> None:
         with Image.open("Tests/images/hopper.iccprofile.tif") as img:
             icc = img.info.get("icc_profile")
             assert icc is not None
-        TiffImagePlugin.READ_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
         with Image.open("Tests/images/hopper.iccprofile.tif") as img:
             icc_libtiff = img.info.get("icc_profile")
             assert icc_libtiff is not None
-        TiffImagePlugin.READ_LIBTIFF = False
         assert icc == icc_libtiff
 
-    def test_write_icc(self, tmp_path):
-        def check_write(libtiff):
-            TiffImagePlugin.WRITE_LIBTIFF = libtiff
-
-            with Image.open("Tests/images/hopper.iccprofile.tif") as img:
-                icc_profile = img.info["icc_profile"]
-
-                out = str(tmp_path / "temp.tif")
-                img.save(out, icc_profile=icc_profile)
-            with Image.open(out) as reloaded:
-                assert icc_profile == reloaded.info["icc_profile"]
+    @pytest.mark.parametrize(
+        "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(
+        self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool
+    ) -> None:
+        monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", libtiff)
 
-        libtiffs = []
-        if Image.core.libtiff_support_custom_tags:
-            libtiffs.append(True)
-        libtiffs.append(False)
+        with Image.open("Tests/images/hopper.iccprofile.tif") as img:
+            icc_profile = img.info["icc_profile"]
 
-        for libtiff in libtiffs:
-            check_write(libtiff)
+            out = str(tmp_path / "temp.tif")
+            img.save(out, icc_profile=icc_profile)
+        with Image.open(out) as reloaded:
+            assert icc_profile == reloaded.info["icc_profile"]
 
-    def test_multipage_compression(self):
+    def test_multipage_compression(self) -> None:
         with Image.open("Tests/images/compression.tif") as im:
             im.seek(0)
             assert im._compression == "tiff_ccitt"
@@ -764,7 +804,7 @@ def test_multipage_compression(self):
             assert im.size == (10, 10)
             im.load()
 
-    def test_save_tiff_with_jpegtables(self, tmp_path):
+    def test_save_tiff_with_jpegtables(self, tmp_path: Path) -> None:
         # Arrange
         outfile = str(tmp_path / "temp.tif")
 
@@ -776,7 +816,7 @@ def test_save_tiff_with_jpegtables(self, tmp_path):
             # Should not raise UnicodeDecodeError or anything else
             im.save(outfile)
 
-    def test_16bit_RGB_tiff(self):
+    def test_16bit_RGB_tiff(self) -> None:
         with Image.open("Tests/images/tiff_16bit_RGB.tiff") as im:
             assert im.mode == "RGB"
             assert im.size == (100, 40)
@@ -792,7 +832,7 @@ def test_16bit_RGB_tiff(self):
 
             assert_image_equal_tofile(im, "Tests/images/tiff_16bit_RGB_target.png")
 
-    def test_16bit_RGBa_tiff(self):
+    def test_16bit_RGBa_tiff(self) -> None:
         with Image.open("Tests/images/tiff_16bit_RGBa.tiff") as im:
             assert im.mode == "RGBA"
             assert im.size == (100, 40)
@@ -804,7 +844,7 @@ def test_16bit_RGBa_tiff(self):
             assert_image_equal_tofile(im, "Tests/images/tiff_16bit_RGBa_target.png")
 
     @skip_unless_feature("jpg")
-    def test_gimp_tiff(self):
+    def test_gimp_tiff(self) -> None:
         # Read TIFF JPEG images from GIMP [@PIL168]
         filename = "Tests/images/pil168.tif"
         with Image.open(filename) as im:
@@ -817,25 +857,26 @@ def test_gimp_tiff(self):
 
             assert_image_equal_tofile(im, "Tests/images/pil168.png")
 
-    def test_sampleformat(self):
+    def test_sampleformat(self) -> None:
         # https://github.com/python-pillow/Pillow/issues/1466
         with Image.open("Tests/images/copyleft.tiff") as im:
             assert im.mode == "RGB"
 
             assert_image_equal_tofile(im, "Tests/images/copyleft.png", mode="RGB")
 
-    def test_sampleformat_write(self, tmp_path):
+    def test_sampleformat_write(
+        self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+    ) -> None:
         im = Image.new("F", (1, 1))
         out = str(tmp_path / "temp.tif")
-        TiffImagePlugin.WRITE_LIBTIFF = True
+        monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
         im.save(out)
-        TiffImagePlugin.WRITE_LIBTIFF = False
 
         with Image.open(out) as reloaded:
             assert reloaded.mode == "F"
             assert reloaded.getexif()[SAMPLEFORMAT] == 3
 
-    def test_lzma(self, capfd):
+    def test_lzma(self, capfd: pytest.CaptureFixture[str]) -> None:
         try:
             with Image.open("Tests/images/hopper_lzma.tif") as im:
                 assert im.mode == "RGB"
@@ -851,7 +892,7 @@ def test_lzma(self, capfd):
             sys.stderr.write(captured.err)
             raise
 
-    def test_webp(self, capfd):
+    def test_webp(self, capfd: pytest.CaptureFixture[str]) -> None:
         try:
             with Image.open("Tests/images/hopper_webp.tif") as im:
                 assert im.mode == "RGB"
@@ -873,7 +914,7 @@ def test_webp(self, capfd):
             sys.stderr.write(captured.err)
             raise
 
-    def test_lzw(self):
+    def test_lzw(self) -> None:
         with Image.open("Tests/images/hopper_lzw.tif") as im:
             assert im.mode == "RGB"
             assert im.size == (128, 128)
@@ -881,12 +922,12 @@ def test_lzw(self):
             im2 = hopper()
             assert_image_similar(im, im2, 5)
 
-    def test_strip_cmyk_jpeg(self):
+    def test_strip_cmyk_jpeg(self) -> None:
         infile = "Tests/images/tiff_strip_cmyk_jpeg.tif"
         with Image.open(infile) as im:
             assert_image_similar_tofile(im, "Tests/images/pil_sample_cmyk.jpg", 0.5)
 
-    def test_strip_cmyk_16l_jpeg(self):
+    def test_strip_cmyk_16l_jpeg(self) -> None:
         infile = "Tests/images/tiff_strip_cmyk_16l_jpeg.tif"
         with Image.open(infile) as im:
             assert_image_similar_tofile(im, "Tests/images/pil_sample_cmyk.jpg", 0.5)
@@ -894,7 +935,7 @@ def test_strip_cmyk_16l_jpeg(self):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_strip_ycbcr_jpeg_2x2_sampling(self):
+    def test_strip_ycbcr_jpeg_2x2_sampling(self) -> None:
         infile = "Tests/images/tiff_strip_ycbcr_jpeg_2x2_sampling.tif"
         with Image.open(infile) as im:
             assert_image_similar_tofile(im, "Tests/images/flower.jpg", 1.2)
@@ -902,12 +943,12 @@ def test_strip_ycbcr_jpeg_2x2_sampling(self):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_strip_ycbcr_jpeg_1x1_sampling(self):
+    def test_strip_ycbcr_jpeg_1x1_sampling(self) -> None:
         infile = "Tests/images/tiff_strip_ycbcr_jpeg_1x1_sampling.tif"
         with Image.open(infile) as im:
             assert_image_similar_tofile(im, "Tests/images/flower2.jpg", 0.01)
 
-    def test_tiled_cmyk_jpeg(self):
+    def test_tiled_cmyk_jpeg(self) -> None:
         infile = "Tests/images/tiff_tiled_cmyk_jpeg.tif"
         with Image.open(infile) as im:
             assert_image_similar_tofile(im, "Tests/images/pil_sample_cmyk.jpg", 0.5)
@@ -915,7 +956,7 @@ def test_tiled_cmyk_jpeg(self):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_tiled_ycbcr_jpeg_1x1_sampling(self):
+    def test_tiled_ycbcr_jpeg_1x1_sampling(self) -> None:
         infile = "Tests/images/tiff_tiled_ycbcr_jpeg_1x1_sampling.tif"
         with Image.open(infile) as im:
             assert_image_similar_tofile(im, "Tests/images/flower2.jpg", 0.01)
@@ -923,45 +964,45 @@ def test_tiled_ycbcr_jpeg_1x1_sampling(self):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_tiled_ycbcr_jpeg_2x2_sampling(self):
+    def test_tiled_ycbcr_jpeg_2x2_sampling(self) -> None:
         infile = "Tests/images/tiff_tiled_ycbcr_jpeg_2x2_sampling.tif"
         with Image.open(infile) as im:
             assert_image_similar_tofile(im, "Tests/images/flower.jpg", 1.5)
 
-    def test_strip_planar_rgb(self):
+    def test_strip_planar_rgb(self) -> None:
         # gdal_translate -co TILED=no -co INTERLEAVE=BAND -co COMPRESS=LZW \
         # tiff_strip_raw.tif tiff_strip_planar_lzw.tiff
         infile = "Tests/images/tiff_strip_planar_lzw.tiff"
         with Image.open(infile) as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_adobe_deflate.png")
 
-    def test_tiled_planar_rgb(self):
+    def test_tiled_planar_rgb(self) -> None:
         # gdal_translate -co TILED=yes -co INTERLEAVE=BAND -co COMPRESS=LZW \
         # tiff_tiled_raw.tif tiff_tiled_planar_lzw.tiff
         infile = "Tests/images/tiff_tiled_planar_lzw.tiff"
         with Image.open(infile) as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_adobe_deflate.png")
 
-    def test_tiled_planar_16bit_RGB(self):
+    def test_tiled_planar_16bit_RGB(self) -> None:
         # gdal_translate -co TILED=yes -co INTERLEAVE=BAND -co COMPRESS=LZW \
         # tiff_16bit_RGB.tiff tiff_tiled_planar_16bit_RGB.tiff
         with Image.open("Tests/images/tiff_tiled_planar_16bit_RGB.tiff") as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_16bit_RGB_target.png")
 
-    def test_strip_planar_16bit_RGB(self):
+    def test_strip_planar_16bit_RGB(self) -> None:
         # gdal_translate -co TILED=no -co INTERLEAVE=BAND -co COMPRESS=LZW \
         # tiff_16bit_RGB.tiff tiff_strip_planar_16bit_RGB.tiff
         with Image.open("Tests/images/tiff_strip_planar_16bit_RGB.tiff") as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_16bit_RGB_target.png")
 
-    def test_tiled_planar_16bit_RGBa(self):
+    def test_tiled_planar_16bit_RGBa(self) -> None:
         # gdal_translate -co TILED=yes \
         # -co INTERLEAVE=BAND -co COMPRESS=LZW -co ALPHA=PREMULTIPLIED \
         # tiff_16bit_RGBa.tiff tiff_tiled_planar_16bit_RGBa.tiff
         with Image.open("Tests/images/tiff_tiled_planar_16bit_RGBa.tiff") as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_16bit_RGBa_target.png")
 
-    def test_strip_planar_16bit_RGBa(self):
+    def test_strip_planar_16bit_RGBa(self) -> None:
         # gdal_translate -co TILED=no \
         # -co INTERLEAVE=BAND -co COMPRESS=LZW -co ALPHA=PREMULTIPLIED \
         # tiff_16bit_RGBa.tiff tiff_strip_planar_16bit_RGBa.tiff
@@ -969,7 +1010,7 @@ def test_strip_planar_16bit_RGBa(self):
             assert_image_equal_tofile(im, "Tests/images/tiff_16bit_RGBa_target.png")
 
     @pytest.mark.parametrize("compression", (None, "jpeg"))
-    def test_block_tile_tags(self, compression, tmp_path):
+    def test_block_tile_tags(self, compression: str | None, tmp_path: Path) -> None:
         im = hopper()
         out = str(tmp_path / "temp.tif")
 
@@ -985,11 +1026,11 @@ def test_block_tile_tags(self, compression, tmp_path):
             for tag in tags:
                 assert tag not in reloaded.getexif()
 
-    def test_old_style_jpeg(self):
+    def test_old_style_jpeg(self) -> None:
         with Image.open("Tests/images/old-style-jpeg-compression.tif") as im:
             assert_image_equal_tofile(im, "Tests/images/old-style-jpeg-compression.png")
 
-    def test_open_missing_samplesperpixel(self):
+    def test_open_missing_samplesperpixel(self) -> None:
         with Image.open(
             "Tests/images/old-style-jpeg-compression-no-samplesperpixel.tif"
         ) as im:
@@ -1018,21 +1059,27 @@ def test_open_missing_samplesperpixel(self):
             ),
         ],
     )
-    def test_wrong_bits_per_sample(self, file_name, mode, size, tile):
+    def test_wrong_bits_per_sample(
+        self,
+        file_name: str,
+        mode: str,
+        size: tuple[int, int],
+        tile: list[tuple[str, tuple[int, int, int, int], int, tuple[Any, ...]]],
+    ) -> None:
         with Image.open("Tests/images/" + file_name) as im:
             assert im.mode == mode
             assert im.size == size
             assert im.tile == tile
             im.load()
 
-    def test_no_rows_per_strip(self):
+    def test_no_rows_per_strip(self) -> None:
         # This image does not have a RowsPerStrip TIFF tag
         infile = "Tests/images/no_rows_per_strip.tif"
         with Image.open(infile) as im:
             im.load()
         assert im.size == (950, 975)
 
-    def test_orientation(self):
+    def test_orientation(self) -> None:
         with Image.open("Tests/images/g4_orientation_1.tif") as base_im:
             for i in range(2, 9):
                 with Image.open("Tests/images/g4_orientation_" + str(i) + ".tif") as im:
@@ -1043,7 +1090,7 @@ def test_orientation(self):
 
                     assert_image_similar(base_im, im, 0.7)
 
-    def test_exif_transpose(self):
+    def test_exif_transpose(self) -> None:
         with Image.open("Tests/images/g4_orientation_1.tif") as base_im:
             for i in range(2, 9):
                 with Image.open("Tests/images/g4_orientation_" + str(i) + ".tif") as im:
@@ -1052,7 +1099,7 @@ def test_exif_transpose(self):
                     assert_image_similar(base_im, im, 0.7)
 
     @pytest.mark.valgrind_known_error(reason="Backtrace in Python Core")
-    def test_sampleformat_not_corrupted(self):
+    def test_sampleformat_not_corrupted(self) -> None:
         # Assert that a TIFF image with SampleFormat=UINT tag is not corrupted
         # when saving to a new file.
         # Pillow 6.0 fails with "OSError: cannot identify image file".
@@ -1073,52 +1120,53 @@ def test_sampleformat_not_corrupted(self):
         with Image.open(out) as im:
             im.load()
 
-    def test_realloc_overflow(self):
-        TiffImagePlugin.READ_LIBTIFF = True
+    def test_realloc_overflow(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True)
         with Image.open("Tests/images/tiff_overflow_rows_per_strip.tif") as im:
             with pytest.raises(OSError) as e:
                 im.load()
 
             # Assert that the error code is IMAGING_CODEC_MEMORY
             assert str(e.value) == "-9"
-        TiffImagePlugin.READ_LIBTIFF = False
 
     @pytest.mark.parametrize("compression", ("tiff_adobe_deflate", "jpeg"))
-    def test_save_multistrip(self, compression, tmp_path):
+    def test_save_multistrip(self, compression: str, tmp_path: Path) -> None:
         im = hopper("RGB").resize((256, 256))
         out = str(tmp_path / "temp.tif")
         im.save(out, compression=compression)
 
         with Image.open(out) as im:
             # Assert that there are multiple strips
+            assert isinstance(im, TiffImagePlugin.TiffImageFile)
             assert len(im.tag_v2[STRIPOFFSETS]) > 1
 
     @pytest.mark.parametrize("argument", (True, False))
-    def test_save_single_strip(self, argument, tmp_path):
+    def test_save_single_strip(self, argument: bool, tmp_path: Path) -> None:
         im = hopper("RGB").resize((256, 256))
         out = str(tmp_path / "temp.tif")
 
         if not argument:
             TiffImagePlugin.STRIP_SIZE = 2**18
         try:
-            arguments = {"compression": "tiff_adobe_deflate"}
+            arguments: dict[str, str | int] = {"compression": "tiff_adobe_deflate"}
             if argument:
                 arguments["strip_size"] = 2**18
-            im.save(out, **arguments)
+            im.save(out, "TIFF", **arguments)
 
             with Image.open(out) as im:
+                assert isinstance(im, TiffImagePlugin.TiffImageFile)
                 assert len(im.tag_v2[STRIPOFFSETS]) == 1
         finally:
             TiffImagePlugin.STRIP_SIZE = 65536
 
     @pytest.mark.parametrize("compression", ("tiff_adobe_deflate", None))
-    def test_save_zero(self, compression, tmp_path):
+    def test_save_zero(self, compression: str | None, tmp_path: Path) -> None:
         im = Image.new("RGB", (0, 0))
         out = str(tmp_path / "temp.tif")
         with pytest.raises(SystemError):
             im.save(out, compression=compression)
 
-    def test_save_many_compressed(self, tmp_path):
+    def test_save_many_compressed(self, tmp_path: Path) -> None:
         im = hopper()
         out = str(tmp_path / "temp.tif")
         for _ in range(10000):
@@ -1132,7 +1180,7 @@ def test_save_many_compressed(self, tmp_path):
             ("Tests/images/child_ifd_jpeg.tiff", (20,)),
         ),
     )
-    def test_get_child_images(self, path, sizes):
+    def test_get_child_images(self, path: str, sizes: tuple[int, ...]) -> None:
         with Image.open(path) as im:
             ims = im.get_child_images()
 
diff --git a/Tests/test_file_libtiff_small.py b/Tests/test_file_libtiff_small.py
index 9501c55a6b8..617e1e89c72 100644
--- a/Tests/test_file_libtiff_small.py
+++ b/Tests/test_file_libtiff_small.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 from io import BytesIO
+from pathlib import Path
 
 from PIL import Image
 
@@ -7,7 +9,6 @@
 
 
 class TestFileLibTiffSmall(LibTiffTestCase):
-
     """The small lena image was failing on open in the libtiff
     decoder because the file pointer was set to the wrong place
     by a spurious seek. It wasn't failing with the byteio method.
@@ -16,7 +17,7 @@ class TestFileLibTiffSmall(LibTiffTestCase):
     file just before reading in libtiff. These tests remain
     to ensure that it stays fixed."""
 
-    def test_g4_hopper_file(self, tmp_path):
+    def test_g4_hopper_file(self, tmp_path: Path) -> None:
         """Testing the open file load path"""
 
         test_file = "Tests/images/hopper_g4.tif"
@@ -25,7 +26,7 @@ def test_g4_hopper_file(self, tmp_path):
                 assert im.size == (128, 128)
                 self._assert_noerr(tmp_path, im)
 
-    def test_g4_hopper_bytesio(self, tmp_path):
+    def test_g4_hopper_bytesio(self, tmp_path: Path) -> None:
         """Testing the bytesio loading code path"""
         test_file = "Tests/images/hopper_g4.tif"
         s = BytesIO()
@@ -36,7 +37,7 @@ def test_g4_hopper_bytesio(self, tmp_path):
             assert im.size == (128, 128)
             self._assert_noerr(tmp_path, im)
 
-    def test_g4_hopper(self, tmp_path):
+    def test_g4_hopper(self, tmp_path: Path) -> None:
         """The 128x128 lena image failed for some reason."""
 
         test_file = "Tests/images/hopper_g4.tif"
diff --git a/Tests/test_file_mcidas.py b/Tests/test_file_mcidas.py
index 4b31aaa7857..e11e6bb5284 100644
--- a/Tests/test_file_mcidas.py
+++ b/Tests/test_file_mcidas.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, McIdasImagePlugin
@@ -6,19 +7,19 @@
 from .helper import assert_image_equal_tofile
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         McIdasImagePlugin.McIdasImageFile(invalid_file)
 
 
-def test_valid_file():
+def test_valid_file() -> None:
     # Arrange
     # https://ghrc.nsstc.nasa.gov/hydro/details/cmx3g8
     # https://ghrc.nsstc.nasa.gov/pub/fieldCampaigns/camex3/cmx3g8/browse/
     test_file = "Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara"
-    saved_file = "Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png"
+    saved_file = "Tests/images/cmx3g8_wv_1998.260_0745_mcidas.tiff"
 
     # Act
     with Image.open(test_file) as im:
diff --git a/Tests/test_file_mic.py b/Tests/test_file_mic.py
index e7ea39ea918..9a6f13ea366 100644
--- a/Tests/test_file_mic.py
+++ b/Tests/test_file_mic.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImagePalette
@@ -12,7 +13,7 @@
 TEST_FILE = "Tests/images/hopper.mic"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_FILE) as im:
         im.load()
         assert im.mode == "RGBA"
@@ -27,22 +28,22 @@ def test_sanity():
         assert_image_similar(im, im2, 10)
 
 
-def test_n_frames():
+def test_n_frames() -> None:
     with Image.open(TEST_FILE) as im:
         assert im.n_frames == 1
 
 
-def test_is_animated():
+def test_is_animated() -> None:
     with Image.open(TEST_FILE) as im:
         assert not im.is_animated
 
 
-def test_tell():
+def test_tell() -> None:
     with Image.open(TEST_FILE) as im:
         assert im.tell() == 0
 
 
-def test_seek():
+def test_seek() -> None:
     with Image.open(TEST_FILE) as im:
         im.seek(0)
         assert im.tell() == 0
@@ -52,7 +53,7 @@ def test_seek():
         assert im.tell() == 0
 
 
-def test_close():
+def test_close() -> None:
     with Image.open(TEST_FILE) as im:
         pass
     assert im.ole.fp.closed
@@ -62,7 +63,7 @@ def test_close():
     assert im.ole.fp.closed
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     # Test an invalid OLE file
     invalid_file = "Tests/images/flower.jpg"
     with pytest.raises(SyntaxError):
diff --git a/Tests/test_file_mpeg.py b/Tests/test_file_mpeg.py
new file mode 100644
index 00000000000..468aef8a950
--- /dev/null
+++ b/Tests/test_file_mpeg.py
@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+from io import BytesIO
+
+import pytest
+
+from PIL import Image, MpegImagePlugin
+
+
+def test_identify() -> None:
+    # Arrange
+    b = BytesIO(b"\x00\x00\x01\xb3\x01\x00\x01")
+
+    # Act
+    with Image.open(b) as im:
+        # Assert
+        assert im.format == "MPEG"
+
+        assert im.mode == "RGB"
+        assert im.size == (16, 1)
+
+
+def test_invalid_file() -> None:
+    # Arrange
+    invalid_file = "Tests/images/flower.jpg"
+
+    # Act / Assert
+    with pytest.raises(SyntaxError):
+        MpegImagePlugin.MpegImageFile(invalid_file)
+
+
+def test_load() -> None:
+    # Arrange
+    b = BytesIO(b"\x00\x00\x01\xb3\x01\x00\x01")
+
+    with Image.open(b) as im:
+        # Act / Assert: cannot load
+        with pytest.raises(OSError):
+            im.load()
diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py
index da62bc6d429..e0f42a26649 100644
--- a/Tests/test_file_mpo.py
+++ b/Tests/test_file_mpo.py
@@ -1,10 +1,12 @@
 from __future__ import annotations
+
 import warnings
 from io import BytesIO
+from typing import Any
 
 import pytest
 
-from PIL import Image
+from PIL import Image, ImageFile, MpoImagePlugin
 
 from .helper import (
     assert_image_equal,
@@ -18,18 +20,15 @@
 pytestmark = skip_unless_feature("jpg")
 
 
-def roundtrip(im, **options):
+def roundtrip(im: Image.Image, **options: Any) -> ImageFile.ImageFile:
     out = BytesIO()
     im.save(out, "MPO", **options)
-    test_bytes = out.tell()
     out.seek(0)
-    im = Image.open(out)
-    im.bytes = test_bytes  # for testing only
-    return im
+    return Image.open(out)
 
 
 @pytest.mark.parametrize("test_file", test_files)
-def test_sanity(test_file):
+def test_sanity(test_file: str) -> None:
     with Image.open(test_file) as im:
         im.load()
         assert im.mode == "RGB"
@@ -38,8 +37,8 @@ def test_sanity(test_file):
 
 
 @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-def test_unclosed_file():
-    def open():
+def test_unclosed_file() -> None:
+    def open() -> None:
         im = Image.open(test_files[0])
         im.load()
 
@@ -47,14 +46,14 @@ def open():
         open()
 
 
-def test_closed_file():
+def test_closed_file() -> None:
     with warnings.catch_warnings():
         im = Image.open(test_files[0])
         im.load()
         im.close()
 
 
-def test_seek_after_close():
+def test_seek_after_close() -> None:
     im = Image.open(test_files[0])
     im.close()
 
@@ -62,14 +61,14 @@ def test_seek_after_close():
         im.seek(1)
 
 
-def test_context_manager():
+def test_context_manager() -> None:
     with warnings.catch_warnings():
         with Image.open(test_files[0]) as im:
             im.load()
 
 
 @pytest.mark.parametrize("test_file", test_files)
-def test_app(test_file):
+def test_app(test_file: str) -> None:
     # Test APP/COM reader (@PIL135)
     with Image.open(test_file) as im:
         assert im.applist[0][0] == "APP1"
@@ -81,20 +80,22 @@ def test_app(test_file):
 
 
 @pytest.mark.parametrize("test_file", test_files)
-def test_exif(test_file):
+def test_exif(test_file: str) -> None:
     with Image.open(test_file) as im_original:
         im_reloaded = roundtrip(im_original, save_all=True, exif=im_original.getexif())
 
     for im in (im_original, im_reloaded):
+        assert isinstance(im, MpoImagePlugin.MpoImageFile)
         info = im._getexif()
+        assert info is not None
         assert info[272] == "Nintendo 3DS"
         assert info[296] == 2
         assert info[34665] == 188
 
 
-def test_frame_size():
+def test_frame_size() -> None:
     # This image has been hexedited to contain a different size
-    # in the EXIF data of the second frame
+    # in the SOF marker of the second frame
     with Image.open("Tests/images/sugarshack_frame_size.mpo") as im:
         assert im.size == (640, 480)
 
@@ -105,7 +106,7 @@ def test_frame_size():
         assert im.size == (640, 480)
 
 
-def test_ignore_frame_size():
+def test_ignore_frame_size() -> None:
     # Ignore the different size of the second frame
     # since this is not a "Large Thumbnail" image
     with Image.open("Tests/images/ignore_frame_size.mpo") as im:
@@ -119,7 +120,7 @@ def test_ignore_frame_size():
         assert im.size == (64, 64)
 
 
-def test_parallax():
+def test_parallax() -> None:
     # Nintendo
     with Image.open("Tests/images/sugarshack.mpo") as im:
         exif = im.getexif()
@@ -132,7 +133,7 @@ def test_parallax():
         assert exif.get_ifd(0x927C)[0xB211] == -3.125
 
 
-def test_reload_exif_after_seek():
+def test_reload_exif_after_seek() -> None:
     with Image.open("Tests/images/sugarshack.mpo") as im:
         exif = im.getexif()
         del exif[296]
@@ -142,14 +143,14 @@ def test_reload_exif_after_seek():
 
 
 @pytest.mark.parametrize("test_file", test_files)
-def test_mp(test_file):
+def test_mp(test_file: str) -> None:
     with Image.open(test_file) as im:
         mpinfo = im._getmp()
         assert mpinfo[45056] == b"0100"
         assert mpinfo[45057] == 2
 
 
-def test_mp_offset():
+def test_mp_offset() -> None:
     # This image has been manually hexedited to have an IFD offset of 10
     # in APP2 data, in contrast to normal 8
     with Image.open("Tests/images/sugarshack_ifd_offset.mpo") as im:
@@ -158,7 +159,7 @@ def test_mp_offset():
         assert mpinfo[45057] == 2
 
 
-def test_mp_no_data():
+def test_mp_no_data() -> None:
     # This image has been manually hexedited to have the second frame
     # beyond the end of the file
     with Image.open("Tests/images/sugarshack_no_data.mpo") as im:
@@ -167,7 +168,7 @@ def test_mp_no_data():
 
 
 @pytest.mark.parametrize("test_file", test_files)
-def test_mp_attribute(test_file):
+def test_mp_attribute(test_file: str) -> None:
     with Image.open(test_file) as im:
         mpinfo = im._getmp()
     for frame_number, mpentry in enumerate(mpinfo[0xB002]):
@@ -184,7 +185,7 @@ def test_mp_attribute(test_file):
 
 
 @pytest.mark.parametrize("test_file", test_files)
-def test_seek(test_file):
+def test_seek(test_file: str) -> None:
     with Image.open(test_file) as im:
         assert im.tell() == 0
         # prior to first image raises an error, both blatant and borderline
@@ -208,13 +209,13 @@ def test_seek(test_file):
         assert im.tell() == 0
 
 
-def test_n_frames():
+def test_n_frames() -> None:
     with Image.open("Tests/images/sugarshack.mpo") as im:
         assert im.n_frames == 2
         assert im.is_animated
 
 
-def test_eoferror():
+def test_eoferror() -> None:
     with Image.open("Tests/images/sugarshack.mpo") as im:
         n_frames = im.n_frames
 
@@ -227,8 +228,19 @@ def test_eoferror():
         im.seek(n_frames - 1)
 
 
+def test_adopt_jpeg() -> None:
+    with Image.open("Tests/images/hopper.jpg") as im:
+        with pytest.raises(ValueError):
+            MpoImagePlugin.MpoImageFile.adopt(im)
+
+
+def test_ultra_hdr() -> None:
+    with Image.open("Tests/images/ultrahdr.jpg") as im:
+        assert im.format == "JPEG"
+
+
 @pytest.mark.parametrize("test_file", test_files)
-def test_image_grab(test_file):
+def test_image_grab(test_file: str) -> None:
     with Image.open(test_file) as im:
         assert im.tell() == 0
         im0 = im.tobytes()
@@ -243,7 +255,7 @@ def test_image_grab(test_file):
 
 
 @pytest.mark.parametrize("test_file", test_files)
-def test_save(test_file):
+def test_save(test_file: str) -> None:
     with Image.open(test_file) as im:
         assert im.tell() == 0
         jpg0 = roundtrip(im)
@@ -254,7 +266,7 @@ def test_save(test_file):
         assert_image_similar(im, jpg1, 30)
 
 
-def test_save_all():
+def test_save_all() -> None:
     for test_file in test_files:
         with Image.open(test_file) as im:
             im_reloaded = roundtrip(im, save_all=True)
@@ -271,6 +283,8 @@ def test_save_all():
     im_reloaded = roundtrip(im, save_all=True, append_images=[im2])
 
     assert_image_equal(im, im_reloaded)
+    assert isinstance(im_reloaded, MpoImagePlugin.MpoImageFile)
+    assert im_reloaded.mpinfo is not None
     assert im_reloaded.mpinfo[45056] == b"0100"
 
     im_reloaded.seek(1)
diff --git a/Tests/test_file_msp.py b/Tests/test_file_msp.py
index f4e357ae0fd..b0964aabe12 100644
--- a/Tests/test_file_msp.py
+++ b/Tests/test_file_msp.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 import os
+from pathlib import Path
 
 import pytest
 
@@ -12,7 +14,7 @@
 YA_EXTRA_DIR = "Tests/images/msp"
 
 
-def test_sanity(tmp_path):
+def test_sanity(tmp_path: Path) -> None:
     test_file = str(tmp_path / "temp.msp")
 
     hopper("1").save(test_file)
@@ -24,14 +26,14 @@ def test_sanity(tmp_path):
         assert im.format == "MSP"
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         MspImagePlugin.MspImageFile(invalid_file)
 
 
-def test_bad_checksum():
+def test_bad_checksum() -> None:
     # Arrange
     # This was created by forcing Pillow to save with checksum=0
     bad_checksum = "Tests/images/hopper_bad_checksum.msp"
@@ -41,7 +43,7 @@ def test_bad_checksum():
         MspImagePlugin.MspImageFile(bad_checksum)
 
 
-def test_open_windows_v1():
+def test_open_windows_v1() -> None:
     # Arrange
     # Act
     with Image.open(TEST_FILE) as im:
@@ -50,7 +52,7 @@ def test_open_windows_v1():
         assert isinstance(im, MspImagePlugin.MspImageFile)
 
 
-def _assert_file_image_equal(source_path, target_path):
+def _assert_file_image_equal(source_path: str, target_path: str) -> None:
     with Image.open(source_path) as im:
         assert_image_equal_tofile(im, target_path)
 
@@ -58,7 +60,7 @@ def _assert_file_image_equal(source_path, target_path):
 @pytest.mark.skipif(
     not os.path.exists(EXTRA_DIR), reason="Extra image files not installed"
 )
-def test_open_windows_v2():
+def test_open_windows_v2() -> None:
     files = (
         os.path.join(EXTRA_DIR, f)
         for f in os.listdir(EXTRA_DIR)
@@ -71,7 +73,7 @@ def test_open_windows_v2():
 @pytest.mark.skipif(
     not os.path.exists(YA_EXTRA_DIR), reason="Even More Extra image files not installed"
 )
-def test_msp_v2():
+def test_msp_v2() -> None:
     for f in os.listdir(YA_EXTRA_DIR):
         if ".MSP" not in f:
             continue
@@ -79,7 +81,7 @@ def test_msp_v2():
         _assert_file_image_equal(path, path.replace(".MSP", ".png"))
 
 
-def test_cannot_save_wrong_mode(tmp_path):
+def test_cannot_save_wrong_mode(tmp_path: Path) -> None:
     # Arrange
     im = hopper()
     filename = str(tmp_path / "temp.msp")
diff --git a/Tests/test_file_palm.py b/Tests/test_file_palm.py
index 735840de4cb..194f39b30b8 100644
--- a/Tests/test_file_palm.py
+++ b/Tests/test_file_palm.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
+
 import os.path
 import subprocess
+from pathlib import Path
 
 import pytest
 
@@ -9,7 +11,7 @@
 from .helper import assert_image_equal, hopper, magick_command
 
 
-def helper_save_as_palm(tmp_path, mode):
+def helper_save_as_palm(tmp_path: Path, mode: str) -> None:
     # Arrange
     im = hopper(mode)
     outfile = str(tmp_path / ("temp_" + mode + ".palm"))
@@ -22,7 +24,7 @@ def helper_save_as_palm(tmp_path, mode):
     assert os.path.getsize(outfile) > 0
 
 
-def open_with_magick(magick, tmp_path, f):
+def open_with_magick(magick: list[str], tmp_path: Path, f: str) -> Image.Image:
     outfile = str(tmp_path / "temp.png")
     rc = subprocess.call(
         magick + [f, outfile], stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT
@@ -31,7 +33,7 @@ def open_with_magick(magick, tmp_path, f):
     return Image.open(outfile)
 
 
-def roundtrip(tmp_path, mode):
+def roundtrip(tmp_path: Path, mode: str) -> None:
     magick = magick_command()
     if not magick:
         return
@@ -44,7 +46,7 @@ def roundtrip(tmp_path, mode):
     assert_image_equal(converted, im)
 
 
-def test_monochrome(tmp_path):
+def test_monochrome(tmp_path: Path) -> None:
     # Arrange
     mode = "1"
 
@@ -54,7 +56,7 @@ def test_monochrome(tmp_path):
 
 
 @pytest.mark.xfail(reason="Palm P image is wrong")
-def test_p_mode(tmp_path):
+def test_p_mode(tmp_path: Path) -> None:
     # Arrange
     mode = "P"
 
@@ -64,6 +66,6 @@ def test_p_mode(tmp_path):
 
 
 @pytest.mark.parametrize("mode", ("L", "RGB"))
-def test_oserror(tmp_path, mode):
+def test_oserror(tmp_path: Path, mode: str) -> None:
     with pytest.raises(OSError):
         helper_save_as_palm(tmp_path, mode)
diff --git a/Tests/test_file_pcd.py b/Tests/test_file_pcd.py
index 596a3414f79..81a316fc14a 100644
--- a/Tests/test_file_pcd.py
+++ b/Tests/test_file_pcd.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
+
 from PIL import Image
 
 
-def test_load_raw():
+def test_load_raw() -> None:
     with Image.open("Tests/images/hopper.pcd") as im:
         im.load()  # should not segfault.
 
diff --git a/Tests/test_file_pcx.py b/Tests/test_file_pcx.py
index f42ec4a6894..b3f38c3e5fd 100644
--- a/Tests/test_file_pcx.py
+++ b/Tests/test_file_pcx.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image, ImageFile, PcxImagePlugin
@@ -6,7 +9,7 @@
 from .helper import assert_image_equal, hopper
 
 
-def _roundtrip(tmp_path, im):
+def _roundtrip(tmp_path: Path, im: Image.Image) -> None:
     f = str(tmp_path / "temp.pcx")
     im.save(f)
     with Image.open(f) as im2:
@@ -17,7 +20,7 @@ def _roundtrip(tmp_path, im):
         assert_image_equal(im2, im)
 
 
-def test_sanity(tmp_path):
+def test_sanity(tmp_path: Path) -> None:
     for mode in ("1", "L", "P", "RGB"):
         _roundtrip(tmp_path, hopper(mode))
 
@@ -33,7 +36,7 @@ def test_sanity(tmp_path):
         im.save(f)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
@@ -41,7 +44,7 @@ def test_invalid_file():
 
 
 @pytest.mark.parametrize("mode", ("1", "L", "P", "RGB"))
-def test_odd(tmp_path, mode):
+def test_odd(tmp_path: Path, mode: str) -> None:
     # See issue #523, odd sized images should have a stride that's even.
     # Not that ImageMagick or GIMP write PCX that way.
     # We were not handling properly.
@@ -50,7 +53,7 @@ def test_odd(tmp_path, mode):
     _roundtrip(tmp_path, hopper(mode).resize((511, 511)))
 
 
-def test_odd_read():
+def test_odd_read() -> None:
     # Reading an image with an odd stride, making it malformed
     with Image.open("Tests/images/odd_stride.pcx") as im:
         im.load()
@@ -58,7 +61,7 @@ def test_odd_read():
         assert im.size == (371, 150)
 
 
-def test_pil184():
+def test_pil184() -> None:
     # Check reading of files where xmin/xmax is not zero.
 
     test_file = "Tests/images/pil184.pcx"
@@ -70,23 +73,25 @@ def test_pil184():
         assert im.histogram()[0] + im.histogram()[255] == 447 * 144
 
 
-def test_1px_width(tmp_path):
+def test_1px_width(tmp_path: Path) -> None:
     im = Image.new("L", (1, 256))
     px = im.load()
+    assert px is not None
     for y in range(256):
         px[0, y] = y
     _roundtrip(tmp_path, im)
 
 
-def test_large_count(tmp_path):
+def test_large_count(tmp_path: Path) -> None:
     im = Image.new("L", (256, 1))
     px = im.load()
+    assert px is not None
     for x in range(256):
         px[x, 0] = x // 67 * 67
     _roundtrip(tmp_path, im)
 
 
-def _test_buffer_overflow(tmp_path, im, size=1024):
+def _test_buffer_overflow(tmp_path: Path, im: Image.Image, size: int = 1024) -> None:
     _last = ImageFile.MAXBLOCK
     ImageFile.MAXBLOCK = size
     try:
@@ -95,27 +100,30 @@ def _test_buffer_overflow(tmp_path, im, size=1024):
         ImageFile.MAXBLOCK = _last
 
 
-def test_break_in_count_overflow(tmp_path):
+def test_break_in_count_overflow(tmp_path: Path) -> None:
     im = Image.new("L", (256, 5))
     px = im.load()
+    assert px is not None
     for y in range(4):
         for x in range(256):
             px[x, y] = x % 128
     _test_buffer_overflow(tmp_path, im)
 
 
-def test_break_one_in_loop(tmp_path):
+def test_break_one_in_loop(tmp_path: Path) -> None:
     im = Image.new("L", (256, 5))
     px = im.load()
+    assert px is not None
     for y in range(5):
         for x in range(256):
             px[x, y] = x % 128
     _test_buffer_overflow(tmp_path, im)
 
 
-def test_break_many_in_loop(tmp_path):
+def test_break_many_in_loop(tmp_path: Path) -> None:
     im = Image.new("L", (256, 5))
     px = im.load()
+    assert px is not None
     for y in range(4):
         for x in range(256):
             px[x, y] = x % 128
@@ -124,9 +132,10 @@ def test_break_many_in_loop(tmp_path):
     _test_buffer_overflow(tmp_path, im)
 
 
-def test_break_one_at_end(tmp_path):
+def test_break_one_at_end(tmp_path: Path) -> None:
     im = Image.new("L", (256, 5))
     px = im.load()
+    assert px is not None
     for y in range(5):
         for x in range(256):
             px[x, y] = x % 128
@@ -134,9 +143,10 @@ def test_break_one_at_end(tmp_path):
     _test_buffer_overflow(tmp_path, im)
 
 
-def test_break_many_at_end(tmp_path):
+def test_break_many_at_end(tmp_path: Path) -> None:
     im = Image.new("L", (256, 5))
     px = im.load()
+    assert px is not None
     for y in range(5):
         for x in range(256):
             px[x, y] = x % 128
@@ -146,9 +156,10 @@ def test_break_many_at_end(tmp_path):
     _test_buffer_overflow(tmp_path, im)
 
 
-def test_break_padding(tmp_path):
+def test_break_padding(tmp_path: Path) -> None:
     im = Image.new("L", (257, 5))
     px = im.load()
+    assert px is not None
     for y in range(5):
         for x in range(257):
             px[x, y] = x % 128
diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index 9e07d9ed014..1d5001b1a9b 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -1,9 +1,13 @@
 from __future__ import annotations
+
 import io
 import os
 import os.path
 import tempfile
 import time
+from collections.abc import Generator
+from pathlib import Path
+from typing import Any
 
 import pytest
 
@@ -12,7 +16,7 @@
 from .helper import hopper, mark_if_feature_version, skip_unless_feature
 
 
-def helper_save_as_pdf(tmp_path, mode, **kwargs):
+def helper_save_as_pdf(tmp_path: Path, mode: str, **kwargs: Any) -> str:
     # Arrange
     im = hopper(mode)
     outfile = str(tmp_path / ("temp_" + mode + ".pdf"))
@@ -39,17 +43,17 @@ def helper_save_as_pdf(tmp_path, mode, **kwargs):
 
 
 @pytest.mark.parametrize("mode", ("L", "P", "RGB", "CMYK"))
-def test_save(tmp_path, mode):
+def test_save(tmp_path: Path, mode: str) -> None:
     helper_save_as_pdf(tmp_path, mode)
 
 
 @skip_unless_feature("jpg_2000")
 @pytest.mark.parametrize("mode", ("LA", "RGBA"))
-def test_save_alpha(tmp_path, mode):
+def test_save_alpha(tmp_path: Path, mode: str) -> None:
     helper_save_as_pdf(tmp_path, mode)
 
 
-def test_p_alpha(tmp_path):
+def test_p_alpha(tmp_path: Path) -> None:
     # Arrange
     outfile = str(tmp_path / "temp.pdf")
     with Image.open("Tests/images/pil123p.png") as im:
@@ -65,7 +69,7 @@ def test_p_alpha(tmp_path):
     assert b"\n/SMask " in contents
 
 
-def test_monochrome(tmp_path):
+def test_monochrome(tmp_path: Path) -> None:
     # Arrange
     mode = "1"
 
@@ -74,7 +78,7 @@ def test_monochrome(tmp_path):
     assert os.path.getsize(outfile) < (5000 if features.check("libtiff") else 15000)
 
 
-def test_unsupported_mode(tmp_path):
+def test_unsupported_mode(tmp_path: Path) -> None:
     im = hopper("PA")
     outfile = str(tmp_path / "temp_PA.pdf")
 
@@ -82,7 +86,7 @@ def test_unsupported_mode(tmp_path):
         im.save(outfile)
 
 
-def test_resolution(tmp_path):
+def test_resolution(tmp_path: Path) -> None:
     im = hopper()
 
     outfile = str(tmp_path / "temp.pdf")
@@ -110,11 +114,11 @@ def test_resolution(tmp_path):
         {"dpi": (75, 150), "resolution": 200},
     ),
 )
-def test_dpi(params, tmp_path):
+def test_dpi(params: dict[str, int | tuple[int, int]], tmp_path: Path) -> None:
     im = hopper()
 
     outfile = str(tmp_path / "temp.pdf")
-    im.save(outfile, **params)
+    im.save(outfile, "PDF", **params)
 
     with open(outfile, "rb") as fp:
         contents = fp.read()
@@ -134,7 +138,7 @@ def test_dpi(params, tmp_path):
 @mark_if_feature_version(
     pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
 )
-def test_save_all(tmp_path):
+def test_save_all(tmp_path: Path) -> None:
     # Single frame image
     helper_save_as_pdf(tmp_path, "RGB", save_all=True)
 
@@ -154,7 +158,7 @@ def test_save_all(tmp_path):
         assert os.path.getsize(outfile) > 0
 
         # Test appending using a generator
-        def im_generator(ims):
+        def im_generator(ims: list[Image.Image]) -> Generator[Image.Image, None, None]:
             yield from ims
 
         im.save(outfile, save_all=True, append_images=im_generator(ims))
@@ -170,7 +174,7 @@ def im_generator(ims):
     assert os.path.getsize(outfile) > 0
 
 
-def test_multiframe_normal_save(tmp_path):
+def test_multiframe_normal_save(tmp_path: Path) -> None:
     # Test saving a multiframe image without save_all
     with Image.open("Tests/images/dispose_bgnd.gif") as im:
         outfile = str(tmp_path / "temp.pdf")
@@ -180,7 +184,7 @@ def test_multiframe_normal_save(tmp_path):
     assert os.path.getsize(outfile) > 0
 
 
-def test_pdf_open(tmp_path):
+def test_pdf_open(tmp_path: Path) -> None:
     # fail on a buffer full of null bytes
     with pytest.raises(PdfParser.PdfFormatError):
         PdfParser.PdfParser(buf=bytearray(65536))
@@ -217,14 +221,15 @@ def test_pdf_open(tmp_path):
             assert not hopper_pdf.should_close_file
 
 
-def test_pdf_append_fails_on_nonexistent_file():
+def test_pdf_append_fails_on_nonexistent_file() -> None:
     im = hopper("RGB")
     with tempfile.TemporaryDirectory() as temp_dir:
         with pytest.raises(OSError):
             im.save(os.path.join(temp_dir, "nonexistent.pdf"), append=True)
 
 
-def check_pdf_pages_consistency(pdf):
+def check_pdf_pages_consistency(pdf: PdfParser.PdfParser) -> None:
+    assert pdf.pages_ref is not None
     pages_info = pdf.read_indirect(pdf.pages_ref)
     assert b"Parent" not in pages_info
     assert b"Kids" in pages_info
@@ -242,7 +247,7 @@ def check_pdf_pages_consistency(pdf):
     assert kids_not_used == []
 
 
-def test_pdf_append(tmp_path):
+def test_pdf_append(tmp_path: Path) -> None:
     # make a PDF file
     pdf_filename = helper_save_as_pdf(tmp_path, "RGB", producer="PdfParser")
 
@@ -293,7 +298,7 @@ def test_pdf_append(tmp_path):
         check_pdf_pages_consistency(pdf)
 
 
-def test_pdf_info(tmp_path):
+def test_pdf_info(tmp_path: Path) -> None:
     # make a PDF file
     pdf_filename = helper_save_as_pdf(
         tmp_path,
@@ -322,7 +327,7 @@ def test_pdf_info(tmp_path):
         check_pdf_pages_consistency(pdf)
 
 
-def test_pdf_append_to_bytesio():
+def test_pdf_append_to_bytesio() -> None:
     im = hopper("RGB")
     f = io.BytesIO()
     im.save(f, format="PDF")
@@ -337,7 +342,7 @@ def test_pdf_append_to_bytesio():
 @pytest.mark.timeout(1)
 @pytest.mark.skipif("PILLOW_VALGRIND_TEST" in os.environ, reason="Valgrind is slower")
 @pytest.mark.parametrize("newline", (b"\r", b"\n"))
-def test_redos(newline):
+def test_redos(newline: bytes) -> None:
     malicious = b" trailer<<>>" + newline * 3456
 
     # This particular exception isn't relevant here.
diff --git a/Tests/test_file_pixar.py b/Tests/test_file_pixar.py
index 63779f202cb..8f208cfbf07 100644
--- a/Tests/test_file_pixar.py
+++ b/Tests/test_file_pixar.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, PixarImagePlugin
@@ -8,7 +9,7 @@
 TEST_FILE = "Tests/images/hopper.pxr"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_FILE) as im:
         im.load()
         assert im.mode == "RGB"
@@ -20,7 +21,7 @@ def test_sanity():
         assert_image_similar(im, im2, 4.8)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py
index ff386211061..0abf9866ff2 100644
--- a/Tests/test_file_png.py
+++ b/Tests/test_file_png.py
@@ -1,9 +1,13 @@
 from __future__ import annotations
+
 import re
 import sys
 import warnings
 import zlib
 from io import BytesIO
+from pathlib import Path
+from types import ModuleType
+from typing import Any, cast
 
 import pytest
 
@@ -20,6 +24,7 @@
     skip_unless_feature,
 )
 
+ElementTree: ModuleType | None
 try:
     from defusedxml import ElementTree
 except ImportError:
@@ -34,9 +39,9 @@
 MAGIC = PngImagePlugin._MAGIC
 
 
-def chunk(cid, *data):
+def chunk(cid: bytes, *data: bytes) -> bytes:
     test_file = BytesIO()
-    PngImagePlugin.putchunk(*(test_file, cid) + data)
+    PngImagePlugin.putchunk(test_file, cid, *data)
     return test_file.getvalue()
 
 
@@ -50,20 +55,20 @@ def chunk(cid, *data):
 TAIL = IDAT + IEND
 
 
-def load(data):
+def load(data: bytes) -> Image.Image:
     return Image.open(BytesIO(data))
 
 
-def roundtrip(im, **options):
+def roundtrip(im: Image.Image, **options: Any) -> PngImagePlugin.PngImageFile:
     out = BytesIO()
     im.save(out, "PNG", **options)
     out.seek(0)
-    return Image.open(out)
+    return cast(PngImagePlugin.PngImageFile, Image.open(out))
 
 
 @skip_unless_feature("zlib")
 class TestFilePng:
-    def get_chunks(self, filename):
+    def get_chunks(self, filename: str) -> list[bytes]:
         chunks = []
         with open(filename, "rb") as fp:
             fp.read(8)
@@ -78,9 +83,11 @@ def get_chunks(self, filename):
                     png.crc(cid, s)
         return chunks
 
-    def test_sanity(self, tmp_path):
+    def test_sanity(self, tmp_path: Path) -> None:
         # internal version number
-        assert re.search(r"\d+(\.\d+){1,3}$", features.version_codec("zlib"))
+        version = features.version_codec("zlib")
+        assert version is not None
+        assert re.search(r"\d+(\.\d+){1,3}(\.zlib\-ng)?$", version)
 
         test_file = str(tmp_path / "temp.png")
 
@@ -97,17 +104,17 @@ def test_sanity(self, tmp_path):
             im = hopper(mode)
             im.save(test_file)
             with Image.open(test_file) as reloaded:
-                if mode in ("I;16", "I;16B"):
+                if mode in ("I", "I;16B"):
                     reloaded = reloaded.convert(mode)
                 assert_image_equal(reloaded, im)
 
-    def test_invalid_file(self):
+    def test_invalid_file(self) -> None:
         invalid_file = "Tests/images/flower.jpg"
 
         with pytest.raises(SyntaxError):
             PngImagePlugin.PngImageFile(invalid_file)
 
-    def test_broken(self):
+    def test_broken(self) -> None:
         # Check reading of totally broken files.  In this case, the test
         # file was checked into Subversion as a text file.
 
@@ -116,7 +123,7 @@ def test_broken(self):
             with Image.open(test_file):
                 pass
 
-    def test_bad_text(self):
+    def test_bad_text(self) -> None:
         # Make sure PIL can read malformed tEXt chunks (@PIL152)
 
         im = load(HEAD + chunk(b"tEXt") + TAIL)
@@ -134,7 +141,7 @@ def test_bad_text(self):
         im = load(HEAD + chunk(b"tEXt", b"spam\0egg\0") + TAIL)
         assert im.info == {"spam": "egg\x00"}
 
-    def test_bad_ztxt(self):
+    def test_bad_ztxt(self) -> None:
         # Test reading malformed zTXt chunks (python-pillow/Pillow#318)
 
         im = load(HEAD + chunk(b"zTXt") + TAIL)
@@ -155,7 +162,7 @@ def test_bad_ztxt(self):
         im = load(HEAD + chunk(b"zTXt", b"spam\0\0" + zlib.compress(b"egg")) + TAIL)
         assert im.info == {"spam": "egg"}
 
-    def test_bad_itxt(self):
+    def test_bad_itxt(self) -> None:
         im = load(HEAD + chunk(b"iTXt") + TAIL)
         assert im.info == {}
 
@@ -199,7 +206,7 @@ def test_bad_itxt(self):
         assert im.info["spam"].lang == "en"
         assert im.info["spam"].tkey == "Spam"
 
-    def test_interlace(self):
+    def test_interlace(self) -> None:
         test_file = "Tests/images/pil123p.png"
         with Image.open(test_file) as im:
             assert_image(im, "P", (162, 150))
@@ -214,7 +221,7 @@ def test_interlace(self):
 
             im.load()
 
-    def test_load_transparent_p(self):
+    def test_load_transparent_p(self) -> None:
         test_file = "Tests/images/pil123p.png"
         with Image.open(test_file) as im:
             assert_image(im, "P", (162, 150))
@@ -224,7 +231,7 @@ def test_load_transparent_p(self):
         # image has 124 unique alpha values
         assert len(im.getchannel("A").getcolors()) == 124
 
-    def test_load_transparent_rgb(self):
+    def test_load_transparent_rgb(self) -> None:
         test_file = "Tests/images/rgb_trns.png"
         with Image.open(test_file) as im:
             assert im.info["transparency"] == (0, 255, 52)
@@ -236,7 +243,7 @@ def test_load_transparent_rgb(self):
         # image has 876 transparent pixels
         assert im.getchannel("A").getcolors()[0][0] == 876
 
-    def test_save_p_transparent_palette(self, tmp_path):
+    def test_save_p_transparent_palette(self, tmp_path: Path) -> None:
         in_file = "Tests/images/pil123p.png"
         with Image.open(in_file) as im:
             # 'transparency' contains a byte string with the opacity for
@@ -257,7 +264,7 @@ def test_save_p_transparent_palette(self, tmp_path):
         # image has 124 unique alpha values
         assert len(im.getchannel("A").getcolors()) == 124
 
-    def test_save_p_single_transparency(self, tmp_path):
+    def test_save_p_single_transparency(self, tmp_path: Path) -> None:
         in_file = "Tests/images/p_trns_single.png"
         with Image.open(in_file) as im:
             # pixel value 164 is full transparent
@@ -280,7 +287,7 @@ def test_save_p_single_transparency(self, tmp_path):
         # image has 876 transparent pixels
         assert im.getchannel("A").getcolors()[0][0] == 876
 
-    def test_save_p_transparent_black(self, tmp_path):
+    def test_save_p_transparent_black(self, tmp_path: Path) -> None:
         # check if solid black image with full transparency
         # is supported (check for #1838)
         im = Image.new("RGBA", (10, 10), (0, 0, 0, 0))
@@ -298,9 +305,9 @@ def test_save_p_transparent_black(self, tmp_path):
         assert_image(im, "RGBA", (10, 10))
         assert im.getcolors() == [(100, (0, 0, 0, 0))]
 
-    def test_save_grayscale_transparency(self, tmp_path):
-        for mode, num_transparent in {"1": 1994, "L": 559, "I": 559}.items():
-            in_file = "Tests/images/" + mode.lower() + "_trns.png"
+    def test_save_grayscale_transparency(self, tmp_path: Path) -> None:
+        for mode, num_transparent in {"1": 1994, "L": 559, "I;16": 559}.items():
+            in_file = "Tests/images/" + mode.split(";")[0].lower() + "_trns.png"
             with Image.open(in_file) as im:
                 assert im.mode == mode
                 assert im.info["transparency"] == 255
@@ -319,13 +326,13 @@ def test_save_grayscale_transparency(self, tmp_path):
             test_im_rgba = test_im.convert("RGBA")
             assert test_im_rgba.getchannel("A").getcolors()[0][0] == num_transparent
 
-    def test_save_rgb_single_transparency(self, tmp_path):
+    def test_save_rgb_single_transparency(self, tmp_path: Path) -> None:
         in_file = "Tests/images/caption_6_33_22.png"
         with Image.open(in_file) as im:
             test_file = str(tmp_path / "temp.png")
             im.save(test_file)
 
-    def test_load_verify(self):
+    def test_load_verify(self) -> None:
         # Check open/load/verify exception (@PIL150)
 
         with Image.open(TEST_PNG_FILE) as im:
@@ -338,7 +345,7 @@ def test_load_verify(self):
             with pytest.raises(RuntimeError):
                 im.verify()
 
-    def test_verify_struct_error(self):
+    def test_verify_struct_error(self) -> None:
         # Check open/load/verify exception (#1755)
 
         # offsets to test, -10: breaks in i32() in read. (OSError)
@@ -354,7 +361,7 @@ def test_verify_struct_error(self):
                 with pytest.raises((OSError, SyntaxError)):
                     im.verify()
 
-    def test_verify_ignores_crc_error(self):
+    def test_verify_ignores_crc_error(self) -> None:
         # check ignores crc errors in ancillary chunks
 
         chunk_data = chunk(b"tEXt", b"spam")
@@ -371,7 +378,7 @@ def test_verify_ignores_crc_error(self):
         finally:
             ImageFile.LOAD_TRUNCATED_IMAGES = False
 
-    def test_verify_not_ignores_crc_error_in_required_chunk(self):
+    def test_verify_not_ignores_crc_error_in_required_chunk(self) -> None:
         # check does not ignore crc errors in required chunks
 
         image_data = MAGIC + IHDR[:-1] + b"q" + TAIL
@@ -383,18 +390,18 @@ def test_verify_not_ignores_crc_error_in_required_chunk(self):
         finally:
             ImageFile.LOAD_TRUNCATED_IMAGES = False
 
-    def test_roundtrip_dpi(self):
+    def test_roundtrip_dpi(self) -> None:
         # Check dpi roundtripping
 
         with Image.open(TEST_PNG_FILE) as im:
             im = roundtrip(im, dpi=(100.33, 100.33))
         assert im.info["dpi"] == (100.33, 100.33)
 
-    def test_load_float_dpi(self):
+    def test_load_float_dpi(self) -> None:
         with Image.open(TEST_PNG_FILE) as im:
             assert im.info["dpi"] == (95.9866, 95.9866)
 
-    def test_roundtrip_text(self):
+    def test_roundtrip_text(self) -> None:
         # Check text roundtripping
 
         with Image.open(TEST_PNG_FILE) as im:
@@ -406,7 +413,7 @@ def test_roundtrip_text(self):
         assert im.info == {"TXT": "VALUE", "ZIP": "VALUE"}
         assert im.text == {"TXT": "VALUE", "ZIP": "VALUE"}
 
-    def test_roundtrip_itxt(self):
+    def test_roundtrip_itxt(self) -> None:
         # Check iTXt roundtripping
 
         im = Image.new("RGB", (32, 32))
@@ -417,12 +424,14 @@ def test_roundtrip_itxt(self):
         im = roundtrip(im, pnginfo=info)
         assert im.info == {"spam": "Eggs", "eggs": "Spam"}
         assert im.text == {"spam": "Eggs", "eggs": "Spam"}
+        assert isinstance(im.text["spam"], PngImagePlugin.iTXt)
         assert im.text["spam"].lang == "en"
         assert im.text["spam"].tkey == "Spam"
+        assert isinstance(im.text["eggs"], PngImagePlugin.iTXt)
         assert im.text["eggs"].lang == "en"
         assert im.text["eggs"].tkey == "Eggs"
 
-    def test_nonunicode_text(self):
+    def test_nonunicode_text(self) -> None:
         # Check so that non-Unicode text is saved as a tEXt rather than iTXt
 
         im = Image.new("RGB", (32, 32))
@@ -431,10 +440,10 @@ def test_nonunicode_text(self):
         im = roundtrip(im, pnginfo=info)
         assert isinstance(im.info["Text"], str)
 
-    def test_unicode_text(self):
+    def test_unicode_text(self) -> None:
         # Check preservation of non-ASCII characters
 
-        def rt_text(value):
+        def rt_text(value: str) -> None:
             im = Image.new("RGB", (32, 32))
             info = PngImagePlugin.PngInfo()
             info.add_text("Text", value)
@@ -447,7 +456,7 @@ def rt_text(value):
         rt_text(chr(0x4E00) + chr(0x66F0) + chr(0x9FBA) + chr(0x3042) + chr(0xAC00))
         rt_text("A" + chr(0xC4) + chr(0x472) + chr(0x3042))  # Combined
 
-    def test_scary(self):
+    def test_scary(self) -> None:
         # Check reading of evil PNG file.  For information, see:
         # http://scary.beasts.org/security/CESA-2004-001.txt
         # The first byte is removed from pngtest_bad.png
@@ -461,7 +470,7 @@ def test_scary(self):
             with Image.open(pngfile):
                 pass
 
-    def test_trns_rgb(self):
+    def test_trns_rgb(self) -> None:
         # Check writing and reading of tRNS chunks for RGB images.
         # Independent file sample provided by Sebastian Spaeth.
 
@@ -476,7 +485,7 @@ def test_trns_rgb(self):
         im = roundtrip(im, transparency=(0, 1, 2))
         assert im.info["transparency"] == (0, 1, 2)
 
-    def test_trns_p(self, tmp_path):
+    def test_trns_p(self, tmp_path: Path) -> None:
         # Check writing a transparency of 0, issue #528
         im = hopper("P")
         im.info["transparency"] = 0
@@ -489,13 +498,13 @@ def test_trns_p(self, tmp_path):
 
             assert_image_equal(im2.convert("RGBA"), im.convert("RGBA"))
 
-    def test_trns_null(self):
+    def test_trns_null(self) -> None:
         # Check reading images with null tRNS value, issue #1239
         test_file = "Tests/images/tRNS_null_1x1.png"
         with Image.open(test_file) as im:
             assert im.info["transparency"] == 0
 
-    def test_save_icc_profile(self):
+    def test_save_icc_profile(self) -> None:
         with Image.open("Tests/images/icc_profile_none.png") as im:
             assert im.info["icc_profile"] is None
 
@@ -505,40 +514,42 @@ def test_save_icc_profile(self):
                 im = roundtrip(im, icc_profile=expected_icc)
                 assert im.info["icc_profile"] == expected_icc
 
-    def test_discard_icc_profile(self):
+    def test_discard_icc_profile(self) -> None:
         with Image.open("Tests/images/icc_profile.png") as im:
             assert "icc_profile" in im.info
 
             im = roundtrip(im, icc_profile=None)
         assert "icc_profile" not in im.info
 
-    def test_roundtrip_icc_profile(self):
+    def test_roundtrip_icc_profile(self) -> None:
         with Image.open("Tests/images/icc_profile.png") as im:
             expected_icc = im.info["icc_profile"]
 
             im = roundtrip(im)
         assert im.info["icc_profile"] == expected_icc
 
-    def test_roundtrip_no_icc_profile(self):
+    def test_roundtrip_no_icc_profile(self) -> None:
         with Image.open("Tests/images/icc_profile_none.png") as im:
             assert im.info["icc_profile"] is None
 
             im = roundtrip(im)
         assert "icc_profile" not in im.info
 
-    def test_repr_png(self):
+    def test_repr_png(self) -> None:
         im = hopper()
+        b = im._repr_png_()
+        assert b is not None
 
-        with Image.open(BytesIO(im._repr_png_())) as repr_png:
+        with Image.open(BytesIO(b)) as repr_png:
             assert repr_png.format == "PNG"
             assert_image_equal(im, repr_png)
 
-    def test_repr_png_error_returns_none(self):
+    def test_repr_png_error_returns_none(self) -> None:
         im = hopper("F")
 
         assert im._repr_png_() is None
 
-    def test_chunk_order(self, tmp_path):
+    def test_chunk_order(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/icc_profile.png") as im:
             test_file = str(tmp_path / "temp.png")
             im.convert("P").save(test_file, dpi=(100, 100))
@@ -559,17 +570,17 @@ def test_chunk_order(self, tmp_path):
         # pHYs - before IDAT
         assert chunks.index(b"pHYs") < chunks.index(b"IDAT")
 
-    def test_getchunks(self):
+    def test_getchunks(self) -> None:
         im = hopper()
 
         chunks = PngImagePlugin.getchunks(im)
         assert len(chunks) == 3
 
-    def test_read_private_chunks(self):
+    def test_read_private_chunks(self) -> None:
         with Image.open("Tests/images/exif.png") as im:
             assert im.private_chunks == [(b"orNT", b"\x01")]
 
-    def test_roundtrip_private_chunk(self):
+    def test_roundtrip_private_chunk(self) -> None:
         # Check private chunk roundtripping
 
         with Image.open(TEST_PNG_FILE) as im:
@@ -587,7 +598,7 @@ def test_roundtrip_private_chunk(self):
             (b"prIV", b"VALUE3", True),
         ]
 
-    def test_textual_chunks_after_idat(self):
+    def test_textual_chunks_after_idat(self) -> None:
         with Image.open("Tests/images/hopper.png") as im:
             assert "comment" in im.text
             for k, v in {
@@ -614,7 +625,11 @@ def test_textual_chunks_after_idat(self):
         with Image.open("Tests/images/hopper_idat_after_image_end.png") as im:
             assert im.text == {"TXT": "VALUE", "ZIP": "VALUE"}
 
-    def test_padded_idat(self):
+    def test_unknown_compression_method(self) -> None:
+        with pytest.raises(SyntaxError, match="Unknown compression method"):
+            PngImagePlugin.PngImageFile("Tests/images/unknown_compression_method.png")
+
+    def test_padded_idat(self) -> None:
         # This image has been manually hexedited
         # so that the IDAT chunk has padding at the end
         # Set MAXBLOCK to the length of the actual data
@@ -634,7 +649,7 @@ def test_padded_idat(self):
     @pytest.mark.parametrize(
         "cid", (b"IHDR", b"sRGB", b"pHYs", b"acTL", b"fcTL", b"fdAT")
     )
-    def test_truncated_chunks(self, cid):
+    def test_truncated_chunks(self, cid: bytes) -> None:
         fp = BytesIO()
         with PngImagePlugin.PngStream(fp) as png:
             with pytest.raises(ValueError):
@@ -644,16 +659,17 @@ def test_truncated_chunks(self, cid):
             png.call(cid, 0, 0)
             ImageFile.LOAD_TRUNCATED_IMAGES = False
 
-    def test_specify_bits(self, tmp_path):
+    @pytest.mark.parametrize("save_all", (True, False))
+    def test_specify_bits(self, save_all: bool, tmp_path: Path) -> None:
         im = hopper("P")
 
         out = str(tmp_path / "temp.png")
-        im.save(out, bits=4)
+        im.save(out, bits=4, save_all=save_all)
 
         with Image.open(out) as reloaded:
             assert len(reloaded.png.im_palette[1]) == 48
 
-    def test_plte_length(self, tmp_path):
+    def test_plte_length(self, tmp_path: Path) -> None:
         im = Image.new("P", (1, 1))
         im.putpalette((1, 1, 1))
 
@@ -663,7 +679,7 @@ def test_plte_length(self, tmp_path):
         with Image.open(out) as reloaded:
             assert len(reloaded.png.im_palette[1]) == 3
 
-    def test_getxmp(self):
+    def test_getxmp(self) -> None:
         with Image.open("Tests/images/color_snakes.png") as im:
             if ElementTree is None:
                 with pytest.warns(
@@ -672,13 +688,14 @@ def test_getxmp(self):
                 ):
                     assert im.getxmp() == {}
             else:
+                assert "xmp" in im.info
                 xmp = im.getxmp()
 
                 description = xmp["xmpmeta"]["RDF"]["Description"]
                 assert description["PixelXDimension"] == "10"
                 assert description["subject"]["Seq"] is None
 
-    def test_exif(self):
+    def test_exif(self) -> None:
         # With an EXIF chunk
         with Image.open("Tests/images/exif.png") as im:
             exif = im._getexif()
@@ -704,7 +721,7 @@ def test_exif(self):
             exif = im.getexif()
         assert exif[274] == 3
 
-    def test_exif_save(self, tmp_path):
+    def test_exif_save(self, tmp_path: Path) -> None:
         # Test exif is not saved from info
         test_file = str(tmp_path / "temp.png")
         with Image.open("Tests/images/exif.png") as im:
@@ -724,7 +741,7 @@ def test_exif_save(self, tmp_path):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_exif_from_jpg(self, tmp_path):
+    def test_exif_from_jpg(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/pil_sample_rgb.jpg") as im:
             test_file = str(tmp_path / "temp.png")
             im.save(test_file, exif=im.getexif())
@@ -733,7 +750,7 @@ def test_exif_from_jpg(self, tmp_path):
             exif = reloaded._getexif()
         assert exif[305] == "Adobe Photoshop CS Macintosh"
 
-    def test_exif_argument(self, tmp_path):
+    def test_exif_argument(self, tmp_path: Path) -> None:
         with Image.open(TEST_PNG_FILE) as im:
             test_file = str(tmp_path / "temp.png")
             im.save(test_file, exif=b"exifstring")
@@ -741,11 +758,11 @@ def test_exif_argument(self, tmp_path):
         with Image.open(test_file) as reloaded:
             assert reloaded.info["exif"] == b"Exif\x00\x00exifstring"
 
-    def test_tell(self):
+    def test_tell(self) -> None:
         with Image.open(TEST_PNG_FILE) as im:
             assert im.tell() == 0
 
-    def test_seek(self):
+    def test_seek(self) -> None:
         with Image.open(TEST_PNG_FILE) as im:
             im.seek(0)
 
@@ -753,17 +770,13 @@ def test_seek(self):
                 im.seek(1)
 
     @pytest.mark.parametrize("buffer", (True, False))
-    def test_save_stdout(self, buffer):
+    def test_save_stdout(self, buffer: bool) -> None:
         old_stdout = sys.stdout
 
-        if buffer:
-
-            class MyStdOut:
-                buffer = BytesIO()
+        class MyStdOut:
+            buffer = BytesIO()
 
-            mystdout = MyStdOut()
-        else:
-            mystdout = BytesIO()
+        mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO()
 
         sys.stdout = mystdout
 
@@ -773,11 +786,23 @@ class MyStdOut:
         # Reset stdout
         sys.stdout = old_stdout
 
-        if buffer:
+        if isinstance(mystdout, MyStdOut):
             mystdout = mystdout.buffer
         with Image.open(mystdout) as reloaded:
             assert_image_equal_tofile(reloaded, TEST_PNG_FILE)
 
+    def test_truncated_end_chunk(self) -> None:
+        with Image.open("Tests/images/truncated_end_chunk.png") as im:
+            with pytest.raises(OSError):
+                im.load()
+
+        ImageFile.LOAD_TRUNCATED_IMAGES = True
+        try:
+            with Image.open("Tests/images/truncated_end_chunk.png") as im:
+                assert_image_equal_tofile(im, "Tests/images/hopper.png")
+        finally:
+            ImageFile.LOAD_TRUNCATED_IMAGES = False
+
 
 @pytest.mark.skipif(is_win32(), reason="Requires Unix or macOS")
 @skip_unless_feature("zlib")
@@ -785,7 +810,7 @@ class TestTruncatedPngPLeaks(PillowLeakTestCase):
     mem_limit = 2 * 1024  # max increase in K
     iterations = 100  # Leak is 56k/iteration, this will leak 5.6megs
 
-    def test_leak_load(self):
+    def test_leak_load(self) -> None:
         with open("Tests/images/hopper.png", "rb") as f:
             DATA = BytesIO(f.read(16 * 1024))
 
@@ -793,7 +818,7 @@ def test_leak_load(self):
         with Image.open(DATA) as im:
             im.load()
 
-        def core():
+        def core() -> None:
             with Image.open(DATA) as im:
                 im.load()
 
diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py
index bb49a46d376..fb08d613a56 100644
--- a/Tests/test_file_ppm.py
+++ b/Tests/test_file_ppm.py
@@ -1,18 +1,25 @@
 from __future__ import annotations
+
 import sys
 from io import BytesIO
+from pathlib import Path
 
 import pytest
 
 from PIL import Image, PpmImagePlugin
 
-from .helper import assert_image_equal_tofile, assert_image_similar, hopper
+from .helper import (
+    assert_image_equal,
+    assert_image_equal_tofile,
+    assert_image_similar,
+    hopper,
+)
 
 # sample ppm stream
 TEST_FILE = "Tests/images/hopper.ppm"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_FILE) as im:
         assert im.mode == "RGB"
         assert im.size == (128, 128)
@@ -63,7 +70,9 @@ def test_sanity():
         ),
     ),
 )
-def test_arbitrary_maxval(data, mode, pixels):
+def test_arbitrary_maxval(
+    data: bytes, mode: str, pixels: tuple[int | tuple[int, int, int], ...]
+) -> None:
     fp = BytesIO(data)
     with Image.open(fp) as im:
         assert im.size == (3, 1)
@@ -73,31 +82,71 @@ def test_arbitrary_maxval(data, mode, pixels):
         assert tuple(px[x, 0] for x in range(3)) == pixels
 
 
-def test_16bit_pgm():
+def test_16bit_pgm() -> None:
     with Image.open("Tests/images/16_bit_binary.pgm") as im:
         assert im.mode == "I"
         assert im.size == (20, 100)
         assert im.get_format_mimetype() == "image/x-portable-graymap"
 
-        assert_image_equal_tofile(im, "Tests/images/16_bit_binary_pgm.png")
+        assert_image_equal_tofile(im, "Tests/images/16_bit_binary_pgm.tiff")
 
 
-def test_16bit_pgm_write(tmp_path):
+def test_16bit_pgm_write(tmp_path: Path) -> None:
     with Image.open("Tests/images/16_bit_binary.pgm") as im:
-        f = str(tmp_path / "temp.pgm")
-        im.save(f, "PPM")
+        filename = str(tmp_path / "temp.pgm")
+        im.save(filename, "PPM")
+        assert_image_equal_tofile(im, filename)
 
-        assert_image_equal_tofile(im, f)
+        im.convert("I;16").save(filename, "PPM")
+        assert_image_equal_tofile(im, filename)
 
 
-def test_pnm(tmp_path):
+def test_pnm(tmp_path: Path) -> None:
     with Image.open("Tests/images/hopper.pnm") as im:
         assert_image_similar(im, hopper(), 0.0001)
 
-        f = str(tmp_path / "temp.pnm")
-        im.save(f)
+        filename = str(tmp_path / "temp.pnm")
+        im.save(filename)
+
+        assert_image_equal_tofile(im, filename)
+
+
+def test_pfm(tmp_path: Path) -> None:
+    with Image.open("Tests/images/hopper.pfm") as im:
+        assert im.info["scale"] == 1.0
+        assert_image_equal(im, hopper("F"))
+
+        filename = str(tmp_path / "tmp.pfm")
+        im.save(filename)
+
+        assert_image_equal_tofile(im, filename)
 
-        assert_image_equal_tofile(im, f)
+
+def test_pfm_big_endian(tmp_path: Path) -> None:
+    with Image.open("Tests/images/hopper_be.pfm") as im:
+        assert im.info["scale"] == 2.5
+        assert_image_equal(im, hopper("F"))
+
+        filename = str(tmp_path / "tmp.pfm")
+        im.save(filename)
+
+        assert_image_equal_tofile(im, filename)
+
+
+@pytest.mark.parametrize(
+    "data",
+    [
+        b"Pf 1 1 NaN \0\0\0\0",
+        b"Pf 1 1 inf \0\0\0\0",
+        b"Pf 1 1 -inf \0\0\0\0",
+        b"Pf 1 1 0.0 \0\0\0\0",
+        b"Pf 1 1 -0.0 \0\0\0\0",
+    ],
+)
+def test_pfm_invalid(data: bytes) -> None:
+    with pytest.raises(ValueError):
+        with Image.open(BytesIO(data)):
+            pass
 
 
 @pytest.mark.parametrize(
@@ -117,12 +166,12 @@ def test_pnm(tmp_path):
         ),
     ),
 )
-def test_plain(plain_path, raw_path):
+def test_plain(plain_path: str, raw_path: str) -> None:
     with Image.open(plain_path) as im:
         assert_image_equal_tofile(im, raw_path)
 
 
-def test_16bit_plain_pgm():
+def test_16bit_plain_pgm() -> None:
     # P2 with maxval 2 ** 16 - 1
     with Image.open("Tests/images/hopper_16bit_plain.pgm") as im:
         assert im.mode == "I"
@@ -141,7 +190,9 @@ def test_16bit_plain_pgm():
         (b"P3\n2 2\n255", b"0 0 0 001 1 1 2 2 2 255 255 255", 10**6),
     ),
 )
-def test_plain_data_with_comment(tmp_path, header, data, comment_count):
+def test_plain_data_with_comment(
+    tmp_path: Path, header: bytes, data: bytes, comment_count: int
+) -> None:
     path1 = str(tmp_path / "temp1.ppm")
     path2 = str(tmp_path / "temp2.ppm")
     comment = b"# comment" * comment_count
@@ -154,7 +205,7 @@ def test_plain_data_with_comment(tmp_path, header, data, comment_count):
 
 
 @pytest.mark.parametrize("data", (b"P1\n128 128\n", b"P3\n128 128\n255\n"))
-def test_plain_truncated_data(tmp_path, data):
+def test_plain_truncated_data(tmp_path: Path, data: bytes) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(data)
@@ -165,7 +216,7 @@ def test_plain_truncated_data(tmp_path, data):
 
 
 @pytest.mark.parametrize("data", (b"P1\n128 128\n1009", b"P3\n128 128\n255\n100A"))
-def test_plain_invalid_data(tmp_path, data):
+def test_plain_invalid_data(tmp_path: Path, data: bytes) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(data)
@@ -182,7 +233,7 @@ def test_plain_invalid_data(tmp_path, data):
         b"P3\n128 128\n255\n012345678910 0",  # token too long
     ),
 )
-def test_plain_ppm_token_too_long(tmp_path, data):
+def test_plain_ppm_token_too_long(tmp_path: Path, data: bytes) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(data)
@@ -192,22 +243,32 @@ def test_plain_ppm_token_too_long(tmp_path, data):
             im.load()
 
 
-def test_plain_ppm_value_too_large(tmp_path):
+def test_plain_ppm_value_negative(tmp_path: Path) -> None:
+    path = str(tmp_path / "temp.ppm")
+    with open(path, "wb") as f:
+        f.write(b"P3\n128 128\n255\n-1")
+
+    with Image.open(path) as im:
+        with pytest.raises(ValueError, match="Channel value is negative"):
+            im.load()
+
+
+def test_plain_ppm_value_too_large(tmp_path: Path) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(b"P3\n128 128\n255\n256")
 
     with Image.open(path) as im:
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="Channel value too large"):
             im.load()
 
 
-def test_magic():
+def test_magic() -> None:
     with pytest.raises(SyntaxError):
         PpmImagePlugin.PpmImageFile(fp=BytesIO(b"PyInvalid"))
 
 
-def test_header_with_comments(tmp_path):
+def test_header_with_comments(tmp_path: Path) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(b"P6 #comment\n#comment\r12#comment\r8\n128 #comment\n255\n")
@@ -216,7 +277,7 @@ def test_header_with_comments(tmp_path):
         assert im.size == (128, 128)
 
 
-def test_non_integer_token(tmp_path):
+def test_non_integer_token(tmp_path: Path) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(b"P6\nTEST")
@@ -226,7 +287,7 @@ def test_non_integer_token(tmp_path):
             pass
 
 
-def test_header_token_too_long(tmp_path):
+def test_header_token_too_long(tmp_path: Path) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(b"P6\n 01234567890")
@@ -238,7 +299,7 @@ def test_header_token_too_long(tmp_path):
     assert str(e.value) == "Token too long in file header: 01234567890"
 
 
-def test_truncated_file(tmp_path):
+def test_truncated_file(tmp_path: Path) -> None:
     # Test EOF in header
     path = str(tmp_path / "temp.pgm")
     with open(path, "wb") as f:
@@ -257,7 +318,7 @@ def test_truncated_file(tmp_path):
             im.load()
 
 
-def test_not_enough_image_data(tmp_path):
+def test_not_enough_image_data(tmp_path: Path) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(b"P2 1 2 255 255")
@@ -268,7 +329,7 @@ def test_not_enough_image_data(tmp_path):
 
 
 @pytest.mark.parametrize("maxval", (b"0", b"65536"))
-def test_invalid_maxval(maxval, tmp_path):
+def test_invalid_maxval(maxval: bytes, tmp_path: Path) -> None:
     path = str(tmp_path / "temp.ppm")
     with open(path, "wb") as f:
         f.write(b"P6\n3 1 " + maxval)
@@ -280,7 +341,7 @@ def test_invalid_maxval(maxval, tmp_path):
     assert str(e.value) == "maxval must be greater than 0 and less than 65536"
 
 
-def test_neg_ppm():
+def test_neg_ppm() -> None:
     # Storage.c accepted negative values for xsize, ysize.  the
     # internal open_ppm function didn't check for sanity but it
     # has been removed. The default opener doesn't accept negative
@@ -291,7 +352,7 @@ def test_neg_ppm():
             pass
 
 
-def test_mimetypes(tmp_path):
+def test_mimetypes(tmp_path: Path) -> None:
     path = str(tmp_path / "temp.pgm")
 
     with open(path, "wb") as f:
@@ -306,17 +367,13 @@ def test_mimetypes(tmp_path):
 
 
 @pytest.mark.parametrize("buffer", (True, False))
-def test_save_stdout(buffer):
+def test_save_stdout(buffer: bool) -> None:
     old_stdout = sys.stdout
 
-    if buffer:
-
-        class MyStdOut:
-            buffer = BytesIO()
+    class MyStdOut:
+        buffer = BytesIO()
 
-        mystdout = MyStdOut()
-    else:
-        mystdout = BytesIO()
+    mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO()
 
     sys.stdout = mystdout
 
@@ -326,7 +383,7 @@ class MyStdOut:
     # Reset stdout
     sys.stdout = old_stdout
 
-    if buffer:
+    if isinstance(mystdout, MyStdOut):
         mystdout = mystdout.buffer
     with Image.open(mystdout) as reloaded:
         assert_image_equal_tofile(reloaded, TEST_FILE)
diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py
index 8b06ce2b163..e6c79e40b6e 100644
--- a/Tests/test_file_psd.py
+++ b/Tests/test_file_psd.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import warnings
 
 import pytest
@@ -10,7 +11,7 @@
 test_file = "Tests/images/hopper.psd"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(test_file) as im:
         im.load()
         assert im.mode == "RGB"
@@ -23,8 +24,8 @@ def test_sanity():
 
 
 @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-def test_unclosed_file():
-    def open():
+def test_unclosed_file() -> None:
+    def open() -> None:
         im = Image.open(test_file)
         im.load()
 
@@ -32,27 +33,27 @@ def open():
         open()
 
 
-def test_closed_file():
+def test_closed_file() -> None:
     with warnings.catch_warnings():
         im = Image.open(test_file)
         im.load()
         im.close()
 
 
-def test_context_manager():
+def test_context_manager() -> None:
     with warnings.catch_warnings():
         with Image.open(test_file) as im:
             im.load()
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         PsdImagePlugin.PsdImageFile(invalid_file)
 
 
-def test_n_frames():
+def test_n_frames() -> None:
     with Image.open("Tests/images/hopper_merged.psd") as im:
         assert im.n_frames == 1
         assert not im.is_animated
@@ -63,7 +64,7 @@ def test_n_frames():
             assert im.is_animated
 
 
-def test_eoferror():
+def test_eoferror() -> None:
     with Image.open(test_file) as im:
         # PSD seek index starts at 1 rather than 0
         n_frames = im.n_frames + 1
@@ -77,7 +78,7 @@ def test_eoferror():
         im.seek(n_frames - 1)
 
 
-def test_seek_tell():
+def test_seek_tell() -> None:
     with Image.open(test_file) as im:
         layer_number = im.tell()
         assert layer_number == 1
@@ -94,30 +95,35 @@ def test_seek_tell():
         assert layer_number == 2
 
 
-def test_seek_eoferror():
+def test_seek_eoferror() -> None:
     with Image.open(test_file) as im:
         with pytest.raises(EOFError):
             im.seek(-1)
 
 
-def test_open_after_exclusive_load():
+def test_open_after_exclusive_load() -> None:
     with Image.open(test_file) as im:
         im.load()
         im.seek(im.tell() + 1)
         im.load()
 
 
-def test_rgba():
+def test_rgba() -> None:
     with Image.open("Tests/images/rgba.psd") as im:
         assert_image_equal_tofile(im, "Tests/images/imagedraw_square.png")
 
 
-def test_layer_skip():
+def test_negative_top_left_layer() -> None:
+    with Image.open("Tests/images/negative_top_left_layer.psd") as im:
+        assert im.layers[0][2] == (-50, -50, 50, 50)
+
+
+def test_layer_skip() -> None:
     with Image.open("Tests/images/five_channels.psd") as im:
         assert im.n_frames == 1
 
 
-def test_icc_profile():
+def test_icc_profile() -> None:
     with Image.open(test_file) as im:
         assert "icc_profile" in im.info
 
@@ -125,12 +131,12 @@ def test_icc_profile():
         assert len(icc_profile) == 3144
 
 
-def test_no_icc_profile():
+def test_no_icc_profile() -> None:
     with Image.open("Tests/images/hopper_merged.psd") as im:
         assert "icc_profile" not in im.info
 
 
-def test_combined_larger_than_size():
+def test_combined_larger_than_size() -> None:
     # The combined size of the individual parts is larger than the
     # declared 'size' of the extra data field, resulting in a backwards seek.
 
@@ -144,20 +150,26 @@ def test_combined_larger_than_size():
 @pytest.mark.parametrize(
     "test_file,raises",
     [
-        (
-            "Tests/images/timeout-1ee28a249896e05b83840ae8140622de8e648ba9.psd",
-            Image.UnidentifiedImageError,
-        ),
-        (
-            "Tests/images/timeout-598843abc37fc080ec36a2699ebbd44f795d3a6f.psd",
-            Image.UnidentifiedImageError,
-        ),
         ("Tests/images/timeout-c8efc3fded6426986ba867a399791bae544f59bc.psd", OSError),
         ("Tests/images/timeout-dedc7a4ebd856d79b4359bbcc79e8ef231ce38f6.psd", OSError),
     ],
 )
-def test_crashes(test_file, raises):
+def test_crashes(test_file: str, raises: type[Exception]) -> None:
     with open(test_file, "rb") as f:
         with pytest.raises(raises):
             with Image.open(f):
                 pass
+
+
+@pytest.mark.parametrize(
+    "test_file",
+    [
+        "Tests/images/timeout-1ee28a249896e05b83840ae8140622de8e648ba9.psd",
+        "Tests/images/timeout-598843abc37fc080ec36a2699ebbd44f795d3a6f.psd",
+    ],
+)
+def test_layer_crashes(test_file: str) -> None:
+    with open(test_file, "rb") as f:
+        with Image.open(f) as im:
+            with pytest.raises(SyntaxError):
+                im.layers
diff --git a/Tests/test_file_qoi.py b/Tests/test_file_qoi.py
index b7c9457294d..fd4b981ce93 100644
--- a/Tests/test_file_qoi.py
+++ b/Tests/test_file_qoi.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, QoiImagePlugin
@@ -6,7 +7,7 @@
 from .helper import assert_image_equal_tofile
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open("Tests/images/hopper.qoi") as im:
         assert im.mode == "RGB"
         assert im.size == (128, 128)
@@ -22,7 +23,7 @@ def test_sanity():
         assert_image_equal_tofile(im, "Tests/images/pil123rgba.png")
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
diff --git a/Tests/test_file_sgi.py b/Tests/test_file_sgi.py
index 13698276b8c..e13a8019ed4 100644
--- a/Tests/test_file_sgi.py
+++ b/Tests/test_file_sgi.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image, SgiImagePlugin
@@ -11,7 +14,7 @@
 )
 
 
-def test_rgb():
+def test_rgb() -> None:
     # Created with ImageMagick then renamed:
     # convert hopper.ppm -compress None sgi:hopper.rgb
     test_file = "Tests/images/hopper.rgb"
@@ -21,11 +24,11 @@ def test_rgb():
         assert im.get_format_mimetype() == "image/rgb"
 
 
-def test_rgb16():
+def test_rgb16() -> None:
     assert_image_equal_tofile(hopper(), "Tests/images/hopper16.rgb")
 
 
-def test_l():
+def test_l() -> None:
     # Created with ImageMagick
     # convert hopper.ppm -monochrome -compress None sgi:hopper.bw
     test_file = "Tests/images/hopper.bw"
@@ -35,7 +38,7 @@ def test_l():
         assert im.get_format_mimetype() == "image/sgi"
 
 
-def test_rgba():
+def test_rgba() -> None:
     # Created with ImageMagick:
     # convert transparent.png -compress None transparent.sgi
     test_file = "Tests/images/transparent.sgi"
@@ -45,7 +48,7 @@ def test_rgba():
         assert im.get_format_mimetype() == "image/sgi"
 
 
-def test_rle():
+def test_rle() -> None:
     # Created with ImageMagick:
     # convert hopper.ppm  hopper.sgi
     test_file = "Tests/images/hopper.sgi"
@@ -54,22 +57,22 @@ def test_rle():
         assert_image_equal_tofile(im, "Tests/images/hopper.rgb")
 
 
-def test_rle16():
+def test_rle16() -> None:
     test_file = "Tests/images/tv16.sgi"
 
     with Image.open(test_file) as im:
         assert_image_equal_tofile(im, "Tests/images/tv.rgb")
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(ValueError):
         SgiImagePlugin.SgiImageFile(invalid_file)
 
 
-def test_write(tmp_path):
-    def roundtrip(img):
+def test_write(tmp_path: Path) -> None:
+    def roundtrip(img: Image.Image) -> None:
         out = str(tmp_path / "temp.sgi")
         img.save(out, format="sgi")
         assert_image_equal_tofile(img, out)
@@ -88,7 +91,7 @@ def roundtrip(img):
     roundtrip(Image.new("L", (10, 1)))
 
 
-def test_write16(tmp_path):
+def test_write16(tmp_path: Path) -> None:
     test_file = "Tests/images/hopper16.rgb"
 
     with Image.open(test_file) as im:
@@ -98,7 +101,7 @@ def test_write16(tmp_path):
         assert_image_equal_tofile(im, out)
 
 
-def test_unsupported_mode(tmp_path):
+def test_unsupported_mode(tmp_path: Path) -> None:
     im = hopper("LA")
     out = str(tmp_path / "temp.sgi")
 
diff --git a/Tests/test_file_spider.py b/Tests/test_file_spider.py
index f2109875478..66c88e9d8eb 100644
--- a/Tests/test_file_spider.py
+++ b/Tests/test_file_spider.py
@@ -1,18 +1,20 @@
 from __future__ import annotations
+
 import tempfile
 import warnings
 from io import BytesIO
+from pathlib import Path
 
 import pytest
 
 from PIL import Image, ImageSequence, SpiderImagePlugin
 
-from .helper import assert_image_equal_tofile, hopper, is_pypy
+from .helper import assert_image_equal, hopper, is_pypy
 
 TEST_FILE = "Tests/images/hopper.spider"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_FILE) as im:
         im.load()
         assert im.mode == "F"
@@ -21,8 +23,8 @@ def test_sanity():
 
 
 @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-def test_unclosed_file():
-    def open():
+def test_unclosed_file() -> None:
+    def open() -> None:
         im = Image.open(TEST_FILE)
         im.load()
 
@@ -30,20 +32,20 @@ def open():
         open()
 
 
-def test_closed_file():
+def test_closed_file() -> None:
     with warnings.catch_warnings():
         im = Image.open(TEST_FILE)
         im.load()
         im.close()
 
 
-def test_context_manager():
+def test_context_manager() -> None:
     with warnings.catch_warnings():
         with Image.open(TEST_FILE) as im:
             im.load()
 
 
-def test_save(tmp_path):
+def test_save(tmp_path: Path) -> None:
     # Arrange
     temp = str(tmp_path / "temp.spider")
     im = hopper()
@@ -58,7 +60,7 @@ def test_save(tmp_path):
         assert im2.format == "SPIDER"
 
 
-def test_tempfile():
+def test_tempfile() -> None:
     # Arrange
     im = hopper()
 
@@ -74,11 +76,11 @@ def test_tempfile():
             assert reloaded.format == "SPIDER"
 
 
-def test_is_spider_image():
+def test_is_spider_image() -> None:
     assert SpiderImagePlugin.isSpiderImage(TEST_FILE)
 
 
-def test_tell():
+def test_tell() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         # Act
@@ -88,13 +90,13 @@ def test_tell():
         assert index == 0
 
 
-def test_n_frames():
+def test_n_frames() -> None:
     with Image.open(TEST_FILE) as im:
         assert im.n_frames == 1
         assert not im.is_animated
 
 
-def test_load_image_series():
+def test_load_image_series() -> None:
     # Arrange
     not_spider_file = "Tests/images/hopper.ppm"
     file_list = [TEST_FILE, not_spider_file, "path/not_found.ext"]
@@ -103,12 +105,13 @@ def test_load_image_series():
     img_list = SpiderImagePlugin.loadImageSeries(file_list)
 
     # Assert
+    assert img_list is not None
     assert len(img_list) == 1
     assert isinstance(img_list[0], Image.Image)
     assert img_list[0].size == (128, 128)
 
 
-def test_load_image_series_no_input():
+def test_load_image_series_no_input() -> None:
     # Arrange
     file_list = None
 
@@ -119,7 +122,7 @@ def test_load_image_series_no_input():
     assert img_list is None
 
 
-def test_is_int_not_a_number():
+def test_is_int_not_a_number() -> None:
     # Arrange
     not_a_number = "a"
 
@@ -130,7 +133,7 @@ def test_is_int_not_a_number():
     assert ret == 0
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/invalid.spider"
 
     with pytest.raises(OSError):
@@ -138,24 +141,25 @@ def test_invalid_file():
             pass
 
 
-def test_nonstack_file():
+def test_nonstack_file() -> None:
     with Image.open(TEST_FILE) as im:
         with pytest.raises(EOFError):
             im.seek(0)
 
 
-def test_nonstack_dos():
+def test_nonstack_dos() -> None:
     with Image.open(TEST_FILE) as im:
         for i, frame in enumerate(ImageSequence.Iterator(im)):
             assert i <= 1, "Non-stack DOS file test failed"
 
 
 # for issue #4093
-def test_odd_size():
+def test_odd_size() -> None:
     data = BytesIO()
     width = 100
     im = Image.new("F", (width, 64))
     im.save(data, format="SPIDER")
 
     data.seek(0)
-    assert_image_equal_tofile(im, data)
+    with Image.open(data) as im2:
+        assert_image_equal(im, im2)
diff --git a/Tests/test_file_sun.py b/Tests/test_file_sun.py
index 874b37b5285..6cfff87309c 100644
--- a/Tests/test_file_sun.py
+++ b/Tests/test_file_sun.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import os
 
 import pytest
@@ -10,7 +11,7 @@
 EXTRA_DIR = "Tests/images/sunraster"
 
 
-def test_sanity():
+def test_sanity() -> None:
     # Arrange
     # Created with ImageMagick: convert hopper.jpg hopper.ras
     test_file = "Tests/images/hopper.ras"
@@ -27,7 +28,7 @@ def test_sanity():
         SunImagePlugin.SunImageFile(invalid_file)
 
 
-def test_im1():
+def test_im1() -> None:
     with Image.open("Tests/images/sunraster.im1") as im:
         assert_image_equal_tofile(im, "Tests/images/sunraster.im1.png")
 
@@ -35,7 +36,7 @@ def test_im1():
 @pytest.mark.skipif(
     not os.path.exists(EXTRA_DIR), reason="Extra image files not installed"
 )
-def test_others():
+def test_others() -> None:
     files = (
         os.path.join(EXTRA_DIR, f)
         for f in os.listdir(EXTRA_DIR)
diff --git a/Tests/test_file_tar.py b/Tests/test_file_tar.py
index 4470823cdbd..6217ebedd8a 100644
--- a/Tests/test_file_tar.py
+++ b/Tests/test_file_tar.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import warnings
 
 import pytest
@@ -18,7 +19,7 @@
         ("jpg", "hopper.jpg", "JPEG"),
     ),
 )
-def test_sanity(codec, test_path, format):
+def test_sanity(codec: str, test_path: str, format: str) -> None:
     if features.check(codec):
         with TarIO.TarIO(TEST_TAR_FILE, test_path) as tar:
             with Image.open(tar) as im:
@@ -29,18 +30,18 @@ def test_sanity(codec, test_path, format):
 
 
 @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-def test_unclosed_file():
+def test_unclosed_file() -> None:
     with pytest.warns(ResourceWarning):
         TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg")
 
 
-def test_close():
+def test_close() -> None:
     with warnings.catch_warnings():
         tar = TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg")
         tar.close()
 
 
-def test_contextmanager():
+def test_contextmanager() -> None:
     with warnings.catch_warnings():
         with TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg"):
             pass
diff --git a/Tests/test_file_tga.py b/Tests/test_file_tga.py
index d0f228573bb..a03a6a6e10a 100644
--- a/Tests/test_file_tga.py
+++ b/Tests/test_file_tga.py
@@ -1,11 +1,13 @@
 from __future__ import annotations
+
 import os
 from glob import glob
 from itertools import product
+from pathlib import Path
 
 import pytest
 
-from PIL import Image
+from PIL import Image, UnidentifiedImageError
 
 from .helper import assert_image_equal, assert_image_equal_tofile, hopper
 
@@ -20,8 +22,8 @@
 
 
 @pytest.mark.parametrize("mode", _MODES)
-def test_sanity(mode, tmp_path):
-    def roundtrip(original_im):
+def test_sanity(mode: str, tmp_path: Path) -> None:
+    def roundtrip(original_im: Image.Image) -> None:
         out = str(tmp_path / "temp.tga")
 
         original_im.save(out, rle=rle)
@@ -63,17 +65,31 @@ def roundtrip(original_im):
                     roundtrip(original_im)
 
 
-def test_palette_depth_16(tmp_path):
+def test_palette_depth_8(tmp_path: Path) -> None:
+    with pytest.raises(UnidentifiedImageError):
+        Image.open("Tests/images/p_8.tga")
+
+
+def test_palette_depth_16(tmp_path: Path) -> None:
     with Image.open("Tests/images/p_16.tga") as im:
-        assert_image_equal_tofile(im.convert("RGB"), "Tests/images/p_16.png")
+        assert im.palette.mode == "RGBA"
+        assert_image_equal_tofile(im.convert("RGBA"), "Tests/images/p_16.png")
 
         out = str(tmp_path / "temp.png")
         im.save(out)
         with Image.open(out) as reloaded:
-            assert_image_equal_tofile(reloaded.convert("RGB"), "Tests/images/p_16.png")
+            assert_image_equal_tofile(reloaded.convert("RGBA"), "Tests/images/p_16.png")
+
 
+def test_rgba_16() -> None:
+    with Image.open("Tests/images/rgba16.tga") as im:
+        assert im.mode == "RGBA"
 
-def test_id_field():
+        assert im.getpixel((0, 0)) == (172, 0, 255, 255)
+        assert im.getpixel((1, 0)) == (0, 255, 82, 0)
+
+
+def test_id_field() -> None:
     # tga file with id field
     test_file = "Tests/images/tga_id_field.tga"
 
@@ -83,7 +99,7 @@ def test_id_field():
         assert im.size == (100, 100)
 
 
-def test_id_field_rle():
+def test_id_field_rle() -> None:
     # tga file with id field
     test_file = "Tests/images/rgb32rle.tga"
 
@@ -93,7 +109,7 @@ def test_id_field_rle():
         assert im.size == (199, 199)
 
 
-def test_cross_scan_line():
+def test_cross_scan_line() -> None:
     with Image.open("Tests/images/cross_scan_line.tga") as im:
         assert_image_equal_tofile(im, "Tests/images/cross_scan_line.png")
 
@@ -102,7 +118,7 @@ def test_cross_scan_line():
             im.load()
 
 
-def test_save(tmp_path):
+def test_save(tmp_path: Path) -> None:
     test_file = "Tests/images/tga_id_field.tga"
     with Image.open(test_file) as im:
         out = str(tmp_path / "temp.tga")
@@ -119,7 +135,7 @@ def test_save(tmp_path):
         assert test_im.size == (100, 100)
 
 
-def test_small_palette(tmp_path):
+def test_small_palette(tmp_path: Path) -> None:
     im = Image.new("P", (1, 1))
     colors = [0, 0, 0]
     im.putpalette(colors)
@@ -131,7 +147,12 @@ def test_small_palette(tmp_path):
         assert reloaded.getpalette() == colors
 
 
-def test_save_wrong_mode(tmp_path):
+def test_missing_palette() -> None:
+    with Image.open("Tests/images/dilation4.lut") as im:
+        assert im.mode == "L"
+
+
+def test_save_wrong_mode(tmp_path: Path) -> None:
     im = hopper("PA")
     out = str(tmp_path / "temp.tga")
 
@@ -139,7 +160,7 @@ def test_save_wrong_mode(tmp_path):
         im.save(out)
 
 
-def test_save_mapdepth():
+def test_save_mapdepth() -> None:
     # This image has been manually hexedited from 200x32_p_bl_raw.tga
     # to include an origin
     test_file = "Tests/images/200x32_p_bl_raw_origin.tga"
@@ -147,7 +168,7 @@ def test_save_mapdepth():
         assert_image_equal_tofile(im, "Tests/images/tga/common/200x32_p.png")
 
 
-def test_save_id_section(tmp_path):
+def test_save_id_section(tmp_path: Path) -> None:
     test_file = "Tests/images/rgb32rle.tga"
     with Image.open(test_file) as im:
         out = str(tmp_path / "temp.tga")
@@ -178,7 +199,7 @@ def test_save_id_section(tmp_path):
         assert "id_section" not in test_im.info
 
 
-def test_save_orientation(tmp_path):
+def test_save_orientation(tmp_path: Path) -> None:
     test_file = "Tests/images/rgb32rle.tga"
     out = str(tmp_path / "temp.tga")
     with Image.open(test_file) as im:
@@ -189,7 +210,7 @@ def test_save_orientation(tmp_path):
         assert test_im.info["orientation"] == 1
 
 
-def test_horizontal_orientations():
+def test_horizontal_orientations() -> None:
     # These images have been manually hexedited to have the relevant orientations
     with Image.open("Tests/images/rgb32rle_top_right.tga") as im:
         assert im.load()[90, 90][:3] == (0, 0, 0)
@@ -198,7 +219,7 @@ def test_horizontal_orientations():
         assert im.load()[90, 90][:3] == (0, 255, 0)
 
 
-def test_save_rle(tmp_path):
+def test_save_rle(tmp_path: Path) -> None:
     test_file = "Tests/images/rgb32rle.tga"
     with Image.open(test_file) as im:
         assert im.info["compression"] == "tga_rle"
@@ -231,7 +252,7 @@ def test_save_rle(tmp_path):
         assert test_im.info["compression"] == "tga_rle"
 
 
-def test_save_l_transparency(tmp_path):
+def test_save_l_transparency(tmp_path: Path) -> None:
     # There are 559 transparent pixels in la.tga.
     num_transparent = 559
 
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
index a50f50e5e96..af766022b5c 100644
--- a/Tests/test_file_tiff.py
+++ b/Tests/test_file_tiff.py
@@ -1,7 +1,11 @@
 from __future__ import annotations
+
 import os
 import warnings
+from collections.abc import Generator
 from io import BytesIO
+from pathlib import Path
+from types import ModuleType
 
 import pytest
 
@@ -18,6 +22,7 @@
     is_win32,
 )
 
+ElementTree: ModuleType | None
 try:
     from defusedxml import ElementTree
 except ImportError:
@@ -25,7 +30,7 @@
 
 
 class TestFileTiff:
-    def test_sanity(self, tmp_path):
+    def test_sanity(self, tmp_path: Path) -> None:
         filename = str(tmp_path / "temp.tif")
 
         hopper("RGB").save(filename)
@@ -57,22 +62,23 @@ def test_sanity(self, tmp_path):
             pass
 
     @pytest.mark.skipif(is_pypy(), reason="Requires CPython")
-    def test_unclosed_file(self):
-        def open():
+    def test_unclosed_file(self) -> None:
+        def open() -> None:
             im = Image.open("Tests/images/multipage.tiff")
             im.load()
 
         with pytest.warns(ResourceWarning):
             open()
 
-    def test_closed_file(self):
+    def test_closed_file(self) -> None:
         with warnings.catch_warnings():
             im = Image.open("Tests/images/multipage.tiff")
             im.load()
             im.close()
 
-    def test_seek_after_close(self):
+    def test_seek_after_close(self) -> None:
         im = Image.open("Tests/images/multipage.tiff")
+        assert isinstance(im, TiffImagePlugin.TiffImageFile)
         im.close()
 
         with pytest.raises(ValueError):
@@ -80,12 +86,12 @@ def test_seek_after_close(self):
         with pytest.raises(ValueError):
             im.seek(1)
 
-    def test_context_manager(self):
+    def test_context_manager(self) -> None:
         with warnings.catch_warnings():
             with Image.open("Tests/images/multipage.tiff") as im:
                 im.load()
 
-    def test_mac_tiff(self):
+    def test_mac_tiff(self) -> None:
         # Read RGBa images from macOS [@PIL136]
 
         filename = "Tests/images/pil136.tiff"
@@ -97,24 +103,25 @@ def test_mac_tiff(self):
 
             assert_image_similar_tofile(im, "Tests/images/pil136.png", 1)
 
-    def test_bigtiff(self, tmp_path):
+    def test_bigtiff(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/hopper_bigtiff.tif") as im:
             assert_image_equal_tofile(im, "Tests/images/hopper.tif")
 
         with Image.open("Tests/images/hopper_bigtiff.tif") as im:
-            # multistrip support not yet implemented
-            del im.tag_v2[273]
-
             outfile = str(tmp_path / "temp.tif")
             im.save(outfile, save_all=True, append_images=[im], tiffinfo=im.tag_v2)
 
-    def test_set_legacy_api(self):
+    def test_seek_too_large(self) -> None:
+        with pytest.raises(ValueError, match="Unable to seek to frame"):
+            Image.open("Tests/images/seek_too_large.tif")
+
+    def test_set_legacy_api(self) -> None:
         ifd = TiffImagePlugin.ImageFileDirectory_v2()
         with pytest.raises(Exception) as e:
-            ifd.legacy_api = None
+            ifd.legacy_api = False
         assert str(e.value) == "Not allowing setting of legacy api"
 
-    def test_xyres_tiff(self):
+    def test_xyres_tiff(self) -> None:
         filename = "Tests/images/pil168.tif"
         with Image.open(filename) as im:
             # legacy api
@@ -127,7 +134,7 @@ def test_xyres_tiff(self):
 
             assert im.info["dpi"] == (72.0, 72.0)
 
-    def test_xyres_fallback_tiff(self):
+    def test_xyres_fallback_tiff(self) -> None:
         filename = "Tests/images/compression.tif"
         with Image.open(filename) as im:
             # v2 api
@@ -141,7 +148,7 @@ def test_xyres_fallback_tiff(self):
             # Fallback "inch".
             assert im.info["dpi"] == (100.0, 100.0)
 
-    def test_int_resolution(self):
+    def test_int_resolution(self) -> None:
         filename = "Tests/images/pil168.tif"
         with Image.open(filename) as im:
             # Try to read a file where X,Y_RESOLUTION are ints
@@ -154,14 +161,14 @@ def test_int_resolution(self):
         "resolution_unit, dpi",
         [(None, 72.8), (2, 72.8), (3, 184.912)],
     )
-    def test_load_float_dpi(self, resolution_unit, dpi):
+    def test_load_float_dpi(self, resolution_unit: int | None, dpi: float) -> None:
         with Image.open(
             "Tests/images/hopper_float_dpi_" + str(resolution_unit) + ".tif"
         ) as im:
             assert im.tag_v2.get(RESOLUTION_UNIT) == resolution_unit
             assert im.info["dpi"] == (dpi, dpi)
 
-    def test_save_float_dpi(self, tmp_path):
+    def test_save_float_dpi(self, tmp_path: Path) -> None:
         outfile = str(tmp_path / "temp.tif")
         with Image.open("Tests/images/hopper.tif") as im:
             dpi = (72.2, 72.2)
@@ -170,7 +177,7 @@ def test_save_float_dpi(self, tmp_path):
             with Image.open(outfile) as reloaded:
                 assert reloaded.info["dpi"] == dpi
 
-    def test_save_setting_missing_resolution(self):
+    def test_save_setting_missing_resolution(self) -> None:
         b = BytesIO()
         with Image.open("Tests/images/10ct_32bit_128.tiff") as im:
             im.save(b, format="tiff", resolution=123.45)
@@ -178,7 +185,7 @@ def test_save_setting_missing_resolution(self):
             assert im.tag_v2[X_RESOLUTION] == 123.45
             assert im.tag_v2[Y_RESOLUTION] == 123.45
 
-    def test_invalid_file(self):
+    def test_invalid_file(self) -> None:
         invalid_file = "Tests/images/flower.jpg"
 
         with pytest.raises(SyntaxError):
@@ -189,30 +196,30 @@ def test_invalid_file(self):
             TiffImagePlugin.TiffImageFile(invalid_file)
         TiffImagePlugin.PREFIXES.pop()
 
-    def test_bad_exif(self):
+    def test_bad_exif(self) -> None:
         with Image.open("Tests/images/hopper_bad_exif.jpg") as i:
             # Should not raise struct.error.
             with pytest.warns(UserWarning):
                 i._getexif()
 
-    def test_save_rgba(self, tmp_path):
+    def test_save_rgba(self, tmp_path: Path) -> None:
         im = hopper("RGBA")
         outfile = str(tmp_path / "temp.tif")
         im.save(outfile)
 
-    def test_save_unsupported_mode(self, tmp_path):
+    def test_save_unsupported_mode(self, tmp_path: Path) -> None:
         im = hopper("HSV")
         outfile = str(tmp_path / "temp.tif")
         with pytest.raises(OSError):
             im.save(outfile)
 
-    def test_8bit_s(self):
+    def test_8bit_s(self) -> None:
         with Image.open("Tests/images/8bit.s.tif") as im:
             im.load()
             assert im.mode == "L"
             assert im.getpixel((50, 50)) == 184
 
-    def test_little_endian(self):
+    def test_little_endian(self) -> None:
         with Image.open("Tests/images/16bit.cropped.tif") as im:
             assert im.getpixel((0, 0)) == 480
             assert im.mode == "I;16"
@@ -222,7 +229,7 @@ def test_little_endian(self):
         assert b[0] == ord(b"\xe0")
         assert b[1] == ord(b"\x01")
 
-    def test_big_endian(self):
+    def test_big_endian(self) -> None:
         with Image.open("Tests/images/16bit.MM.cropped.tif") as im:
             assert im.getpixel((0, 0)) == 480
             assert im.mode == "I;16B"
@@ -232,7 +239,7 @@ def test_big_endian(self):
         assert b[0] == ord(b"\x01")
         assert b[1] == ord(b"\xe0")
 
-    def test_16bit_r(self):
+    def test_16bit_r(self) -> None:
         with Image.open("Tests/images/16bit.r.tif") as im:
             assert im.getpixel((0, 0)) == 480
             assert im.mode == "I;16"
@@ -241,14 +248,14 @@ def test_16bit_r(self):
         assert b[0] == ord(b"\xe0")
         assert b[1] == ord(b"\x01")
 
-    def test_16bit_s(self):
+    def test_16bit_s(self) -> None:
         with Image.open("Tests/images/16bit.s.tif") as im:
             im.load()
             assert im.mode == "I"
             assert im.getpixel((0, 0)) == 32767
             assert im.getpixel((0, 1)) == 0
 
-    def test_12bit_rawmode(self):
+    def test_12bit_rawmode(self) -> None:
         """Are we generating the same interpretation
         of the image as Imagemagick is?"""
 
@@ -261,7 +268,7 @@ def test_12bit_rawmode(self):
 
             assert_image_equal_tofile(im, "Tests/images/12in16bit.tif")
 
-    def test_32bit_float(self):
+    def test_32bit_float(self) -> None:
         # Issue 614, specific 32-bit float format
         path = "Tests/images/10ct_32bit_128.tiff"
         with Image.open(path) as im:
@@ -270,7 +277,7 @@ def test_32bit_float(self):
             assert im.getpixel((0, 0)) == -0.4526388943195343
             assert im.getextrema() == (-3.140936851501465, 3.140684127807617)
 
-    def test_unknown_pixel_mode(self):
+    def test_unknown_pixel_mode(self) -> None:
         with pytest.raises(OSError):
             with Image.open("Tests/images/hopper_unknown_pixel_mode.tif"):
                 pass
@@ -282,12 +289,12 @@ def test_unknown_pixel_mode(self):
             ("Tests/images/multipage.tiff", 3),
         ),
     )
-    def test_n_frames(self, path, n_frames):
+    def test_n_frames(self, path: str, n_frames: int) -> None:
         with Image.open(path) as im:
             assert im.n_frames == n_frames
             assert im.is_animated == (n_frames != 1)
 
-    def test_eoferror(self):
+    def test_eoferror(self) -> None:
         with Image.open("Tests/images/multipage-lastframe.tif") as im:
             n_frames = im.n_frames
 
@@ -299,7 +306,7 @@ def test_eoferror(self):
             # Test that seeking to the last frame does not raise an error
             im.seek(n_frames - 1)
 
-    def test_multipage(self):
+    def test_multipage(self) -> None:
         # issue #862
         with Image.open("Tests/images/multipage.tiff") as im:
             # file is a multipage tiff: 10x10 green, 10x10 red, 20x20 blue
@@ -323,13 +330,13 @@ def test_multipage(self):
             assert im.size == (20, 20)
             assert im.convert("RGB").getpixel((0, 0)) == (0, 0, 255)
 
-    def test_multipage_last_frame(self):
+    def test_multipage_last_frame(self) -> None:
         with Image.open("Tests/images/multipage-lastframe.tif") as im:
             im.load()
             assert im.size == (20, 20)
             assert im.convert("RGB").getpixel((0, 0)) == (0, 0, 255)
 
-    def test_frame_order(self):
+    def test_frame_order(self) -> None:
         # A frame can't progress to itself after reading
         with Image.open("Tests/images/multipage_single_frame_loop.tiff") as im:
             assert im.n_frames == 1
@@ -342,7 +349,7 @@ def test_frame_order(self):
         with Image.open("Tests/images/multipage_out_of_order.tiff") as im:
             assert im.n_frames == 3
 
-    def test___str__(self):
+    def test___str__(self) -> None:
         filename = "Tests/images/pil136.tiff"
         with Image.open(filename) as im:
             # Act
@@ -351,7 +358,7 @@ def test___str__(self):
             # Assert
             assert isinstance(ret, str)
 
-    def test_dict(self):
+    def test_dict(self) -> None:
         # Arrange
         filename = "Tests/images/pil136.tiff"
         with Image.open(filename) as im:
@@ -391,7 +398,7 @@ def test_dict(self):
             }
             assert dict(im.tag) == legacy_tags
 
-    def test__delitem__(self):
+    def test__delitem__(self) -> None:
         filename = "Tests/images/pil136.tiff"
         with Image.open(filename) as im:
             len_before = len(dict(im.ifd))
@@ -400,36 +407,36 @@ def test__delitem__(self):
             assert len_before == len_after + 1
 
     @pytest.mark.parametrize("legacy_api", (False, True))
-    def test_load_byte(self, legacy_api):
+    def test_load_byte(self, legacy_api: bool) -> None:
         ifd = TiffImagePlugin.ImageFileDirectory_v2()
         data = b"abc"
         ret = ifd.load_byte(data, legacy_api)
         assert ret == b"abc"
 
-    def test_load_string(self):
+    def test_load_string(self) -> None:
         ifd = TiffImagePlugin.ImageFileDirectory_v2()
         data = b"abc\0"
         ret = ifd.load_string(data, False)
         assert ret == "abc"
 
-    def test_load_float(self):
+    def test_load_float(self) -> None:
         ifd = TiffImagePlugin.ImageFileDirectory_v2()
         data = b"abcdabcd"
-        ret = ifd.load_float(data, False)
+        ret = getattr(ifd, "load_float")(data, False)
         assert ret == (1.6777999408082104e22, 1.6777999408082104e22)
 
-    def test_load_double(self):
+    def test_load_double(self) -> None:
         ifd = TiffImagePlugin.ImageFileDirectory_v2()
         data = b"abcdefghabcdefgh"
-        ret = ifd.load_double(data, False)
+        ret = getattr(ifd, "load_double")(data, False)
         assert ret == (8.540883223036124e194, 8.540883223036124e194)
 
-    def test_ifd_tag_type(self):
+    def test_ifd_tag_type(self) -> None:
         with Image.open("Tests/images/ifd_tag_type.tiff") as im:
             assert 0x8825 in im.tag_v2
 
-    def test_exif(self, tmp_path):
-        def check_exif(exif):
+    def test_exif(self, tmp_path: Path) -> None:
+        def check_exif(exif: Image.Exif) -> None:
             assert sorted(exif.keys()) == [
                 256,
                 257,
@@ -480,7 +487,7 @@ def check_exif(exif):
             exif = im.getexif()
             check_exif(exif)
 
-    def test_modify_exif(self, tmp_path):
+    def test_modify_exif(self, tmp_path: Path) -> None:
         outfile = str(tmp_path / "temp.tif")
         with Image.open("Tests/images/ifd_tag_type.tiff") as im:
             exif = im.getexif()
@@ -492,7 +499,7 @@ def test_modify_exif(self, tmp_path):
             exif = im.getexif()
             assert exif[264] == 100
 
-    def test_reload_exif_after_seek(self):
+    def test_reload_exif_after_seek(self) -> None:
         with Image.open("Tests/images/multipage.tiff") as im:
             exif = im.getexif()
             del exif[256]
@@ -500,7 +507,7 @@ def test_reload_exif_after_seek(self):
 
             assert 256 in exif
 
-    def test_exif_frames(self):
+    def test_exif_frames(self) -> None:
         # Test that EXIF data can change across frames
         with Image.open("Tests/images/g4-multi.tiff") as im:
             assert im.getexif()[273] == (328, 815)
@@ -509,7 +516,7 @@ def test_exif_frames(self):
             assert im.getexif()[273] == (1408, 1907)
 
     @pytest.mark.parametrize("mode", ("1", "L"))
-    def test_photometric(self, mode, tmp_path):
+    def test_photometric(self, mode: str, tmp_path: Path) -> None:
         filename = str(tmp_path / "temp.tif")
         im = hopper(mode)
         im.save(filename, tiffinfo={262: 0})
@@ -517,13 +524,13 @@ def test_photometric(self, mode, tmp_path):
             assert reloaded.tag_v2[262] == 0
             assert_image_equal(im, reloaded)
 
-    def test_seek(self):
+    def test_seek(self) -> None:
         filename = "Tests/images/pil136.tiff"
         with Image.open(filename) as im:
             im.seek(0)
             assert im.tell() == 0
 
-    def test_seek_eof(self):
+    def test_seek_eof(self) -> None:
         filename = "Tests/images/pil136.tiff"
         with Image.open(filename) as im:
             assert im.tell() == 0
@@ -532,21 +539,21 @@ def test_seek_eof(self):
             with pytest.raises(EOFError):
                 im.seek(1)
 
-    def test__limit_rational_int(self):
+    def test__limit_rational_int(self) -> None:
         from PIL.TiffImagePlugin import _limit_rational
 
         value = 34
         ret = _limit_rational(value, 65536)
         assert ret == (34, 1)
 
-    def test__limit_rational_float(self):
+    def test__limit_rational_float(self) -> None:
         from PIL.TiffImagePlugin import _limit_rational
 
         value = 22.3
         ret = _limit_rational(value, 65536)
         assert ret == (223, 10)
 
-    def test_4bit(self):
+    def test_4bit(self) -> None:
         test_file = "Tests/images/hopper_gray_4bpp.tif"
         original = hopper("L")
         with Image.open(test_file) as im:
@@ -554,7 +561,7 @@ def test_4bit(self):
             assert im.mode == "L"
             assert_image_similar(im, original, 7.3)
 
-    def test_gray_semibyte_per_pixel(self):
+    def test_gray_semibyte_per_pixel(self) -> None:
         test_files = (
             (
                 24.8,  # epsilon
@@ -587,10 +594,10 @@ def test_gray_semibyte_per_pixel(self):
                         assert im2.mode == "L"
                         assert_image_equal(im, im2)
 
-    def test_with_underscores(self, tmp_path):
+    def test_with_underscores(self, tmp_path: Path) -> None:
         kwargs = {"resolution_unit": "inch", "x_resolution": 72, "y_resolution": 36}
         filename = str(tmp_path / "temp.tif")
-        hopper("RGB").save(filename, **kwargs)
+        hopper("RGB").save(filename, "TIFF", **kwargs)
         with Image.open(filename) as im:
             # legacy interface
             assert im.tag[X_RESOLUTION][0][0] == 72
@@ -600,7 +607,7 @@ def test_with_underscores(self, tmp_path):
             assert im.tag_v2[X_RESOLUTION] == 72
             assert im.tag_v2[Y_RESOLUTION] == 36
 
-    def test_roundtrip_tiff_uint16(self, tmp_path):
+    def test_roundtrip_tiff_uint16(self, tmp_path: Path) -> None:
         # Test an image of all '0' values
         pixel_value = 0x1234
         infile = "Tests/images/uint16_1_4660.tif"
@@ -612,33 +619,50 @@ def test_roundtrip_tiff_uint16(self, tmp_path):
 
             assert_image_equal_tofile(im, tmpfile)
 
-    def test_rowsperstrip(self, tmp_path):
+    def test_iptc(self, tmp_path: Path) -> None:
+        # Do not preserve IPTC_NAA_CHUNK by default if type is LONG
+        outfile = str(tmp_path / "temp.tif")
+        with Image.open("Tests/images/hopper.tif") as im:
+            im.load()
+            assert isinstance(im, TiffImagePlugin.TiffImageFile)
+            ifd = TiffImagePlugin.ImageFileDirectory_v2()
+            ifd[33723] = 1
+            ifd.tagtype[33723] = 4
+            im.tag_v2 = ifd
+            im.save(outfile)
+
+        with Image.open(outfile) as im:
+            assert isinstance(im, TiffImagePlugin.TiffImageFile)
+            assert 33723 not in im.tag_v2
+
+    def test_rowsperstrip(self, tmp_path: Path) -> None:
         outfile = str(tmp_path / "temp.tif")
         im = hopper()
         im.save(outfile, tiffinfo={278: 256})
 
         with Image.open(outfile) as im:
+            assert isinstance(im, TiffImagePlugin.TiffImageFile)
             assert im.tag_v2[278] == 256
 
-    def test_strip_raw(self):
+    def test_strip_raw(self) -> None:
         infile = "Tests/images/tiff_strip_raw.tif"
         with Image.open(infile) as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_adobe_deflate.png")
 
-    def test_strip_planar_raw(self):
+    def test_strip_planar_raw(self) -> None:
         # gdal_translate -of GTiff -co INTERLEAVE=BAND \
         # tiff_strip_raw.tif tiff_strip_planar_raw.tiff
         infile = "Tests/images/tiff_strip_planar_raw.tif"
         with Image.open(infile) as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_adobe_deflate.png")
 
-    def test_strip_planar_raw_with_overviews(self):
+    def test_strip_planar_raw_with_overviews(self) -> None:
         # gdaladdo tiff_strip_planar_raw2.tif 2 4 8 16
         infile = "Tests/images/tiff_strip_planar_raw_with_overviews.tif"
         with Image.open(infile) as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_adobe_deflate.png")
 
-    def test_tiled_planar_raw(self):
+    def test_tiled_planar_raw(self) -> None:
         # gdal_translate -of GTiff -co TILED=YES -co BLOCKXSIZE=32 \
         # -co BLOCKYSIZE=32 -co INTERLEAVE=BAND \
         # tiff_tiled_raw.tif tiff_tiled_planar_raw.tiff
@@ -646,7 +670,7 @@ def test_tiled_planar_raw(self):
         with Image.open(infile) as im:
             assert_image_equal_tofile(im, "Tests/images/tiff_adobe_deflate.png")
 
-    def test_planar_configuration_save(self, tmp_path):
+    def test_planar_configuration_save(self, tmp_path: Path) -> None:
         infile = "Tests/images/tiff_tiled_planar_raw.tif"
         with Image.open(infile) as im:
             assert im._planar_configuration == 2
@@ -657,8 +681,15 @@ def test_planar_configuration_save(self, tmp_path):
             with Image.open(outfile) as reloaded:
                 assert_image_equal_tofile(reloaded, infile)
 
+    def test_invalid_tiled_dimensions(self) -> None:
+        with open("Tests/images/tiff_tiled_planar_raw.tif", "rb") as fp:
+            data = fp.read()
+        b = BytesIO(data[:144] + b"\x02" + data[145:])
+        with pytest.raises(ValueError):
+            Image.open(b)
+
     @pytest.mark.parametrize("mode", ("P", "PA"))
-    def test_palette(self, mode, tmp_path):
+    def test_palette(self, mode: str, tmp_path: Path) -> None:
         outfile = str(tmp_path / "temp.tif")
 
         im = hopper(mode)
@@ -667,7 +698,7 @@ def test_palette(self, mode, tmp_path):
         with Image.open(outfile) as reloaded:
             assert_image_equal(im.convert("RGB"), reloaded.convert("RGB"))
 
-    def test_tiff_save_all(self):
+    def test_tiff_save_all(self) -> None:
         mp = BytesIO()
         with Image.open("Tests/images/multipage.tiff") as im:
             im.save(mp, format="tiff", save_all=True)
@@ -687,7 +718,7 @@ def test_tiff_save_all(self):
             assert reread.n_frames == 3
 
         # Test appending using a generator
-        def im_generator(ims):
+        def im_generator(ims: list[Image.Image]) -> Generator[Image.Image, None, None]:
             yield from ims
 
         mp = BytesIO()
@@ -697,7 +728,21 @@ def im_generator(ims):
         with Image.open(mp) as reread:
             assert reread.n_frames == 3
 
-    def test_saving_icc_profile(self, tmp_path):
+    def test_fixoffsets(self) -> None:
+        b = BytesIO(b"II\x2a\x00\x00\x00\x00\x00")
+        with TiffImagePlugin.AppendingTiffWriter(b) as a:
+            b.seek(0)
+            a.fixOffsets(1, isShort=True)
+
+            b.seek(0)
+            a.fixOffsets(1, isLong=True)
+
+            # Neither short nor long
+            b.seek(0)
+            with pytest.raises(RuntimeError):
+                a.fixOffsets(1)
+
+    def test_saving_icc_profile(self, tmp_path: Path) -> None:
         # Tests saving TIFF with icc_profile set.
         # At the time of writing this will only work for non-compressed tiffs
         # as libtiff does not support embedded ICC profiles,
@@ -711,7 +756,7 @@ def test_saving_icc_profile(self, tmp_path):
         with Image.open(tmpfile) as reloaded:
             assert b"Dummy value" == reloaded.info["icc_profile"]
 
-    def test_save_icc_profile(self, tmp_path):
+    def test_save_icc_profile(self, tmp_path: Path) -> None:
         im = hopper()
         assert "icc_profile" not in im.info
 
@@ -722,14 +767,14 @@ def test_save_icc_profile(self, tmp_path):
         with Image.open(outfile) as reloaded:
             assert reloaded.info["icc_profile"] == icc_profile
 
-    def test_save_bmp_compression(self, tmp_path):
+    def test_save_bmp_compression(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/hopper.bmp") as im:
             assert im.info["compression"] == 0
 
             outfile = str(tmp_path / "temp.tif")
             im.save(outfile)
 
-    def test_discard_icc_profile(self, tmp_path):
+    def test_discard_icc_profile(self, tmp_path: Path) -> None:
         outfile = str(tmp_path / "temp.tif")
 
         with Image.open("Tests/images/icc_profile.png") as im:
@@ -740,7 +785,7 @@ def test_discard_icc_profile(self, tmp_path):
         with Image.open(outfile) as reloaded:
             assert "icc_profile" not in reloaded.info
 
-    def test_getxmp(self):
+    def test_getxmp(self) -> None:
         with Image.open("Tests/images/lab.tif") as im:
             if ElementTree is None:
                 with pytest.warns(
@@ -749,13 +794,14 @@ def test_getxmp(self):
                 ):
                     assert im.getxmp() == {}
             else:
+                assert "xmp" in im.info
                 xmp = im.getxmp()
 
                 description = xmp["xmpmeta"]["RDF"]["Description"]
                 assert description[0]["format"] == "image/tiff"
                 assert description[3]["BitsPerSample"]["Seq"]["li"] == ["8", "8", "8"]
 
-    def test_get_photoshop_blocks(self):
+    def test_get_photoshop_blocks(self) -> None:
         with Image.open("Tests/images/lab.tif") as im:
             assert list(im.get_photoshop_blocks().keys()) == [
                 1061,
@@ -781,7 +827,7 @@ def test_get_photoshop_blocks(self):
                 4001,
             ]
 
-    def test_tiff_chunks(self, tmp_path):
+    def test_tiff_chunks(self, tmp_path: Path) -> None:
         tmpfile = str(tmp_path / "temp.tif")
 
         im = hopper()
@@ -802,7 +848,7 @@ def test_tiff_chunks(self, tmp_path):
 
         assert_image_equal_tofile(im, tmpfile)
 
-    def test_close_on_load_exclusive(self, tmp_path):
+    def test_close_on_load_exclusive(self, tmp_path: Path) -> None:
         # similar to test_fd_leak, but runs on unixlike os
         tmpfile = str(tmp_path / "temp.tif")
 
@@ -815,7 +861,7 @@ def test_close_on_load_exclusive(self, tmp_path):
         im.load()
         assert fp.closed
 
-    def test_close_on_load_nonexclusive(self, tmp_path):
+    def test_close_on_load_nonexclusive(self, tmp_path: Path) -> None:
         tmpfile = str(tmp_path / "temp.tif")
 
         with Image.open("Tests/images/uint16_1_4660.tif") as im:
@@ -837,7 +883,7 @@ def test_close_on_load_nonexclusive(self, tmp_path):
         not os.path.exists("Tests/images/string_dimension.tiff"),
         reason="Extra image files not installed",
     )
-    def test_string_dimension(self):
+    def test_string_dimension(self) -> None:
         # Assert that an error is raised if one of the dimensions is a string
         with Image.open("Tests/images/string_dimension.tiff") as im:
             with pytest.raises(OSError):
@@ -845,7 +891,7 @@ def test_string_dimension(self):
 
     @pytest.mark.timeout(6)
     @pytest.mark.filterwarnings("ignore:Truncated File Read")
-    def test_timeout(self):
+    def test_timeout(self) -> None:
         with Image.open("Tests/images/timeout-6646305047838720") as im:
             ImageFile.LOAD_TRUNCATED_IMAGES = True
             im.load()
@@ -858,7 +904,7 @@ def test_timeout(self):
         ],
     )
     @pytest.mark.timeout(2)
-    def test_oom(self, test_file):
+    def test_oom(self, test_file: str) -> None:
         with pytest.raises(UnidentifiedImageError):
             with pytest.warns(UserWarning):
                 with Image.open(test_file):
@@ -867,7 +913,7 @@ def test_oom(self, test_file):
 
 @pytest.mark.skipif(not is_win32(), reason="Windows only")
 class TestFileTiffW32:
-    def test_fd_leak(self, tmp_path):
+    def test_fd_leak(self, tmp_path: Path) -> None:
         tmpfile = str(tmp_path / "temp.tif")
 
         # this is an mmaped file.
diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py
index ee69681854e..36aabf4f82c 100644
--- a/Tests/test_file_tiff_metadata.py
+++ b/Tests/test_file_tiff_metadata.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
+
 import io
 import struct
+from pathlib import Path
 
 import pytest
 
@@ -9,10 +11,14 @@
 
 from .helper import assert_deep_equal, hopper
 
-TAG_IDS = {info.name: info.value for info in TiffTags.TAGS_V2.values()}
+TAG_IDS: dict[str, int] = {
+    info.name: info.value
+    for info in TiffTags.TAGS_V2.values()
+    if info.value is not None
+}
 
 
-def test_rt_metadata(tmp_path):
+def test_rt_metadata(tmp_path: Path) -> None:
     """Test writing arbitrary metadata into the tiff image directory
     Use case is ImageJ private tags, one numeric, one arbitrary
     data.  https://github.com/python-pillow/Pillow/issues/291
@@ -78,7 +84,7 @@ def test_rt_metadata(tmp_path):
         assert loaded.tag_v2[ImageJMetaDataByteCounts] == (8, len(bin_data) - 8)
 
 
-def test_read_metadata():
+def test_read_metadata() -> None:
     with Image.open("Tests/images/hopper_g4.tif") as img:
         assert {
             "YResolution": IFDRational(4294967295, 113653537),
@@ -119,7 +125,7 @@ def test_read_metadata():
         } == img.tag.named()
 
 
-def test_write_metadata(tmp_path):
+def test_write_metadata(tmp_path: Path) -> None:
     """Test metadata writing through the python code"""
     with Image.open("Tests/images/hopper.tif") as img:
         f = str(tmp_path / "temp.tiff")
@@ -156,7 +162,7 @@ def test_write_metadata(tmp_path):
             assert value == reloaded[tag], f"{tag} didn't roundtrip"
 
 
-def test_change_stripbytecounts_tag_type(tmp_path):
+def test_change_stripbytecounts_tag_type(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.tiff")
     with Image.open("Tests/images/hopper.tif") as im:
         info = im.tag_v2
@@ -175,19 +181,44 @@ def test_change_stripbytecounts_tag_type(tmp_path):
         assert reloaded.tag_v2.tagtype[TiffImagePlugin.STRIPBYTECOUNTS] == TiffTags.LONG
 
 
-def test_no_duplicate_50741_tag():
+def test_save_multiple_stripoffsets() -> None:
+    ifd = TiffImagePlugin.ImageFileDirectory_v2()
+    ifd[TiffImagePlugin.STRIPOFFSETS] = (123, 456)
+    assert ifd.tagtype[TiffImagePlugin.STRIPOFFSETS] == TiffTags.LONG
+
+    # all values are in little-endian
+    assert ifd.tobytes() == (
+        # number of tags == 1
+        b"\x01\x00"
+        # tag id (2 bytes), type (2 bytes), count (4 bytes), value (4 bytes)
+        # TiffImagePlugin.STRIPOFFSETS, TiffTags.LONG, 2, 18
+        # where STRIPOFFSETS is 273, LONG is 4
+        # and 18 is the offset of the tag data
+        b"\x11\x01\x04\x00\x02\x00\x00\x00\x12\x00\x00\x00"
+        # end of entries
+        b"\x00\x00\x00\x00"
+        # 26 is the total number of bytes output,
+        # the offset for any auxiliary strip data that will then be appended
+        # (123 + 26, 456 + 26) == (149, 482)
+        b"\x95\x00\x00\x00\xe2\x01\x00\x00"
+    )
+
+
+def test_no_duplicate_50741_tag() -> None:
     assert TAG_IDS["MakerNoteSafety"] == 50741
     assert TAG_IDS["BestQualityScale"] == 50780
 
 
-def test_iptc(tmp_path):
+def test_iptc(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.tiff")
     with Image.open("Tests/images/hopper.Lab.tif") as im:
         im.save(out)
 
 
 @pytest.mark.parametrize("value, expected", ((b"test", "test"), (1, "1")))
-def test_writing_other_types_to_ascii(value, expected, tmp_path):
+def test_writing_other_types_to_ascii(
+    value: bytes | int, expected: str, tmp_path: Path
+) -> None:
     info = TiffImagePlugin.ImageFileDirectory_v2()
 
     tag = TiffTags.TAGS_V2[271]
@@ -204,7 +235,7 @@ def test_writing_other_types_to_ascii(value, expected, tmp_path):
 
 
 @pytest.mark.parametrize("value", (1, IFDRational(1)))
-def test_writing_other_types_to_bytes(value, tmp_path):
+def test_writing_other_types_to_bytes(value: int | IFDRational, tmp_path: Path) -> None:
     im = hopper()
     info = TiffImagePlugin.ImageFileDirectory_v2()
 
@@ -220,14 +251,17 @@ def test_writing_other_types_to_bytes(value, tmp_path):
         assert reloaded.tag_v2[700] == b"\x01"
 
 
-def test_writing_other_types_to_undefined(tmp_path):
+@pytest.mark.parametrize("value", (1, IFDRational(1)))
+def test_writing_other_types_to_undefined(
+    value: int | IFDRational, tmp_path: Path
+) -> None:
     im = hopper()
     info = TiffImagePlugin.ImageFileDirectory_v2()
 
     tag = TiffTags.TAGS_V2[33723]
     assert tag.type == TiffTags.UNDEFINED
 
-    info[33723] = 1
+    info[33723] = value
 
     out = str(tmp_path / "temp.tiff")
     im.save(out, tiffinfo=info)
@@ -236,7 +270,7 @@ def test_writing_other_types_to_undefined(tmp_path):
         assert reloaded.tag_v2[33723] == b"1"
 
 
-def test_undefined_zero(tmp_path):
+def test_undefined_zero(tmp_path: Path) -> None:
     # Check that the tag has not been changed since this test was created
     tag = TiffTags.TAGS_V2[45059]
     assert tag.type == TiffTags.UNDEFINED
@@ -251,7 +285,7 @@ def test_undefined_zero(tmp_path):
     assert info[45059] == original
 
 
-def test_empty_metadata():
+def test_empty_metadata() -> None:
     f = io.BytesIO(b"II*\x00\x08\x00\x00\x00")
     head = f.read(8)
     info = TiffImagePlugin.ImageFileDirectory(head)
@@ -260,7 +294,7 @@ def test_empty_metadata():
         info.load(f)
 
 
-def test_iccprofile(tmp_path):
+def test_iccprofile(tmp_path: Path) -> None:
     # https://github.com/python-pillow/Pillow/issues/1462
     out = str(tmp_path / "temp.tiff")
     with Image.open("Tests/images/hopper.iccprofile.tif") as im:
@@ -271,7 +305,7 @@ def test_iccprofile(tmp_path):
         assert im.info["icc_profile"] == reloaded.info["icc_profile"]
 
 
-def test_iccprofile_binary():
+def test_iccprofile_binary() -> None:
     # https://github.com/python-pillow/Pillow/issues/1526
     # We should be able to load this,
     # but probably won't be able to save it.
@@ -281,19 +315,19 @@ def test_iccprofile_binary():
         assert im.info["icc_profile"]
 
 
-def test_iccprofile_save_png(tmp_path):
+def test_iccprofile_save_png(tmp_path: Path) -> None:
     with Image.open("Tests/images/hopper.iccprofile.tif") as im:
         outfile = str(tmp_path / "temp.png")
         im.save(outfile)
 
 
-def test_iccprofile_binary_save_png(tmp_path):
+def test_iccprofile_binary_save_png(tmp_path: Path) -> None:
     with Image.open("Tests/images/hopper.iccprofile_binary.tif") as im:
         outfile = str(tmp_path / "temp.png")
         im.save(outfile)
 
 
-def test_exif_div_zero(tmp_path):
+def test_exif_div_zero(tmp_path: Path) -> None:
     im = hopper()
     info = TiffImagePlugin.ImageFileDirectory_v2()
     info[41988] = TiffImagePlugin.IFDRational(0, 0)
@@ -306,7 +340,7 @@ def test_exif_div_zero(tmp_path):
         assert 0 == reloaded.tag_v2[41988].denominator
 
 
-def test_ifd_unsigned_rational(tmp_path):
+def test_ifd_unsigned_rational(tmp_path: Path) -> None:
     im = hopper()
     info = TiffImagePlugin.ImageFileDirectory_v2()
 
@@ -337,7 +371,7 @@ def test_ifd_unsigned_rational(tmp_path):
         assert 1 == reloaded.tag_v2[41493].denominator
 
 
-def test_ifd_signed_rational(tmp_path):
+def test_ifd_signed_rational(tmp_path: Path) -> None:
     im = hopper()
     info = TiffImagePlugin.ImageFileDirectory_v2()
 
@@ -380,7 +414,7 @@ def test_ifd_signed_rational(tmp_path):
         assert -1 == reloaded.tag_v2[37380].denominator
 
 
-def test_ifd_signed_long(tmp_path):
+def test_ifd_signed_long(tmp_path: Path) -> None:
     im = hopper()
     info = TiffImagePlugin.ImageFileDirectory_v2()
 
@@ -393,7 +427,7 @@ def test_ifd_signed_long(tmp_path):
         assert reloaded.tag_v2[37000] == -60000
 
 
-def test_empty_values():
+def test_empty_values() -> None:
     data = io.BytesIO(
         b"II*\x00\x08\x00\x00\x00\x03\x00\x1a\x01\x05\x00\x00\x00\x00\x00"
         b"\x00\x00\x00\x00\x1b\x01\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00"
@@ -404,11 +438,11 @@ def test_empty_values():
     info = TiffImagePlugin.ImageFileDirectory_v2(head)
     info.load(data)
     # Should not raise ValueError.
-    info = dict(info)
-    assert 33432 in info
+    info_dict = dict(info)
+    assert 33432 in info_dict
 
 
-def test_photoshop_info(tmp_path):
+def test_photoshop_info(tmp_path: Path) -> None:
     with Image.open("Tests/images/issue_2278.tif") as im:
         assert len(im.tag_v2[34377]) == 70
         assert isinstance(im.tag_v2[34377], bytes)
@@ -419,7 +453,7 @@ def test_photoshop_info(tmp_path):
         assert isinstance(reloaded.tag_v2[34377], bytes)
 
 
-def test_too_many_entries():
+def test_too_many_entries() -> None:
     ifd = TiffImagePlugin.ImageFileDirectory_v2()
 
     #    277: ("SamplesPerPixel", SHORT, 1),
@@ -431,7 +465,7 @@ def test_too_many_entries():
         assert ifd[277] == 4
 
 
-def test_tag_group_data():
+def test_tag_group_data() -> None:
     base_ifd = TiffImagePlugin.ImageFileDirectory_v2()
     interop_ifd = TiffImagePlugin.ImageFileDirectory_v2(group=40965)
     for ifd in (base_ifd, interop_ifd):
@@ -445,7 +479,7 @@ def test_tag_group_data():
     assert base_ifd.tagtype[2] != interop_ifd.tagtype[256]
 
 
-def test_empty_subifd(tmp_path):
+def test_empty_subifd(tmp_path: Path) -> None:
     out = str(tmp_path / "temp.jpg")
 
     im = hopper()
diff --git a/Tests/test_file_wal.py b/Tests/test_file_wal.py
index 0b84d0320aa..b34975e8380 100644
--- a/Tests/test_file_wal.py
+++ b/Tests/test_file_wal.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from PIL import WalImageFile
 
 from .helper import assert_image_equal_tofile
@@ -6,7 +7,7 @@
 TEST_FILE = "Tests/images/hopper.wal"
 
 
-def test_open():
+def test_open() -> None:
     with WalImageFile.open(TEST_FILE) as im:
         assert im.format == "WAL"
         assert im.format_description == "Quake2 Texture"
@@ -18,7 +19,7 @@ def test_open():
         assert_image_equal_tofile(im, "Tests/images/hopper_wal.png")
 
 
-def test_load():
+def test_load() -> None:
     with WalImageFile.open(TEST_FILE) as im:
         assert im.load()[0, 0] == 122
 
diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py
index c91818ef64e..79f6bb4e0e4 100644
--- a/Tests/test_file_webp.py
+++ b/Tests/test_file_webp.py
@@ -1,8 +1,11 @@
 from __future__ import annotations
+
 import io
 import re
 import sys
 import warnings
+from pathlib import Path
+from typing import Any
 
 import pytest
 
@@ -25,7 +28,7 @@
 
 
 class TestUnsupportedWebp:
-    def test_unsupported(self):
+    def test_unsupported(self) -> None:
         if HAVE_WEBP:
             WebPImagePlugin.SUPPORTED = False
 
@@ -41,15 +44,15 @@ def test_unsupported(self):
 
 @skip_unless_feature("webp")
 class TestFileWebp:
-    def setup_method(self):
+    def setup_method(self) -> None:
         self.rgb_mode = "RGB"
 
-    def test_version(self):
-        _webp.WebPDecoderVersion()
-        _webp.WebPDecoderBuggyAlpha()
-        assert re.search(r"\d+\.\d+\.\d+$", features.version_module("webp"))
+    def test_version(self) -> None:
+        version = features.version_module("webp")
+        assert version is not None
+        assert re.search(r"\d+\.\d+\.\d+$", version)
 
-    def test_read_rgb(self):
+    def test_read_rgb(self) -> None:
         """
         Can we read a RGB mode WebP file without error?
         Does it have the bits we expect?
@@ -66,8 +69,10 @@ def test_read_rgb(self):
             # dwebp -ppm ../../Tests/images/hopper.webp -o hopper_webp_bits.ppm
             assert_image_similar_tofile(image, "Tests/images/hopper_webp_bits.ppm", 1.0)
 
-    def _roundtrip(self, tmp_path, mode, epsilon, args={}):
-        temp_file = str(tmp_path / "temp.webp")
+    def _roundtrip(
+        self, tmp_path: Path, mode: str, epsilon: float, args: dict[str, Any] = {}
+    ) -> None:
+        temp_file = tmp_path / "temp.webp"
 
         hopper(mode).save(temp_file, **args)
         with Image.open(temp_file) as image:
@@ -92,7 +97,7 @@ def _roundtrip(self, tmp_path, mode, epsilon, args={}):
                 target = target.convert(self.rgb_mode)
             assert_image_similar(image, target, epsilon)
 
-    def test_write_rgb(self, tmp_path):
+    def test_write_rgb(self, tmp_path: Path) -> None:
         """
         Can we write a RGB mode file to webp without error?
         Does it have the bits we expect?
@@ -100,7 +105,7 @@ def test_write_rgb(self, tmp_path):
 
         self._roundtrip(tmp_path, self.rgb_mode, 12.5)
 
-    def test_write_method(self, tmp_path):
+    def test_write_method(self, tmp_path: Path) -> None:
         self._roundtrip(tmp_path, self.rgb_mode, 12.0, {"method": 6})
 
         buffer_no_args = io.BytesIO()
@@ -110,9 +115,8 @@ def test_write_method(self, tmp_path):
         hopper().save(buffer_method, format="WEBP", method=6)
         assert buffer_no_args.getbuffer() != buffer_method.getbuffer()
 
-    @skip_unless_feature("webp_anim")
-    def test_save_all(self, tmp_path):
-        temp_file = str(tmp_path / "temp.webp")
+    def test_save_all(self, tmp_path: Path) -> None:
+        temp_file = tmp_path / "temp.webp"
         im = Image.new("RGB", (1, 1))
         im2 = Image.new("RGB", (1, 1), "#f00")
         im.save(temp_file, save_all=True, append_images=[im2])
@@ -123,14 +127,18 @@ def test_save_all(self, tmp_path):
             reloaded.seek(1)
             assert_image_similar(im2, reloaded, 1)
 
-    def test_icc_profile(self, tmp_path):
+    def test_unsupported_image_mode(self) -> None:
+        im = Image.new("1", (1, 1))
+        with pytest.raises(ValueError):
+            _webp.WebPEncode(im.getim(), False, 0, 0, "", 4, 0, b"", "")
+
+    def test_icc_profile(self, tmp_path: Path) -> None:
         self._roundtrip(tmp_path, self.rgb_mode, 12.5, {"icc_profile": None})
-        if _webp.HAVE_WEBPANIM:
-            self._roundtrip(
-                tmp_path, self.rgb_mode, 12.5, {"icc_profile": None, "save_all": True}
-            )
+        self._roundtrip(
+            tmp_path, self.rgb_mode, 12.5, {"icc_profile": None, "save_all": True}
+        )
 
-    def test_write_unsupported_mode_L(self, tmp_path):
+    def test_write_unsupported_mode_L(self, tmp_path: Path) -> None:
         """
         Saving a black-and-white file to WebP format should work, and be
         similar to the original file.
@@ -138,7 +146,7 @@ def test_write_unsupported_mode_L(self, tmp_path):
 
         self._roundtrip(tmp_path, "L", 10.0)
 
-    def test_write_unsupported_mode_P(self, tmp_path):
+    def test_write_unsupported_mode_P(self, tmp_path: Path) -> None:
         """
         Saving a palette-based file to WebP format should work, and be
         similar to the original file.
@@ -147,43 +155,45 @@ def test_write_unsupported_mode_P(self, tmp_path):
         self._roundtrip(tmp_path, "P", 50.0)
 
     @pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system")
-    def test_write_encoding_error_message(self, tmp_path):
-        temp_file = str(tmp_path / "temp.webp")
+    def test_write_encoding_error_message(self, tmp_path: Path) -> None:
         im = Image.new("RGB", (15000, 15000))
         with pytest.raises(ValueError) as e:
-            im.save(temp_file, method=0)
+            im.save(tmp_path / "temp.webp", method=0)
         assert str(e.value) == "encoding error 6"
 
-    def test_WebPEncode_with_invalid_args(self):
+    @pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system")
+    def test_write_encoding_error_bad_dimension(self, tmp_path: Path) -> None:
+        im = Image.new("L", (16384, 16384))
+        with pytest.raises(ValueError) as e:
+            im.save(tmp_path / "temp.webp")
+        assert (
+            str(e.value)
+            == "encoding error 5: Image size exceeds WebP limit of 16383 pixels"
+        )
+
+    def test_WebPEncode_with_invalid_args(self) -> None:
         """
         Calling encoder functions with no arguments should result in an error.
         """
-
-        if _webp.HAVE_WEBPANIM:
-            with pytest.raises(TypeError):
-                _webp.WebPAnimEncoder()
+        with pytest.raises(TypeError):
+            _webp.WebPAnimEncoder()
         with pytest.raises(TypeError):
             _webp.WebPEncode()
 
-    def test_WebPDecode_with_invalid_args(self):
+    def test_WebPAnimDecoder_with_invalid_args(self) -> None:
         """
         Calling decoder functions with no arguments should result in an error.
         """
-
-        if _webp.HAVE_WEBPANIM:
-            with pytest.raises(TypeError):
-                _webp.WebPAnimDecoder()
         with pytest.raises(TypeError):
-            _webp.WebPDecode()
+            _webp.WebPAnimDecoder()
 
-    def test_no_resource_warning(self, tmp_path):
+    def test_no_resource_warning(self, tmp_path: Path) -> None:
         file_path = "Tests/images/hopper.webp"
         with Image.open(file_path) as image:
-            temp_file = str(tmp_path / "temp.webp")
             with warnings.catch_warnings():
-                image.save(temp_file)
+                image.save(tmp_path / "temp.webp")
 
-    def test_file_pointer_could_be_reused(self):
+    def test_file_pointer_could_be_reused(self) -> None:
         file_path = "Tests/images/hopper.webp"
         with open(file_path, "rb") as blob:
             Image.open(blob).load()
@@ -193,18 +203,19 @@ def test_file_pointer_could_be_reused(self):
         "background",
         (0, (0,), (-1, 0, 1, 2), (253, 254, 255, 256)),
     )
-    @skip_unless_feature("webp_anim")
-    def test_invalid_background(self, background, tmp_path):
-        temp_file = str(tmp_path / "temp.webp")
+    def test_invalid_background(
+        self, background: int | tuple[int, ...], tmp_path: Path
+    ) -> None:
+        temp_file = tmp_path / "temp.webp"
         im = hopper()
         with pytest.raises(OSError):
             im.save(temp_file, save_all=True, append_images=[im], background=background)
 
-    @skip_unless_feature("webp_anim")
-    def test_background_from_gif(self, tmp_path):
+    def test_background_from_gif(self, tmp_path: Path) -> None:
+        out_webp = tmp_path / "temp.webp"
+
         # Save L mode GIF with background
         with Image.open("Tests/images/no_palette_with_background.gif") as im:
-            out_webp = str(tmp_path / "temp.webp")
             im.save(out_webp, save_all=True)
 
         # Save P mode GIF with background
@@ -212,11 +223,10 @@ def test_background_from_gif(self, tmp_path):
             original_value = im.convert("RGB").getpixel((1, 1))
 
             # Save as WEBP
-            out_webp = str(tmp_path / "temp.webp")
             im.save(out_webp, save_all=True)
 
         # Save as GIF
-        out_gif = str(tmp_path / "temp.gif")
+        out_gif = tmp_path / "temp.gif"
         with Image.open(out_webp) as im:
             im.save(out_gif)
 
@@ -225,22 +235,22 @@ def test_background_from_gif(self, tmp_path):
         difference = sum(abs(original_value[i] - reread_value[i]) for i in range(0, 3))
         assert difference < 5
 
-    @skip_unless_feature("webp_anim")
-    def test_duration(self, tmp_path):
+    def test_duration(self, tmp_path: Path) -> None:
+        out_webp = tmp_path / "temp.webp"
+
         with Image.open("Tests/images/dispose_bgnd.gif") as im:
             assert im.info["duration"] == 1000
-
-            out_webp = str(tmp_path / "temp.webp")
             im.save(out_webp, save_all=True)
 
         with Image.open(out_webp) as reloaded:
             reloaded.load()
             assert reloaded.info["duration"] == 1000
 
-    def test_roundtrip_rgba_palette(self, tmp_path):
-        temp_file = str(tmp_path / "temp.webp")
+    def test_roundtrip_rgba_palette(self, tmp_path: Path) -> None:
+        temp_file = tmp_path / "temp.webp"
         im = Image.new("RGBA", (1, 1)).convert("P")
         assert im.mode == "P"
+        assert im.palette is not None
         assert im.palette.mode == "RGBA"
         im.save(temp_file)
 
diff --git a/Tests/test_file_webp_alpha.py b/Tests/test_file_webp_alpha.py
index 79d01a4446a..c88fe3589ea 100644
--- a/Tests/test_file_webp_alpha.py
+++ b/Tests/test_file_webp_alpha.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image
@@ -10,15 +13,10 @@
     hopper,
 )
 
-_webp = pytest.importorskip("PIL._webp", reason="WebP support not installed")
-
-
-def setup_module():
-    if _webp.WebPDecoderBuggyAlpha():
-        pytest.skip("Buggy early version of WebP installed, not testing transparency")
+pytest.importorskip("PIL._webp", reason="WebP support not installed")
 
 
-def test_read_rgba():
+def test_read_rgba() -> None:
     """
     Can we read an RGBA mode file without error?
     Does it have the bits we expect?
@@ -38,7 +36,7 @@ def test_read_rgba():
         assert_image_similar_tofile(image, "Tests/images/transparent.png", 20.0)
 
 
-def test_write_lossless_rgb(tmp_path):
+def test_write_lossless_rgb(tmp_path: Path) -> None:
     """
     Can we write an RGBA mode file with lossless compression without error?
     Does it have the bits we expect?
@@ -67,7 +65,7 @@ def test_write_lossless_rgb(tmp_path):
         assert_image_equal(image, pil_image)
 
 
-def test_write_rgba(tmp_path):
+def test_write_rgba(tmp_path: Path) -> None:
     """
     Can we write a RGBA mode file to WebP without error.
     Does it have the bits we expect?
@@ -78,9 +76,6 @@ def test_write_rgba(tmp_path):
     pil_image = Image.new("RGBA", (10, 10), (255, 0, 0, 20))
     pil_image.save(temp_file)
 
-    if _webp.WebPDecoderBuggyAlpha():
-        return
-
     with Image.open(temp_file) as image:
         image.load()
 
@@ -90,15 +85,10 @@ def test_write_rgba(tmp_path):
         image.load()
         image.getdata()
 
-        # Early versions of WebP are known to produce higher deviations:
-        # deal with it
-        if _webp.WebPDecoderVersion() <= 0x201:
-            assert_image_similar(image, pil_image, 3.0)
-        else:
-            assert_image_similar(image, pil_image, 1.0)
+        assert_image_similar(image, pil_image, 1.0)
 
 
-def test_keep_rgb_values_when_transparent(tmp_path):
+def test_keep_rgb_values_when_transparent(tmp_path: Path) -> None:
     """
     Saving transparent pixels should retain their original RGB values
     when using the "exact" parameter.
@@ -127,7 +117,7 @@ def test_keep_rgb_values_when_transparent(tmp_path):
         assert_image_equal(reloaded.convert("RGB"), image)
 
 
-def test_write_unsupported_mode_PA(tmp_path):
+def test_write_unsupported_mode_PA(tmp_path: Path) -> None:
     """
     Saving a palette-based file with transparency to WebP format
     should work, and be similar to the original file.
@@ -148,3 +138,15 @@ def test_write_unsupported_mode_PA(tmp_path):
             target = im.convert("RGBA")
 
         assert_image_similar(image, target, 25.0)
+
+
+def test_alpha_quality(tmp_path: Path) -> None:
+    with Image.open("Tests/images/transparent.png") as im:
+        out = str(tmp_path / "temp.webp")
+        im.save(out)
+
+        out_quality = str(tmp_path / "quality.webp")
+        im.save(out_quality, alpha_quality=50)
+        with Image.open(out) as reloaded:
+            with Image.open(out_quality) as reloaded_quality:
+                assert reloaded.tobytes() != reloaded_quality.tobytes()
diff --git a/Tests/test_file_webp_animated.py b/Tests/test_file_webp_animated.py
index 22acb4be68f..967a0aae847 100644
--- a/Tests/test_file_webp_animated.py
+++ b/Tests/test_file_webp_animated.py
@@ -1,4 +1,8 @@
 from __future__ import annotations
+
+from collections.abc import Generator
+from pathlib import Path
+
 import pytest
 from packaging.version import parse as parse_version
 
@@ -11,13 +15,10 @@
     skip_unless_feature,
 )
 
-pytestmark = [
-    skip_unless_feature("webp"),
-    skip_unless_feature("webp_anim"),
-]
+pytestmark = skip_unless_feature("webp")
 
 
-def test_n_frames():
+def test_n_frames() -> None:
     """Ensure that WebP format sets n_frames and is_animated attributes correctly."""
 
     with Image.open("Tests/images/hopper.webp") as im:
@@ -29,7 +30,7 @@ def test_n_frames():
         assert im.is_animated
 
 
-def test_write_animation_L(tmp_path):
+def test_write_animation_L(tmp_path: Path) -> None:
     """
     Convert an animated GIF to animated WebP, then compare the frame count, and first
     and last frames to ensure they're visually similar.
@@ -49,8 +50,9 @@ def test_write_animation_L(tmp_path):
             assert_image_similar(im, orig.convert("RGBA"), 32.9)
 
             if is_big_endian():
-                webp = parse_version(features.version_module("webp"))
-                if webp < parse_version("1.2.2"):
+                version = features.version_module("webp")
+                assert version is not None
+                if parse_version(version) < parse_version("1.2.2"):
                     pytest.skip("Fails with libwebp earlier than 1.2.2")
             orig.seek(orig.n_frames - 1)
             im.seek(im.n_frames - 1)
@@ -59,13 +61,13 @@ def test_write_animation_L(tmp_path):
             assert_image_similar(im, orig.convert("RGBA"), 32.9)
 
 
-def test_write_animation_RGB(tmp_path):
+def test_write_animation_RGB(tmp_path: Path) -> None:
     """
     Write an animated WebP from RGB frames, and ensure the frames
     are visually similar to the originals.
     """
 
-    def check(temp_file):
+    def check(temp_file: str) -> None:
         with Image.open(temp_file) as im:
             assert im.n_frames == 2
 
@@ -75,8 +77,9 @@ def check(temp_file):
 
             # Compare second frame to original
             if is_big_endian():
-                webp = parse_version(features.version_module("webp"))
-                if webp < parse_version("1.2.2"):
+                version = features.version_module("webp")
+                assert version is not None
+                if parse_version(version) < parse_version("1.2.2"):
                     pytest.skip("Fails with libwebp earlier than 1.2.2")
             im.seek(1)
             im.load()
@@ -91,7 +94,9 @@ def check(temp_file):
             check(temp_file1)
 
             # Tests appending using a generator
-            def im_generator(ims):
+            def im_generator(
+                ims: list[Image.Image],
+            ) -> Generator[Image.Image, None, None]:
                 yield from ims
 
             temp_file2 = str(tmp_path / "temp_generator.webp")
@@ -104,7 +109,7 @@ def im_generator(ims):
             check(temp_file2)
 
 
-def test_timestamp_and_duration(tmp_path):
+def test_timestamp_and_duration(tmp_path: Path) -> None:
     """
     Try passing a list of durations, and make sure the encoded
     timestamps and durations are correct.
@@ -135,7 +140,7 @@ def test_timestamp_and_duration(tmp_path):
             ts += durations[frame]
 
 
-def test_float_duration(tmp_path):
+def test_float_duration(tmp_path: Path) -> None:
     temp_file = str(tmp_path / "temp.webp")
     with Image.open("Tests/images/iss634.apng") as im:
         assert im.info["duration"] == 70.0
@@ -147,7 +152,7 @@ def test_float_duration(tmp_path):
         assert reloaded.info["duration"] == 70
 
 
-def test_seeking(tmp_path):
+def test_seeking(tmp_path: Path) -> None:
     """
     Create an animated WebP file, and then try seeking through frames in reverse-order,
     verifying the timestamps and durations are correct.
@@ -178,10 +183,28 @@ def test_seeking(tmp_path):
             ts -= dur
 
 
-def test_seek_errors():
+def test_seek_errors() -> None:
     with Image.open("Tests/images/iss634.webp") as im:
         with pytest.raises(EOFError):
             im.seek(-1)
 
         with pytest.raises(EOFError):
             im.seek(42)
+
+
+def test_alpha_quality(tmp_path: Path) -> None:
+    with Image.open("Tests/images/transparent.png") as im:
+        first_frame = Image.new("L", im.size)
+
+        out = str(tmp_path / "temp.webp")
+        first_frame.save(out, save_all=True, append_images=[im])
+
+        out_quality = str(tmp_path / "quality.webp")
+        first_frame.save(
+            out_quality, save_all=True, append_images=[im], alpha_quality=50
+        )
+        with Image.open(out) as reloaded:
+            reloaded.seek(1)
+            with Image.open(out_quality) as reloaded_quality:
+                reloaded_quality.seek(1)
+                assert reloaded.tobytes() != reloaded_quality.tobytes()
diff --git a/Tests/test_file_webp_lossless.py b/Tests/test_file_webp_lossless.py
index 6acf58ac3f5..80429715e9e 100644
--- a/Tests/test_file_webp_lossless.py
+++ b/Tests/test_file_webp_lossless.py
@@ -1,18 +1,18 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image
 
 from .helper import assert_image_equal, hopper
 
-_webp = pytest.importorskip("PIL._webp", reason="WebP support not installed")
+pytest.importorskip("PIL._webp", reason="WebP support not installed")
 RGB_MODE = "RGB"
 
 
-def test_write_lossless_rgb(tmp_path):
-    if _webp.WebPDecoderVersion() < 0x0200:
-        pytest.skip("lossless not included")
-
+def test_write_lossless_rgb(tmp_path: Path) -> None:
     temp_file = str(tmp_path / "temp.webp")
 
     hopper(RGB_MODE).save(temp_file, lossless=True)
diff --git a/Tests/test_file_webp_metadata.py b/Tests/test_file_webp_metadata.py
index a7b7bbcf6ee..d9a834c7500 100644
--- a/Tests/test_file_webp_metadata.py
+++ b/Tests/test_file_webp_metadata.py
@@ -1,5 +1,8 @@
 from __future__ import annotations
+
 from io import BytesIO
+from pathlib import Path
+from types import ModuleType
 
 import pytest
 
@@ -7,18 +10,16 @@
 
 from .helper import mark_if_feature_version, skip_unless_feature
 
-pytestmark = [
-    skip_unless_feature("webp"),
-    skip_unless_feature("webp_mux"),
-]
+pytestmark = skip_unless_feature("webp")
 
+ElementTree: ModuleType | None
 try:
     from defusedxml import ElementTree
 except ImportError:
     ElementTree = None
 
 
-def test_read_exif_metadata():
+def test_read_exif_metadata() -> None:
     file_path = "Tests/images/flower.webp"
     with Image.open(file_path) as image:
         assert image.format == "WEBP"
@@ -36,7 +37,7 @@ def test_read_exif_metadata():
             assert exif_data == expected_exif
 
 
-def test_read_exif_metadata_without_prefix():
+def test_read_exif_metadata_without_prefix() -> None:
     with Image.open("Tests/images/flower2.webp") as im:
         # Assert prefix is not present
         assert im.info["exif"][:6] != b"Exif\x00\x00"
@@ -48,7 +49,7 @@ def test_read_exif_metadata_without_prefix():
 @mark_if_feature_version(
     pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
 )
-def test_write_exif_metadata():
+def test_write_exif_metadata() -> None:
     file_path = "Tests/images/flower.jpg"
     test_buffer = BytesIO()
     with Image.open(file_path) as image:
@@ -62,7 +63,7 @@ def test_write_exif_metadata():
     assert webp_exif == expected_exif[6:], "WebP EXIF didn't match"
 
 
-def test_read_icc_profile():
+def test_read_icc_profile() -> None:
     file_path = "Tests/images/flower2.webp"
     with Image.open(file_path) as image:
         assert image.format == "WEBP"
@@ -79,7 +80,7 @@ def test_read_icc_profile():
 @mark_if_feature_version(
     pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
 )
-def test_write_icc_metadata():
+def test_write_icc_metadata() -> None:
     file_path = "Tests/images/flower2.jpg"
     test_buffer = BytesIO()
     with Image.open(file_path) as image:
@@ -99,7 +100,7 @@ def test_write_icc_metadata():
 @mark_if_feature_version(
     pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
 )
-def test_read_no_exif():
+def test_read_no_exif() -> None:
     file_path = "Tests/images/flower.jpg"
     test_buffer = BytesIO()
     with Image.open(file_path) as image:
@@ -112,10 +113,18 @@ def test_read_no_exif():
         assert not webp_image._getexif()
 
 
-def test_getxmp():
+def test_getxmp() -> None:
     with Image.open("Tests/images/flower.webp") as im:
         assert "xmp" not in im.info
-        assert im.getxmp() == {}
+        if ElementTree is None:
+            with pytest.warns(
+                UserWarning,
+                match="XMP data cannot be read without defusedxml dependency",
+            ):
+                xmp = im.getxmp()
+        else:
+            xmp = im.getxmp()
+        assert xmp == {}
 
     with Image.open("Tests/images/flower2.webp") as im:
         if ElementTree is None:
@@ -125,14 +134,14 @@ def test_getxmp():
             ):
                 assert im.getxmp() == {}
         else:
+            assert "xmp" in im.info
             assert (
                 im.getxmp()["xmpmeta"]["xmptk"]
                 == "Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27        "
             )
 
 
-@skip_unless_feature("webp_anim")
-def test_write_animated_metadata(tmp_path):
+def test_write_animated_metadata(tmp_path: Path) -> None:
     iccp_data = b"<iccp_data>"
     exif_data = b"<exif_data>"
     xmp_data = b"<xmp_data>"
diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py
index 596dc8ba181..79e707263d6 100644
--- a/Tests/test_file_wmf.py
+++ b/Tests/test_file_wmf.py
@@ -1,12 +1,16 @@
 from __future__ import annotations
+
+from pathlib import Path
+from typing import IO
+
 import pytest
 
-from PIL import Image, WmfImagePlugin
+from PIL import Image, ImageFile, WmfImagePlugin
 
 from .helper import assert_image_similar_tofile, hopper
 
 
-def test_load_raw():
+def test_load_raw() -> None:
     # Test basic EMF open and rendering
     with Image.open("Tests/images/drawing.emf") as im:
         if hasattr(Image.core, "drawwmf"):
@@ -24,17 +28,20 @@ def test_load_raw():
             assert_image_similar_tofile(im, "Tests/images/drawing_wmf_ref.png", 2.0)
 
 
-def test_load():
+def test_load() -> None:
     with Image.open("Tests/images/drawing.emf") as im:
         if hasattr(Image.core, "drawwmf"):
             assert im.load()[0, 0] == (255, 255, 255)
 
 
-def test_register_handler(tmp_path):
-    class TestHandler:
+def test_register_handler(tmp_path: Path) -> None:
+    class TestHandler(ImageFile.StubHandler):
         methodCalled = False
 
-        def save(self, im, fp, filename):
+        def load(self, im: ImageFile.StubImageFile) -> Image.Image:
+            return Image.new("RGB", (1, 1))
+
+        def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None:
             self.methodCalled = True
 
     handler = TestHandler()
@@ -50,12 +57,12 @@ def save(self, im, fp, filename):
     WmfImagePlugin.register_handler(original_handler)
 
 
-def test_load_float_dpi():
+def test_load_float_dpi() -> None:
     with Image.open("Tests/images/drawing.emf") as im:
         assert im.info["dpi"] == 1423.7668161434979
 
 
-def test_load_set_dpi():
+def test_load_set_dpi() -> None:
     with Image.open("Tests/images/drawing.wmf") as im:
         assert im.size == (82, 82)
 
@@ -67,7 +74,7 @@ def test_load_set_dpi():
 
 
 @pytest.mark.parametrize("ext", (".wmf", ".emf"))
-def test_save(ext, tmp_path):
+def test_save(ext: str, tmp_path: Path) -> None:
     im = hopper()
 
     tmpfile = str(tmp_path / ("temp" + ext))
diff --git a/Tests/test_file_xbm.py b/Tests/test_file_xbm.py
index b086ffd683f..44dd2541fb5 100644
--- a/Tests/test_file_xbm.py
+++ b/Tests/test_file_xbm.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 from io import BytesIO
+from pathlib import Path
 
 import pytest
 
@@ -31,14 +33,14 @@
 """
 
 
-def test_pil151():
+def test_pil151() -> None:
     with Image.open(BytesIO(PIL151)) as im:
         im.load()
         assert im.mode == "1"
         assert im.size == (32, 32)
 
 
-def test_open():
+def test_open() -> None:
     # Arrange
     # Created with `convert hopper.png hopper.xbm`
     filename = "Tests/images/hopper.xbm"
@@ -50,7 +52,7 @@ def test_open():
         assert im.size == (128, 128)
 
 
-def test_open_filename_with_underscore():
+def test_open_filename_with_underscore() -> None:
     # Arrange
     # Created with `convert hopper.png hopper_underscore.xbm`
     filename = "Tests/images/hopper_underscore.xbm"
@@ -62,14 +64,14 @@ def test_open_filename_with_underscore():
         assert im.size == (128, 128)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         XbmImagePlugin.XbmImageFile(invalid_file)
 
 
-def test_save_wrong_mode(tmp_path):
+def test_save_wrong_mode(tmp_path: Path) -> None:
     im = hopper()
     out = str(tmp_path / "temp.xbm")
 
@@ -77,7 +79,7 @@ def test_save_wrong_mode(tmp_path):
         im.save(out)
 
 
-def test_hotspot(tmp_path):
+def test_hotspot(tmp_path: Path) -> None:
     im = hopper("1")
     out = str(tmp_path / "temp.xbm")
 
diff --git a/Tests/test_file_xpm.py b/Tests/test_file_xpm.py
index 265feab4294..26afe93f450 100644
--- a/Tests/test_file_xpm.py
+++ b/Tests/test_file_xpm.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, XpmImagePlugin
@@ -8,7 +9,7 @@
 TEST_FILE = "Tests/images/hopper.xpm"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_FILE) as im:
         im.load()
         assert im.mode == "P"
@@ -19,14 +20,14 @@ def test_sanity():
         assert_image_similar(im.convert("RGB"), hopper("RGB"), 60)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):
         XpmImagePlugin.XpmImageFile(invalid_file)
 
 
-def test_load_read():
+def test_load_read() -> None:
     # Arrange
     with Image.open(TEST_FILE) as im:
         dummy_bytes = 1
diff --git a/Tests/test_file_xvthumb.py b/Tests/test_file_xvthumb.py
index 5848995c1aa..6b81159303e 100644
--- a/Tests/test_file_xvthumb.py
+++ b/Tests/test_file_xvthumb.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, XVThumbImagePlugin
@@ -8,7 +9,7 @@
 TEST_FILE = "Tests/images/hopper.p7"
 
 
-def test_open():
+def test_open() -> None:
     # Act
     with Image.open(TEST_FILE) as im:
         # Assert
@@ -19,7 +20,7 @@ def test_open():
         assert_image_similar(im, im_hopper, 9)
 
 
-def test_unexpected_eof():
+def test_unexpected_eof() -> None:
     # Test unexpected EOF reading XV thumbnail file
     # Arrange
     bad_file = "Tests/images/hopper_bad.p7"
@@ -29,7 +30,7 @@ def test_unexpected_eof():
         XVThumbImagePlugin.XVThumbImageFile(bad_file)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     # Arrange
     invalid_file = "Tests/images/flower.jpg"
 
diff --git a/Tests/test_font_bdf.py b/Tests/test_font_bdf.py
index 1e5eff2f15d..136070f9e7d 100644
--- a/Tests/test_font_bdf.py
+++ b/Tests/test_font_bdf.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import BdfFontFile, FontFile
@@ -6,7 +7,7 @@
 filename = "Tests/images/courB08.bdf"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with open(filename, "rb") as test_file:
         font = BdfFontFile.BdfFontFile(test_file)
 
@@ -14,7 +15,7 @@ def test_sanity():
     assert len([_f for _f in font.glyph if _f]) == 190
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     with open("Tests/images/flower.jpg", "rb") as fp:
         with pytest.raises(SyntaxError):
             BdfFontFile.BdfFontFile(fp)
diff --git a/Tests/test_font_crash.py b/Tests/test_font_crash.py
index 388ee711861..b82340ef70b 100644
--- a/Tests/test_font_crash.py
+++ b/Tests/test_font_crash.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageDraw, ImageFont
@@ -7,7 +8,7 @@
 
 
 class TestFontCrash:
-    def _fuzz_font(self, font):
+    def _fuzz_font(self, font: ImageFont.FreeTypeFont) -> None:
         # from fuzzers.fuzz_font
         font.getbbox("ABC")
         font.getmask("test text")
@@ -17,7 +18,7 @@ def _fuzz_font(self, font):
             draw.text((10, 10), "Test Text", font=font, fill="#000")
 
     @skip_unless_feature("freetype2")
-    def test_segfault(self):
+    def test_segfault(self) -> None:
         with pytest.raises(OSError):
             font = ImageFont.truetype("Tests/fonts/fuzz_font-5203009437302784")
             self._fuzz_font(font)
diff --git a/Tests/test_font_leaks.py b/Tests/test_font_leaks.py
index 6a038bb4038..ab8a7f9ecca 100644
--- a/Tests/test_font_leaks.py
+++ b/Tests/test_font_leaks.py
@@ -1,7 +1,10 @@
 from __future__ import annotations
-from PIL import Image, ImageDraw, ImageFont
 
-from .helper import PillowLeakTestCase, skip_unless_feature
+from PIL import Image, ImageDraw, ImageFont, _util
+
+from .helper import PillowLeakTestCase, features, skip_unless_feature
+
+original_core = ImageFont.core
 
 
 class TestTTypeFontLeak(PillowLeakTestCase):
@@ -9,7 +12,7 @@ class TestTTypeFontLeak(PillowLeakTestCase):
     iterations = 10
     mem_limit = 4096  # k
 
-    def _test_font(self, font):
+    def _test_font(self, font: ImageFont.FreeTypeFont | ImageFont.ImageFont) -> None:
         im = Image.new("RGB", (255, 255), "white")
         draw = ImageDraw.ImageDraw(im)
         self._test_leak(
@@ -19,7 +22,7 @@ def _test_font(self, font):
         )
 
     @skip_unless_feature("freetype2")
-    def test_leak(self):
+    def test_leak(self) -> None:
         ttype = ImageFont.truetype("Tests/fonts/FreeMono.ttf", 20)
         self._test_font(ttype)
 
@@ -29,6 +32,12 @@ class TestDefaultFontLeak(TestTTypeFontLeak):
     iterations = 100
     mem_limit = 1024  # k
 
-    def test_leak(self):
-        default_font = ImageFont.load_default()
+    def test_leak(self) -> None:
+        if features.check_module("freetype2"):
+            ImageFont.core = _util.DeferredError(ImportError("Disabled for testing"))
+        try:
+            default_font = ImageFont.load_default()
+        finally:
+            ImageFont.core = original_core
+
         self._test_font(default_font)
diff --git a/Tests/test_font_pcf.py b/Tests/test_font_pcf.py
index 4365b931066..567ddaf13a0 100644
--- a/Tests/test_font_pcf.py
+++ b/Tests/test_font_pcf.py
@@ -1,5 +1,8 @@
 from __future__ import annotations
+
 import os
+from pathlib import Path
+from typing import AnyStr
 
 import pytest
 
@@ -19,7 +22,7 @@
 pytestmark = skip_unless_feature("zlib")
 
 
-def save_font(request, tmp_path):
+def save_font(request: pytest.FixtureRequest, tmp_path: Path) -> str:
     with open(fontname, "rb") as test_file:
         font = PcfFontFile.PcfFontFile(test_file)
     assert isinstance(font, FontFile.FontFile)
@@ -28,7 +31,7 @@ def save_font(request, tmp_path):
 
     tempname = str(tmp_path / "temp.pil")
 
-    def delete_tempfile():
+    def delete_tempfile() -> None:
         try:
             os.remove(tempname[:-4] + ".pbm")
         except OSError:
@@ -46,11 +49,11 @@ def delete_tempfile():
     return tempname
 
 
-def test_sanity(request, tmp_path):
+def test_sanity(request: pytest.FixtureRequest, tmp_path: Path) -> None:
     save_font(request, tmp_path)
 
 
-def test_less_than_256_characters():
+def test_less_than_256_characters() -> None:
     with open("Tests/fonts/10x20-ISO8859-1-fewer-characters.pcf", "rb") as test_file:
         font = PcfFontFile.PcfFontFile(test_file)
     assert isinstance(font, FontFile.FontFile)
@@ -58,13 +61,13 @@ def test_less_than_256_characters():
     assert len([_f for _f in font.glyph if _f]) == 127
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     with open("Tests/images/flower.jpg", "rb") as fp:
         with pytest.raises(SyntaxError):
             PcfFontFile.PcfFontFile(fp)
 
 
-def test_draw(request, tmp_path):
+def test_draw(request: pytest.FixtureRequest, tmp_path: Path) -> None:
     tempname = save_font(request, tmp_path)
     font = ImageFont.load(tempname)
     im = Image.new("L", (130, 30), "white")
@@ -73,7 +76,7 @@ def test_draw(request, tmp_path):
     assert_image_similar_tofile(im, "Tests/images/test_draw_pbm_target.png", 0)
 
 
-def test_textsize(request, tmp_path):
+def test_textsize(request: pytest.FixtureRequest, tmp_path: Path) -> None:
     tempname = save_font(request, tmp_path)
     font = ImageFont.load(tempname)
     for i in range(255):
@@ -89,7 +92,9 @@ def test_textsize(request, tmp_path):
         assert font.getbbox(msg) == (0, 0, len(msg) * 10, 20)
 
 
-def _test_high_characters(request, tmp_path, message):
+def _test_high_characters(
+    request: pytest.FixtureRequest, tmp_path: Path, message: AnyStr
+) -> None:
     tempname = save_font(request, tmp_path)
     font = ImageFont.load(tempname)
     im = Image.new("L", (750, 30), "white")
@@ -98,7 +103,7 @@ def _test_high_characters(request, tmp_path, message):
     assert_image_similar_tofile(im, "Tests/images/high_ascii_chars.png", 0)
 
 
-def test_high_characters(request, tmp_path):
+def test_high_characters(request: pytest.FixtureRequest, tmp_path: Path) -> None:
     message = "".join(chr(i + 1) for i in range(140, 232))
     _test_high_characters(request, tmp_path, message)
     # accept bytes instances.
diff --git a/Tests/test_font_pcf_charsets.py b/Tests/test_font_pcf_charsets.py
index 950e5029ff5..895458d9d82 100644
--- a/Tests/test_font_pcf_charsets.py
+++ b/Tests/test_font_pcf_charsets.py
@@ -1,5 +1,8 @@
 from __future__ import annotations
+
 import os
+from pathlib import Path
+from typing import TypedDict
 
 import pytest
 
@@ -13,7 +16,14 @@
 
 fontname = "Tests/fonts/ter-x20b.pcf"
 
-charsets = {
+
+class Charset(TypedDict):
+    glyph_count: int
+    message: str
+    image1: str
+
+
+charsets: dict[str, Charset] = {
     "iso8859-1": {
         "glyph_count": 223,
         "message": "hello, world",
@@ -35,7 +45,7 @@
 pytestmark = skip_unless_feature("zlib")
 
 
-def save_font(request, tmp_path, encoding):
+def save_font(request: pytest.FixtureRequest, tmp_path: Path, encoding: str) -> str:
     with open(fontname, "rb") as test_file:
         font = PcfFontFile.PcfFontFile(test_file, encoding)
     assert isinstance(font, FontFile.FontFile)
@@ -44,7 +54,7 @@ def save_font(request, tmp_path, encoding):
 
     tempname = str(tmp_path / "temp.pil")
 
-    def delete_tempfile():
+    def delete_tempfile() -> None:
         try:
             os.remove(tempname[:-4] + ".pbm")
         except OSError:
@@ -63,12 +73,12 @@ def delete_tempfile():
 
 
 @pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250"))
-def test_sanity(request, tmp_path, encoding):
+def test_sanity(request: pytest.FixtureRequest, tmp_path: Path, encoding: str) -> None:
     save_font(request, tmp_path, encoding)
 
 
 @pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250"))
-def test_draw(request, tmp_path, encoding):
+def test_draw(request: pytest.FixtureRequest, tmp_path: Path, encoding: str) -> None:
     tempname = save_font(request, tmp_path, encoding)
     font = ImageFont.load(tempname)
     im = Image.new("L", (150, 30), "white")
@@ -79,7 +89,9 @@ def test_draw(request, tmp_path, encoding):
 
 
 @pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250"))
-def test_textsize(request, tmp_path, encoding):
+def test_textsize(
+    request: pytest.FixtureRequest, tmp_path: Path, encoding: str
+) -> None:
     tempname = save_font(request, tmp_path, encoding)
     font = ImageFont.load(tempname)
     for i in range(255):
diff --git a/Tests/test_fontfile.py b/Tests/test_fontfile.py
index ce1e02f63e0..206499a047f 100644
--- a/Tests/test_fontfile.py
+++ b/Tests/test_fontfile.py
@@ -1,10 +1,13 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import FontFile
 
 
-def test_save(tmp_path):
+def test_save(tmp_path: Path) -> None:
     tempname = str(tmp_path / "temp.pil")
 
     font = FontFile.FontFile()
diff --git a/Tests/test_format_hsv.py b/Tests/test_format_hsv.py
index fd47fae39ba..c07024a2c5d 100644
--- a/Tests/test_format_hsv.py
+++ b/Tests/test_format_hsv.py
@@ -1,30 +1,28 @@
 from __future__ import annotations
+
 import colorsys
 import itertools
+from typing import Callable
 
 from PIL import Image
 
 from .helper import assert_image_similar, hopper
 
 
-def int_to_float(i):
+def int_to_float(i: int) -> float:
     return i / 255
 
 
-def str_to_float(i):
-    return ord(i) / 255
-
-
-def tuple_to_ints(tp):
+def tuple_to_ints(tp: tuple[float, float, float]) -> tuple[int, int, int]:
     x, y, z = tp
     return int(x * 255.0), int(y * 255.0), int(z * 255.0)
 
 
-def test_sanity():
+def test_sanity() -> None:
     Image.new("HSV", (100, 100))
 
 
-def wedge():
+def wedge() -> Image.Image:
     w = Image._wedge()
     w90 = w.rotate(90)
 
@@ -48,7 +46,11 @@ def wedge():
     return img
 
 
-def to_xxx_colorsys(im, func, mode):
+def to_xxx_colorsys(
+    im: Image.Image,
+    func: Callable[[float, float, float], tuple[float, float, float]],
+    mode: str,
+) -> Image.Image:
     # convert the hard way using the library colorsys routines.
 
     (r, g, b) = im.split()
@@ -69,15 +71,15 @@ def to_xxx_colorsys(im, func, mode):
     return hsv
 
 
-def to_hsv_colorsys(im):
+def to_hsv_colorsys(im: Image.Image) -> Image.Image:
     return to_xxx_colorsys(im, colorsys.rgb_to_hsv, "HSV")
 
 
-def to_rgb_colorsys(im):
+def to_rgb_colorsys(im: Image.Image) -> Image.Image:
     return to_xxx_colorsys(im, colorsys.hsv_to_rgb, "RGB")
 
 
-def test_wedge():
+def test_wedge() -> None:
     src = wedge().resize((3 * 32, 32), Image.Resampling.BILINEAR)
     im = src.convert("HSV")
     comparable = to_hsv_colorsys(src)
@@ -109,7 +111,7 @@ def test_wedge():
     )
 
 
-def test_convert():
+def test_convert() -> None:
     im = hopper("RGB").convert("HSV")
     comparable = to_hsv_colorsys(hopper("RGB"))
 
@@ -127,7 +129,7 @@ def test_convert():
     )
 
 
-def test_hsv_to_rgb():
+def test_hsv_to_rgb() -> None:
     comparable = to_hsv_colorsys(hopper("RGB"))
     converted = comparable.convert("RGB")
     comparable = to_rgb_colorsys(comparable)
diff --git a/Tests/test_format_lab.py b/Tests/test_format_lab.py
index c7610ce8a6c..4fcc37e88cc 100644
--- a/Tests/test_format_lab.py
+++ b/Tests/test_format_lab.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
+
 from PIL import Image
 
 
-def test_white():
+def test_white() -> None:
     with Image.open("Tests/images/lab.tif") as i:
         i.load()
 
@@ -23,7 +24,7 @@ def test_white():
     assert list(b) == [128] * 100
 
 
-def test_green():
+def test_green() -> None:
     # l= 50 (/100), a = -100 (-128 .. 128) b=0 in PS
     # == RGB: 0, 152, 117
     with Image.open("Tests/images/lab-green.tif") as i:
@@ -31,7 +32,7 @@ def test_green():
     assert k == (128, 28, 128)
 
 
-def test_red():
+def test_red() -> None:
     # l= 50 (/100), a = 100 (-128 .. 128) b=0 in PS
     # == RGB: 255, 0, 124
     with Image.open("Tests/images/lab-red.tif") as i:
diff --git a/Tests/test_image.py b/Tests/test_image.py
index 80f6583d8d9..9b65041f4b4 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import io
 import logging
 import os
@@ -6,6 +7,9 @@
 import sys
 import tempfile
 import warnings
+from pathlib import Path
+from types import ModuleType
+from typing import IO, Any
 
 import pytest
 
@@ -13,6 +17,7 @@
     ExifTags,
     Image,
     ImageDraw,
+    ImageFile,
     ImagePalette,
     UnidentifiedImageError,
     features,
@@ -21,57 +26,53 @@
 from .helper import (
     assert_image_equal,
     assert_image_equal_tofile,
+    assert_image_similar,
     assert_image_similar_tofile,
     assert_not_all_same,
     hopper,
+    is_big_endian,
     is_win32,
     mark_if_feature_version,
     skip_unless_feature,
 )
 
+ElementTree: ModuleType | None
+try:
+    from defusedxml import ElementTree
+except ImportError:
+    ElementTree = None
+
+PrettyPrinter: type | None
+try:
+    from IPython.lib.pretty import PrettyPrinter
+except ImportError:
+    PrettyPrinter = None
+
+
+# Deprecation helper
+def helper_image_new(mode: str, size: tuple[int, int]) -> Image.Image:
+    if mode.startswith("BGR;"):
+        with pytest.warns(DeprecationWarning):
+            return Image.new(mode, size)
+    else:
+        return Image.new(mode, size)
+
 
 class TestImage:
-    @pytest.mark.parametrize(
-        "mode",
-        (
-            "1",
-            "P",
-            "PA",
-            "L",
-            "LA",
-            "La",
-            "F",
-            "I",
-            "I;16",
-            "I;16L",
-            "I;16B",
-            "I;16N",
-            "RGB",
-            "RGBX",
-            "RGBA",
-            "RGBa",
-            "BGR;15",
-            "BGR;16",
-            "BGR;24",
-            "CMYK",
-            "YCbCr",
-            "LAB",
-            "HSV",
-        ),
-    )
-    def test_image_modes_success(self, mode):
-        Image.new(mode, (1, 1))
+    @pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
+    def test_image_modes_success(self, mode: str) -> None:
+        helper_image_new(mode, (1, 1))
 
     @pytest.mark.parametrize("mode", ("", "bad", "very very long"))
-    def test_image_modes_fail(self, mode):
+    def test_image_modes_fail(self, mode: str) -> None:
         with pytest.raises(ValueError) as e:
             Image.new(mode, (1, 1))
         assert str(e.value) == "unrecognized image mode"
 
-    def test_exception_inheritance(self):
+    def test_exception_inheritance(self) -> None:
         assert issubclass(UnidentifiedImageError, OSError)
 
-    def test_sanity(self):
+    def test_sanity(self) -> None:
         im = Image.new("L", (100, 100))
         assert repr(im)[:45] == "<PIL.Image.Image image mode=L size=100x100 at"
         assert im.mode == "L"
@@ -96,26 +97,33 @@ def test_sanity(self):
         # with pytest.raises(MemoryError):
         #   Image.new("L", (1000000, 1000000))
 
-    def test_repr_pretty(self):
-        class Pretty:
-            def text(self, text):
-                self.pretty_output = text
-
+    @pytest.mark.skipif(PrettyPrinter is None, reason="IPython is not installed")
+    def test_repr_pretty(self) -> None:
         im = Image.new("L", (100, 100))
 
-        p = Pretty()
-        im._repr_pretty_(p, None)
-        assert p.pretty_output == "<PIL.Image.Image image mode=L size=100x100>"
+        output = io.StringIO()
+        assert PrettyPrinter is not None
+        p = PrettyPrinter(output)
+        im._repr_pretty_(p, False)
+        assert output.getvalue() == "<PIL.Image.Image image mode=L size=100x100>"
 
-    def test_open_formats(self):
+    def test_open_formats(self) -> None:
         PNGFILE = "Tests/images/hopper.png"
         JPGFILE = "Tests/images/hopper.jpg"
 
         with pytest.raises(TypeError):
-            with Image.open(PNGFILE, formats=123):
+            with Image.open(PNGFILE, formats=123):  # type: ignore[arg-type]
                 pass
 
-        for formats in [["JPEG"], ("JPEG",), ["jpeg"], ["Jpeg"], ["jPeG"], ["JpEg"]]:
+        format_list: list[list[str] | tuple[str, ...]] = [
+            ["JPEG"],
+            ("JPEG",),
+            ["jpeg"],
+            ["Jpeg"],
+            ["jPeG"],
+            ["JpEg"],
+        ]
+        for formats in format_list:
             with pytest.raises(UnidentifiedImageError):
                 with Image.open(PNGFILE, formats=formats):
                     pass
@@ -129,39 +137,46 @@ def test_open_formats(self):
                 assert im.mode == "RGB"
                 assert im.size == (128, 128)
 
-    def test_width_height(self):
+    def test_open_verbose_failure(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        monkeypatch.setattr(Image, "WARN_POSSIBLE_FORMATS", True)
+
+        im = io.BytesIO(b"")
+        with pytest.warns(UserWarning):
+            with pytest.raises(UnidentifiedImageError):
+                with Image.open(im):
+                    pass
+
+    def test_width_height(self) -> None:
         im = Image.new("RGB", (1, 2))
         assert im.width == 1
         assert im.height == 2
 
         with pytest.raises(AttributeError):
-            im.size = (3, 4)
+            im.size = (3, 4)  # type: ignore[misc]
 
-    def test_set_mode(self):
+    def test_set_mode(self) -> None:
         im = Image.new("RGB", (1, 1))
 
         with pytest.raises(AttributeError):
-            im.mode = "P"
+            im.mode = "P"  # type: ignore[misc]
 
-    def test_invalid_image(self):
+    def test_invalid_image(self) -> None:
         im = io.BytesIO(b"")
         with pytest.raises(UnidentifiedImageError):
             with Image.open(im):
                 pass
 
-    def test_bad_mode(self):
+    def test_bad_mode(self) -> None:
         with pytest.raises(ValueError):
-            with Image.open("filename", "bad mode"):
+            with Image.open("filename", "bad mode"):  # type: ignore[arg-type]
                 pass
 
-    def test_stringio(self):
+    def test_stringio(self) -> None:
         with pytest.raises(ValueError):
-            with Image.open(io.StringIO()):
+            with Image.open(io.StringIO()):  # type: ignore[arg-type]
                 pass
 
-    def test_pathlib(self, tmp_path):
-        from PIL.Image import Path
-
+    def test_pathlib(self, tmp_path: Path) -> None:
         with Image.open(Path("Tests/images/multipage-mmap.tiff")) as im:
             assert im.mode == "P"
             assert im.size == (10, 10)
@@ -178,12 +193,22 @@ def test_pathlib(self, tmp_path):
                     os.remove(temp_file)
                 im.save(Path(temp_file))
 
-    def test_fp_name(self, tmp_path):
+    def test_fp_name(self, tmp_path: Path) -> None:
         temp_file = str(tmp_path / "temp.jpg")
 
-        class FP:
-            def write(self, b):
-                pass
+        class FP(io.BytesIO):
+            name: str
+
+            if sys.version_info >= (3, 12):
+                from collections.abc import Buffer
+
+                def write(self, data: Buffer) -> int:
+                    return len(data)
+
+            else:
+
+                def write(self, data: Any) -> int:
+                    return len(data)
 
         fp = FP()
         fp.name = temp_file
@@ -191,22 +216,23 @@ def write(self, b):
         im = hopper()
         im.save(fp)
 
-    def test_tempfile(self):
+    def test_tempfile(self) -> None:
         # see #1460, pathlib support breaks tempfile.TemporaryFile on py27
         # Will error out on save on 3.0.0
         im = hopper()
         with tempfile.TemporaryFile() as fp:
             im.save(fp, "JPEG")
             fp.seek(0)
-            assert_image_similar_tofile(im, fp, 20)
+            with Image.open(fp) as reloaded:
+                assert_image_similar(im, reloaded, 20)
 
-    def test_unknown_extension(self, tmp_path):
+    def test_unknown_extension(self, tmp_path: Path) -> None:
         im = hopper()
         temp_file = str(tmp_path / "temp.unknown")
         with pytest.raises(ValueError):
             im.save(temp_file)
 
-    def test_internals(self):
+    def test_internals(self) -> None:
         im = Image.new("L", (100, 100))
         im.readonly = 1
         im._copy()
@@ -221,7 +247,7 @@ def test_internals(self):
         sys.platform == "cygwin",
         reason="Test requires opening an mmaped file for writing",
     )
-    def test_readonly_save(self, tmp_path):
+    def test_readonly_save(self, tmp_path: Path) -> None:
         temp_file = str(tmp_path / "temp.bmp")
         shutil.copy("Tests/images/rgb32bf-rgba.bmp", temp_file)
 
@@ -229,7 +255,7 @@ def test_readonly_save(self, tmp_path):
             assert im.readonly
             im.save(temp_file)
 
-    def test_dump(self, tmp_path):
+    def test_dump(self, tmp_path: Path) -> None:
         im = Image.new("L", (10, 10))
         im._dump(str(tmp_path / "temp_L.ppm"))
 
@@ -240,7 +266,7 @@ def test_dump(self, tmp_path):
         with pytest.raises(ValueError):
             im._dump(str(tmp_path / "temp_HSV.ppm"))
 
-    def test_comparison_with_other_type(self):
+    def test_comparison_with_other_type(self) -> None:
         # Arrange
         item = Image.new("RGB", (25, 25), "#000")
         num = 12
@@ -250,7 +276,7 @@ def test_comparison_with_other_type(self):
         assert item is not None
         assert item != num
 
-    def test_expand_x(self):
+    def test_expand_x(self) -> None:
         # Arrange
         im = hopper()
         orig_size = im.size
@@ -263,7 +289,7 @@ def test_expand_x(self):
         assert im.size[0] == orig_size[0] + 2 * xmargin
         assert im.size[1] == orig_size[1] + 2 * xmargin
 
-    def test_expand_xy(self):
+    def test_expand_xy(self) -> None:
         # Arrange
         im = hopper()
         orig_size = im.size
@@ -277,12 +303,12 @@ def test_expand_xy(self):
         assert im.size[0] == orig_size[0] + 2 * xmargin
         assert im.size[1] == orig_size[1] + 2 * ymargin
 
-    def test_getbands(self):
+    def test_getbands(self) -> None:
         # Assert
         assert hopper("RGB").getbands() == ("R", "G", "B")
         assert hopper("YCbCr").getbands() == ("Y", "Cb", "Cr")
 
-    def test_getchannel_wrong_params(self):
+    def test_getchannel_wrong_params(self) -> None:
         im = hopper()
 
         with pytest.raises(ValueError):
@@ -294,7 +320,7 @@ def test_getchannel_wrong_params(self):
         with pytest.raises(ValueError):
             im.getchannel("1")
 
-    def test_getchannel(self):
+    def test_getchannel(self) -> None:
         im = hopper("YCbCr")
         Y, Cb, Cr = im.split()
 
@@ -305,7 +331,7 @@ def test_getchannel(self):
         assert_image_equal(Cr, im.getchannel(2))
         assert_image_equal(Cr, im.getchannel("Cr"))
 
-    def test_getbbox(self):
+    def test_getbbox(self) -> None:
         # Arrange
         im = hopper()
 
@@ -315,7 +341,7 @@ def test_getbbox(self):
         # Assert
         assert bbox == (0, 0, 128, 128)
 
-    def test_ne(self):
+    def test_ne(self) -> None:
         # Arrange
         im1 = Image.new("RGB", (25, 25), "black")
         im2 = Image.new("RGB", (25, 25), "white")
@@ -323,7 +349,7 @@ def test_ne(self):
         # Act / Assert
         assert im1 != im2
 
-    def test_alpha_composite(self):
+    def test_alpha_composite(self) -> None:
         # https://stackoverflow.com/questions/3374878
         # Arrange
         expected_colors = sorted(
@@ -351,10 +377,11 @@ def test_alpha_composite(self):
         img = Image.alpha_composite(dst, src)
 
         # Assert
-        img_colors = sorted(img.getcolors())
-        assert img_colors == expected_colors
+        img_colors = img.getcolors()
+        assert img_colors is not None
+        assert sorted(img_colors) == expected_colors
 
-    def test_alpha_inplace(self):
+    def test_alpha_inplace(self) -> None:
         src = Image.new("RGBA", (128, 128), "blue")
 
         over = Image.new("RGBA", (128, 128), "red")
@@ -396,17 +423,17 @@ def test_alpha_inplace(self):
 
         # errors
         with pytest.raises(ValueError):
-            source.alpha_composite(over, "invalid source")
+            source.alpha_composite(over, "invalid destination")  # type: ignore[arg-type]
         with pytest.raises(ValueError):
-            source.alpha_composite(over, (0, 0), "invalid destination")
+            source.alpha_composite(over, (0, 0), "invalid source")  # type: ignore[arg-type]
         with pytest.raises(ValueError):
-            source.alpha_composite(over, 0)
+            source.alpha_composite(over, 0)  # type: ignore[arg-type]
         with pytest.raises(ValueError):
-            source.alpha_composite(over, (0, 0), 0)
+            source.alpha_composite(over, (0, 0), 0)  # type: ignore[arg-type]
         with pytest.raises(ValueError):
             source.alpha_composite(over, (0, 0), (0, -1))
 
-    def test_register_open_duplicates(self):
+    def test_register_open_duplicates(self) -> None:
         # Arrange
         factory, accept = Image.OPEN["JPEG"]
         id_length = len(Image.ID)
@@ -417,7 +444,7 @@ def test_register_open_duplicates(self):
         # Assert
         assert len(Image.ID) == id_length
 
-    def test_registered_extensions_uninitialized(self):
+    def test_registered_extensions_uninitialized(self) -> None:
         # Arrange
         Image._initialized = 0
 
@@ -427,7 +454,7 @@ def test_registered_extensions_uninitialized(self):
         # Assert
         assert Image._initialized == 2
 
-    def test_registered_extensions(self):
+    def test_registered_extensions(self) -> None:
         # Arrange
         # Open an image to trigger plugin registration
         with Image.open("Tests/images/rgb.jpg"):
@@ -441,7 +468,7 @@ def test_registered_extensions(self):
         for ext in [".cur", ".icns", ".tif", ".tiff"]:
             assert ext in extensions
 
-    def test_effect_mandelbrot(self):
+    def test_effect_mandelbrot(self) -> None:
         # Arrange
         size = (512, 512)
         extent = (-3, -2.5, 2, 2.5)
@@ -454,7 +481,7 @@ def test_effect_mandelbrot(self):
         assert im.size == (512, 512)
         assert_image_equal_tofile(im, "Tests/images/effect_mandelbrot.png")
 
-    def test_effect_mandelbrot_bad_arguments(self):
+    def test_effect_mandelbrot_bad_arguments(self) -> None:
         # Arrange
         size = (512, 512)
         # Get coordinates the wrong way round:
@@ -466,7 +493,7 @@ def test_effect_mandelbrot_bad_arguments(self):
         with pytest.raises(ValueError):
             Image.effect_mandelbrot(size, extent, quality)
 
-    def test_effect_noise(self):
+    def test_effect_noise(self) -> None:
         # Arrange
         size = (100, 100)
         sigma = 128
@@ -484,7 +511,7 @@ def test_effect_noise(self):
         p4 = im.getpixel((0, 4))
         assert_not_all_same([p0, p1, p2, p3, p4])
 
-    def test_effect_spread(self):
+    def test_effect_spread(self) -> None:
         # Arrange
         im = hopper()
         distance = 10
@@ -496,7 +523,7 @@ def test_effect_spread(self):
         assert im.size == (128, 128)
         assert_image_similar_tofile(im2, "Tests/images/effect_spread.png", 110)
 
-    def test_effect_spread_zero(self):
+    def test_effect_spread_zero(self) -> None:
         # Arrange
         im = hopper()
         distance = 0
@@ -507,12 +534,14 @@ def test_effect_spread_zero(self):
         # Assert
         assert_image_equal(im, im2)
 
-    def test_check_size(self):
+    def test_check_size(self) -> None:
         # Checking that the _check_size function throws value errors when we want it to
         with pytest.raises(ValueError):
-            Image.new("RGB", 0)  # not a tuple
+            # not a tuple
+            Image.new("RGB", 0)  # type: ignore[arg-type]
         with pytest.raises(ValueError):
-            Image.new("RGB", (0,))  # Tuple too short
+            # tuple too short
+            Image.new("RGB", (0,))  # type: ignore[arg-type]
         with pytest.raises(ValueError):
             Image.new("RGB", (-1, -1))  # w,h < 0
 
@@ -536,10 +565,10 @@ def test_check_size(self):
         "PILLOW_VALGRIND_TEST" in os.environ, reason="Valgrind is slower"
     )
     @pytest.mark.parametrize("size", ((0, 100000000), (100000000, 0)))
-    def test_empty_image(self, size):
+    def test_empty_image(self, size: tuple[int, int]) -> None:
         Image.new("RGB", size)
 
-    def test_storage_neg(self):
+    def test_storage_neg(self) -> None:
         # Storage.c accepted negative values for xsize, ysize.  Was
         # test_neg_ppm, but the core function for that has been
         # removed Calling directly into core to test the error in
@@ -548,13 +577,14 @@ def test_storage_neg(self):
         with pytest.raises(ValueError):
             Image.core.fill("RGB", (2, -2), (0, 0, 0))
 
-    def test_one_item_tuple(self):
+    def test_one_item_tuple(self) -> None:
         for mode in ("I", "F", "L"):
             im = Image.new(mode, (100, 100), (5,))
             px = im.load()
+            assert px is not None
             assert px[0, 0] == 5
 
-    def test_linear_gradient_wrong_mode(self):
+    def test_linear_gradient_wrong_mode(self) -> None:
         # Arrange
         wrong_mode = "RGB"
 
@@ -563,7 +593,7 @@ def test_linear_gradient_wrong_mode(self):
             Image.linear_gradient(wrong_mode)
 
     @pytest.mark.parametrize("mode", ("L", "P", "I", "F"))
-    def test_linear_gradient(self, mode):
+    def test_linear_gradient(self, mode: str) -> None:
         # Arrange
         target_file = "Tests/images/linear_gradient.png"
 
@@ -579,7 +609,7 @@ def test_linear_gradient(self, mode):
             target = target.convert(mode)
         assert_image_equal(im, target)
 
-    def test_radial_gradient_wrong_mode(self):
+    def test_radial_gradient_wrong_mode(self) -> None:
         # Arrange
         wrong_mode = "RGB"
 
@@ -588,7 +618,7 @@ def test_radial_gradient_wrong_mode(self):
             Image.radial_gradient(wrong_mode)
 
     @pytest.mark.parametrize("mode", ("L", "P", "I", "F"))
-    def test_radial_gradient(self, mode):
+    def test_radial_gradient(self, mode: str) -> None:
         # Arrange
         target_file = "Tests/images/radial_gradient.png"
 
@@ -604,7 +634,7 @@ def test_radial_gradient(self, mode):
             target = target.convert(mode)
         assert_image_equal(im, target)
 
-    def test_register_extensions(self):
+    def test_register_extensions(self) -> None:
         test_format = "a"
         exts = ["b", "c"]
         for ext in exts:
@@ -620,7 +650,7 @@ def test_register_extensions(self):
 
         assert ext_individual == ext_multiple
 
-    def test_remap_palette(self):
+    def test_remap_palette(self) -> None:
         # Test identity transform
         with Image.open("Tests/images/hopper.gif") as im:
             assert_image_equal(im, im.remap_palette(list(range(256))))
@@ -639,14 +669,16 @@ def test_remap_palette(self):
             with pytest.raises(ValueError):
                 im.remap_palette(None)
 
-    def test_remap_palette_transparency(self):
+    def test_remap_palette_transparency(self) -> None:
         im = Image.new("P", (1, 2), (0, 0, 0))
         im.putpixel((0, 1), (255, 0, 0))
         im.info["transparency"] = 0
 
         im_remapped = im.remap_palette([1, 0])
         assert im_remapped.info["transparency"] == 1
-        assert len(im_remapped.getpalette()) == 6
+        palette = im_remapped.getpalette()
+        assert palette is not None
+        assert len(palette) == 6
 
         # Test unused transparency
         im.info["transparency"] = 2
@@ -654,7 +686,7 @@ def test_remap_palette_transparency(self):
         im_remapped = im.remap_palette([1, 0])
         assert "transparency" not in im_remapped.info
 
-    def test__new(self):
+    def test__new(self) -> None:
         im = hopper("RGB")
         im_p = hopper("P")
 
@@ -663,32 +695,40 @@ def test__new(self):
         blank_p.palette = None
         blank_pa.palette = None
 
-        def _make_new(base_image, image, palette_result=None):
+        def _make_new(
+            base_image: Image.Image,
+            image: Image.Image,
+            palette_result: ImagePalette.ImagePalette | None = None,
+        ) -> None:
             new_image = base_image._new(image.im)
             assert new_image.mode == image.mode
             assert new_image.size == image.size
             assert new_image.info == base_image.info
             if palette_result is not None:
+                assert new_image.palette is not None
                 assert new_image.palette.tobytes() == palette_result.tobytes()
             else:
                 assert new_image.palette is None
 
-        _make_new(im, im_p, ImagePalette.ImagePalette(list(range(256)) * 3))
+        _make_new(im, im_p, ImagePalette.ImagePalette("RGB"))
         _make_new(im_p, im, None)
         _make_new(im, blank_p, ImagePalette.ImagePalette())
         _make_new(im, blank_pa, ImagePalette.ImagePalette())
 
-    def test_p_from_rgb_rgba(self):
-        for mode, color in [
+    @pytest.mark.parametrize(
+        "mode, color",
+        (
             ("RGB", "#DDEEFF"),
             ("RGB", (221, 238, 255)),
             ("RGBA", (221, 238, 255, 255)),
-        ]:
-            im = Image.new("P", (100, 100), color)
-            expected = Image.new(mode, (100, 100), color)
-            assert_image_equal(im.convert(mode), expected)
+        ),
+    )
+    def test_p_from_rgb_rgba(self, mode: str, color: str | tuple[int, ...]) -> None:
+        im = Image.new("P", (100, 100), color)
+        expected = Image.new(mode, (100, 100), color)
+        assert_image_equal(im.convert(mode), expected)
 
-    def test_no_resource_warning_on_save(self, tmp_path):
+    def test_no_resource_warning_on_save(self, tmp_path: Path) -> None:
         # https://github.com/python-pillow/Pillow/issues/835
         # Arrange
         test_file = "Tests/images/hopper.png"
@@ -699,7 +739,7 @@ def test_no_resource_warning_on_save(self, tmp_path):
             with warnings.catch_warnings():
                 im.save(temp_file)
 
-    def test_no_new_file_on_error(self, tmp_path):
+    def test_no_new_file_on_error(self, tmp_path: Path) -> None:
         temp_file = str(tmp_path / "temp.jpg")
 
         im = Image.new("RGB", (0, 0))
@@ -708,10 +748,10 @@ def test_no_new_file_on_error(self, tmp_path):
 
         assert not os.path.exists(temp_file)
 
-    def test_load_on_nonexclusive_multiframe(self):
+    def test_load_on_nonexclusive_multiframe(self) -> None:
         with open("Tests/images/frozenpond.mpo", "rb") as fp:
 
-            def act(fp):
+            def act(fp: IO[bytes]) -> None:
                 im = Image.open(fp)
                 im.load()
 
@@ -722,7 +762,7 @@ def act(fp):
 
             assert not fp.closed
 
-    def test_empty_exif(self):
+    def test_empty_exif(self) -> None:
         with Image.open("Tests/images/exif.png") as im:
             exif = im.getexif()
         assert dict(exif)
@@ -735,10 +775,26 @@ def test_empty_exif(self):
         exif.load(b"Exif\x00\x00")
         assert not dict(exif)
 
+    def test_duplicate_exif_header(self) -> None:
+        with Image.open("Tests/images/exif.png") as im:
+            im.load()
+            im.info["exif"] = b"Exif\x00\x00" + im.info["exif"]
+
+            exif = im.getexif()
+        assert exif[274] == 1
+
+    def test_empty_get_ifd(self) -> None:
+        exif = Image.Exif()
+        ifd = exif.get_ifd(0x8769)
+        assert ifd == {}
+
+        ifd[36864] = b"0220"
+        assert exif.get_ifd(0x8769) == {36864: b"0220"}
+
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_exif_jpeg(self, tmp_path):
+    def test_exif_jpeg(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/exif-72dpi-int.jpg") as im:  # Little endian
             exif = im.getexif()
             assert 258 not in exif
@@ -783,8 +839,7 @@ def test_exif_jpeg(self, tmp_path):
             assert reloaded_exif[305] == "Pillow test"
 
     @skip_unless_feature("webp")
-    @skip_unless_feature("webp_anim")
-    def test_exif_webp(self, tmp_path):
+    def test_exif_webp(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/hopper.webp") as im:
             exif = im.getexif()
             assert exif == {}
@@ -794,7 +849,7 @@ def test_exif_webp(self, tmp_path):
             exif[40963] = 455
             exif[305] = "Pillow test"
 
-            def check_exif():
+            def check_exif() -> None:
                 with Image.open(out) as reloaded:
                     reloaded_exif = reloaded.getexif()
                     assert reloaded_exif[258] == 8
@@ -806,7 +861,7 @@ def check_exif():
             im.save(out, exif=exif, save_all=True)
             check_exif()
 
-    def test_exif_png(self, tmp_path):
+    def test_exif_png(self, tmp_path: Path) -> None:
         with Image.open("Tests/images/exif.png") as im:
             exif = im.getexif()
             assert exif == {274: 1}
@@ -822,7 +877,7 @@ def test_exif_png(self, tmp_path):
             reloaded_exif = reloaded.getexif()
             assert reloaded_exif == {258: 8, 40963: 455, 305: "Pillow test"}
 
-    def test_exif_interop(self):
+    def test_exif_interop(self) -> None:
         with Image.open("Tests/images/flower.jpg") as im:
             exif = im.getexif()
             assert exif.get_ifd(0xA005) == {
@@ -836,7 +891,7 @@ def test_exif_interop(self):
             reloaded_exif.load(exif.tobytes())
             assert reloaded_exif.get_ifd(0xA005) == exif.get_ifd(0xA005)
 
-    def test_exif_ifd1(self):
+    def test_exif_ifd1(self) -> None:
         with Image.open("Tests/images/flower.jpg") as im:
             exif = im.getexif()
             assert exif.get_ifd(ExifTags.IFD.IFD1) == {
@@ -848,7 +903,7 @@ def test_exif_ifd1(self):
                 283: 180.0,
             }
 
-    def test_exif_ifd(self):
+    def test_exif_ifd(self) -> None:
         with Image.open("Tests/images/flower.jpg") as im:
             exif = im.getexif()
         del exif.get_ifd(0x8769)[0xA005]
@@ -857,7 +912,7 @@ def test_exif_ifd(self):
         reloaded_exif.load(exif.tobytes())
         assert reloaded_exif.get_ifd(0x8769) == exif.get_ifd(0x8769)
 
-    def test_exif_load_from_fp(self):
+    def test_exif_load_from_fp(self) -> None:
         with Image.open("Tests/images/flower.jpg") as im:
             data = im.info["exif"]
             if data.startswith(b"Exif\x00\x00"):
@@ -878,7 +933,7 @@ def test_exif_load_from_fp(self):
                 34665: 196,
             }
 
-    def test_exif_hide_offsets(self):
+    def test_exif_hide_offsets(self) -> None:
         with Image.open("Tests/images/flower.jpg") as im:
             exif = im.getexif()
 
@@ -903,19 +958,46 @@ def test_exif_hide_offsets(self):
                     assert tag not in exif.get_ifd(0x8769)
                 assert exif.get_ifd(0xA005)
 
+    def test_empty_xmp(self) -> None:
+        with Image.open("Tests/images/hopper.gif") as im:
+            if ElementTree is None:
+                with pytest.warns(
+                    UserWarning,
+                    match="XMP data cannot be read without defusedxml dependency",
+                ):
+                    xmp = im.getxmp()
+            else:
+                xmp = im.getxmp()
+            assert xmp == {}
+
+    def test_getxmp_padded(self) -> None:
+        im = Image.new("RGB", (1, 1))
+        im.info["xmp"] = (
+            b'<?xpacket begin="\xef\xbb\xbf" id="W5M0MpCehiHzreSzNTczkc9d"?>\n'
+            b'<x:xmpmeta xmlns:x="adobe:ns:meta/" />\n<?xpacket end="w"?>\x00\x00'
+        )
+        if ElementTree is None:
+            with pytest.warns(
+                UserWarning,
+                match="XMP data cannot be read without defusedxml dependency",
+            ):
+                assert im.getxmp() == {}
+        else:
+            assert im.getxmp() == {"xmpmeta": None}
+
     @pytest.mark.parametrize("size", ((1, 0), (0, 1), (0, 0)))
-    def test_zero_tobytes(self, size):
+    def test_zero_tobytes(self, size: tuple[int, int]) -> None:
         im = Image.new("RGB", size)
         assert im.tobytes() == b""
 
     @pytest.mark.parametrize("size", ((1, 0), (0, 1), (0, 0)))
-    def test_zero_frombytes(self, size):
+    def test_zero_frombytes(self, size: tuple[int, int]) -> None:
         Image.frombytes("RGB", size, b"")
 
         im = Image.new("RGB", size)
         im.frombytes(b"")
 
-    def test_has_transparency_data(self):
+    def test_has_transparency_data(self) -> None:
         for mode in ("1", "L", "P", "RGB"):
             im = Image.new(mode, (1, 1))
             assert not im.has_transparency_data
@@ -937,12 +1019,14 @@ def test_has_transparency_data(self):
         # P mode with RGBA palette
         im = Image.new("RGBA", (1, 1)).convert("P")
         assert im.mode == "P"
+        assert im.palette is not None
         assert im.palette.mode == "RGBA"
         assert im.has_transparency_data
 
-    def test_apply_transparency(self):
+    def test_apply_transparency(self) -> None:
         im = Image.new("P", (1, 1))
         im.putpalette((0, 0, 0, 1, 1, 1))
+        assert im.palette is not None
         assert im.palette.colors == {(0, 0, 0): 0, (1, 1, 1): 1}
 
         # Test that no transformation is applied without transparency
@@ -960,16 +1044,19 @@ def test_apply_transparency(self):
         im.putpalette((0, 0, 0, 255, 1, 1, 1, 128), "RGBA")
         im.info["transparency"] = 0
         im.apply_transparency()
+        assert im.palette is not None
         assert im.palette.colors == {(0, 0, 0, 0): 0, (1, 1, 1, 128): 1}
 
         # Test that transparency bytes are applied
         with Image.open("Tests/images/pil123p.png") as im:
             assert isinstance(im.info["transparency"], bytes)
+            assert im.palette is not None
             assert im.palette.colors[(27, 35, 6)] == 24
             im.apply_transparency()
+            assert im.palette is not None
             assert im.palette.colors[(27, 35, 6, 214)] == 24
 
-    def test_constants(self):
+    def test_constants(self) -> None:
         for enum in (
             Image.Transpose,
             Image.Transform,
@@ -994,34 +1081,29 @@ def test_constants(self):
             "01r_00.pcx",
         ],
     )
-    def test_overrun(self, path):
+    def test_overrun(self, path: str) -> None:
         """For overrun completeness, test as:
         valgrind pytest -qq Tests/test_image.py::TestImage::test_overrun | grep decode.c
         """
         with Image.open(os.path.join("Tests/images", path)) as im:
-            try:
+            with pytest.raises(OSError) as e:
                 im.load()
-                pytest.fail()
-            except OSError as e:
-                buffer_overrun = str(e) == "buffer overrun when reading image file"
-                truncated = "image file is truncated" in str(e)
+        buffer_overrun = str(e.value) == "buffer overrun when reading image file"
+        truncated = "image file is truncated" in str(e.value)
 
-                assert buffer_overrun or truncated
+        assert buffer_overrun or truncated
 
-    def test_fli_overrun2(self):
+    def test_fli_overrun2(self) -> None:
         with Image.open("Tests/images/fli_overrun2.bin") as im:
-            try:
+            with pytest.raises(OSError, match="buffer overrun when reading image file"):
                 im.seek(1)
-                pytest.fail()
-            except OSError as e:
-                assert str(e) == "buffer overrun when reading image file"
 
-    def test_exit_fp(self):
+    def test_exit_fp(self) -> None:
         with Image.new("L", (1, 1)) as im:
             pass
         assert not hasattr(im, "fp")
 
-    def test_close_graceful(self, caplog):
+    def test_close_graceful(self, caplog: pytest.LogCaptureFixture) -> None:
         with Image.open("Tests/images/hopper.jpg") as im:
             copy = im.copy()
             with caplog.at_level(logging.DEBUG):
@@ -1030,27 +1112,58 @@ def test_close_graceful(self, caplog):
             assert len(caplog.records) == 0
             assert im.fp is None
 
+    def test_deprecation(self) -> None:
+        with pytest.warns(DeprecationWarning):
+            assert not Image.isImageType(None)
 
-class MockEncoder:
-    pass
 
+class TestImageBytes:
+    @pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
+    def test_roundtrip_bytes_constructor(self, mode: str) -> None:
+        im = hopper(mode)
+        source_bytes = im.tobytes()
+
+        if mode.startswith("BGR;"):
+            with pytest.warns(DeprecationWarning):
+                reloaded = Image.frombytes(mode, im.size, source_bytes)
+        else:
+            reloaded = Image.frombytes(mode, im.size, source_bytes)
+        assert reloaded.tobytes() == source_bytes
 
-def mock_encode(*args):
-    encoder = MockEncoder()
-    encoder.args = args
-    return encoder
+    @pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
+    def test_roundtrip_bytes_method(self, mode: str) -> None:
+        im = hopper(mode)
+        source_bytes = im.tobytes()
+
+        reloaded = helper_image_new(mode, im.size)
+        reloaded.frombytes(source_bytes)
+        assert reloaded.tobytes() == source_bytes
+
+    @pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
+    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)
+        reloaded = helper_image_new(mode, im.size)
+        reloaded.putdata(im.getdata())
+        assert_image_equal(im, reloaded)
+
+
+class MockEncoder(ImageFile.PyEncoder):
+    pass
 
 
 class TestRegistry:
-    def test_encode_registry(self):
-        Image.register_encoder("MOCK", mock_encode)
+    def test_encode_registry(self) -> None:
+        Image.register_encoder("MOCK", MockEncoder)
         assert "MOCK" in Image.ENCODERS
 
         enc = Image._getencoder("RGB", "MOCK", ("args",), extra=("extra",))
 
         assert isinstance(enc, MockEncoder)
-        assert enc.args == ("RGB", "args", "extra")
+        assert enc.mode == "RGB"
+        assert enc.args == ("args", "extra")
 
-    def test_encode_registry_fail(self):
+    def test_encode_registry_fail(self) -> None:
         with pytest.raises(OSError):
             Image._getencoder("RGB", "DoesNotExist", ("args",), extra=("extra",))
diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py
index 4a794371d67..bb30b462d2f 100644
--- a/Tests/test_image_access.py
+++ b/Tests/test_image_access.py
@@ -1,8 +1,10 @@
 from __future__ import annotations
+
 import os
 import subprocess
 import sys
 import sysconfig
+from types import ModuleType
 
 import pytest
 
@@ -10,47 +12,24 @@
 
 from .helper import assert_image_equal, hopper, is_win32
 
-# CFFI imports pycparser which doesn't support PYTHONOPTIMIZE=2
-# https://github.com/eliben/pycparser/pull/198#issuecomment-317001670
-if os.environ.get("PYTHONOPTIMIZE") == "2":
-    cffi = None
-else:
-    try:
-        import cffi
-
-        from PIL import PyAccess
-    except ImportError:
-        cffi = None
-
+numpy: ModuleType | None
 try:
     import numpy
 except ImportError:
     numpy = None
 
 
-class AccessTest:
-    # initial value
-    _init_cffi_access = Image.USE_CFFI_ACCESS
-    _need_cffi_access = False
-
-    @classmethod
-    def setup_class(cls):
-        Image.USE_CFFI_ACCESS = cls._need_cffi_access
-
-    @classmethod
-    def teardown_class(cls):
-        Image.USE_CFFI_ACCESS = cls._init_cffi_access
-
-
-class TestImagePutPixel(AccessTest):
-    def test_sanity(self):
+class TestImagePutPixel:
+    def test_sanity(self) -> None:
         im1 = hopper()
         im2 = Image.new(im1.mode, im1.size, 0)
 
         for y in range(im1.size[1]):
             for x in range(im1.size[0]):
                 pos = x, y
-                im2.putpixel(pos, im1.getpixel(pos))
+                value = im1.getpixel(pos)
+                assert value is not None
+                im2.putpixel(pos, value)
 
         assert_image_equal(im1, im2)
 
@@ -60,7 +39,9 @@ def test_sanity(self):
         for y in range(im1.size[1]):
             for x in range(im1.size[0]):
                 pos = x, y
-                im2.putpixel(pos, im1.getpixel(pos))
+                value = im1.getpixel(pos)
+                assert value is not None
+                im2.putpixel(pos, value)
 
         assert not im2.readonly
         assert_image_equal(im1, im2)
@@ -70,9 +51,12 @@ def test_sanity(self):
         pix1 = im1.load()
         pix2 = im2.load()
 
-        for x, y in ((0, "0"), ("0", 0)):
-            with pytest.raises(TypeError):
-                pix1[x, y]
+        assert pix1 is not None
+        assert pix2 is not None
+        with pytest.raises(TypeError):
+            pix1[0, "0"]  # type: ignore[index]
+        with pytest.raises(TypeError):
+            pix1["0", 0]  # type: ignore[index]
 
         for y in range(im1.size[1]):
             for x in range(im1.size[0]):
@@ -80,7 +64,7 @@ def test_sanity(self):
 
         assert_image_equal(im1, im2)
 
-    def test_sanity_negative_index(self):
+    def test_sanity_negative_index(self) -> None:
         im1 = hopper()
         im2 = Image.new(im1.mode, im1.size, 0)
 
@@ -91,7 +75,9 @@ def test_sanity_negative_index(self):
         for y in range(-1, -im1.size[1] - 1, -1):
             for x in range(-1, -im1.size[0] - 1, -1):
                 pos = x, y
-                im2.putpixel(pos, im1.getpixel(pos))
+                value = im1.getpixel(pos)
+                assert value is not None
+                im2.putpixel(pos, value)
 
         assert_image_equal(im1, im2)
 
@@ -101,7 +87,9 @@ def test_sanity_negative_index(self):
         for y in range(-1, -im1.size[1] - 1, -1):
             for x in range(-1, -im1.size[0] - 1, -1):
                 pos = x, y
-                im2.putpixel(pos, im1.getpixel(pos))
+                value = im1.getpixel(pos)
+                assert value is not None
+                im2.putpixel(pos, value)
 
         assert not im2.readonly
         assert_image_equal(im1, im2)
@@ -111,6 +99,8 @@ def test_sanity_negative_index(self):
         pix1 = im1.load()
         pix2 = im2.load()
 
+        assert pix1 is not None
+        assert pix2 is not None
         for y in range(-1, -im1.size[1] - 1, -1):
             for x in range(-1, -im1.size[0] - 1, -1):
                 pix2[x, y] = pix1[x, y]
@@ -118,33 +108,33 @@ def test_sanity_negative_index(self):
         assert_image_equal(im1, im2)
 
     @pytest.mark.skipif(numpy is None, reason="NumPy not installed")
-    def test_numpy(self):
+    def test_numpy(self) -> None:
         im = hopper()
-        pix = im.load()
+        px = im.load()
 
-        assert pix[numpy.int32(1), numpy.int32(2)] == (18, 20, 59)
+        assert px is not None
+        assert numpy is not None
+        assert px[numpy.int32(1), numpy.int32(2)] == (18, 20, 59)
 
 
-class TestImageGetPixel(AccessTest):
+class TestImageGetPixel:
     @staticmethod
-    def color(mode):
+    def color(mode: str) -> int | tuple[int, ...]:
         bands = Image.getmodebands(mode)
         if bands == 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
+            # 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))
 
-    def check(self, mode, expected_color=None):
-        if self._need_cffi_access and mode.startswith("BGR;"):
-            pytest.skip("Support not added to deprecated module for BGR;* modes")
-
-        if not expected_color:
-            expected_color = self.color(mode)
+    def check(self, mode: str, expected_color_int: int | None = None) -> None:
+        expected_color = (
+            self.color(mode) if expected_color_int is None else expected_color_int
+        )
 
-        # check putpixel
+        # Check putpixel
         im = Image.new(mode, (1, 1), None)
         im.putpixel((0, 0), expected_color)
         actual_color = im.getpixel((0, 0))
@@ -153,7 +143,7 @@ def check(self, mode, expected_color=None):
             f"expected {expected_color} got {actual_color}"
         )
 
-        # check putpixel negative index
+        # Check putpixel negative index
         im.putpixel((-1, -1), expected_color)
         actual_color = im.getpixel((-1, -1))
         assert actual_color == expected_color, (
@@ -161,22 +151,20 @@ def check(self, mode, expected_color=None):
             f"expected {expected_color} got {actual_color}"
         )
 
-        # Check 0
+        # Check 0x0 image with None initial color
         im = Image.new(mode, (0, 0), None)
         assert im.load() is not None
-
-        error = ValueError if self._need_cffi_access else IndexError
-        with pytest.raises(error):
+        with pytest.raises(IndexError):
             im.putpixel((0, 0), expected_color)
-        with pytest.raises(error):
+        with pytest.raises(IndexError):
             im.getpixel((0, 0))
-        # Check 0 negative index
-        with pytest.raises(error):
+        # Check negative index
+        with pytest.raises(IndexError):
             im.putpixel((-1, -1), expected_color)
-        with pytest.raises(error):
+        with pytest.raises(IndexError):
             im.getpixel((-1, -1))
 
-        # check initial color
+        # Check initial color
         im = Image.new(mode, (1, 1), expected_color)
         actual_color = im.getpixel((0, 0))
         assert actual_color == expected_color, (
@@ -184,62 +172,44 @@ def check(self, mode, expected_color=None):
             f"expected {expected_color} got {actual_color}"
         )
 
-        # check initial color negative index
+        # Check initial color negative index
         actual_color = im.getpixel((-1, -1))
         assert actual_color == expected_color, (
             f"initial color failed with negative index for mode {mode}, "
             f"expected {expected_color} got {actual_color}"
         )
 
-        # Check 0
+        # Check 0x0 image with initial color
         im = Image.new(mode, (0, 0), expected_color)
-        with pytest.raises(error):
+        with pytest.raises(IndexError):
             im.getpixel((0, 0))
-        # Check 0 negative index
-        with pytest.raises(error):
+        # Check negative index
+        with pytest.raises(IndexError):
             im.getpixel((-1, -1))
 
-    @pytest.mark.parametrize(
-        "mode",
-        (
-            "1",
-            "L",
-            "LA",
-            "I",
-            "I;16",
-            "I;16B",
-            "F",
-            "P",
-            "PA",
-            "BGR;15",
-            "BGR;16",
-            "BGR;24",
-            "RGB",
-            "RGBA",
-            "RGBX",
-            "CMYK",
-            "YCbCr",
-        ),
-    )
-    def test_basic(self, mode):
+    @pytest.mark.parametrize("mode", Image.MODES)
+    def test_basic(self, mode: str) -> None:
         self.check(mode)
 
-    def test_list(self):
+    @pytest.mark.parametrize("mode", ("BGR;15", "BGR;16", "BGR;24"))
+    def test_deprecated(self, mode: str) -> None:
+        with pytest.warns(DeprecationWarning):
+            self.check(mode)
+
+    def test_list(self) -> None:
         im = hopper()
         assert im.getpixel([0, 0]) == (20, 20, 70)
 
     @pytest.mark.parametrize("mode", ("I;16", "I;16B"))
-    @pytest.mark.parametrize(
-        "expected_color", (2**15 - 1, 2**15, 2**15 + 1, 2**16 - 1)
-    )
-    def test_signedness(self, mode, expected_color):
-        # see https://github.com/python-pillow/Pillow/issues/452
+    @pytest.mark.parametrize("expected_color", (2**15 - 1, 2**15, 2**15 + 1, 2**16 - 1))
+    def test_signedness(self, mode: str, expected_color: int) -> None:
+        # See https://github.com/python-pillow/Pillow/issues/452
         # pixelaccess is using signed int* instead of uint*
         self.check(mode, expected_color)
 
     @pytest.mark.parametrize("mode", ("P", "PA"))
     @pytest.mark.parametrize("color", ((255, 0, 0), (255, 0, 0, 255)))
-    def test_p_putpixel_rgb_rgba(self, mode, color):
+    def test_p_putpixel_rgb_rgba(self, mode: str, color: tuple[int, ...]) -> None:
         im = Image.new(mode, (1, 1))
         im.putpixel((0, 0), color)
 
@@ -247,145 +217,20 @@ def test_p_putpixel_rgb_rgba(self, mode, color):
         assert im.convert("RGBA").getpixel((0, 0)) == (255, 0, 0, alpha)
 
 
-@pytest.mark.filterwarnings("ignore::DeprecationWarning")
-@pytest.mark.skipif(cffi is None, reason="No CFFI")
-class TestCffiPutPixel(TestImagePutPixel):
-    _need_cffi_access = True
-
-
-@pytest.mark.filterwarnings("ignore::DeprecationWarning")
-@pytest.mark.skipif(cffi is None, reason="No CFFI")
-class TestCffiGetPixel(TestImageGetPixel):
-    _need_cffi_access = True
-
-
-@pytest.mark.skipif(cffi is None, reason="No CFFI")
-class TestCffi(AccessTest):
-    _need_cffi_access = True
-
-    def _test_get_access(self, im):
-        """Do we get the same thing as the old pixel access
-
-        Using private interfaces, forcing a capi access and
-        a pyaccess for the same image"""
-        caccess = im.im.pixel_access(False)
-        with pytest.warns(DeprecationWarning):
-            access = PyAccess.new(im, False)
-
-        w, h = im.size
-        for x in range(0, w, 10):
-            for y in range(0, h, 10):
-                assert access[(x, y)] == caccess[(x, y)]
-
-        # Access an out-of-range pixel
-        with pytest.raises(ValueError):
-            access[(access.xsize + 1, access.ysize + 1)]
-
-    def test_get_vs_c(self):
-        with pytest.warns(DeprecationWarning):
-            rgb = hopper("RGB")
-            rgb.load()
-            self._test_get_access(rgb)
-            for mode in ("RGBA", "L", "LA", "1", "P", "F"):
-                self._test_get_access(hopper(mode))
-
-            for mode in ("I;16", "I;16L", "I;16B", "I;16N", "I"):
-                im = Image.new(mode, (10, 10), 40000)
-                self._test_get_access(im)
-
-        # These don't actually appear to be modes that I can actually make,
-        # as unpack sets them directly into the I mode.
-        # im = Image.new('I;32L', (10, 10), -2**10)
-        # self._test_get_access(im)
-        # im = Image.new('I;32B', (10, 10), 2**10)
-        # self._test_get_access(im)
-
-    def _test_set_access(self, im, color):
-        """Are we writing the correct bits into the image?
-
-        Using private interfaces, forcing a capi access and
-        a pyaccess for the same image"""
-        caccess = im.im.pixel_access(False)
-        with pytest.warns(DeprecationWarning):
-            access = PyAccess.new(im, False)
-
-        w, h = im.size
-        for x in range(0, w, 10):
-            for y in range(0, h, 10):
-                access[(x, y)] = color
-                assert color == caccess[(x, y)]
-
-        # Attempt to set the value on a read-only image
-        with pytest.warns(DeprecationWarning):
-            access = PyAccess.new(im, True)
-        with pytest.raises(ValueError):
-            access[(0, 0)] = color
-
-    def test_set_vs_c(self):
-        rgb = hopper("RGB")
-        with pytest.warns(DeprecationWarning):
-            rgb.load()
-        self._test_set_access(rgb, (255, 128, 0))
-        self._test_set_access(hopper("RGBA"), (255, 192, 128, 0))
-        self._test_set_access(hopper("L"), 128)
-        self._test_set_access(hopper("LA"), (128, 128))
-        self._test_set_access(hopper("1"), 255)
-        self._test_set_access(hopper("P"), 128)
-        # self._test_set_access(i, (128, 128))  #PA  -- undone how to make
-        self._test_set_access(hopper("F"), 1024.0)
-
-        for mode in ("I;16", "I;16L", "I;16B", "I;16N", "I"):
-            im = Image.new(mode, (10, 10), 40000)
-            self._test_set_access(im, 45000)
-
-        # im = Image.new('I;32L', (10, 10), -(2**10))
-        # self._test_set_access(im, -(2**13)+1)
-        # im = Image.new('I;32B', (10, 10), 2**10)
-        # self._test_set_access(im, 2**13-1)
-
-    @pytest.mark.filterwarnings("ignore::DeprecationWarning")
-    def test_not_implemented(self):
-        assert PyAccess.new(hopper("BGR;15")) is None
-
-    # ref https://github.com/python-pillow/Pillow/pull/2009
-    def test_reference_counting(self):
-        size = 10
-
-        for _ in range(10):
-            # Do not save references to the image, only to the access object
-            with pytest.warns(DeprecationWarning):
-                px = Image.new("L", (size, 1), 0).load()
-            for i in range(size):
-                # pixels can contain garbage if image is released
-                assert px[i, 0] == 0
-
-    @pytest.mark.parametrize("mode", ("P", "PA"))
-    def test_p_putpixel_rgb_rgba(self, mode):
-        for color in ((255, 0, 0), (255, 0, 0, 127 if mode == "PA" else 255)):
-            im = Image.new(mode, (1, 1))
-            with pytest.warns(DeprecationWarning):
-                access = PyAccess.new(im, False)
-                access.putpixel((0, 0), color)
-
-                if len(color) == 3:
-                    color += (255,)
-                assert im.convert("RGBA").getpixel((0, 0)) == color
-
-
-class TestImagePutPixelError(AccessTest):
+class TestImagePutPixelError:
     IMAGE_MODES1 = ["LA", "RGB", "RGBA", "BGR;15"]
     IMAGE_MODES2 = ["L", "I", "I;16"]
     INVALID_TYPES = ["foo", 1.0, None]
 
     @pytest.mark.parametrize("mode", IMAGE_MODES1)
-    def test_putpixel_type_error1(self, mode):
+    def test_putpixel_type_error1(self, mode: str) -> None:
         im = hopper(mode)
         for v in self.INVALID_TYPES:
             with pytest.raises(TypeError, match="color must be int or tuple"):
-                im.putpixel((0, 0), v)
+                im.putpixel((0, 0), v)  # type: ignore[arg-type]
 
     @pytest.mark.parametrize(
-        ("mode", "band_numbers", "match"),
+        "mode, band_numbers, match",
         (
             ("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"),
@@ -401,23 +246,25 @@ def test_putpixel_type_error1(self, mode):
             ),
         ),
     )
-    def test_putpixel_invalid_number_of_bands(self, mode, band_numbers, match):
+    def test_putpixel_invalid_number_of_bands(
+        self, mode: str, band_numbers: tuple[int, ...], match: str
+    ) -> None:
         im = hopper(mode)
         for band_number in band_numbers:
             with pytest.raises(TypeError, match=match):
                 im.putpixel((0, 0), (0,) * band_number)
 
     @pytest.mark.parametrize("mode", IMAGE_MODES2)
-    def test_putpixel_type_error2(self, mode):
+    def test_putpixel_type_error2(self, mode: str) -> None:
         im = hopper(mode)
         for v in self.INVALID_TYPES:
             with pytest.raises(
                 TypeError, match="color must be int or single-element tuple"
             ):
-                im.putpixel((0, 0), v)
+                im.putpixel((0, 0), v)  # type: ignore[arg-type]
 
     @pytest.mark.parametrize("mode", IMAGE_MODES1 + IMAGE_MODES2)
-    def test_putpixel_overflow_error(self, mode):
+    def test_putpixel_overflow_error(self, mode: str) -> None:
         im = hopper(mode)
         with pytest.raises(OverflowError):
             im.putpixel((0, 0), 2**80)
@@ -426,19 +273,20 @@ def test_putpixel_overflow_error(self, mode):
 class TestEmbeddable:
     @pytest.mark.xfail(reason="failing test")
     @pytest.mark.skipif(not is_win32(), reason="requires Windows")
-    def test_embeddable(self):
+    def test_embeddable(self) -> None:
         import ctypes
 
-        from setuptools.command.build_ext import new_compiler
+        from setuptools.command import build_ext
 
         with open("embed_pil.c", "w", encoding="utf-8") as fh:
+            home = sys.prefix.replace("\\", "\\\\")
             fh.write(
-                """
+                f"""
 #include "Python.h"
 
 int main(int argc, char* argv[])
-{
-    char *home = "%s";
+{{
+    char *home = "{home}";
     wchar_t *whome = Py_DecodeLocale(home, NULL);
     Py_SetPythonHome(whome);
 
@@ -453,12 +301,11 @@ def test_embeddable(self):
     PyMem_RawFree(whome);
 
     return 0;
-}
+}}
         """
-                % sys.prefix.replace("\\", "\\\\")
             )
 
-        compiler = new_compiler()
+        compiler = getattr(build_ext, "new_compiler")()
         compiler.add_include_dir(sysconfig.get_config_var("INCLUDEPY"))
 
         libdir = sysconfig.get_config_var("LIBDIR") or sysconfig.get_config_var(
@@ -471,8 +318,8 @@ def test_embeddable(self):
         env = os.environ.copy()
         env["PATH"] = sys.prefix + ";" + env["PATH"]
 
-        # do not display the Windows Error Reporting dialog
-        ctypes.windll.kernel32.SetErrorMode(0x0002)
+        # Do not display the Windows Error Reporting dialog
+        getattr(ctypes, "windll").kernel32.SetErrorMode(0x0002)
 
         process = subprocess.Popen(["embed_pil.exe"], env=env)
         process.communicate()
diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py
index b3e5d9e3e08..eb2309e0ffe 100644
--- a/Tests/test_image_array.py
+++ b/Tests/test_image_array.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
 import pytest
 from packaging.version import parse as parse_version
 
@@ -10,15 +13,18 @@
 
 im = hopper().resize((128, 100))
 
+if TYPE_CHECKING:
+    import numpy.typing as npt
 
-def test_toarray():
-    def test(mode):
+
+def test_toarray() -> None:
+    def test(mode: str) -> tuple[tuple[int, ...], str, int]:
         ai = numpy.array(im.convert(mode))
         return ai.shape, ai.dtype.str, ai.nbytes
 
-    def test_with_dtype(dtype):
+    def test_with_dtype(dtype: npt.DTypeLike) -> None:
         ai = numpy.array(im, dtype=dtype)
-        assert ai.dtype == dtype
+        assert ai.dtype.type is dtype
 
     # assert test("1") == ((100, 128), '|b1', 1600))
     assert test("L") == ((100, 128), "|u1", 12800)
@@ -41,22 +47,22 @@ def test_with_dtype(dtype):
             with pytest.raises(OSError):
                 numpy.array(im_truncated)
         else:
-            with pytest.warns(UserWarning):
+            with pytest.warns(DeprecationWarning):
                 numpy.array(im_truncated)
 
 
-def test_fromarray():
+def test_fromarray() -> None:
     class Wrapper:
         """Class with API matching Image.fromarray"""
 
-        def __init__(self, img, arr_params):
+        def __init__(self, img: Image.Image, arr_params: dict[str, Any]) -> None:
             self.img = img
             self.__array_interface__ = arr_params
 
-        def tobytes(self):
+        def tobytes(self) -> bytes:
             return self.img.tobytes()
 
-    def test(mode):
+    def test(mode: str) -> tuple[str, tuple[int, int], bool]:
         i = im.convert(mode)
         a = numpy.array(i)
         # Make wrapper instance for image, new array interface
@@ -83,12 +89,22 @@ def test(mode):
     assert test("RGBX") == ("RGBA", (128, 100), True)
 
     # Test mode is None with no "typestr" in the array interface
+    wrapped = Wrapper(hopper("L"), {"shape": (100, 128)})
     with pytest.raises(TypeError):
-        wrapped = Wrapper(test("L"), {"shape": (100, 128)})
         Image.fromarray(wrapped)
 
 
-def test_fromarray_palette():
+def test_fromarray_strides_without_tobytes() -> None:
+    class Wrapper:
+        def __init__(self, arr_params: dict[str, Any]) -> None:
+            self.__array_interface__ = arr_params
+
+    with pytest.raises(ValueError):
+        wrapped = Wrapper({"shape": (1, 1), "strides": (1, 1)})
+        Image.fromarray(wrapped, "L")
+
+
+def test_fromarray_palette() -> None:
     # Arrange
     i = im.convert("L")
     a = numpy.array(i)
@@ -97,4 +113,5 @@ def test_fromarray_palette():
     out = Image.fromarray(a, "P")
 
     # Assert that the Python and C palettes match
+    assert out.palette is not None
     assert len(out.palette.colors) == len(out.im.getpalette()) / 3
diff --git a/Tests/test_image_convert.py b/Tests/test_image_convert.py
index 7c17040d30b..6a925975eaa 100644
--- a/Tests/test_image_convert.py
+++ b/Tests/test_image_convert.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image
@@ -6,8 +9,8 @@
 from .helper import assert_image, assert_image_equal, assert_image_similar, hopper
 
 
-def test_sanity():
-    def convert(im, mode):
+def test_sanity() -> None:
+    def convert(im: Image.Image, mode: str) -> None:
         out = im.convert(mode)
         assert out.mode == mode
         assert out.size == im.size
@@ -39,13 +42,13 @@ def convert(im, mode):
             convert(im, output_mode)
 
 
-def test_unsupported_conversion():
+def test_unsupported_conversion() -> None:
     im = hopper()
     with pytest.raises(ValueError):
         im.convert("INVALID")
 
 
-def test_default():
+def test_default() -> None:
     im = hopper("P")
     assert im.mode == "P"
     converted_im = im.convert()
@@ -61,18 +64,18 @@ def test_default():
 # ref https://github.com/python-pillow/Pillow/issues/274
 
 
-def _test_float_conversion(im):
+def _test_float_conversion(im: Image.Image) -> None:
     orig = im.getpixel((5, 5))
     converted = im.convert("F").getpixel((5, 5))
     assert orig == converted
 
 
-def test_8bit():
+def test_8bit() -> None:
     with Image.open("Tests/images/hopper.jpg") as im:
         _test_float_conversion(im.convert("L"))
 
 
-def test_16bit():
+def test_16bit() -> None:
     with Image.open("Tests/images/16bit.cropped.tif") as im:
         _test_float_conversion(im)
 
@@ -82,19 +85,19 @@ def test_16bit():
         assert im_i16.getpixel((0, 0)) == 65535
 
 
-def test_16bit_workaround():
+def test_16bit_workaround() -> None:
     with Image.open("Tests/images/16bit.cropped.tif") as im:
         _test_float_conversion(im.convert("I"))
 
 
-def test_opaque():
+def test_opaque() -> None:
     alpha = hopper("P").convert("PA").getchannel("A")
 
     solid = Image.new("L", (128, 128), 255)
     assert_image_equal(alpha, solid)
 
 
-def test_rgba_p():
+def test_rgba_p() -> None:
     im = hopper("RGBA")
     im.putalpha(hopper("L"))
 
@@ -104,14 +107,14 @@ def test_rgba_p():
     assert_image_similar(im, comparable, 20)
 
 
-def test_rgba():
+def test_rgba() -> None:
     with Image.open("Tests/images/transparent.png") as im:
         assert im.mode == "RGBA"
 
         assert_image_similar(im.convert("RGBa").convert("RGB"), im.convert("RGB"), 1.5)
 
 
-def test_trns_p(tmp_path):
+def test_trns_p(tmp_path: Path) -> None:
     im = hopper("P")
     im.info["transparency"] = 0
 
@@ -130,7 +133,7 @@ def test_trns_p(tmp_path):
 
 
 @pytest.mark.parametrize("mode", ("LA", "PA", "RGBA"))
-def test_trns_p_transparency(mode):
+def test_trns_p_transparency(mode: str) -> None:
     # Arrange
     im = hopper("P")
     im.info["transparency"] = 128
@@ -147,7 +150,7 @@ def test_trns_p_transparency(mode):
         assert converted_im.palette is None
 
 
-def test_trns_l(tmp_path):
+def test_trns_l(tmp_path: Path) -> None:
     im = hopper("L")
     im.info["transparency"] = 128
 
@@ -170,7 +173,7 @@ def test_trns_l(tmp_path):
     im_p.save(f)
 
 
-def test_trns_RGB(tmp_path):
+def test_trns_RGB(tmp_path: Path) -> None:
     im = hopper("RGB")
     im.info["transparency"] = im.getpixel((0, 0))
 
@@ -180,6 +183,14 @@ def test_trns_RGB(tmp_path):
     assert im_l.info["transparency"] == im_l.getpixel((0, 0))  # undone
     im_l.save(f)
 
+    im_la = im.convert("LA")
+    assert "transparency" not in im_la.info
+    im_la.save(f)
+
+    im_la = im.convert("La")
+    assert "transparency" not in im_la.info
+    assert im_la.getpixel((0, 0)) == (0, 0)
+
     im_p = im.convert("P")
     assert "transparency" in im_p.info
     im_p.save(f)
@@ -188,6 +199,10 @@ def test_trns_RGB(tmp_path):
     assert "transparency" not in im_rgba.info
     im_rgba.save(f)
 
+    im_rgba = im.convert("RGBa")
+    assert "transparency" not in im_rgba.info
+    assert im_rgba.getpixel((0, 0)) == (0, 0, 0, 0)
+
     im_p = pytest.warns(UserWarning, im.convert, "P", palette=Image.Palette.ADAPTIVE)
     assert "transparency" not in im_p.info
     im_p.save(f)
@@ -200,20 +215,23 @@ def test_trns_RGB(tmp_path):
 
 
 @pytest.mark.parametrize("convert_mode", ("L", "LA", "I"))
-def test_l_macro_rounding(convert_mode):
+def test_l_macro_rounding(convert_mode: str) -> None:
     for mode in ("P", "PA"):
         im = Image.new(mode, (1, 1))
+        assert im.palette is not None
         im.palette.getcolor((0, 1, 2))
 
         converted_im = im.convert(convert_mode)
         px = converted_im.load()
+        assert px is not None
         converted_color = px[0, 0]
         if convert_mode == "LA":
+            assert isinstance(converted_color, tuple)
             converted_color = converted_color[0]
         assert converted_color == 1
 
 
-def test_gif_with_rgba_palette_to_p():
+def test_gif_with_rgba_palette_to_p() -> None:
     # See https://github.com/python-pillow/Pillow/issues/2433
     with Image.open("Tests/images/hopper.gif") as im:
         im.info["transparency"] = 255
@@ -225,7 +243,7 @@ def test_gif_with_rgba_palette_to_p():
     im_p.load()
 
 
-def test_p_la():
+def test_p_la() -> None:
     im = hopper("RGBA")
     alpha = hopper("L")
     im.putalpha(alpha)
@@ -235,7 +253,7 @@ def test_p_la():
     assert_image_similar(alpha, comparable, 5)
 
 
-def test_p2pa_alpha():
+def test_p2pa_alpha() -> None:
     with Image.open("Tests/images/tiny.png") as im:
         assert im.mode == "P"
 
@@ -249,13 +267,13 @@ def test_p2pa_alpha():
             assert im_a.getpixel((x, y)) == alpha
 
 
-def test_p2pa_palette():
+def test_p2pa_palette() -> None:
     with Image.open("Tests/images/tiny.png") as im:
         im_pa = im.convert("PA")
     assert im_pa.getpalette() == im.getpalette()
 
 
-def test_matrix_illegal_conversion():
+def test_matrix_illegal_conversion() -> None:
     # Arrange
     im = hopper("CMYK")
     # fmt: off
@@ -271,7 +289,7 @@ def test_matrix_illegal_conversion():
         im.convert(mode="CMYK", matrix=matrix)
 
 
-def test_matrix_wrong_mode():
+def test_matrix_wrong_mode() -> None:
     # Arrange
     im = hopper("L")
     # fmt: off
@@ -288,7 +306,7 @@ def test_matrix_wrong_mode():
 
 
 @pytest.mark.parametrize("mode", ("RGB", "L"))
-def test_matrix_xyz(mode):
+def test_matrix_xyz(mode: str) -> None:
     # Arrange
     im = hopper("RGB")
     im.info["transparency"] = (255, 0, 0)
@@ -316,7 +334,7 @@ def test_matrix_xyz(mode):
             assert converted_im.info["transparency"] == 105
 
 
-def test_matrix_identity():
+def test_matrix_identity() -> None:
     # Arrange
     im = hopper("RGB")
     # fmt: off
diff --git a/Tests/test_image_copy.py b/Tests/test_image_copy.py
index abf5f846f89..a0b829cc565 100644
--- a/Tests/test_image_copy.py
+++ b/Tests/test_image_copy.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import copy
 
 import pytest
@@ -9,7 +10,7 @@
 
 
 @pytest.mark.parametrize("mode", ("1", "P", "L", "RGB", "I", "F"))
-def test_copy(mode):
+def test_copy(mode: str) -> None:
     cropped_coordinates = (10, 10, 20, 20)
     cropped_size = (10, 10)
 
@@ -38,7 +39,7 @@ def test_copy(mode):
     assert out.size == cropped_size
 
 
-def test_copy_zero():
+def test_copy_zero() -> None:
     im = Image.new("RGB", (0, 0))
     out = im.copy()
     assert out.mode == im.mode
@@ -46,7 +47,9 @@ def test_copy_zero():
 
 
 @skip_unless_feature("libtiff")
-def test_deepcopy():
+def test_deepcopy() -> None:
     with Image.open("Tests/images/g4_orientation_5.tif") as im:
+        assert im.size == (590, 88)
+
         out = copy.deepcopy(im)
     assert out.size == (590, 88)
diff --git a/Tests/test_image_crop.py b/Tests/test_image_crop.py
index 0bb54e5d811..07fec2e64af 100644
--- a/Tests/test_image_crop.py
+++ b/Tests/test_image_crop.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -7,7 +8,7 @@
 
 
 @pytest.mark.parametrize("mode", ("1", "P", "L", "RGB", "I", "F"))
-def test_crop(mode):
+def test_crop(mode: str) -> None:
     im = hopper(mode)
     assert_image_equal(im.crop(), im)
 
@@ -16,8 +17,8 @@ def test_crop(mode):
     assert cropped.size == (50, 50)
 
 
-def test_wide_crop():
-    def crop(*bbox):
+def test_wide_crop() -> None:
+    def crop(bbox: tuple[int, int, int, int]) -> tuple[int, ...]:
         i = im.crop(bbox)
         h = i.histogram()
         while h and not h[-1]:
@@ -26,34 +27,34 @@ def crop(*bbox):
 
     im = Image.new("L", (100, 100), 1)
 
-    assert crop(0, 0, 100, 100) == (0, 10000)
-    assert crop(25, 25, 75, 75) == (0, 2500)
+    assert crop((0, 0, 100, 100)) == (0, 10000)
+    assert crop((25, 25, 75, 75)) == (0, 2500)
 
     # sides
-    assert crop(-25, 0, 25, 50) == (1250, 1250)
-    assert crop(0, -25, 50, 25) == (1250, 1250)
-    assert crop(75, 0, 125, 50) == (1250, 1250)
-    assert crop(0, 75, 50, 125) == (1250, 1250)
+    assert crop((-25, 0, 25, 50)) == (1250, 1250)
+    assert crop((0, -25, 50, 25)) == (1250, 1250)
+    assert crop((75, 0, 125, 50)) == (1250, 1250)
+    assert crop((0, 75, 50, 125)) == (1250, 1250)
 
-    assert crop(-25, 25, 125, 75) == (2500, 5000)
-    assert crop(25, -25, 75, 125) == (2500, 5000)
+    assert crop((-25, 25, 125, 75)) == (2500, 5000)
+    assert crop((25, -25, 75, 125)) == (2500, 5000)
 
     # corners
-    assert crop(-25, -25, 25, 25) == (1875, 625)
-    assert crop(75, -25, 125, 25) == (1875, 625)
-    assert crop(75, 75, 125, 125) == (1875, 625)
-    assert crop(-25, 75, 25, 125) == (1875, 625)
+    assert crop((-25, -25, 25, 25)) == (1875, 625)
+    assert crop((75, -25, 125, 25)) == (1875, 625)
+    assert crop((75, 75, 125, 125)) == (1875, 625)
+    assert crop((-25, 75, 25, 125)) == (1875, 625)
 
 
 @pytest.mark.parametrize("box", ((8, 2, 2, 8), (2, 8, 8, 2), (8, 8, 2, 2)))
-def test_negative_crop(box):
+def test_negative_crop(box: tuple[int, int, int, int]) -> None:
     im = Image.new("RGB", (10, 10))
 
     with pytest.raises(ValueError):
         im.crop(box)
 
 
-def test_crop_float():
+def test_crop_float() -> None:
     # Check cropping floats are rounded to nearest integer
     # https://github.com/python-pillow/Pillow/issues/1744
 
@@ -68,7 +69,7 @@ def test_crop_float():
     assert cropped.size == (3, 5)
 
 
-def test_crop_crash():
+def test_crop_crash() -> None:
     # Image.crop crashes prepatch with an access violation
     # apparently a use after free on Windows, see
     # https://github.com/python-pillow/Pillow/issues/1077
@@ -86,7 +87,7 @@ def test_crop_crash():
     img.load()
 
 
-def test_crop_zero():
+def test_crop_zero() -> None:
     im = Image.new("RGB", (0, 0), "white")
 
     cropped = im.crop((0, 0, 0, 0))
diff --git a/Tests/test_image_draft.py b/Tests/test_image_draft.py
index 774272dd1f7..c9d8c93f314 100644
--- a/Tests/test_image_draft.py
+++ b/Tests/test_image_draft.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from PIL import Image
 
 from .helper import fromstring, skip_unless_feature, tostring
@@ -6,11 +7,18 @@
 pytestmark = skip_unless_feature("jpg")
 
 
-def draft_roundtrip(in_mode, in_size, req_mode, req_size):
+def draft_roundtrip(
+    in_mode: str,
+    in_size: tuple[int, int],
+    req_mode: str | None,
+    req_size: tuple[int, int] | None,
+) -> Image.Image:
     im = Image.new(in_mode, in_size)
     data = tostring(im, "JPEG")
     im = fromstring(data)
-    mode, box = im.draft(req_mode, req_size)
+    result = im.draft(req_mode, req_size)
+    assert result is not None
+    box = result[1]
     scale, _ = im.decoderconfig
     assert box[:2] == (0, 0)
     assert (im.width - scale) < box[2] <= im.width
@@ -18,7 +26,7 @@ def draft_roundtrip(in_mode, in_size, req_mode, req_size):
     return im
 
 
-def test_size():
+def test_size() -> None:
     for in_size, req_size, out_size in [
         ((435, 361), (2048, 2048), (435, 361)),  # bigger
         ((435, 361), (435, 361), (435, 361)),  # same
@@ -47,7 +55,7 @@ def test_size():
         assert im.size == out_size
 
 
-def test_mode():
+def test_mode() -> None:
     for in_mode, req_mode, out_mode in [
         ("RGB", "1", "RGB"),
         ("RGB", "L", "L"),
@@ -67,7 +75,7 @@ def test_mode():
         assert im.mode == out_mode
 
 
-def test_several_drafts():
+def test_several_drafts() -> None:
     im = draft_roundtrip("L", (128, 128), None, (64, 64))
     im.draft(None, (64, 64))
     im.load()
diff --git a/Tests/test_image_entropy.py b/Tests/test_image_entropy.py
index 031fceda3fa..c1dbb879b0b 100644
--- a/Tests/test_image_entropy.py
+++ b/Tests/test_image_entropy.py
@@ -1,9 +1,10 @@
 from __future__ import annotations
+
 from .helper import hopper
 
 
-def test_entropy():
-    def entropy(mode):
+def test_entropy() -> None:
+    def entropy(mode: str) -> float:
         return hopper(mode).entropy()
 
     assert round(abs(entropy("1") - 0.9138803254693582), 7) == 0
diff --git a/Tests/test_image_filter.py b/Tests/test_image_filter.py
index 5bd7ee0d273..e566cd0557a 100644
--- a/Tests/test_image_filter.py
+++ b/Tests/test_image_filter.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageFilter
@@ -34,25 +35,34 @@
         ImageFilter.UnsharpMask(10),
     ),
 )
-@pytest.mark.parametrize("mode", ("L", "I", "RGB", "CMYK"))
-def test_sanity(filter_to_apply, mode):
+@pytest.mark.parametrize(
+    "mode", ("L", "I", "I;16", "I;16L", "I;16B", "I;16N", "RGB", "CMYK")
+)
+def test_sanity(
+    filter_to_apply: ImageFilter.Filter | type[ImageFilter.Filter], mode: str
+) -> None:
     im = hopper(mode)
-    if mode != "I" or isinstance(filter_to_apply, ImageFilter.BuiltinFilter):
+    if mode[0] != "I" or (
+        callable(filter_to_apply)
+        and issubclass(filter_to_apply, ImageFilter.BuiltinFilter)
+    ):
         out = im.filter(filter_to_apply)
         assert out.mode == im.mode
         assert out.size == im.size
 
 
-@pytest.mark.parametrize("mode", ("L", "I", "RGB", "CMYK"))
-def test_sanity_error(mode):
+@pytest.mark.parametrize(
+    "mode", ("L", "I", "I;16", "I;16L", "I;16B", "I;16N", "RGB", "CMYK")
+)
+def test_sanity_error(mode: str) -> None:
+    im = hopper(mode)
     with pytest.raises(TypeError):
-        im = hopper(mode)
-        im.filter("hello")
+        im.filter("hello")  # type: ignore[arg-type]
 
 
 # crashes on small images
 @pytest.mark.parametrize("size", ((1, 1), (2, 2), (3, 3)))
-def test_crash(size):
+def test_crash(size: tuple[int, int]) -> None:
     im = Image.new("RGB", size)
     im.filter(ImageFilter.SMOOTH)
 
@@ -66,7 +76,10 @@ def test_crash(size):
         ("RGB", ((4, 0, 0), (0, 0, 0))),
     ),
 )
-def test_modefilter(mode, expected):
+def test_modefilter(
+    mode: str,
+    expected: tuple[int, int] | tuple[tuple[int, int, int], tuple[int, int, int]],
+) -> None:
     im = Image.new(mode, (3, 3), None)
     im.putdata(list(range(9)))
     # image is:
@@ -89,7 +102,13 @@ def test_modefilter(mode, expected):
         ("F", (0.0, 4.0, 8.0)),
     ),
 )
-def test_rankfilter(mode, expected):
+def test_rankfilter(
+    mode: str,
+    expected: (
+        tuple[float, float, float]
+        | tuple[tuple[int, int, int], tuple[int, int, int], tuple[int, int, int]]
+    ),
+) -> None:
     im = Image.new(mode, (3, 3), None)
     im.putdata(list(range(9)))
     # image is:
@@ -105,7 +124,7 @@ def test_rankfilter(mode, expected):
 @pytest.mark.parametrize(
     "filter", (ImageFilter.MinFilter, ImageFilter.MedianFilter, ImageFilter.MaxFilter)
 )
-def test_rankfilter_error(filter):
+def test_rankfilter_error(filter: ImageFilter.RankFilter) -> None:
     with pytest.raises(ValueError):
         im = Image.new("P", (3, 3), None)
         im.putdata(list(range(9)))
@@ -116,31 +135,31 @@ def test_rankfilter_error(filter):
         im.filter(filter).getpixel((1, 1))
 
 
-def test_rankfilter_properties():
+def test_rankfilter_properties() -> None:
     rankfilter = ImageFilter.RankFilter(1, 2)
 
     assert rankfilter.size == 1
     assert rankfilter.rank == 2
 
 
-def test_builtinfilter_p():
+def test_builtinfilter_p() -> None:
     builtin_filter = ImageFilter.BuiltinFilter()
 
     with pytest.raises(ValueError):
-        builtin_filter.filter(hopper("P"))
+        builtin_filter.filter(hopper("P").im)
 
 
-def test_kernel_not_enough_coefficients():
+def test_kernel_not_enough_coefficients() -> None:
     with pytest.raises(ValueError):
         ImageFilter.Kernel((3, 3), (0, 0))
 
 
-@pytest.mark.parametrize("mode", ("L", "LA", "I", "RGB", "CMYK"))
-def test_consistency_3x3(mode):
+@pytest.mark.parametrize(
+    "mode", ("L", "LA", "I", "I;16", "I;16L", "I;16B", "I;16N", "RGB", "CMYK")
+)
+def test_consistency_3x3(mode: str) -> None:
     with Image.open("Tests/images/hopper.bmp") as source:
-        reference_name = "hopper_emboss"
-        reference_name += "_I.png" if mode == "I" else ".bmp"
-        with Image.open("Tests/images/" + reference_name) as reference:
+        with Image.open("Tests/images/hopper_emboss.bmp") as reference:
             kernel = ImageFilter.Kernel(
                 (3, 3),
                 # fmt: off
@@ -150,23 +169,15 @@ def test_consistency_3x3(mode):
                 # fmt: on
                 0.3,
             )
-            source = source.split() * 2
-            reference = reference.split() * 2
-
-            if mode == "I":
-                source = source[0].convert(mode)
-            else:
-                source = Image.merge(mode, source[: len(mode)])
-            reference = Image.merge(mode, reference[: len(mode)])
             assert_image_equal(source.filter(kernel), reference)
 
 
-@pytest.mark.parametrize("mode", ("L", "LA", "I", "RGB", "CMYK"))
-def test_consistency_5x5(mode):
+@pytest.mark.parametrize(
+    "mode", ("L", "LA", "I", "I;16", "I;16L", "I;16B", "I;16N", "RGB", "CMYK")
+)
+def test_consistency_5x5(mode: str) -> None:
     with Image.open("Tests/images/hopper.bmp") as source:
-        reference_name = "hopper_emboss_more"
-        reference_name += "_I.png" if mode == "I" else ".bmp"
-        with Image.open("Tests/images/" + reference_name) as reference:
+        with Image.open("Tests/images/hopper_emboss_more.bmp") as reference:
             kernel = ImageFilter.Kernel(
                 (5, 5),
                 # fmt: off
@@ -178,14 +189,6 @@ def test_consistency_5x5(mode):
                 # fmt: on
                 0.3,
             )
-            source = source.split() * 2
-            reference = reference.split() * 2
-
-            if mode == "I":
-                source = source[0].convert(mode)
-            else:
-                source = Image.merge(mode, source[: len(mode)])
-            reference = Image.merge(mode, reference[: len(mode)])
             assert_image_equal(source.filter(kernel), reference)
 
 
@@ -198,7 +201,7 @@ def test_consistency_5x5(mode):
         (2, -2),
     ),
 )
-def test_invalid_box_blur_filter(radius):
+def test_invalid_box_blur_filter(radius: int | tuple[int, int]) -> None:
     with pytest.raises(ValueError):
         ImageFilter.BoxBlur(radius)
 
diff --git a/Tests/test_image_frombytes.py b/Tests/test_image_frombytes.py
index 017da499d2c..98c0ea0b43c 100644
--- a/Tests/test_image_frombytes.py
+++ b/Tests/test_image_frombytes.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -7,7 +8,7 @@
 
 
 @pytest.mark.parametrize("data_type", ("bytes", "memoryview"))
-def test_sanity(data_type):
+def test_sanity(data_type: str) -> None:
     im1 = hopper()
 
     data = im1.tobytes()
diff --git a/Tests/test_image_fromqimage.py b/Tests/test_image_fromqimage.py
index b3ca43bde6d..1149e29649e 100644
--- a/Tests/test_image_fromqimage.py
+++ b/Tests/test_image_fromqimage.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import warnings
 
 import pytest
@@ -15,22 +16,21 @@
     not ImageQt.qt_is_installed, reason="Qt bindings are not installed"
 )
 
+ims: list[Image.Image] = []
+
+
+def setup_module() -> None:
+    ims.append(hopper())
+    ims.append(Image.open("Tests/images/transparent.png"))
+    ims.append(Image.open("Tests/images/7x13.png"))
+
 
-@pytest.fixture
-def test_images():
-    ims = [
-        hopper(),
-        Image.open("Tests/images/transparent.png"),
-        Image.open("Tests/images/7x13.png"),
-    ]
-    try:
-        yield ims
-    finally:
-        for im in ims:
-            im.close()
+def teardown_module() -> None:
+    for im in ims:
+        im.close()
 
 
-def roundtrip(expected):
+def roundtrip(expected: Image.Image) -> None:
     # PIL -> Qt
     intermediate = expected.toqimage()
     # Qt -> PIL
@@ -42,26 +42,26 @@ def roundtrip(expected):
         assert_image_equal(result, expected.convert("RGB"))
 
 
-def test_sanity_1(test_images):
-    for im in test_images:
+def test_sanity_1() -> None:
+    for im in ims:
         roundtrip(im.convert("1"))
 
 
-def test_sanity_rgb(test_images):
-    for im in test_images:
+def test_sanity_rgb() -> None:
+    for im in ims:
         roundtrip(im.convert("RGB"))
 
 
-def test_sanity_rgba(test_images):
-    for im in test_images:
+def test_sanity_rgba() -> None:
+    for im in ims:
         roundtrip(im.convert("RGBA"))
 
 
-def test_sanity_l(test_images):
-    for im in test_images:
+def test_sanity_l() -> None:
+    for im in ims:
         roundtrip(im.convert("L"))
 
 
-def test_sanity_p(test_images):
-    for im in test_images:
+def test_sanity_p() -> None:
+    for im in ims:
         roundtrip(im.convert("P"))
diff --git a/Tests/test_image_getbands.py b/Tests/test_image_getbands.py
index e7701dbc460..887553fc042 100644
--- a/Tests/test_image_getbands.py
+++ b/Tests/test_image_getbands.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
+
 from PIL import Image
 
 
-def test_getbands():
+def test_getbands() -> None:
     assert Image.new("1", (1, 1)).getbands() == ("1",)
     assert Image.new("L", (1, 1)).getbands() == ("L",)
     assert Image.new("I", (1, 1)).getbands() == ("I",)
diff --git a/Tests/test_image_getbbox.py b/Tests/test_image_getbbox.py
index 9e792cfdf7c..18c6f657925 100644
--- a/Tests/test_image_getbbox.py
+++ b/Tests/test_image_getbbox.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -6,13 +7,13 @@
 from .helper import hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     bbox = hopper().getbbox()
     assert isinstance(bbox, tuple)
 
 
-def test_bbox():
-    def check(im, fill_color):
+def test_bbox() -> None:
+    def check(im: Image.Image, fill_color: int | tuple[int, ...]) -> None:
         assert im.getbbox() is None
 
         im.paste(fill_color, (10, 25, 90, 75))
@@ -33,8 +34,8 @@ def check(im, fill_color):
     check(im, 255)
 
     for mode in ("RGBA", "RGBa"):
-        for color in ((0, 0, 0, 0), (127, 127, 127, 0), (255, 255, 255, 0)):
-            im = Image.new(mode, (100, 100), color)
+        for rgba_color in ((0, 0, 0, 0), (127, 127, 127, 0), (255, 255, 255, 0)):
+            im = Image.new(mode, (100, 100), rgba_color)
             check(im, (255, 255, 255, 255))
 
     for mode in ("La", "LA", "PA"):
@@ -44,7 +45,7 @@ def check(im, fill_color):
 
 
 @pytest.mark.parametrize("mode", ("RGBA", "RGBa", "La", "LA", "PA"))
-def test_bbox_alpha_only_false(mode):
+def test_bbox_alpha_only_false(mode: str) -> None:
     im = Image.new(mode, (100, 100))
     assert im.getbbox(alpha_only=False) is None
 
diff --git a/Tests/test_image_getcolors.py b/Tests/test_image_getcolors.py
index dea3a60a112..8dbe82b29b0 100644
--- a/Tests/test_image_getcolors.py
+++ b/Tests/test_image_getcolors.py
@@ -1,9 +1,10 @@
 from __future__ import annotations
+
 from .helper import hopper
 
 
-def test_getcolors():
-    def getcolors(mode, limit=None):
+def test_getcolors() -> None:
+    def getcolors(mode: str, limit: int | None = None) -> int | None:
         im = hopper(mode)
         if limit:
             colors = im.getcolors(limit)
@@ -38,7 +39,7 @@ def getcolors(mode, limit=None):
 # --------------------------------------------------------------------
 
 
-def test_pack():
+def test_pack() -> None:
     # Pack problems for small tables (@PIL209)
 
     im = hopper().quantize(3).convert("RGB")
@@ -53,17 +54,21 @@ def test_pack():
     assert A is None
 
     A = im.getcolors(maxcolors=3)
+    assert A is not None
     A.sort()
     assert A == expected
 
     A = im.getcolors(maxcolors=4)
+    assert A is not None
     A.sort()
     assert A == expected
 
     A = im.getcolors(maxcolors=8)
+    assert A is not None
     A.sort()
     assert A == expected
 
     A = im.getcolors(maxcolors=16)
+    assert A is not None
     A.sort()
     assert A == expected
diff --git a/Tests/test_image_getdata.py b/Tests/test_image_getdata.py
index 873cc65bf91..dd3d70b3450 100644
--- a/Tests/test_image_getdata.py
+++ b/Tests/test_image_getdata.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 from PIL import Image
 
 from .helper import hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     data = hopper().getdata()
 
     len(data)
@@ -13,8 +14,8 @@ def test_sanity():
     assert data[0] == (20, 20, 70)
 
 
-def test_roundtrip():
-    def getdata(mode):
+def test_mode() -> None:
+    def getdata(mode: str) -> tuple[float | tuple[int, ...], int, int]:
         im = hopper(mode).resize((32, 30), Image.Resampling.NEAREST)
         data = im.getdata()
         return data[0], len(data), len(list(data))
diff --git a/Tests/test_image_getextrema.py b/Tests/test_image_getextrema.py
index b17c8a786dd..de5956f3e7e 100644
--- a/Tests/test_image_getextrema.py
+++ b/Tests/test_image_getextrema.py
@@ -1,11 +1,12 @@
 from __future__ import annotations
+
 from PIL import Image
 
 from .helper import hopper
 
 
-def test_extrema():
-    def extrema(mode):
+def test_extrema() -> None:
+    def extrema(mode: str) -> tuple[float, float] | tuple[tuple[int, int], ...]:
         return hopper(mode).getextrema()
 
     assert extrema("1") == (0, 255)
@@ -19,7 +20,7 @@ def extrema(mode):
     assert extrema("I;16") == (1, 255)
 
 
-def test_true_16():
+def test_true_16() -> None:
     with Image.open("Tests/images/16_bit_noise.tif") as im:
         assert im.mode == "I;16"
         extrema = im.getextrema()
diff --git a/Tests/test_image_getim.py b/Tests/test_image_getim.py
index e969c8164a2..fa58492fc76 100644
--- a/Tests/test_image_getim.py
+++ b/Tests/test_image_getim.py
@@ -1,10 +1,19 @@
 from __future__ import annotations
+
+import pytest
+
 from .helper import hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper()
-    type_repr = repr(type(im.getim()))
 
+    type_repr = repr(type(im.getim()))
     assert "PyCapsule" in type_repr
-    assert isinstance(im.im.id, int)
+
+    with pytest.warns(DeprecationWarning):
+        assert isinstance(im.im.id, int)
+
+    with pytest.warns(DeprecationWarning):
+        ptrs = dict(im.im.unsafe_ptrs)
+    assert ptrs.keys() == {"image8", "image32", "image"}
diff --git a/Tests/test_image_getpalette.py b/Tests/test_image_getpalette.py
index a5be972d3ed..6a8f157fc3e 100644
--- a/Tests/test_image_getpalette.py
+++ b/Tests/test_image_getpalette.py
@@ -1,11 +1,12 @@
 from __future__ import annotations
+
 from PIL import Image
 
 from .helper import hopper
 
 
-def test_palette():
-    def palette(mode):
+def test_palette() -> None:
+    def palette(mode: str) -> list[int] | None:
         p = hopper(mode).getpalette()
         if p:
             return p[:10]
@@ -22,7 +23,7 @@ def palette(mode):
     assert palette("YCbCr") is None
 
 
-def test_palette_rawmode():
+def test_palette_rawmode() -> None:
     im = Image.new("P", (1, 1))
     im.putpalette((1, 2, 3))
 
diff --git a/Tests/test_image_getprojection.py b/Tests/test_image_getprojection.py
index aa47be3b2e0..2b5a758ed29 100644
--- a/Tests/test_image_getprojection.py
+++ b/Tests/test_image_getprojection.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 from PIL import Image
 
 from .helper import hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper()
 
     projection = im.getprojection()
diff --git a/Tests/test_image_histogram.py b/Tests/test_image_histogram.py
index 7ba2f10b765..dbd55d4c2d3 100644
--- a/Tests/test_image_histogram.py
+++ b/Tests/test_image_histogram.py
@@ -1,9 +1,10 @@
 from __future__ import annotations
+
 from .helper import hopper
 
 
-def test_histogram():
-    def histogram(mode):
+def test_histogram() -> None:
+    def histogram(mode: str) -> tuple[int, int, int]:
         h = hopper(mode).histogram()
         return len(h), min(h), max(h)
 
diff --git a/Tests/test_image_load.py b/Tests/test_image_load.py
index 17847c4fd9c..4f1d63b8f43 100644
--- a/Tests/test_image_load.py
+++ b/Tests/test_image_load.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import logging
 import os
 
@@ -9,14 +10,15 @@
 from .helper import hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper()
-    pix = im.load()
+    px = im.load()
 
-    assert pix[0, 0] == (20, 20, 70)
+    assert px is not None
+    assert px[0, 0] == (20, 20, 70)
 
 
-def test_close():
+def test_close() -> None:
     im = Image.open("Tests/images/hopper.gif")
     im.close()
     with pytest.raises(ValueError):
@@ -25,7 +27,7 @@ def test_close():
         im.getpixel((0, 0))
 
 
-def test_close_after_load(caplog):
+def test_close_after_load(caplog: pytest.LogCaptureFixture) -> None:
     im = Image.open("Tests/images/hopper.gif")
     im.load()
     with caplog.at_level(logging.DEBUG):
@@ -33,7 +35,7 @@ def test_close_after_load(caplog):
     assert len(caplog.records) == 0
 
 
-def test_contextmanager():
+def test_contextmanager() -> None:
     fn = None
     with Image.open("Tests/images/hopper.gif") as im:
         fn = im.fp.fileno()
@@ -43,7 +45,7 @@ def test_contextmanager():
         os.fstat(fn)
 
 
-def test_contextmanager_non_exclusive_fp():
+def test_contextmanager_non_exclusive_fp() -> None:
     with open("Tests/images/hopper.gif", "rb") as fp:
         with Image.open(fp):
             pass
diff --git a/Tests/test_image_mode.py b/Tests/test_image_mode.py
index ad90d1250dc..20d3a160e9c 100644
--- a/Tests/test_image_mode.py
+++ b/Tests/test_image_mode.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageMode
@@ -6,7 +7,7 @@
 from .helper import hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     with hopper() as im:
         im.mode
 
@@ -67,8 +68,12 @@ def test_sanity():
     ),
 )
 def test_properties(
-    mode, expected_base, expected_type, expected_bands, expected_band_names
-):
+    mode: str,
+    expected_base: str,
+    expected_type: str,
+    expected_bands: int,
+    expected_band_names: tuple[str, ...],
+) -> None:
     assert Image.getmodebase(mode) == expected_base
     assert Image.getmodetype(mode) == expected_type
     assert Image.getmodebands(mode) == expected_bands
diff --git a/Tests/test_image_paste.py b/Tests/test_image_paste.py
index 0b87f607286..2cff6c89378 100644
--- a/Tests/test_image_paste.py
+++ b/Tests/test_image_paste.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -7,14 +8,13 @@
 
 
 class TestImagingPaste:
-    masks = {}
     size = 128
 
-    def assert_9points_image(self, im, expected):
-        expected = [
-            point[0] if im.mode == "L" else point[: len(im.mode)] for point in expected
-        ]
+    def assert_9points_image(
+        self, im: Image.Image, expected: list[tuple[int, int, int, int]]
+    ) -> None:
         px = im.load()
+        assert px is not None
         actual = [
             px[0, 0],
             px[self.size // 2, 0],
@@ -26,9 +26,17 @@ def assert_9points_image(self, im, expected):
             px[self.size // 2, self.size - 1],
             px[self.size - 1, self.size - 1],
         ]
-        assert actual == expected
+        assert actual == [
+            point[0] if im.mode == "L" else point[: len(im.mode)] for point in expected
+        ]
 
-    def assert_9points_paste(self, im, im2, mask, expected):
+    def assert_9points_paste(
+        self,
+        im: Image.Image,
+        im2: Image.Image | str | tuple[int, ...],
+        mask: Image.Image,
+        expected: list[tuple[int, int, int, int]],
+    ) -> None:
         im3 = im.copy()
         im3.paste(im2, (0, 0), mask)
         self.assert_9points_image(im3, expected)
@@ -38,29 +46,31 @@ def assert_9points_paste(self, im, im2, mask, expected):
         self.assert_9points_image(im, expected)
 
     @CachedProperty
-    def mask_1(self):
+    def mask_1(self) -> Image.Image:
         mask = Image.new("1", (self.size, self.size))
         px = mask.load()
+        assert px is not None
         for y in range(mask.height):
             for x in range(mask.width):
                 px[y, x] = (x + y) % 2
         return mask
 
     @CachedProperty
-    def mask_L(self):
+    def mask_L(self) -> Image.Image:
         return self.gradient_L.transpose(Image.Transpose.ROTATE_270)
 
     @CachedProperty
-    def gradient_L(self):
+    def gradient_L(self) -> Image.Image:
         gradient = Image.new("L", (self.size, self.size))
         px = gradient.load()
+        assert px is not None
         for y in range(gradient.height):
             for x in range(gradient.width):
                 px[y, x] = (x + y) % 255
         return gradient
 
     @CachedProperty
-    def gradient_RGB(self):
+    def gradient_RGB(self) -> Image.Image:
         return Image.merge(
             "RGB",
             [
@@ -71,7 +81,7 @@ def gradient_RGB(self):
         )
 
     @CachedProperty
-    def gradient_LA(self):
+    def gradient_LA(self) -> Image.Image:
         return Image.merge(
             "LA",
             [
@@ -81,7 +91,7 @@ def gradient_LA(self):
         )
 
     @CachedProperty
-    def gradient_RGBA(self):
+    def gradient_RGBA(self) -> Image.Image:
         return Image.merge(
             "RGBA",
             [
@@ -93,7 +103,7 @@ def gradient_RGBA(self):
         )
 
     @CachedProperty
-    def gradient_RGBa(self):
+    def gradient_RGBa(self) -> Image.Image:
         return Image.merge(
             "RGBa",
             [
@@ -105,7 +115,7 @@ def gradient_RGBa(self):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_image_solid(self, mode):
+    def test_image_solid(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), "red")
         im2 = getattr(self, "gradient_" + mode)
 
@@ -115,7 +125,7 @@ def test_image_solid(self, mode):
         assert_image_equal(im, im2)
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_image_mask_1(self, mode):
+    def test_image_mask_1(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), "white")
         im2 = getattr(self, "gradient_" + mode)
 
@@ -137,7 +147,7 @@ def test_image_mask_1(self, mode):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_image_mask_L(self, mode):
+    def test_image_mask_L(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), "white")
         im2 = getattr(self, "gradient_" + mode)
 
@@ -159,7 +169,7 @@ def test_image_mask_L(self, mode):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_image_mask_LA(self, mode):
+    def test_image_mask_LA(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), "white")
         im2 = getattr(self, "gradient_" + mode)
 
@@ -181,7 +191,7 @@ def test_image_mask_LA(self, mode):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_image_mask_RGBA(self, mode):
+    def test_image_mask_RGBA(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), "white")
         im2 = getattr(self, "gradient_" + mode)
 
@@ -203,7 +213,7 @@ def test_image_mask_RGBA(self, mode):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_image_mask_RGBa(self, mode):
+    def test_image_mask_RGBa(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), "white")
         im2 = getattr(self, "gradient_" + mode)
 
@@ -225,7 +235,7 @@ def test_image_mask_RGBa(self, mode):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_color_solid(self, mode):
+    def test_color_solid(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), "black")
 
         rect = (12, 23, 128 + 12, 128 + 23)
@@ -238,7 +248,7 @@ def test_color_solid(self, mode):
             assert sum(head[:255]) == 0
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_color_mask_1(self, mode):
+    def test_color_mask_1(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), (50, 60, 70, 80)[: len(mode)])
         color = (10, 20, 30, 40)[: len(mode)]
 
@@ -260,7 +270,7 @@ def test_color_mask_1(self, mode):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_color_mask_L(self, mode):
+    def test_color_mask_L(self, mode: str) -> None:
         im = getattr(self, "gradient_" + mode).copy()
         color = "white"
 
@@ -282,7 +292,7 @@ def test_color_mask_L(self, mode):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_color_mask_RGBA(self, mode):
+    def test_color_mask_RGBA(self, mode: str) -> None:
         im = getattr(self, "gradient_" + mode).copy()
         color = "white"
 
@@ -304,7 +314,7 @@ def test_color_mask_RGBA(self, mode):
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
-    def test_color_mask_RGBa(self, mode):
+    def test_color_mask_RGBa(self, mode: str) -> None:
         im = getattr(self, "gradient_" + mode).copy()
         color = "white"
 
@@ -325,9 +335,14 @@ def test_color_mask_RGBa(self, mode):
             ],
         )
 
-    def test_different_sizes(self):
+    def test_different_sizes(self) -> None:
         im = Image.new("RGB", (100, 100))
         im2 = Image.new("RGB", (50, 50))
 
         im.copy().paste(im2)
         im.copy().paste(im2, (0, 0))
+
+    def test_incorrect_abbreviated_form(self) -> None:
+        im = Image.new("L", (1, 1))
+        with pytest.raises(ValueError):
+            im.paste(im, im, im)
diff --git a/Tests/test_image_point.py b/Tests/test_image_point.py
index fce45ec4f0e..a5d5a15dbab 100644
--- a/Tests/test_image_point.py
+++ b/Tests/test_image_point.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 import pytest
 
 from .helper import assert_image_equal, hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper()
 
     with pytest.raises(ValueError):
@@ -38,7 +39,7 @@ def test_sanity():
         im.point(lambda x: x // 2)
 
 
-def test_16bit_lut():
+def test_16bit_lut() -> None:
     """Tests for 16 bit -> 8 bit lut for converting I->L images
     see https://github.com/python-pillow/Pillow/issues/440
     """
@@ -46,7 +47,7 @@ def test_16bit_lut():
     im.point(list(range(256)) * 256, "L")
 
 
-def test_f_lut():
+def test_f_lut() -> None:
     """Tests for floating point lut of 8bit gray image"""
     im = hopper("L")
     lut = [0.5 * float(x) for x in range(256)]
@@ -57,7 +58,7 @@ def test_f_lut():
     assert_image_equal(out.convert("L"), im.point(int_lut, "L"))
 
 
-def test_f_mode():
+def test_f_mode() -> None:
     im = hopper("F")
     with pytest.raises(ValueError):
-        im.point(None)
+        im.point([])
diff --git a/Tests/test_image_putalpha.py b/Tests/test_image_putalpha.py
index 0ba7e5919a5..2c92911d1fb 100644
--- a/Tests/test_image_putalpha.py
+++ b/Tests/test_image_putalpha.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
+
 from PIL import Image
 
 
-def test_interface():
+def test_interface() -> None:
     im = Image.new("RGBA", (1, 1), (1, 2, 3, 0))
     assert im.getpixel((0, 0)) == (1, 2, 3, 0)
 
@@ -16,7 +17,7 @@ def test_interface():
     assert im.getpixel((0, 0)) == (1, 2, 3, 5)
 
 
-def test_promote():
+def test_promote() -> None:
     im = Image.new("L", (1, 1), 1)
     assert im.getpixel((0, 0)) == 1
 
@@ -39,7 +40,7 @@ def test_promote():
     assert im.getpixel((0, 0)) == (1, 2, 3, 4)
 
 
-def test_readonly():
+def test_readonly() -> None:
     im = Image.new("RGB", (1, 1), (1, 2, 3))
     im.readonly = 1
 
diff --git a/Tests/test_image_putdata.py b/Tests/test_image_putdata.py
index d3cb13e2e97..27cb7c59d89 100644
--- a/Tests/test_image_putdata.py
+++ b/Tests/test_image_putdata.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import sys
 from array import array
 
@@ -9,7 +10,7 @@
 from .helper import assert_image_equal, hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     im1 = hopper()
 
     data = list(im1.getdata())
@@ -28,9 +29,9 @@ def test_sanity():
     assert_image_equal(im1, im2)
 
 
-def test_long_integers():
+def test_long_integers() -> None:
     # see bug-200802-systemerror
-    def put(value):
+    def put(value: int) -> float | tuple[int, ...] | None:
         im = Image.new("RGBA", (1, 1))
         im.putdata([value])
         return im.getpixel((0, 0))
@@ -45,19 +46,19 @@ def put(value):
         assert put(sys.maxsize) == (255, 255, 255, 127)
 
 
-def test_pypy_performance():
+def test_pypy_performance() -> None:
     im = Image.new("L", (256, 256))
     im.putdata(list(range(256)) * 256)
 
 
-def test_mode_with_L_with_float():
+def test_mode_with_L_with_float() -> None:
     im = Image.new("L", (1, 1), 0)
     im.putdata([2.0])
     assert im.getpixel((0, 0)) == 2
 
 
 @pytest.mark.parametrize("mode", ("I", "I;16", "I;16L", "I;16B"))
-def test_mode_i(mode):
+def test_mode_i(mode: str) -> None:
     src = hopper("L")
     data = list(src.getdata())
     im = Image.new(mode, src.size, 0)
@@ -67,7 +68,7 @@ def test_mode_i(mode):
     assert list(im.getdata()) == target
 
 
-def test_mode_F():
+def test_mode_F() -> None:
     src = hopper("L")
     data = list(src.getdata())
     im = Image.new("F", src.size, 0)
@@ -78,15 +79,16 @@ def test_mode_F():
 
 
 @pytest.mark.parametrize("mode", ("BGR;15", "BGR;16", "BGR;24"))
-def test_mode_BGR(mode):
+def test_mode_BGR(mode: str) -> None:
     data = [(16, 32, 49), (32, 32, 98)]
-    im = Image.new(mode, (1, 2))
+    with pytest.warns(DeprecationWarning):
+        im = Image.new(mode, (1, 2))
     im.putdata(data)
 
     assert list(im.getdata()) == data
 
 
-def test_array_B():
+def test_array_B() -> None:
     # shouldn't segfault
     # see https://github.com/python-pillow/Pillow/issues/1008
 
@@ -97,7 +99,7 @@ def test_array_B():
     assert len(im.getdata()) == len(arr)
 
 
-def test_array_F():
+def test_array_F() -> None:
     # shouldn't segfault
     # see https://github.com/python-pillow/Pillow/issues/1008
 
@@ -108,7 +110,7 @@ def test_array_F():
     assert len(im.getdata()) == len(arr)
 
 
-def test_not_flattened():
+def test_not_flattened() -> None:
     im = Image.new("L", (1, 1))
     with pytest.raises(TypeError):
         im.putdata([[0]])
diff --git a/Tests/test_image_putpalette.py b/Tests/test_image_putpalette.py
index de2d9024213..f2c447f711c 100644
--- a/Tests/test_image_putpalette.py
+++ b/Tests/test_image_putpalette.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImagePalette
@@ -6,8 +7,8 @@
 from .helper import assert_image_equal, assert_image_equal_tofile, hopper
 
 
-def test_putpalette():
-    def palette(mode):
+def test_putpalette() -> None:
+    def palette(mode: str) -> str | tuple[str, list[int]]:
         im = hopper(mode).copy()
         im.putpalette(list(range(256)) * 3)
         p = im.getpalette()
@@ -42,7 +43,7 @@ def palette(mode):
         im.putpalette(list(range(256)) * 3)
 
 
-def test_imagepalette():
+def test_imagepalette() -> None:
     im = hopper("P")
     im.putpalette(ImagePalette.negative())
     assert_image_equal_tofile(im.convert("RGB"), "Tests/images/palette_negative.png")
@@ -56,7 +57,7 @@ def test_imagepalette():
     assert_image_equal_tofile(im.convert("RGB"), "Tests/images/palette_wedge.png")
 
 
-def test_putpalette_with_alpha_values():
+def test_putpalette_with_alpha_values() -> None:
     with Image.open("Tests/images/transparent.gif") as im:
         expected = im.convert("RGBA")
 
@@ -78,21 +79,23 @@ def test_putpalette_with_alpha_values():
     (
         ("RGBA", (1, 2, 3, 4)),
         ("RGBAX", (1, 2, 3, 4, 0)),
+        ("ARGB", (4, 1, 2, 3)),
     ),
 )
-def test_rgba_palette(mode, palette):
+def test_rgba_palette(mode: str, palette: tuple[int, ...]) -> None:
     im = Image.new("P", (1, 1))
     im.putpalette(palette, mode)
     assert im.getpalette() == [1, 2, 3]
+    assert im.palette is not None
     assert im.palette.colors == {(1, 2, 3, 4): 0}
 
 
-def test_empty_palette():
+def test_empty_palette() -> None:
     im = Image.new("P", (1, 1))
     assert im.getpalette() == []
 
 
-def test_undefined_palette_index():
+def test_undefined_palette_index() -> None:
     im = Image.new("P", (1, 1), 3)
     im.putpalette((1, 2, 3))
     assert im.convert("RGB").getpixel((0, 0)) == (0, 0, 0)
diff --git a/Tests/test_image_quantize.py b/Tests/test_image_quantize.py
index 54c567aae6c..7c564d96758 100644
--- a/Tests/test_image_quantize.py
+++ b/Tests/test_image_quantize.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 from packaging.version import parse as parse_version
 
@@ -7,7 +8,7 @@
 from .helper import assert_image_similar, hopper, is_ppc64le, skip_unless_feature
 
 
-def test_sanity():
+def test_sanity() -> None:
     image = hopper()
     converted = image.quantize()
     assert converted.mode == "P"
@@ -20,27 +21,32 @@ def test_sanity():
 
 
 @skip_unless_feature("libimagequant")
-def test_libimagequant_quantize():
+def test_libimagequant_quantize() -> None:
     image = hopper()
     if is_ppc64le():
-        libimagequant = parse_version(features.version_feature("libimagequant"))
-        if libimagequant < parse_version("4"):
+        version = features.version_feature("libimagequant")
+        assert version is not None
+        if parse_version(version) < parse_version("4"):
             pytest.skip("Fails with libimagequant earlier than 4.0.0 on ppc64le")
     converted = image.quantize(100, Image.Quantize.LIBIMAGEQUANT)
     assert converted.mode == "P"
     assert_image_similar(converted.convert("RGB"), image, 15)
-    assert len(converted.getcolors()) == 100
+    colors = converted.getcolors()
+    assert colors is not None
+    assert len(colors) == 100
 
 
-def test_octree_quantize():
+def test_octree_quantize() -> None:
     image = hopper()
     converted = image.quantize(100, Image.Quantize.FASTOCTREE)
     assert converted.mode == "P"
     assert_image_similar(converted.convert("RGB"), image, 20)
-    assert len(converted.getcolors()) == 100
+    colors = converted.getcolors()
+    assert colors is not None
+    assert len(colors) == 100
 
 
-def test_rgba_quantize():
+def test_rgba_quantize() -> None:
     image = hopper("RGBA")
     with pytest.raises(ValueError):
         image.quantize(method=0)
@@ -48,7 +54,7 @@ def test_rgba_quantize():
     assert image.quantize().convert().mode == "RGBA"
 
 
-def test_quantize():
+def test_quantize() -> None:
     with Image.open("Tests/images/caption_6_33_22.png") as image:
         image = image.convert("RGB")
     converted = image.quantize()
@@ -56,17 +62,18 @@ def test_quantize():
     assert_image_similar(converted.convert("RGB"), image, 1)
 
 
-def test_quantize_no_dither():
+def test_quantize_no_dither() -> None:
     image = hopper()
     with Image.open("Tests/images/caption_6_33_22.png") as palette:
         palette = palette.convert("P")
 
     converted = image.quantize(dither=Image.Dither.NONE, palette=palette)
     assert converted.mode == "P"
+    assert converted.palette is not None
     assert converted.palette.palette == palette.palette.palette
 
 
-def test_quantize_no_dither2():
+def test_quantize_no_dither2() -> None:
     im = Image.new("RGB", (9, 1))
     im.putdata([(p,) * 3 for p in range(0, 36, 4)])
 
@@ -75,14 +82,16 @@ def test_quantize_no_dither2():
     palette.putpalette(data)
     quantized = im.quantize(dither=Image.Dither.NONE, palette=palette)
 
+    assert quantized.palette is not None
     assert tuple(quantized.palette.palette) == data
 
     px = quantized.load()
+    assert px is not None
     for x in range(9):
         assert px[x, 0] == (0 if x < 5 else 1)
 
 
-def test_quantize_dither_diff():
+def test_quantize_dither_diff() -> None:
     image = hopper()
     with Image.open("Tests/images/caption_6_33_22.png") as palette:
         palette = palette.convert("P")
@@ -93,20 +102,36 @@ def test_quantize_dither_diff():
     assert dither.tobytes() != nodither.tobytes()
 
 
-def test_colors():
+@pytest.mark.parametrize(
+    "method", (Image.Quantize.MEDIANCUT, Image.Quantize.MAXCOVERAGE)
+)
+def test_quantize_kmeans(method: Image.Quantize) -> None:
+    im = hopper()
+    no_kmeans = im.quantize(kmeans=0, method=method)
+    kmeans = im.quantize(kmeans=1, method=method)
+    assert kmeans.tobytes() != no_kmeans.tobytes()
+
+    with pytest.raises(ValueError):
+        im.quantize(kmeans=-1, method=method)
+
+
+def test_colors() -> None:
     im = hopper()
     colors = 2
     converted = im.quantize(colors)
+    assert converted.palette is not None
     assert len(converted.palette.palette) == colors * len("RGB")
 
 
-def test_transparent_colors_equal():
+def test_transparent_colors_equal() -> None:
     im = Image.new("RGBA", (1, 2), (0, 0, 0, 0))
     px = im.load()
+    assert px is not None
     px[0, 1] = (255, 255, 255, 0)
 
     converted = im.quantize()
     converted_px = converted.load()
+    assert converted_px is not None
     assert converted_px[0, 0] == converted_px[0, 1]
 
 
@@ -119,15 +144,17 @@ def test_transparent_colors_equal():
         (Image.Quantize.FASTOCTREE, (0, 0, 0, 0)),
     ),
 )
-def test_palette(method, color):
+def test_palette(method: Image.Quantize, color: tuple[int, ...]) -> None:
     im = Image.new("RGBA" if len(color) == 4 else "RGB", (1, 1), color)
 
     converted = im.quantize(method=method)
     converted_px = converted.load()
+    assert converted_px is not None
+    assert converted.palette is not None
     assert converted_px[0, 0] == converted.palette.colors[color]
 
 
-def test_small_palette():
+def test_small_palette() -> None:
     # Arrange
     im = hopper()
 
@@ -139,4 +166,6 @@ def test_small_palette():
     im = im.quantize(palette=p)
 
     # Assert
-    assert len(im.getcolors()) == 2
+    quantized_colors = im.getcolors()
+    assert quantized_colors is not None
+    assert len(quantized_colors) == 2
diff --git a/Tests/test_image_reduce.py b/Tests/test_image_reduce.py
index a4d0f510761..6771b46b051 100644
--- a/Tests/test_image_reduce.py
+++ b/Tests/test_image_reduce.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageMath, ImageMode
@@ -47,7 +48,7 @@
         ((1, 3), (10, 4)),
     ),
 )
-def test_args_factor(size, expected):
+def test_args_factor(size: int | tuple[int, int], expected: tuple[int, int]) -> None:
     im = Image.new("L", (10, 10))
     assert expected == im.reduce(size).size
 
@@ -55,10 +56,12 @@ def test_args_factor(size, expected):
 @pytest.mark.parametrize(
     "size, expected_error", ((0, ValueError), (2.0, TypeError), ((0, 10), ValueError))
 )
-def test_args_factor_error(size, expected_error):
+def test_args_factor_error(
+    size: float | tuple[int, int], expected_error: type[Exception]
+) -> None:
     im = Image.new("L", (10, 10))
     with pytest.raises(expected_error):
-        im.reduce(size)
+        im.reduce(size)  # type: ignore[arg-type]
 
 
 @pytest.mark.parametrize(
@@ -68,7 +71,7 @@ def test_args_factor_error(size, expected_error):
         ((5, 5, 6, 6), (1, 1)),
     ),
 )
-def test_args_box(size, expected):
+def test_args_box(size: tuple[int, int, int, int], expected: tuple[int, int]) -> None:
     im = Image.new("L", (10, 10))
     assert expected == im.reduce(2, size).size
 
@@ -85,23 +88,25 @@ def test_args_box(size, expected):
         ((5, 0, 5, 10), ValueError),
     ),
 )
-def test_args_box_error(size, expected_error):
+def test_args_box_error(
+    size: str | tuple[int, int, int, int], expected_error: type[Exception]
+) -> None:
     im = Image.new("L", (10, 10))
     with pytest.raises(expected_error):
-        im.reduce(2, size).size
+        im.reduce(2, size).size  # type: ignore[arg-type]
 
 
 @pytest.mark.parametrize("mode", ("P", "1", "I;16"))
-def test_unsupported_modes(mode):
+def test_unsupported_modes(mode: str) -> None:
     im = Image.new("P", (10, 10))
     with pytest.raises(ValueError):
         im.reduce(3)
 
 
-def get_image(mode):
+def get_image(mode: str) -> Image.Image:
     mode_info = ImageMode.getmode(mode)
     if mode_info.basetype == "L":
-        bands = [gradients_image]
+        bands: list[Image.Image] = [gradients_image]
         for _ in mode_info.bands[1:]:
             # rotate previous image
             band = bands[-1].transpose(Image.Transpose.ROTATE_90)
@@ -118,14 +123,19 @@ def get_image(mode):
     return im.crop((0, 0, im.width, im.height - 5))
 
 
-def compare_reduce_with_box(im, factor):
+def compare_reduce_with_box(im: Image.Image, factor: int | tuple[int, int]) -> None:
     box = (11, 13, 146, 164)
     reduced = im.reduce(factor, box=box)
     reference = im.crop(box).reduce(factor)
     assert reduced == reference
 
 
-def compare_reduce_with_reference(im, factor, average_diff=0.4, max_diff=1):
+def compare_reduce_with_reference(
+    im: Image.Image,
+    factor: int | tuple[int, int],
+    average_diff: float = 0.4,
+    max_diff: int = 1,
+) -> None:
     """Image.reduce() should look very similar to Image.resize(BOX).
 
     A reference image is compiled from a large source area
@@ -170,7 +180,9 @@ def compare_reduce_with_reference(im, factor, average_diff=0.4, max_diff=1):
     assert_compare_images(reduced, reference, average_diff, max_diff)
 
 
-def assert_compare_images(a, b, max_average_diff, max_diff=255):
+def assert_compare_images(
+    a: Image.Image, b: Image.Image, max_average_diff: float, max_diff: int = 255
+) -> None:
     assert a.mode == b.mode, f"got mode {repr(a.mode)}, expected {repr(b.mode)}"
     assert a.size == b.size, f"got size {repr(a.size)}, expected {repr(b.size)}"
 
@@ -178,7 +190,9 @@ def assert_compare_images(a, b, max_average_diff, max_diff=255):
 
     bands = ImageMode.getmode(a.mode).bands
     for band, ach, bch in zip(bands, a.split(), b.split()):
-        ch_diff = ImageMath.eval("convert(abs(a - b), 'L')", a=ach, b=bch)
+        ch_diff = ImageMath.lambda_eval(
+            lambda args: args["convert"](abs(args["a"] - args["b"]), "L"), a=ach, b=bch
+        )
         ch_hist = ch_diff.histogram()
 
         average_diff = sum(i * num for i, num in enumerate(ch_hist)) / (
@@ -198,20 +212,20 @@ def assert_compare_images(a, b, max_average_diff, max_diff=255):
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_L(factor):
+def test_mode_L(factor: int | tuple[int, int]) -> None:
     im = get_image("L")
     compare_reduce_with_reference(im, factor)
     compare_reduce_with_box(im, factor)
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_LA(factor):
+def test_mode_LA(factor: int | tuple[int, int]) -> None:
     im = get_image("LA")
     compare_reduce_with_reference(im, factor, 0.8, 5)
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_LA_opaque(factor):
+def test_mode_LA_opaque(factor: int | tuple[int, int]) -> None:
     im = get_image("LA")
     # With opaque alpha, an error should be way smaller.
     im.putalpha(Image.new("L", im.size, 255))
@@ -220,27 +234,27 @@ def test_mode_LA_opaque(factor):
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_La(factor):
+def test_mode_La(factor: int | tuple[int, int]) -> None:
     im = get_image("La")
     compare_reduce_with_reference(im, factor)
     compare_reduce_with_box(im, factor)
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_RGB(factor):
+def test_mode_RGB(factor: int | tuple[int, int]) -> None:
     im = get_image("RGB")
     compare_reduce_with_reference(im, factor)
     compare_reduce_with_box(im, factor)
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_RGBA(factor):
+def test_mode_RGBA(factor: int | tuple[int, int]) -> None:
     im = get_image("RGBA")
     compare_reduce_with_reference(im, factor, 0.8, 5)
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_RGBA_opaque(factor):
+def test_mode_RGBA_opaque(factor: int | tuple[int, int]) -> None:
     im = get_image("RGBA")
     # With opaque alpha, an error should be way smaller.
     im.putalpha(Image.new("L", im.size, 255))
@@ -249,27 +263,27 @@ def test_mode_RGBA_opaque(factor):
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_RGBa(factor):
+def test_mode_RGBa(factor: int | tuple[int, int]) -> None:
     im = get_image("RGBa")
     compare_reduce_with_reference(im, factor)
     compare_reduce_with_box(im, factor)
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_I(factor):
+def test_mode_I(factor: int | tuple[int, int]) -> None:
     im = get_image("I")
     compare_reduce_with_reference(im, factor)
     compare_reduce_with_box(im, factor)
 
 
 @pytest.mark.parametrize("factor", remarkable_factors)
-def test_mode_F(factor):
+def test_mode_F(factor: int | tuple[int, int]) -> None:
     im = get_image("F")
     compare_reduce_with_reference(im, factor, 0, 0)
     compare_reduce_with_box(im, factor)
 
 
 @skip_unless_feature("jpg_2000")
-def test_jpeg2k():
+def test_jpeg2k() -> None:
     with Image.open("Tests/images/test-card-lossless.jp2") as im:
         assert im.reduce(2).size == (320, 240)
diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py
index b4bf6c8df3a..ce6209c0da4 100644
--- a/Tests/test_image_resample.py
+++ b/Tests/test_image_resample.py
@@ -1,4 +1,6 @@
 from __future__ import annotations
+
+from collections.abc import Generator
 from contextlib import contextmanager
 
 import pytest
@@ -15,7 +17,7 @@
 
 class TestImagingResampleVulnerability:
     # see https://github.com/python-pillow/Pillow/issues/1710
-    def test_overflow(self):
+    def test_overflow(self) -> None:
         im = hopper("L")
         size_too_large = 0x100000008 // 4
         size_normal = 1000  # unimportant
@@ -27,7 +29,7 @@ def test_overflow(self):
                 # any resampling filter will do here
                 im.im.resize((xsize, ysize), Image.Resampling.BILINEAR)
 
-    def test_invalid_size(self):
+    def test_invalid_size(self) -> None:
         im = hopper()
 
         # Should not crash
@@ -39,7 +41,7 @@ def test_invalid_size(self):
         with pytest.raises(ValueError):
             im.resize((100, -100))
 
-    def test_modify_after_resizing(self):
+    def test_modify_after_resizing(self) -> None:
         im = hopper("RGB")
         # get copy with same size
         copy = im.resize(im.size)
@@ -50,7 +52,7 @@ def test_modify_after_resizing(self):
 
 
 class TestImagingCoreResampleAccuracy:
-    def make_case(self, mode, size, color):
+    def make_case(self, mode: str, size: tuple[int, int], color: int) -> Image.Image:
         """Makes a sample image with two dark and two bright squares.
         For example:
         e0 e0 1f 1f
@@ -65,13 +67,14 @@ def make_case(self, mode, size, color):
 
         return Image.merge(mode, [case] * len(mode))
 
-    def make_sample(self, data, size):
+    def make_sample(self, data: str, size: tuple[int, int]) -> Image.Image:
         """Restores a sample image from given data string which contains
         hex-encoded pixels from the top left fourth of a sample.
         """
         data = data.replace(" ", "")
         sample = Image.new("L", size)
         s_px = sample.load()
+        assert s_px is not None
         w, h = size[0] // 2, size[1] // 2
         for y in range(h):
             for x in range(w):
@@ -82,9 +85,11 @@ def make_sample(self, data, size):
                 s_px[size[0] - x - 1, y] = 255 - val
         return sample
 
-    def check_case(self, case, sample):
+    def check_case(self, case: Image.Image, sample: Image.Image) -> None:
         s_px = sample.load()
         c_px = case.load()
+        assert s_px is not None
+        assert c_px is not None
         for y in range(case.size[1]):
             for x in range(case.size[0]):
                 if c_px[x, y] != s_px[x, y]:
@@ -94,15 +99,16 @@ def check_case(self, case, sample):
                     )
                     assert s_px[x, y] == c_px[x, y], message
 
-    def serialize_image(self, image):
+    def serialize_image(self, image: Image.Image) -> str:
         s_px = image.load()
+        assert s_px is not None
         return "\n".join(
             " ".join(f"{s_px[x, y]:02x}" for x in range(image.size[0]))
             for y in range(image.size[1])
         )
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_reduce_box(self, mode):
+    def test_reduce_box(self, mode: str) -> None:
         case = self.make_case(mode, (8, 8), 0xE1)
         case = case.resize((4, 4), Image.Resampling.BOX)
         # fmt: off
@@ -113,7 +119,7 @@ def test_reduce_box(self, mode):
             self.check_case(channel, self.make_sample(data, (4, 4)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_reduce_bilinear(self, mode):
+    def test_reduce_bilinear(self, mode: str) -> None:
         case = self.make_case(mode, (8, 8), 0xE1)
         case = case.resize((4, 4), Image.Resampling.BILINEAR)
         # fmt: off
@@ -124,7 +130,7 @@ def test_reduce_bilinear(self, mode):
             self.check_case(channel, self.make_sample(data, (4, 4)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_reduce_hamming(self, mode):
+    def test_reduce_hamming(self, mode: str) -> None:
         case = self.make_case(mode, (8, 8), 0xE1)
         case = case.resize((4, 4), Image.Resampling.HAMMING)
         # fmt: off
@@ -135,7 +141,7 @@ def test_reduce_hamming(self, mode):
             self.check_case(channel, self.make_sample(data, (4, 4)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_reduce_bicubic(self, mode):
+    def test_reduce_bicubic(self, mode: str) -> None:
         case = self.make_case(mode, (12, 12), 0xE1)
         case = case.resize((6, 6), Image.Resampling.BICUBIC)
         # fmt: off
@@ -147,7 +153,7 @@ def test_reduce_bicubic(self, mode):
             self.check_case(channel, self.make_sample(data, (6, 6)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_reduce_lanczos(self, mode):
+    def test_reduce_lanczos(self, mode: str) -> None:
         case = self.make_case(mode, (16, 16), 0xE1)
         case = case.resize((8, 8), Image.Resampling.LANCZOS)
         # fmt: off
@@ -160,7 +166,7 @@ def test_reduce_lanczos(self, mode):
             self.check_case(channel, self.make_sample(data, (8, 8)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_enlarge_box(self, mode):
+    def test_enlarge_box(self, mode: str) -> None:
         case = self.make_case(mode, (2, 2), 0xE1)
         case = case.resize((4, 4), Image.Resampling.BOX)
         # fmt: off
@@ -171,7 +177,7 @@ def test_enlarge_box(self, mode):
             self.check_case(channel, self.make_sample(data, (4, 4)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_enlarge_bilinear(self, mode):
+    def test_enlarge_bilinear(self, mode: str) -> None:
         case = self.make_case(mode, (2, 2), 0xE1)
         case = case.resize((4, 4), Image.Resampling.BILINEAR)
         # fmt: off
@@ -182,7 +188,7 @@ def test_enlarge_bilinear(self, mode):
             self.check_case(channel, self.make_sample(data, (4, 4)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_enlarge_hamming(self, mode):
+    def test_enlarge_hamming(self, mode: str) -> None:
         case = self.make_case(mode, (2, 2), 0xE1)
         case = case.resize((4, 4), Image.Resampling.HAMMING)
         # fmt: off
@@ -193,7 +199,7 @@ def test_enlarge_hamming(self, mode):
             self.check_case(channel, self.make_sample(data, (4, 4)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_enlarge_bicubic(self, mode):
+    def test_enlarge_bicubic(self, mode: str) -> None:
         case = self.make_case(mode, (4, 4), 0xE1)
         case = case.resize((8, 8), Image.Resampling.BICUBIC)
         # fmt: off
@@ -206,7 +212,7 @@ def test_enlarge_bicubic(self, mode):
             self.check_case(channel, self.make_sample(data, (8, 8)))
 
     @pytest.mark.parametrize("mode", ("RGBX", "RGB", "La", "L"))
-    def test_enlarge_lanczos(self, mode):
+    def test_enlarge_lanczos(self, mode: str) -> None:
         case = self.make_case(mode, (6, 6), 0xE1)
         case = case.resize((12, 12), Image.Resampling.LANCZOS)
         data = (
@@ -220,7 +226,7 @@ def test_enlarge_lanczos(self, mode):
         for channel in case.split():
             self.check_case(channel, self.make_sample(data, (12, 12)))
 
-    def test_box_filter_correct_range(self):
+    def test_box_filter_correct_range(self) -> None:
         im = Image.new("RGB", (8, 8), "#1688ff").resize(
             (100, 100), Image.Resampling.BOX
         )
@@ -229,34 +235,40 @@ def test_box_filter_correct_range(self):
 
 
 class TestCoreResampleConsistency:
-    def make_case(self, mode, fill):
+    def make_case(
+        self, mode: str, fill: tuple[int, int, int] | float
+    ) -> tuple[Image.Image, float | tuple[int, ...]]:
         im = Image.new(mode, (512, 9), fill)
-        return im.resize((9, 512), Image.Resampling.LANCZOS), im.load()[0, 0]
+        px = im.load()
+        assert px is not None
+        return im.resize((9, 512), Image.Resampling.LANCZOS), px[0, 0]
 
-    def run_case(self, case):
+    def run_case(self, case: tuple[Image.Image, float | tuple[int, ...]]) -> None:
         channel, color = case
         px = channel.load()
+        assert px is not None
         for x in range(channel.size[0]):
             for y in range(channel.size[1]):
                 if px[x, y] != color:
                     message = f"{px[x, y]} != {color} for pixel {(x, y)}"
                     assert px[x, y] == color, message
 
-    def test_8u(self):
+    def test_8u(self) -> None:
         im, color = self.make_case("RGB", (0, 64, 255))
         r, g, b = im.split()
+        assert isinstance(color, tuple)
         self.run_case((r, color[0]))
         self.run_case((g, color[1]))
         self.run_case((b, color[2]))
         self.run_case(self.make_case("L", 12))
 
-    def test_32i(self):
+    def test_32i(self) -> None:
         self.run_case(self.make_case("I", 12))
         self.run_case(self.make_case("I", 0x7FFFFFFF))
         self.run_case(self.make_case("I", -12))
         self.run_case(self.make_case("I", -1 << 31))
 
-    def test_32f(self):
+    def test_32f(self) -> None:
         self.run_case(self.make_case("F", 1))
         self.run_case(self.make_case("F", 3.40282306074e38))
         self.run_case(self.make_case("F", 1.175494e-38))
@@ -264,9 +276,10 @@ def test_32f(self):
 
 
 class TestCoreResampleAlphaCorrect:
-    def make_levels_case(self, mode):
+    def make_levels_case(self, mode: str) -> Image.Image:
         i = Image.new(mode, (256, 16))
         px = i.load()
+        assert px is not None
         for y in range(i.size[1]):
             for x in range(i.size[0]):
                 pix = [x] * len(mode)
@@ -274,17 +287,22 @@ def make_levels_case(self, mode):
                 px[x, y] = tuple(pix)
         return i
 
-    def run_levels_case(self, i):
+    def run_levels_case(self, i: Image.Image) -> None:
         px = i.load()
+        assert px is not None
         for y in range(i.size[1]):
-            used_colors = {px[x, y][0] for x in range(i.size[0])}
+            used_colors = set()
+            for x in range(i.size[0]):
+                value = px[x, y]
+                assert isinstance(value, tuple)
+                used_colors.add(value[0])
             assert 256 == len(used_colors), (
                 "All colors should be present in resized image. "
-                f"Only {len(used_colors)} on {y} line."
+                f"Only {len(used_colors)} on line {y}."
             )
 
     @pytest.mark.xfail(reason="Current implementation isn't precise enough")
-    def test_levels_rgba(self):
+    def test_levels_rgba(self) -> None:
         case = self.make_levels_case("RGBA")
         self.run_levels_case(case.resize((512, 32), Image.Resampling.BOX))
         self.run_levels_case(case.resize((512, 32), Image.Resampling.BILINEAR))
@@ -293,7 +311,7 @@ def test_levels_rgba(self):
         self.run_levels_case(case.resize((512, 32), Image.Resampling.LANCZOS))
 
     @pytest.mark.xfail(reason="Current implementation isn't precise enough")
-    def test_levels_la(self):
+    def test_levels_la(self) -> None:
         case = self.make_levels_case("LA")
         self.run_levels_case(case.resize((512, 32), Image.Resampling.BOX))
         self.run_levels_case(case.resize((512, 32), Image.Resampling.BILINEAR))
@@ -301,9 +319,12 @@ def test_levels_la(self):
         self.run_levels_case(case.resize((512, 32), Image.Resampling.BICUBIC))
         self.run_levels_case(case.resize((512, 32), Image.Resampling.LANCZOS))
 
-    def make_dirty_case(self, mode, clean_pixel, dirty_pixel):
+    def make_dirty_case(
+        self, mode: str, clean_pixel: tuple[int, ...], dirty_pixel: tuple[int, ...]
+    ) -> Image.Image:
         i = Image.new(mode, (64, 64), dirty_pixel)
         px = i.load()
+        assert px is not None
         xdiv4 = i.size[0] // 4
         ydiv4 = i.size[1] // 4
         for y in range(ydiv4 * 2):
@@ -311,18 +332,20 @@ def make_dirty_case(self, mode, clean_pixel, dirty_pixel):
                 px[x + xdiv4, y + ydiv4] = clean_pixel
         return i
 
-    def run_dirty_case(self, i, clean_pixel):
+    def run_dirty_case(self, i: Image.Image, clean_pixel: tuple[int, ...]) -> None:
         px = i.load()
+        assert px is not None
         for y in range(i.size[1]):
             for x in range(i.size[0]):
-                if px[x, y][-1] != 0 and px[x, y][:-1] != clean_pixel:
+                value = px[x, y]
+                assert isinstance(value, tuple)
+                if value[-1] != 0 and value[:-1] != clean_pixel:
                     message = (
-                        f"pixel at ({x}, {y}) is different:\n"
-                        f"{px[x, y]}\n{clean_pixel}"
+                        f"pixel at ({x}, {y}) is different:\n{value}\n{clean_pixel}"
                     )
-                    assert px[x, y][:3] == clean_pixel, message
+                    assert value[:3] == clean_pixel, message
 
-    def test_dirty_pixels_rgba(self):
+    def test_dirty_pixels_rgba(self) -> None:
         case = self.make_dirty_case("RGBA", (255, 255, 0, 128), (0, 0, 255, 0))
         self.run_dirty_case(case.resize((20, 20), Image.Resampling.BOX), (255, 255, 0))
         self.run_dirty_case(
@@ -338,7 +361,7 @@ def test_dirty_pixels_rgba(self):
             case.resize((20, 20), Image.Resampling.LANCZOS), (255, 255, 0)
         )
 
-    def test_dirty_pixels_la(self):
+    def test_dirty_pixels_la(self) -> None:
         case = self.make_dirty_case("LA", (255, 128), (0, 0))
         self.run_dirty_case(case.resize((20, 20), Image.Resampling.BOX), (255,))
         self.run_dirty_case(case.resize((20, 20), Image.Resampling.BILINEAR), (255,))
@@ -349,27 +372,27 @@ def test_dirty_pixels_la(self):
 
 class TestCoreResamplePasses:
     @contextmanager
-    def count(self, diff):
+    def count(self, diff: int) -> Generator[None, None, None]:
         count = Image.core.get_stats()["new_count"]
         yield
         assert Image.core.get_stats()["new_count"] - count == diff
 
-    def test_horizontal(self):
+    def test_horizontal(self) -> None:
         im = hopper("L")
         with self.count(1):
             im.resize((im.size[0] - 10, im.size[1]), Image.Resampling.BILINEAR)
 
-    def test_vertical(self):
+    def test_vertical(self) -> None:
         im = hopper("L")
         with self.count(1):
             im.resize((im.size[0], im.size[1] - 10), Image.Resampling.BILINEAR)
 
-    def test_both(self):
+    def test_both(self) -> None:
         im = hopper("L")
         with self.count(2):
             im.resize((im.size[0] - 10, im.size[1] - 10), Image.Resampling.BILINEAR)
 
-    def test_box_horizontal(self):
+    def test_box_horizontal(self) -> None:
         im = hopper("L")
         box = (20, 0, im.size[0] - 20, im.size[1])
         with self.count(1):
@@ -379,7 +402,7 @@ def test_box_horizontal(self):
             cropped = im.crop(box).resize(im.size, Image.Resampling.BILINEAR)
         assert_image_similar(with_box, cropped, 0.1)
 
-    def test_box_vertical(self):
+    def test_box_vertical(self) -> None:
         im = hopper("L")
         box = (0, 20, im.size[0], im.size[1] - 20)
         with self.count(1):
@@ -391,7 +414,7 @@ def test_box_vertical(self):
 
 
 class TestCoreResampleCoefficients:
-    def test_reduce(self):
+    def test_reduce(self) -> None:
         test_color = 254
 
         for size in range(400000, 400010, 2):
@@ -400,10 +423,11 @@ def test_reduce(self):
             draw.rectangle((0, 0, i.size[0] // 2 - 1, 0), test_color)
 
             px = i.resize((5, i.size[1]), Image.Resampling.BICUBIC).load()
+            assert px is not None
             if px[2, 0] != test_color // 2:
                 assert test_color // 2 == px[2, 0]
 
-    def test_nonzero_coefficients(self):
+    def test_non_zero_coefficients(self) -> None:
         # regression test for the wrong coefficients calculation
         # due to bug https://github.com/python-pillow/Pillow/issues/2161
         im = Image.new("RGBA", (1280, 1280), (0x20, 0x40, 0x60, 0xFF))
@@ -431,7 +455,7 @@ class TestCoreResampleBox:
             Image.Resampling.LANCZOS,
         ),
     )
-    def test_wrong_arguments(self, resample):
+    def test_wrong_arguments(self, resample: Image.Resampling) -> None:
         im = hopper()
         im.resize((32, 32), resample, (0, 0, im.width, im.height))
         im.resize((32, 32), resample, (20, 20, im.width, im.height))
@@ -439,7 +463,7 @@ def test_wrong_arguments(self, resample):
         im.resize((32, 32), resample, (20, 20, 100, 20))
 
         with pytest.raises(TypeError, match="must be sequence of length 4"):
-            im.resize((32, 32), resample, (im.width, im.height))
+            im.resize((32, 32), resample, (im.width, im.height))  # type: ignore[arg-type]
 
         with pytest.raises(ValueError, match="can't be negative"):
             im.resize((32, 32), resample, (-20, 20, 100, 100))
@@ -458,8 +482,12 @@ def test_wrong_arguments(self, resample):
         with pytest.raises(ValueError, match="can't exceed"):
             im.resize((32, 32), resample, (0, 0, im.width, im.height + 1))
 
-    def resize_tiled(self, im, dst_size, xtiles, ytiles):
-        def split_range(size, tiles):
+    def resize_tiled(
+        self, im: Image.Image, dst_size: tuple[int, int], xtiles: int, ytiles: int
+    ) -> Image.Image:
+        def split_range(
+            size: int, tiles: int
+        ) -> Generator[tuple[int, int], None, None]:
             scale = size / tiles
             for i in range(tiles):
                 yield int(round(scale * i)), int(round(scale * (i + 1)))
@@ -477,7 +505,7 @@ def split_range(size, tiles):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_tiles(self):
+    def test_tiles(self) -> None:
         with Image.open("Tests/images/flower.jpg") as im:
             assert im.size == (480, 360)
             dst_size = (251, 188)
@@ -490,7 +518,7 @@ def test_tiles(self):
     @mark_if_feature_version(
         pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing"
     )
-    def test_subsample(self):
+    def test_subsample(self) -> None:
         # This test shows advantages of the subpixel resizing
         # after supersampling (e.g. during JPEG decoding).
         with Image.open("Tests/images/flower.jpg") as im:
@@ -517,14 +545,14 @@ def test_subsample(self):
     @pytest.mark.parametrize(
         "resample", (Image.Resampling.NEAREST, Image.Resampling.BILINEAR)
     )
-    def test_formats(self, mode, resample):
+    def test_formats(self, mode: str, resample: Image.Resampling) -> None:
         im = hopper(mode)
         box = (20, 20, im.size[0] - 20, im.size[1] - 20)
         with_box = im.resize((32, 32), resample, box)
         cropped = im.crop(box).resize((32, 32), resample)
         assert_image_similar(cropped, with_box, 0.4)
 
-    def test_passthrough(self):
+    def test_passthrough(self) -> None:
         # When no resize is required
         im = hopper()
 
@@ -538,7 +566,7 @@ def test_passthrough(self):
             assert res.size == size
             assert_image_equal(res, im.crop(box), f">>> {size} {box}")
 
-    def test_no_passthrough(self):
+    def test_no_passthrough(self) -> None:
         # When resize is required
         im = hopper()
 
@@ -557,7 +585,7 @@ def test_no_passthrough(self):
     @pytest.mark.parametrize(
         "flt", (Image.Resampling.NEAREST, Image.Resampling.BICUBIC)
     )
-    def test_skip_horizontal(self, flt):
+    def test_skip_horizontal(self, flt: Image.Resampling) -> None:
         # Can skip resize for one dimension
         im = hopper()
 
@@ -580,7 +608,7 @@ def test_skip_horizontal(self, flt):
     @pytest.mark.parametrize(
         "flt", (Image.Resampling.NEAREST, Image.Resampling.BICUBIC)
     )
-    def test_skip_vertical(self, flt):
+    def test_skip_vertical(self, flt: Image.Resampling) -> None:
         # Can skip resize for one dimension
         im = hopper()
 
diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py
index 0d3b43ee29f..8548fb5da3b 100644
--- a/Tests/test_image_resize.py
+++ b/Tests/test_image_resize.py
@@ -1,8 +1,12 @@
 """
 Tests for resize functionality.
 """
+
 from __future__ import annotations
+
+from collections.abc import Generator
 from itertools import permutations
+from pathlib import Path
 
 import pytest
 
@@ -18,7 +22,9 @@
 
 
 class TestImagingCoreResize:
-    def resize(self, im, size, f):
+    def resize(
+        self, im: Image.Image, size: tuple[int, int], f: Image.Resampling
+    ) -> Image.Image:
         # Image class independent version of resize.
         im.load()
         return im._new(im.im.resize(size, f))
@@ -26,21 +32,31 @@ def resize(self, im, size, f):
     @pytest.mark.parametrize(
         "mode", ("1", "P", "L", "I", "F", "RGB", "RGBA", "CMYK", "YCbCr", "I;16")
     )
-    def test_nearest_mode(self, mode):
+    def test_nearest_mode(self, mode: str) -> None:
         im = hopper(mode)
         r = self.resize(im, (15, 12), Image.Resampling.NEAREST)
         assert r.mode == mode
         assert r.size == (15, 12)
         assert r.im.bands == im.im.bands
 
-    def test_convolution_modes(self):
+    def test_convolution_modes(self) -> None:
         with pytest.raises(ValueError):
             self.resize(hopper("1"), (15, 12), Image.Resampling.BILINEAR)
         with pytest.raises(ValueError):
             self.resize(hopper("P"), (15, 12), Image.Resampling.BILINEAR)
-        with pytest.raises(ValueError):
-            self.resize(hopper("I;16"), (15, 12), Image.Resampling.BILINEAR)
-        for mode in ["L", "I", "F", "RGB", "RGBA", "CMYK", "YCbCr"]:
+        for mode in [
+            "L",
+            "I",
+            "I;16",
+            "I;16L",
+            "I;16B",
+            "I;16N",
+            "F",
+            "RGB",
+            "RGBA",
+            "CMYK",
+            "YCbCr",
+        ]:
             im = hopper(mode)
             r = self.resize(im, (15, 12), Image.Resampling.BILINEAR)
             assert r.mode == mode
@@ -58,7 +74,7 @@ def test_convolution_modes(self):
             Image.Resampling.LANCZOS,
         ),
     )
-    def test_reduce_filters(self, resample):
+    def test_reduce_filters(self, resample: Image.Resampling) -> None:
         r = self.resize(hopper("RGB"), (15, 12), resample)
         assert r.mode == "RGB"
         assert r.size == (15, 12)
@@ -74,7 +90,7 @@ def test_reduce_filters(self, resample):
             Image.Resampling.LANCZOS,
         ),
     )
-    def test_enlarge_filters(self, resample):
+    def test_enlarge_filters(self, resample: Image.Resampling) -> None:
         r = self.resize(hopper("RGB"), (212, 195), resample)
         assert r.mode == "RGB"
         assert r.size == (212, 195)
@@ -98,7 +114,9 @@ def test_enlarge_filters(self, resample):
             ("LA", ("filled", "dirty")),
         ),
     )
-    def test_endianness(self, resample, mode, channels_set):
+    def test_endianness(
+        self, resample: Image.Resampling, mode: str, channels_set: tuple[str, ...]
+    ) -> None:
         # Make an image with one colored pixel, in one channel.
         # When resized, that channel should be the same as a GS image.
         # Other channels should be unaffected.
@@ -138,17 +156,17 @@ def test_endianness(self, resample, mode, channels_set):
             Image.Resampling.LANCZOS,
         ),
     )
-    def test_enlarge_zero(self, resample):
+    def test_enlarge_zero(self, resample: Image.Resampling) -> None:
         r = self.resize(Image.new("RGB", (0, 0), "white"), (212, 195), resample)
         assert r.mode == "RGB"
         assert r.size == (212, 195)
         assert r.getdata()[0] == (0, 0, 0)
 
-    def test_unknown_filter(self):
+    def test_unknown_filter(self) -> None:
         with pytest.raises(ValueError):
-            self.resize(hopper(), (10, 10), 9)
+            self.resize(hopper(), (10, 10), 9)  # type: ignore[arg-type]
 
-    def test_cross_platform(self, tmp_path):
+    def test_cross_platform(self, tmp_path: Path) -> None:
         # This test is intended for only check for consistent behaviour across
         # platforms. So if a future Pillow change requires that the test file
         # be updated, that is okay.
@@ -161,7 +179,7 @@ def test_cross_platform(self, tmp_path):
 
 
 @pytest.fixture
-def gradients_image():
+def gradients_image() -> Generator[Image.Image, None, None]:
     with Image.open("Tests/images/radial_gradients.png") as im:
         im.load()
     try:
@@ -171,7 +189,7 @@ def gradients_image():
 
 
 class TestReducingGapResize:
-    def test_reducing_gap_values(self, gradients_image):
+    def test_reducing_gap_values(self, gradients_image: Image.Image) -> None:
         ref = gradients_image.resize(
             (52, 34), Image.Resampling.BICUBIC, reducing_gap=None
         )
@@ -190,7 +208,12 @@ def test_reducing_gap_values(self, gradients_image):
         "box, epsilon",
         ((None, 4), ((1.1, 2.2, 510.8, 510.9), 4), ((3, 10, 410, 256), 10)),
     )
-    def test_reducing_gap_1(self, gradients_image, box, epsilon):
+    def test_reducing_gap_1(
+        self,
+        gradients_image: Image.Image,
+        box: tuple[float, float, float, float],
+        epsilon: float,
+    ) -> None:
         ref = gradients_image.resize((52, 34), Image.Resampling.BICUBIC, box=box)
         im = gradients_image.resize(
             (52, 34), Image.Resampling.BICUBIC, box=box, reducing_gap=1.0
@@ -205,7 +228,12 @@ def test_reducing_gap_1(self, gradients_image, box, epsilon):
         "box, epsilon",
         ((None, 1.5), ((1.1, 2.2, 510.8, 510.9), 1.5), ((3, 10, 410, 256), 1)),
     )
-    def test_reducing_gap_2(self, gradients_image, box, epsilon):
+    def test_reducing_gap_2(
+        self,
+        gradients_image: Image.Image,
+        box: tuple[float, float, float, float],
+        epsilon: float,
+    ) -> None:
         ref = gradients_image.resize((52, 34), Image.Resampling.BICUBIC, box=box)
         im = gradients_image.resize(
             (52, 34), Image.Resampling.BICUBIC, box=box, reducing_gap=2.0
@@ -220,7 +248,12 @@ def test_reducing_gap_2(self, gradients_image, box, epsilon):
         "box, epsilon",
         ((None, 1), ((1.1, 2.2, 510.8, 510.9), 1), ((3, 10, 410, 256), 0.5)),
     )
-    def test_reducing_gap_3(self, gradients_image, box, epsilon):
+    def test_reducing_gap_3(
+        self,
+        gradients_image: Image.Image,
+        box: tuple[float, float, float, float],
+        epsilon: float,
+    ) -> None:
         ref = gradients_image.resize((52, 34), Image.Resampling.BICUBIC, box=box)
         im = gradients_image.resize(
             (52, 34), Image.Resampling.BICUBIC, box=box, reducing_gap=3.0
@@ -232,7 +265,9 @@ def test_reducing_gap_3(self, gradients_image, box, epsilon):
         assert_image_similar(ref, im, epsilon)
 
     @pytest.mark.parametrize("box", (None, (1.1, 2.2, 510.8, 510.9), (3, 10, 410, 256)))
-    def test_reducing_gap_8(self, gradients_image, box):
+    def test_reducing_gap_8(
+        self, gradients_image: Image.Image, box: tuple[float, float, float, float]
+    ) -> None:
         ref = gradients_image.resize((52, 34), Image.Resampling.BICUBIC, box=box)
         im = gradients_image.resize(
             (52, 34), Image.Resampling.BICUBIC, box=box, reducing_gap=8.0
@@ -244,7 +279,12 @@ def test_reducing_gap_8(self, gradients_image, box):
         "box, epsilon",
         (((0, 0, 512, 512), 5.5), ((0.9, 1.7, 128, 128), 9.5)),
     )
-    def test_box_filter(self, gradients_image, box, epsilon):
+    def test_box_filter(
+        self,
+        gradients_image: Image.Image,
+        box: tuple[float, float, float, float],
+        epsilon: float,
+    ) -> None:
         ref = gradients_image.resize((52, 34), Image.Resampling.BOX, box=box)
         im = gradients_image.resize(
             (52, 34), Image.Resampling.BOX, box=box, reducing_gap=1.0
@@ -254,15 +294,15 @@ def test_box_filter(self, gradients_image, box, epsilon):
 
 
 class TestImageResize:
-    def test_resize(self):
-        def resize(mode, size):
+    def test_resize(self) -> None:
+        def resize(mode: str, size: tuple[int, int] | list[int]) -> None:
             out = hopper(mode).resize(size)
             assert out.mode == mode
-            assert out.size == size
+            assert out.size == tuple(size)
 
         for mode in "1", "P", "L", "RGB", "I", "F":
             resize(mode, (112, 103))
-            resize(mode, (188, 214))
+            resize(mode, [188, 214])
 
         # Test unknown resampling filter
         with hopper() as im:
@@ -270,21 +310,19 @@ def resize(mode, size):
                 im.resize((10, 10), "unknown")
 
     @skip_unless_feature("libtiff")
-    def test_load_first(self):
-        # load() may change the size of the image
-        # Test that resize() is calling it before getting the size
+    def test_transposed(self) -> None:
         with Image.open("Tests/images/g4_orientation_5.tif") as im:
             im = im.resize((64, 64))
             assert im.size == (64, 64)
 
-    @pytest.mark.parametrize("mode", ("L", "RGB", "I", "F"))
-    def test_default_filter_bicubic(self, mode):
+    @pytest.mark.parametrize(
+        "mode", ("L", "RGB", "I", "I;16", "I;16L", "I;16B", "I;16N", "F")
+    )
+    def test_default_filter_bicubic(self, mode: str) -> None:
         im = hopper(mode)
         assert im.resize((20, 20), Image.Resampling.BICUBIC) == im.resize((20, 20))
 
-    @pytest.mark.parametrize(
-        "mode", ("1", "P", "I;16", "I;16L", "I;16B", "BGR;15", "BGR;16")
-    )
-    def test_default_filter_nearest(self, mode):
+    @pytest.mark.parametrize("mode", ("1", "P", "BGR;15", "BGR;16"))
+    def test_default_filter_nearest(self, mode: str) -> None:
         im = hopper(mode)
         assert im.resize((20, 20), Image.Resampling.NEAREST) == im.resize((20, 20))
diff --git a/Tests/test_image_rotate.py b/Tests/test_image_rotate.py
index 0931aa32d98..252a15db742 100644
--- a/Tests/test_image_rotate.py
+++ b/Tests/test_image_rotate.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -11,7 +12,13 @@
 )
 
 
-def rotate(im, mode, angle, center=None, translate=None):
+def rotate(
+    im: Image.Image,
+    mode: str,
+    angle: int,
+    center: tuple[int, int] | None = None,
+    translate: tuple[int, int] | None = None,
+) -> None:
     out = im.rotate(angle, center=center, translate=translate)
     assert out.mode == mode
     assert out.size == im.size  # default rotate clips output
@@ -26,13 +33,13 @@ def rotate(im, mode, angle, center=None, translate=None):
 
 
 @pytest.mark.parametrize("mode", ("1", "P", "L", "RGB", "I", "F"))
-def test_mode(mode):
+def test_mode(mode: str) -> None:
     im = hopper(mode)
     rotate(im, mode, 45)
 
 
 @pytest.mark.parametrize("angle", (0, 90, 180, 270))
-def test_angle(angle):
+def test_angle(angle: int) -> None:
     with Image.open("Tests/images/test-card.png") as im:
         rotate(im, im.mode, angle)
 
@@ -41,12 +48,12 @@ def test_angle(angle):
 
 
 @pytest.mark.parametrize("angle", (0, 45, 90, 180, 270))
-def test_zero(angle):
+def test_zero(angle: int) -> None:
     im = Image.new("RGB", (0, 0))
     rotate(im, im.mode, angle)
 
 
-def test_resample():
+def test_resample() -> None:
     # Target image creation, inspected by eye.
     # >>> im = Image.open('Tests/images/hopper.ppm')
     # >>> im = im.rotate(45, resample=Image.Resampling.BICUBIC, expand=True)
@@ -63,7 +70,7 @@ def test_resample():
             assert_image_similar(im, target, epsilon)
 
 
-def test_center_0():
+def test_center_0() -> None:
     im = hopper()
     im = im.rotate(45, center=(0, 0), resample=Image.Resampling.BICUBIC)
 
@@ -74,7 +81,7 @@ def test_center_0():
     assert_image_similar(im, target, 15)
 
 
-def test_center_14():
+def test_center_14() -> None:
     im = hopper()
     im = im.rotate(45, center=(14, 14), resample=Image.Resampling.BICUBIC)
 
@@ -85,7 +92,7 @@ def test_center_14():
         assert_image_similar(im, target, 10)
 
 
-def test_translate():
+def test_translate() -> None:
     im = hopper()
     with Image.open("Tests/images/hopper_45.png") as target:
         target_origin = (target.size[1] / 2 - 64) - 5
@@ -98,7 +105,7 @@ def test_translate():
     assert_image_similar(im, target, 1)
 
 
-def test_fastpath_center():
+def test_fastpath_center() -> None:
     # if the center is -1,-1 and we rotate by 90<=x<=270 the
     # resulting image should be black
     for angle in (90, 180, 270):
@@ -106,7 +113,7 @@ def test_fastpath_center():
         assert_image_equal(im, Image.new("RGB", im.size, "black"))
 
 
-def test_fastpath_translate():
+def test_fastpath_translate() -> None:
     # if we post-translate by -128
     # resulting image should be black
     for angle in (0, 90, 180, 270):
@@ -114,26 +121,26 @@ def test_fastpath_translate():
         assert_image_equal(im, Image.new("RGB", im.size, "black"))
 
 
-def test_center():
+def test_center() -> None:
     im = hopper()
     rotate(im, im.mode, 45, center=(0, 0))
-    rotate(im, im.mode, 45, translate=(im.size[0] / 2, 0))
-    rotate(im, im.mode, 45, center=(0, 0), translate=(im.size[0] / 2, 0))
+    rotate(im, im.mode, 45, translate=(im.size[0] // 2, 0))
+    rotate(im, im.mode, 45, center=(0, 0), translate=(im.size[0] // 2, 0))
 
 
-def test_rotate_no_fill():
+def test_rotate_no_fill() -> None:
     im = Image.new("RGB", (100, 100), "green")
     im = im.rotate(45)
     assert_image_equal_tofile(im, "Tests/images/rotate_45_no_fill.png")
 
 
-def test_rotate_with_fill():
+def test_rotate_with_fill() -> None:
     im = Image.new("RGB", (100, 100), "green")
     im = im.rotate(45, fillcolor="white")
     assert_image_equal_tofile(im, "Tests/images/rotate_45_with_fill.png")
 
 
-def test_alpha_rotate_no_fill():
+def test_alpha_rotate_no_fill() -> None:
     # Alpha images are handled differently internally
     im = Image.new("RGBA", (10, 10), "green")
     im = im.rotate(45, expand=1)
@@ -141,7 +148,7 @@ def test_alpha_rotate_no_fill():
     assert corner == (0, 0, 0, 0)
 
 
-def test_alpha_rotate_with_fill():
+def test_alpha_rotate_with_fill() -> None:
     # Alpha images are handled differently internally
     im = Image.new("RGBA", (10, 10), "green")
     im = im.rotate(45, expand=1, fillcolor=(255, 0, 0, 255))
diff --git a/Tests/test_image_split.py b/Tests/test_image_split.py
index 707508250f6..3385f81f527 100644
--- a/Tests/test_image_split.py
+++ b/Tests/test_image_split.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image, features
@@ -6,8 +9,8 @@
 from .helper import assert_image_equal, hopper
 
 
-def test_split():
-    def split(mode):
+def test_split() -> None:
+    def split(mode: str) -> list[tuple[str, int, int]]:
         layers = hopper(mode).split()
         return [(i.mode, i.size[0], i.size[1]) for i in layers]
 
@@ -35,18 +38,18 @@ def split(mode):
 @pytest.mark.parametrize(
     "mode", ("1", "L", "I", "F", "P", "RGB", "RGBA", "CMYK", "YCbCr")
 )
-def test_split_merge(mode):
+def test_split_merge(mode: str) -> None:
     expected = Image.merge(mode, hopper(mode).split())
     assert_image_equal(hopper(mode), expected)
 
 
-def test_split_open(tmp_path):
+def test_split_open(tmp_path: Path) -> None:
     if features.check("zlib"):
         test_file = str(tmp_path / "temp.png")
     else:
         test_file = str(tmp_path / "temp.pcx")
 
-    def split_open(mode):
+    def split_open(mode: str) -> int:
         hopper(mode).save(test_file)
         with Image.open(test_file) as im:
             return len(im.split())
diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py
index 9e6796ca299..01bd4b1d76b 100644
--- a/Tests/test_image_thumbnail.py
+++ b/Tests/test_image_thumbnail.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -13,14 +14,14 @@
 )
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper()
-    assert im.thumbnail((100, 100)) is None
+    im.thumbnail((100, 100))
 
     assert im.size == (100, 100)
 
 
-def test_aspect():
+def test_aspect() -> None:
     im = Image.new("L", (128, 128))
     im.thumbnail((100, 100))
     assert im.size == (100, 100)
@@ -66,19 +67,19 @@ def test_aspect():
     assert im.size == (75, 23)  # ratio is 3.260869565217
 
 
-def test_division_by_zero():
+def test_division_by_zero() -> None:
     im = Image.new("L", (200, 2))
     im.thumbnail((75, 75))
     assert im.size == (75, 1)
 
 
-def test_float():
+def test_float() -> None:
     im = Image.new("L", (128, 128))
     im.thumbnail((99.9, 99.9))
     assert im.size == (99, 99)
 
 
-def test_no_resize():
+def test_no_resize() -> None:
     # Check that draft() can resize the image to the destination size
     with Image.open("Tests/images/hopper.jpg") as im:
         im.draft(None, (64, 64))
@@ -91,26 +92,26 @@ def test_no_resize():
 
 
 @skip_unless_feature("libtiff")
-def test_load_first():
-    # load() may change the size of the image
-    # Test that thumbnail() is calling it before performing size calculations
+def test_transposed() -> None:
     with Image.open("Tests/images/g4_orientation_5.tif") as im:
+        assert im.size == (590, 88)
+
         im.thumbnail((64, 64))
         assert im.size == (64, 10)
 
-    # Test thumbnail(), without draft(),
-    # on an image that is large enough once load() has changed the size
     with Image.open("Tests/images/g4_orientation_5.tif") as im:
         im.thumbnail((590, 88), reducing_gap=None)
         assert im.size == (590, 88)
 
 
-def test_load_first_unless_jpeg():
+def test_load_first_unless_jpeg() -> None:
     # Test that thumbnail() still uses draft() for JPEG
     with Image.open("Tests/images/hopper.jpg") as im:
         draft = im.draft
 
-        def im_draft(mode, size):
+        def im_draft(
+            mode: str, size: tuple[int, int]
+        ) -> tuple[str, tuple[int, int, float, float]] | None:
             result = draft(mode, size)
             assert result is not None
 
@@ -123,7 +124,7 @@ def im_draft(mode, size):
 
 # valgrind test is failing with memory allocated in libjpeg
 @pytest.mark.valgrind_known_error(reason="Known Failing")
-def test_DCT_scaling_edges():
+def test_DCT_scaling_edges() -> None:
     # Make an image with red borders and size (N * 8) + 1 to cross DCT grid
     im = Image.new("RGB", (257, 257), "red")
     im.paste(Image.new("RGB", (235, 235)), (11, 11))
@@ -137,7 +138,7 @@ def test_DCT_scaling_edges():
     assert_image_similar(thumb, ref, 1.5)
 
 
-def test_reducing_gap_values():
+def test_reducing_gap_values() -> None:
     im = hopper()
     im.thumbnail((18, 18), Image.Resampling.BICUBIC)
 
@@ -154,7 +155,7 @@ def test_reducing_gap_values():
     assert_image_similar(ref, im, 3.5)
 
 
-def test_reducing_gap_for_DCT_scaling():
+def test_reducing_gap_for_DCT_scaling() -> None:
     with Image.open("Tests/images/hopper.jpg") as ref:
         # thumbnail should call draft with reducing_gap scale
         ref.draft(None, (18 * 3, 18 * 3))
diff --git a/Tests/test_image_tobitmap.py b/Tests/test_image_tobitmap.py
index 156b9919d27..f7a3cc41d90 100644
--- a/Tests/test_image_tobitmap.py
+++ b/Tests/test_image_tobitmap.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 import pytest
 
 from .helper import assert_image_equal, fromstring, hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     with pytest.raises(ValueError):
         hopper().tobitmap()
 
diff --git a/Tests/test_image_tobytes.py b/Tests/test_image_tobytes.py
index f6042bca527..d32b6c09ba0 100644
--- a/Tests/test_image_tobytes.py
+++ b/Tests/test_image_tobytes.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
+
 from .helper import hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     data = hopper().tobytes()
     assert isinstance(data, bytes)
diff --git a/Tests/test_image_transform.py b/Tests/test_image_transform.py
index 15939ef647c..7e83396def7 100644
--- a/Tests/test_image_transform.py
+++ b/Tests/test_image_transform.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 import math
+from typing import Callable
 
 import pytest
 
@@ -9,21 +11,28 @@
 
 
 class TestImageTransform:
-    def test_sanity(self):
-        im = Image.new("L", (100, 100))
-
-        seq = tuple(range(10))
-
-        transform = ImageTransform.AffineTransform(seq[:6])
-        im.transform((100, 100), transform)
-        transform = ImageTransform.ExtentTransform(seq[:4])
-        im.transform((100, 100), transform)
-        transform = ImageTransform.QuadTransform(seq[:8])
-        im.transform((100, 100), transform)
-        transform = ImageTransform.MeshTransform([(seq[:4], seq[:8])])
-        im.transform((100, 100), transform)
+    def test_sanity(self) -> None:
+        im = hopper()
+
+        for transform in (
+            ImageTransform.AffineTransform((1, 0, 0, 0, 1, 0)),
+            ImageTransform.PerspectiveTransform((1, 0, 0, 0, 1, 0, 0, 0)),
+            ImageTransform.ExtentTransform((0, 0) + im.size),
+            ImageTransform.QuadTransform(
+                (0, 0, 0, im.height, im.width, im.height, im.width, 0)
+            ),
+            ImageTransform.MeshTransform(
+                [
+                    (
+                        (0, 0) + im.size,
+                        (0, 0, 0, im.height, im.width, im.height, im.width, 0),
+                    )
+                ]
+            ),
+        ):
+            assert_image_equal(im, im.transform(im.size, transform))
 
-    def test_info(self):
+    def test_info(self) -> None:
         comment = b"File written by Adobe Photoshop\xa8 4.0"
 
         with Image.open("Tests/images/hopper.gif") as im:
@@ -33,14 +42,14 @@ def test_info(self):
             new_im = im.transform((100, 100), transform)
         assert new_im.info["comment"] == comment
 
-    def test_palette(self):
+    def test_palette(self) -> None:
         with Image.open("Tests/images/hopper.gif") as im:
             transformed = im.transform(
                 im.size, Image.Transform.AFFINE, [1, 0, 0, 0, 1, 0]
             )
             assert im.palette.palette == transformed.palette.palette
 
-    def test_extent(self):
+    def test_extent(self) -> None:
         im = hopper("RGB")
         (w, h) = im.size
         transformed = im.transform(
@@ -55,7 +64,7 @@ def test_extent(self):
         # undone -- precision?
         assert_image_similar(transformed, scaled, 23)
 
-    def test_quad(self):
+    def test_quad(self) -> None:
         # one simple quad transform, equivalent to scale & crop upper left quad
         im = hopper("RGB")
         (w, h) = im.size
@@ -83,7 +92,7 @@ def test_quad(self):
             ("LA", (76, 0)),
         ),
     )
-    def test_fill(self, mode, expected_pixel):
+    def test_fill(self, mode: str, expected_pixel: tuple[int, ...]) -> None:
         im = hopper(mode)
         (w, h) = im.size
         transformed = im.transform(
@@ -95,7 +104,7 @@ def test_fill(self, mode, expected_pixel):
         )
         assert transformed.getpixel((w - 1, h - 1)) == expected_pixel
 
-    def test_mesh(self):
+    def test_mesh(self) -> None:
         # this should be a checkerboard of halfsized hoppers in ul, lr
         im = hopper("RGBA")
         (w, h) = im.size
@@ -134,7 +143,9 @@ def test_mesh(self):
         assert_image_equal(blank, transformed.crop((w // 2, 0, w, h // 2)))
         assert_image_equal(blank, transformed.crop((0, h // 2, w // 2, h)))
 
-    def _test_alpha_premult(self, op):
+    def _test_alpha_premult(
+        self, op: Callable[[Image.Image, tuple[int, int]], Image.Image]
+    ) -> None:
         # create image with half white, half black,
         # with the black half transparent.
         # do op,
@@ -150,14 +161,14 @@ def _test_alpha_premult(self, op):
         hist = im_background.histogram()
         assert 40 * 10 == hist[-1]
 
-    def test_alpha_premult_resize(self):
-        def op(im, sz):
+    def test_alpha_premult_resize(self) -> None:
+        def op(im: Image.Image, sz: tuple[int, int]) -> Image.Image:
             return im.resize(sz, Image.Resampling.BILINEAR)
 
         self._test_alpha_premult(op)
 
-    def test_alpha_premult_transform(self):
-        def op(im, sz):
+    def test_alpha_premult_transform(self) -> None:
+        def op(im: Image.Image, sz: tuple[int, int]) -> Image.Image:
             (w, h) = im.size
             return im.transform(
                 sz, Image.Transform.EXTENT, (0, 0, w, h), Image.Resampling.BILINEAR
@@ -165,7 +176,9 @@ def op(im, sz):
 
         self._test_alpha_premult(op)
 
-    def _test_nearest(self, op, mode):
+    def _test_nearest(
+        self, op: Callable[[Image.Image, tuple[int, int]], Image.Image], mode: str
+    ) -> None:
         # create white image with half transparent,
         # do op,
         # the image should remain white with half transparent
@@ -179,8 +192,9 @@ def _test_nearest(self, op, mode):
 
         im = op(im, (40, 10))
 
-        colors = sorted(im.getcolors())
-        assert colors == sorted(
+        colors = im.getcolors()
+        assert colors is not None
+        assert sorted(colors) == sorted(
             (
                 (20 * 10, opaque),
                 (20 * 10, transparent),
@@ -188,15 +202,15 @@ def _test_nearest(self, op, mode):
         )
 
     @pytest.mark.parametrize("mode", ("RGBA", "LA"))
-    def test_nearest_resize(self, mode):
-        def op(im, sz):
+    def test_nearest_resize(self, mode: str) -> None:
+        def op(im: Image.Image, sz: tuple[int, int]) -> Image.Image:
             return im.resize(sz, Image.Resampling.NEAREST)
 
         self._test_nearest(op, mode)
 
     @pytest.mark.parametrize("mode", ("RGBA", "LA"))
-    def test_nearest_transform(self, mode):
-        def op(im, sz):
+    def test_nearest_transform(self, mode: str) -> None:
+        def op(im: Image.Image, sz: tuple[int, int]) -> Image.Image:
             (w, h) = im.size
             return im.transform(
                 sz, Image.Transform.EXTENT, (0, 0, w, h), Image.Resampling.NEAREST
@@ -204,7 +218,7 @@ def op(im, sz):
 
         self._test_nearest(op, mode)
 
-    def test_blank_fill(self):
+    def test_blank_fill(self) -> None:
         # attempting to hit
         # https://github.com/python-pillow/Pillow/issues/254 reported
         #
@@ -219,20 +233,22 @@ def test_blank_fill(self):
         # Running by default, but I'd totally understand not doing it in
         # the future
 
-        pattern = [Image.new("RGBA", (1024, 1024), (a, a, a, a)) for a in range(1, 65)]
+        pattern: list[Image.Image] | None = [
+            Image.new("RGBA", (1024, 1024), (a, a, a, a)) for a in range(1, 65)
+        ]
 
         # Yeah. Watch some JIT optimize this out.
         pattern = None  # noqa: F841
 
         self.test_mesh()
 
-    def test_missing_method_data(self):
+    def test_missing_method_data(self) -> None:
         with hopper() as im:
             with pytest.raises(ValueError):
                 im.transform((100, 100), None)
 
     @pytest.mark.parametrize("resample", (Image.Resampling.BOX, "unknown"))
-    def test_unknown_resampling_filter(self, resample):
+    def test_unknown_resampling_filter(self, resample: Image.Resampling | str) -> None:
         with hopper() as im:
             (w, h) = im.size
             with pytest.raises(ValueError):
@@ -242,7 +258,7 @@ def test_unknown_resampling_filter(self, resample):
 class TestImageTransformAffine:
     transform = Image.Transform.AFFINE
 
-    def _test_image(self):
+    def _test_image(self) -> Image.Image:
         im = hopper("RGB")
         return im.crop((10, 20, im.width - 10, im.height - 20))
 
@@ -255,7 +271,7 @@ def _test_image(self):
             (270, Image.Transpose.ROTATE_270),
         ),
     )
-    def test_rotate(self, deg, transpose):
+    def test_rotate(self, deg: int, transpose: Image.Transpose | None) -> None:
         im = self._test_image()
 
         angle = -math.radians(deg)
@@ -305,7 +321,13 @@ def test_rotate(self, deg, transpose):
             (Image.Resampling.BICUBIC, 1),
         ),
     )
-    def test_resize(self, scale, epsilon_scale, resample, epsilon):
+    def test_resize(
+        self,
+        scale: float,
+        epsilon_scale: float,
+        resample: Image.Resampling,
+        epsilon: int,
+    ) -> None:
         im = self._test_image()
 
         size_up = int(round(im.width * scale)), int(round(im.height * scale))
@@ -334,7 +356,14 @@ def test_resize(self, scale, epsilon_scale, resample, epsilon):
             (Image.Resampling.BICUBIC, 1),
         ),
     )
-    def test_translate(self, x, y, epsilon_scale, resample, epsilon):
+    def test_translate(
+        self,
+        x: float,
+        y: float,
+        epsilon_scale: float,
+        resample: Image.Resampling,
+        epsilon: float,
+    ) -> None:
         im = self._test_image()
 
         size_up = int(round(im.width + x)), int(round(im.height + y))
diff --git a/Tests/test_image_transpose.py b/Tests/test_image_transpose.py
index 66a2d9e2955..d384d81414a 100644
--- a/Tests/test_image_transpose.py
+++ b/Tests/test_image_transpose.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
+
 import pytest
 
+from PIL import Image
 from PIL.Image import Transpose
 
 from . import helper
@@ -13,7 +15,7 @@
 
 
 @pytest.mark.parametrize("mode", HOPPER)
-def test_flip_left_right(mode):
+def test_flip_left_right(mode: str) -> None:
     im = HOPPER[mode]
     out = im.transpose(Transpose.FLIP_LEFT_RIGHT)
     assert out.mode == mode
@@ -27,7 +29,7 @@ def test_flip_left_right(mode):
 
 
 @pytest.mark.parametrize("mode", HOPPER)
-def test_flip_top_bottom(mode):
+def test_flip_top_bottom(mode: str) -> None:
     im = HOPPER[mode]
     out = im.transpose(Transpose.FLIP_TOP_BOTTOM)
     assert out.mode == mode
@@ -41,7 +43,7 @@ def test_flip_top_bottom(mode):
 
 
 @pytest.mark.parametrize("mode", HOPPER)
-def test_rotate_90(mode):
+def test_rotate_90(mode: str) -> None:
     im = HOPPER[mode]
     out = im.transpose(Transpose.ROTATE_90)
     assert out.mode == mode
@@ -55,7 +57,7 @@ def test_rotate_90(mode):
 
 
 @pytest.mark.parametrize("mode", HOPPER)
-def test_rotate_180(mode):
+def test_rotate_180(mode: str) -> None:
     im = HOPPER[mode]
     out = im.transpose(Transpose.ROTATE_180)
     assert out.mode == mode
@@ -69,7 +71,7 @@ def test_rotate_180(mode):
 
 
 @pytest.mark.parametrize("mode", HOPPER)
-def test_rotate_270(mode):
+def test_rotate_270(mode: str) -> None:
     im = HOPPER[mode]
     out = im.transpose(Transpose.ROTATE_270)
     assert out.mode == mode
@@ -83,7 +85,7 @@ def test_rotate_270(mode):
 
 
 @pytest.mark.parametrize("mode", HOPPER)
-def test_transpose(mode):
+def test_transpose(mode: str) -> None:
     im = HOPPER[mode]
     out = im.transpose(Transpose.TRANSPOSE)
     assert out.mode == mode
@@ -97,7 +99,7 @@ def test_transpose(mode):
 
 
 @pytest.mark.parametrize("mode", HOPPER)
-def test_tranverse(mode):
+def test_tranverse(mode: str) -> None:
     im = HOPPER[mode]
     out = im.transpose(Transpose.TRANSVERSE)
     assert out.mode == mode
@@ -111,10 +113,10 @@ def test_tranverse(mode):
 
 
 @pytest.mark.parametrize("mode", HOPPER)
-def test_roundtrip(mode):
+def test_roundtrip(mode: str) -> None:
     im = HOPPER[mode]
 
-    def transpose(first, second):
+    def transpose(first: Transpose, second: Transpose) -> Image.Image:
         return im.transpose(first).transpose(second)
 
     assert_image_equal(
diff --git a/Tests/test_imagechops.py b/Tests/test_imagechops.py
index 8e3a738d708..4309214f5cc 100644
--- a/Tests/test_imagechops.py
+++ b/Tests/test_imagechops.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from typing import Callable
+
 from PIL import Image, ImageChops
 
 from .helper import assert_image_equal, hopper
@@ -14,7 +17,7 @@
 GRAY = 128
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper("L")
 
     ImageChops.constant(im, 128)
@@ -47,7 +50,7 @@ def test_sanity():
     ImageChops.offset(im, 10, 20)
 
 
-def test_add():
+def test_add() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
@@ -59,7 +62,7 @@ def test_add():
     assert new.getpixel((50, 50)) == ORANGE
 
 
-def test_add_scale_offset():
+def test_add_scale_offset() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
@@ -71,7 +74,7 @@ def test_add_scale_offset():
     assert new.getpixel((50, 50)) == (202, 151, 100)
 
 
-def test_add_clip():
+def test_add_clip() -> None:
     # Arrange
     im = hopper()
 
@@ -82,7 +85,7 @@ def test_add_clip():
     assert new.getpixel((50, 50)) == (255, 255, 254)
 
 
-def test_add_modulo():
+def test_add_modulo() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
@@ -94,7 +97,7 @@ def test_add_modulo():
     assert new.getpixel((50, 50)) == ORANGE
 
 
-def test_add_modulo_no_clip():
+def test_add_modulo_no_clip() -> None:
     # Arrange
     im = hopper()
 
@@ -105,7 +108,7 @@ def test_add_modulo_no_clip():
     assert new.getpixel((50, 50)) == (224, 76, 254)
 
 
-def test_blend():
+def test_blend() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
@@ -117,7 +120,7 @@ def test_blend():
     assert new.getpixel((50, 50)) == BROWN
 
 
-def test_constant():
+def test_constant() -> None:
     # Arrange
     im = Image.new("RGB", (20, 10))
 
@@ -130,7 +133,7 @@ def test_constant():
     assert new.getpixel((19, 9)) == GRAY
 
 
-def test_darker_image():
+def test_darker_image() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
@@ -141,7 +144,7 @@ def test_darker_image():
             assert_image_equal(new, im2)
 
 
-def test_darker_pixel():
+def test_darker_pixel() -> None:
     # Arrange
     im1 = hopper()
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im2:
@@ -152,7 +155,7 @@ def test_darker_pixel():
     assert new.getpixel((50, 50)) == (240, 166, 0)
 
 
-def test_difference():
+def test_difference() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_arc_end_le_start.png") as im1:
         with Image.open("Tests/images/imagedraw_arc_no_loops.png") as im2:
@@ -163,7 +166,7 @@ def test_difference():
     assert new.getbbox() == (25, 25, 76, 76)
 
 
-def test_difference_pixel():
+def test_difference_pixel() -> None:
     # Arrange
     im1 = hopper()
     with Image.open("Tests/images/imagedraw_polygon_kite_RGB.png") as im2:
@@ -174,7 +177,7 @@ def test_difference_pixel():
     assert new.getpixel((50, 50)) == (240, 166, 128)
 
 
-def test_duplicate():
+def test_duplicate() -> None:
     # Arrange
     im = hopper()
 
@@ -185,7 +188,7 @@ def test_duplicate():
     assert_image_equal(new, im)
 
 
-def test_invert():
+def test_invert() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im:
         # Act
@@ -197,7 +200,7 @@ def test_invert():
     assert new.getpixel((50, 50)) == CYAN
 
 
-def test_lighter_image():
+def test_lighter_image() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
@@ -208,7 +211,7 @@ def test_lighter_image():
         assert_image_equal(new, im1)
 
 
-def test_lighter_pixel():
+def test_lighter_pixel() -> None:
     # Arrange
     im1 = hopper()
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im2:
@@ -219,7 +222,7 @@ def test_lighter_pixel():
     assert new.getpixel((50, 50)) == (255, 255, 127)
 
 
-def test_multiply_black():
+def test_multiply_black() -> None:
     """If you multiply an image with a solid black image,
     the result is black."""
     # Arrange
@@ -233,7 +236,7 @@ def test_multiply_black():
     assert_image_equal(new, black)
 
 
-def test_multiply_green():
+def test_multiply_green() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im:
         green = Image.new("RGB", im.size, "green")
@@ -247,7 +250,7 @@ def test_multiply_green():
     assert new.getpixel((50, 50)) == BLACK
 
 
-def test_multiply_white():
+def test_multiply_white() -> None:
     """If you multiply with a solid white image, the image is unaffected."""
     # Arrange
     im1 = hopper()
@@ -260,7 +263,7 @@ def test_multiply_white():
     assert_image_equal(new, im1)
 
 
-def test_offset():
+def test_offset() -> None:
     # Arrange
     xoffset = 45
     yoffset = 20
@@ -277,7 +280,7 @@ def test_offset():
         assert ImageChops.offset(im, xoffset) == ImageChops.offset(im, xoffset, xoffset)
 
 
-def test_screen():
+def test_screen() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
@@ -289,7 +292,7 @@ def test_screen():
     assert new.getpixel((50, 50)) == ORANGE
 
 
-def test_subtract():
+def test_subtract() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
@@ -302,7 +305,7 @@ def test_subtract():
     assert new.getpixel((50, 52)) == BLACK
 
 
-def test_subtract_scale_offset():
+def test_subtract_scale_offset() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
@@ -314,7 +317,7 @@ def test_subtract_scale_offset():
     assert new.getpixel((50, 50)) == (100, 202, 100)
 
 
-def test_subtract_clip():
+def test_subtract_clip() -> None:
     # Arrange
     im1 = hopper()
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im2:
@@ -325,7 +328,7 @@ def test_subtract_clip():
     assert new.getpixel((50, 50)) == (0, 0, 127)
 
 
-def test_subtract_modulo():
+def test_subtract_modulo() -> None:
     # Arrange
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
         with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
@@ -338,7 +341,7 @@ def test_subtract_modulo():
     assert new.getpixel((50, 52)) == BLACK
 
 
-def test_subtract_modulo_no_clip():
+def test_subtract_modulo_no_clip() -> None:
     # Arrange
     im1 = hopper()
     with Image.open("Tests/images/imagedraw_chord_RGB.png") as im2:
@@ -349,7 +352,7 @@ def test_subtract_modulo_no_clip():
     assert new.getpixel((50, 50)) == (241, 167, 127)
 
 
-def test_soft_light():
+def test_soft_light() -> None:
     # Arrange
     with Image.open("Tests/images/hopper.png") as im1:
         with Image.open("Tests/images/hopper-XYZ.png") as im2:
@@ -361,7 +364,7 @@ def test_soft_light():
     assert new.getpixel((15, 100)) == (1, 1, 3)
 
 
-def test_hard_light():
+def test_hard_light() -> None:
     # Arrange
     with Image.open("Tests/images/hopper.png") as im1:
         with Image.open("Tests/images/hopper-XYZ.png") as im2:
@@ -373,7 +376,7 @@ def test_hard_light():
     assert new.getpixel((15, 100)) == (1, 1, 2)
 
 
-def test_overlay():
+def test_overlay() -> None:
     # Arrange
     with Image.open("Tests/images/hopper.png") as im1:
         with Image.open("Tests/images/hopper-XYZ.png") as im2:
@@ -385,24 +388,29 @@ def test_overlay():
     assert new.getpixel((15, 100)) == (1, 1, 2)
 
 
-def test_logical():
-    def table(op, a, b):
+def test_logical() -> None:
+    def table(
+        op: Callable[[Image.Image, Image.Image], Image.Image], a: int, b: int
+    ) -> list[float]:
         out = []
         for x in (a, b):
             imx = Image.new("1", (1, 1), x)
             for y in (a, b):
                 imy = Image.new("1", (1, 1), y)
-                out.append(op(imx, imy).getpixel((0, 0)))
-        return tuple(out)
-
-    assert table(ImageChops.logical_and, 0, 1) == (0, 0, 0, 255)
-    assert table(ImageChops.logical_or, 0, 1) == (0, 255, 255, 255)
-    assert table(ImageChops.logical_xor, 0, 1) == (0, 255, 255, 0)
-
-    assert table(ImageChops.logical_and, 0, 128) == (0, 0, 0, 255)
-    assert table(ImageChops.logical_or, 0, 128) == (0, 255, 255, 255)
-    assert table(ImageChops.logical_xor, 0, 128) == (0, 255, 255, 0)
-
-    assert table(ImageChops.logical_and, 0, 255) == (0, 0, 0, 255)
-    assert table(ImageChops.logical_or, 0, 255) == (0, 255, 255, 255)
-    assert table(ImageChops.logical_xor, 0, 255) == (0, 255, 255, 0)
+                value = op(imx, imy).getpixel((0, 0))
+                assert not isinstance(value, tuple)
+                assert value is not None
+                out.append(value)
+        return out
+
+    assert table(ImageChops.logical_and, 0, 1) == [0, 0, 0, 255]
+    assert table(ImageChops.logical_or, 0, 1) == [0, 255, 255, 255]
+    assert table(ImageChops.logical_xor, 0, 1) == [0, 255, 255, 0]
+
+    assert table(ImageChops.logical_and, 0, 128) == [0, 0, 0, 255]
+    assert table(ImageChops.logical_or, 0, 128) == [0, 255, 255, 255]
+    assert table(ImageChops.logical_xor, 0, 128) == [0, 255, 255, 0]
+
+    assert table(ImageChops.logical_and, 0, 255) == [0, 0, 0, 255]
+    assert table(ImageChops.logical_or, 0, 255) == [0, 255, 255, 255]
+    assert table(ImageChops.logical_xor, 0, 255) == [0, 255, 255, 0]
diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py
index 0dde82bd748..f062651f0c5 100644
--- a/Tests/test_imagecms.py
+++ b/Tests/test_imagecms.py
@@ -1,13 +1,17 @@
 from __future__ import annotations
+
 import datetime
 import os
 import re
 import shutil
+import sys
 from io import BytesIO
+from pathlib import Path
+from typing import Any, Literal, cast
 
 import pytest
 
-from PIL import Image, ImageMode, features
+from PIL import Image, ImageMode, ImageWin, features
 
 from .helper import (
     assert_image,
@@ -15,6 +19,7 @@
     assert_image_similar,
     assert_image_similar_tofile,
     hopper,
+    is_pypy,
 )
 
 try:
@@ -31,7 +36,7 @@
 HAVE_PROFILE = os.path.exists(SRGB)
 
 
-def setup_module():
+def setup_module() -> None:
     try:
         from PIL import ImageCms
 
@@ -41,24 +46,27 @@ def setup_module():
         pytest.skip(str(v))
 
 
-def skip_missing():
+def skip_missing() -> None:
     if not HAVE_PROFILE:
         pytest.skip("SRGB profile not available")
 
 
-def test_sanity():
+def test_sanity() -> None:
     # basic smoke test.
     # this mostly follows the cms_test outline.
-
-    v = ImageCms.versions()  # should return four strings
+    with pytest.warns(DeprecationWarning):
+        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
-    assert re.search(r"\d+\.\d+(\.\d+)?$", features.version_module("littlecms2"))
+    version = features.version_module("littlecms2")
+    assert version is not None
+    assert re.search(r"\d+\.\d+(\.\d+)?$", version)
 
     skip_missing()
     i = ImageCms.profileToProfile(hopper(), SRGB, SRGB)
+    assert i is not None
     assert_image(i, "RGB", (128, 128))
 
     i = hopper()
@@ -67,30 +75,44 @@ def test_sanity():
 
     t = ImageCms.buildTransform(SRGB, SRGB, "RGB", "RGB")
     i = ImageCms.applyTransform(hopper(), t)
+    assert i is not None
     assert_image(i, "RGB", (128, 128))
 
     with hopper() as i:
         t = ImageCms.buildTransform(SRGB, SRGB, "RGB", "RGB")
         ImageCms.applyTransform(hopper(), t, inPlace=True)
+        assert i is not None
         assert_image(i, "RGB", (128, 128))
 
     p = ImageCms.createProfile("sRGB")
     o = ImageCms.getOpenProfile(SRGB)
     t = ImageCms.buildTransformFromOpenProfiles(p, o, "RGB", "RGB")
     i = ImageCms.applyTransform(hopper(), t)
+    assert i is not None
     assert_image(i, "RGB", (128, 128))
 
     t = ImageCms.buildProofTransform(SRGB, SRGB, SRGB, "RGB", "RGB")
     assert t.inputMode == "RGB"
     assert t.outputMode == "RGB"
     i = ImageCms.applyTransform(hopper(), t)
+    assert i is not None
     assert_image(i, "RGB", (128, 128))
 
     # test PointTransform convenience API
     hopper().point(t)
 
 
-def test_name():
+def test_flags() -> None:
+    assert ImageCms.Flags.NONE.value == 0
+    assert ImageCms.Flags.GRIDPOINTS(0) == ImageCms.Flags.NONE
+    assert ImageCms.Flags.GRIDPOINTS(256) == ImageCms.Flags.NONE
+
+    assert ImageCms.Flags.GRIDPOINTS(255) == (255 << 16)
+    assert ImageCms.Flags.GRIDPOINTS(-1) == ImageCms.Flags.GRIDPOINTS(255)
+    assert ImageCms.Flags.GRIDPOINTS(511) == ImageCms.Flags.GRIDPOINTS(255)
+
+
+def test_name() -> None:
     skip_missing()
     # get profile information for file
     assert (
@@ -99,7 +121,7 @@ def test_name():
     )
 
 
-def test_info():
+def test_info() -> None:
     skip_missing()
     assert ImageCms.getProfileInfo(SRGB).splitlines() == [
         "sRGB IEC61966-2-1 black scaled",
@@ -109,7 +131,7 @@ def test_info():
     ]
 
 
-def test_copyright():
+def test_copyright() -> None:
     skip_missing()
     assert (
         ImageCms.getProfileCopyright(SRGB).strip()
@@ -117,12 +139,12 @@ def test_copyright():
     )
 
 
-def test_manufacturer():
+def test_manufacturer() -> None:
     skip_missing()
     assert ImageCms.getProfileManufacturer(SRGB).strip() == ""
 
 
-def test_model():
+def test_model() -> None:
     skip_missing()
     assert (
         ImageCms.getProfileModel(SRGB).strip()
@@ -130,14 +152,14 @@ def test_model():
     )
 
 
-def test_description():
+def test_description() -> None:
     skip_missing()
     assert (
         ImageCms.getProfileDescription(SRGB).strip() == "sRGB IEC61966-2-1 black scaled"
     )
 
 
-def test_intent():
+def test_intent() -> None:
     skip_missing()
     assert ImageCms.getDefaultIntent(SRGB) == 0
     support = ImageCms.isIntentSupported(
@@ -146,7 +168,7 @@ def test_intent():
     assert support == 1
 
 
-def test_profile_object():
+def test_profile_object() -> None:
     # same, using profile object
     p = ImageCms.createProfile("sRGB")
     # assert ImageCms.getProfileName(p).strip() == "sRGB built-in - (lcms internal)"
@@ -159,7 +181,7 @@ def test_profile_object():
     assert support == 1
 
 
-def test_extensions():
+def test_extensions() -> None:
     # extensions
 
     with Image.open("Tests/images/rgb.jpg") as i:
@@ -170,7 +192,7 @@ def test_extensions():
     )
 
 
-def test_exceptions():
+def test_exceptions() -> None:
     # Test mode mismatch
     psRGB = ImageCms.createProfile("sRGB")
     pLab = ImageCms.createProfile("LAB")
@@ -187,53 +209,57 @@ def test_exceptions():
         ImageCms.buildTransform("foo", "bar", "RGB", "RGB")
 
     with pytest.raises(ImageCms.PyCMSError, match="Invalid type for Profile"):
-        ImageCms.getProfileName(None)
+        ImageCms.getProfileName(None)  # type: ignore[arg-type]
     skip_missing()
 
     # Python <= 3.9: "an integer is required (got type NoneType)"
     # Python > 3.9: "'NoneType' object cannot be interpreted as an integer"
     with pytest.raises(ImageCms.PyCMSError, match="integer"):
-        ImageCms.isIntentSupported(SRGB, None, None)
+        ImageCms.isIntentSupported(SRGB, None, None)  # type: ignore[arg-type]
 
 
-def test_display_profile():
+def test_display_profile() -> None:
     # try fetching the profile for the current display device
     ImageCms.get_display_profile()
 
+    if sys.platform == "win32":
+        ImageCms.get_display_profile(ImageWin.HDC(0))
+        ImageCms.get_display_profile(ImageWin.HWND(0))
 
-def test_lab_color_profile():
+
+def test_lab_color_profile() -> None:
     ImageCms.createProfile("LAB", 5000)
     ImageCms.createProfile("LAB", 6500)
 
 
-def test_unsupported_color_space():
+def test_unsupported_color_space() -> None:
     with pytest.raises(
         ImageCms.PyCMSError,
         match=re.escape(
             "Color space not supported for on-the-fly profile creation (unsupported)"
         ),
     ):
-        ImageCms.createProfile("unsupported")
+        ImageCms.createProfile("unsupported")  # type: ignore[arg-type]
 
 
-def test_invalid_color_temperature():
+def test_invalid_color_temperature() -> None:
     with pytest.raises(
         ImageCms.PyCMSError,
         match='Color temperature must be numeric, "invalid" not valid',
     ):
-        ImageCms.createProfile("LAB", "invalid")
+        ImageCms.createProfile("LAB", "invalid")  # type: ignore[arg-type]
 
 
 @pytest.mark.parametrize("flag", ("my string", -1))
-def test_invalid_flag(flag):
+def test_invalid_flag(flag: str | int) -> None:
     with hopper() as im:
         with pytest.raises(
             ImageCms.PyCMSError, match="flags must be an integer between 0 and "
         ):
-            ImageCms.profileToProfile(im, "foo", "bar", flags=flag)
+            ImageCms.profileToProfile(im, "foo", "bar", flags=flag)  # type: ignore[arg-type]
 
 
-def test_simple_lab():
+def test_simple_lab() -> None:
     i = Image.new("RGB", (10, 10), (128, 128, 128))
 
     psRGB = ImageCms.createProfile("sRGB")
@@ -241,7 +267,7 @@ def test_simple_lab():
     t = ImageCms.buildTransform(psRGB, pLab, "RGB", "LAB")
 
     i_lab = ImageCms.applyTransform(i, t)
-
+    assert i_lab is not None
     assert i_lab.mode == "LAB"
 
     k = i_lab.getpixel((0, 0))
@@ -257,7 +283,7 @@ def test_simple_lab():
     assert list(b_data) == [128] * 100
 
 
-def test_lab_color():
+def test_lab_color() -> None:
     psRGB = ImageCms.createProfile("sRGB")
     pLab = ImageCms.createProfile("LAB")
     t = ImageCms.buildTransform(psRGB, pLab, "RGB", "LAB")
@@ -265,6 +291,7 @@ def test_lab_color():
     # Need to add a type mapping for some PIL type to TYPE_Lab_8 in findLCMSType, and
     # have that mapping work back to a PIL mode (likely RGB).
     i = ImageCms.applyTransform(hopper(), t)
+    assert i is not None
     assert_image(i, "LAB", (128, 128))
 
     # i.save('temp.lab.tif')  # visually verified vs PS.
@@ -272,13 +299,14 @@ def test_lab_color():
     assert_image_similar_tofile(i, "Tests/images/hopper.Lab.tif", 3.5)
 
 
-def test_lab_srgb():
+def test_lab_srgb() -> None:
     psRGB = ImageCms.createProfile("sRGB")
     pLab = ImageCms.createProfile("LAB")
     t = ImageCms.buildTransform(pLab, psRGB, "LAB", "RGB")
 
     with Image.open("Tests/images/hopper.Lab.tif") as img:
         img_srgb = ImageCms.applyTransform(img, t)
+    assert img_srgb is not None
 
     # img_srgb.save('temp.srgb.tif') # visually verified vs ps.
 
@@ -289,7 +317,7 @@ def test_lab_srgb():
     assert "sRGB" in ImageCms.getProfileDescription(profile)
 
 
-def test_lab_roundtrip():
+def test_lab_roundtrip() -> None:
     # check to see if we're at least internally consistent.
     psRGB = ImageCms.createProfile("sRGB")
     pLab = ImageCms.createProfile("LAB")
@@ -298,15 +326,15 @@ def test_lab_roundtrip():
     t2 = ImageCms.buildTransform(pLab, psRGB, "LAB", "RGB")
 
     i = ImageCms.applyTransform(hopper(), t)
-
+    assert i is not None
     assert i.info["icc_profile"] == ImageCmsProfile(pLab).tobytes()
 
     out = ImageCms.applyTransform(i, t2)
-
+    assert out is not None
     assert_image_similar(hopper(), out, 2)
 
 
-def test_profile_tobytes():
+def test_profile_tobytes() -> None:
     with Image.open("Tests/images/rgb.jpg") as i:
         p = ImageCms.getOpenProfile(BytesIO(i.info["icc_profile"]))
 
@@ -318,24 +346,29 @@ def test_profile_tobytes():
     assert ImageCms.getProfileDescription(p) == ImageCms.getProfileDescription(p2)
 
 
-def test_extended_information():
+def test_extended_information() -> None:
     skip_missing()
     o = ImageCms.getOpenProfile(SRGB)
     p = o.profile
 
-    def assert_truncated_tuple_equal(tup1, tup2, digits=10):
+    def assert_truncated_tuple_equal(
+        tup1: tuple[Any, ...] | None, tup2: tuple[Any, ...], digits: int = 10
+    ) -> None:
         # Helper function to reduce precision of tuples of floats
         # recursively and then check equality.
         power = 10**digits
 
-        def truncate_tuple(tuple_or_float):
+        def truncate_tuple(tuple_value: tuple[Any, ...]) -> tuple[Any, ...]:
             return tuple(
-                truncate_tuple(val)
-                if isinstance(val, tuple)
-                else int(val * power) / power
-                for val in tuple_or_float
+                (
+                    truncate_tuple(val)
+                    if isinstance(val, tuple)
+                    else int(val * power) / power
+                )
+                for val in tuple_value
             )
 
+        assert tup1 is not None
         assert truncate_tuple(tup1) == truncate_tuple(tup2)
 
     assert p.attributes == 4294967296
@@ -465,7 +498,7 @@ def truncate_tuple(tuple_or_float):
     assert p.xcolor_space == "RGB "
 
 
-def test_non_ascii_path(tmp_path):
+def test_non_ascii_path(tmp_path: Path) -> None:
     skip_missing()
     tempfile = str(tmp_path / ("temp_" + chr(128) + ".icc"))
     try:
@@ -478,20 +511,40 @@ def test_non_ascii_path(tmp_path):
     assert p.model == "IEC 61966-2-1 Default RGB Colour Space - sRGB"
 
 
-def test_profile_typesafety():
-    """Profile init type safety
-
-    prepatch, these would segfault, postpatch they should emit a typeerror
-    """
-
+def test_profile_typesafety() -> None:
+    # does not segfault
     with pytest.raises(TypeError, match="Invalid type for Profile"):
-        ImageCms.ImageCmsProfile(0).tobytes()
+        ImageCms.ImageCmsProfile(0)  # type: ignore[arg-type]
     with pytest.raises(TypeError, match="Invalid type for Profile"):
-        ImageCms.ImageCmsProfile(1).tobytes()
-
-
-def assert_aux_channel_preserved(mode, transform_in_place, preserved_channel):
-    def create_test_image():
+        ImageCms.ImageCmsProfile(1)  # type: ignore[arg-type]
+
+    # also check core function
+    with pytest.raises(TypeError):
+        ImageCms.core.profile_tobytes(0)  # type: ignore[arg-type]
+    with pytest.raises(TypeError):
+        ImageCms.core.profile_tobytes(1)  # type: ignore[arg-type]
+
+    if not is_pypy():
+        # core profile should not be directly instantiable
+        with pytest.raises(TypeError):
+            ImageCms.core.CmsProfile()
+        with pytest.raises(TypeError):
+            ImageCms.core.CmsProfile(0)  # type: ignore[call-arg]
+
+
+@pytest.mark.skipif(is_pypy(), reason="fails on PyPy")
+def test_transform_typesafety() -> None:
+    # core transform should not be directly instantiable
+    with pytest.raises(TypeError):
+        ImageCms.core.CmsTransform()
+    with pytest.raises(TypeError):
+        ImageCms.core.CmsTransform(0)  # type: ignore[call-arg]
+
+
+def assert_aux_channel_preserved(
+    mode: str, transform_in_place: bool, preserved_channel: str
+) -> None:
+    def create_test_image() -> Image.Image:
         # set up test image with something interesting in the tested aux channel.
         # fmt: off
         nine_grid_deltas = [
@@ -516,9 +569,9 @@ def create_test_image():
             for delta in nine_grid_deltas:
                 channel_data.paste(
                     channel_pattern,
-                    tuple(
-                        paste_offset[c] + delta[c] * channel_pattern.size[c]
-                        for c in range(2)
+                    (
+                        paste_offset[0] + delta[0] * channel_pattern.size[0],
+                        paste_offset[1] + delta[1] * channel_pattern.size[1],
                     ),
                 )
             chans.append(channel_data)
@@ -535,41 +588,43 @@ def create_test_image():
     )
 
     # apply transform
+    result_image: Image.Image | None
     if transform_in_place:
         ImageCms.applyTransform(source_image, t, inPlace=True)
         result_image = source_image
     else:
         result_image = ImageCms.applyTransform(source_image, t, inPlace=False)
+    assert result_image is not None
     result_image_aux = result_image.getchannel(preserved_channel)
 
     assert_image_equal(source_image_aux, result_image_aux)
 
 
-def test_preserve_auxiliary_channels_rgba():
+def test_preserve_auxiliary_channels_rgba() -> None:
     assert_aux_channel_preserved(
         mode="RGBA", transform_in_place=False, preserved_channel="A"
     )
 
 
-def test_preserve_auxiliary_channels_rgba_in_place():
+def test_preserve_auxiliary_channels_rgba_in_place() -> None:
     assert_aux_channel_preserved(
         mode="RGBA", transform_in_place=True, preserved_channel="A"
     )
 
 
-def test_preserve_auxiliary_channels_rgbx():
+def test_preserve_auxiliary_channels_rgbx() -> None:
     assert_aux_channel_preserved(
         mode="RGBX", transform_in_place=False, preserved_channel="X"
     )
 
 
-def test_preserve_auxiliary_channels_rgbx_in_place():
+def test_preserve_auxiliary_channels_rgbx_in_place() -> None:
     assert_aux_channel_preserved(
         mode="RGBX", transform_in_place=True, preserved_channel="X"
     )
 
 
-def test_auxiliary_channels_isolated():
+def test_auxiliary_channels_isolated() -> None:
     # test data in aux channels does not affect non-aux channels
     aux_channel_formats = [
         # format, profile, color-only format, source test image
@@ -585,8 +640,10 @@ def test_auxiliary_channels_isolated():
                     continue
 
                 # convert with and without AUX data, test colors are equal
-                source_profile = ImageCms.createProfile(src_format[1])
-                destination_profile = ImageCms.createProfile(dst_format[1])
+                src_colorSpace = cast(Literal["LAB", "XYZ", "sRGB"], src_format[1])
+                source_profile = ImageCms.createProfile(src_colorSpace)
+                dst_colorSpace = cast(Literal["LAB", "XYZ", "sRGB"], dst_format[1])
+                destination_profile = ImageCms.createProfile(dst_colorSpace)
                 source_image = src_format[3]
                 test_transform = ImageCms.buildTransform(
                     source_profile,
@@ -596,6 +653,7 @@ def test_auxiliary_channels_isolated():
                 )
 
                 # test conversion from aux-ful source
+                test_image: Image.Image | None
                 if transform_in_place:
                     test_image = source_image.copy()
                     ImageCms.applyTransform(test_image, test_transform, inPlace=True)
@@ -603,6 +661,7 @@ def test_auxiliary_channels_isolated():
                     test_image = ImageCms.applyTransform(
                         source_image, test_transform, inPlace=False
                     )
+                assert test_image is not None
 
                 # reference conversion from aux-less source
                 reference_transform = ImageCms.buildTransform(
@@ -614,16 +673,45 @@ def test_auxiliary_channels_isolated():
                 reference_image = ImageCms.applyTransform(
                     source_image.convert(src_format[2]), reference_transform
                 )
-
+                assert reference_image is not None
                 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):
+        ImageCms.buildTransform(p, p, "ABCDEFGHI", "ABCDEFGHI")
+
+
 @pytest.mark.parametrize("mode", ("RGB", "RGBA", "RGBX"))
-def test_rgb_lab(mode):
+def test_rgb_lab(mode: str) -> None:
     im = Image.new(mode, (1, 1))
     converted_im = im.convert("LAB")
     assert converted_im.getpixel((0, 0)) == (0, 128, 128)
 
     im = Image.new("LAB", (1, 1), (255, 0, 0))
     converted_im = im.convert(mode)
-    assert converted_im.getpixel((0, 0))[:3] == (0, 255, 255)
+    value = converted_im.getpixel((0, 0))
+    assert isinstance(value, tuple)
+    assert value[:3] == (0, 255, 255)
+
+
+def test_cmyk_lab() -> None:
+    im = Image.new("CMYK", (1, 1))
+    converted_im = im.convert("LAB")
+    assert converted_im.getpixel((0, 0)) == (255, 128, 128)
+
+
+def test_deprecation() -> None:
+    with pytest.warns(DeprecationWarning):
+        assert ImageCms.DESCRIPTION.strip().startswith("pyCMS")
+    with pytest.warns(DeprecationWarning):
+        assert ImageCms.VERSION == "1.0.0 pil"
+    with pytest.warns(DeprecationWarning):
+        assert isinstance(ImageCms.FLAGS, dict)
+
+    profile = ImageCmsProfile(ImageCms.createProfile("sRGB"))
+    with pytest.warns(DeprecationWarning):
+        ImageCms.ImageCmsTransform(profile, profile, "RGBA;16B", "RGB")
+    with pytest.warns(DeprecationWarning):
+        ImageCms.ImageCmsTransform(profile, profile, "RGB", "RGBA;16B")
diff --git a/Tests/test_imagecolor.py b/Tests/test_imagecolor.py
index c0ffd2ebf0b..6eea7886dd8 100644
--- a/Tests/test_imagecolor.py
+++ b/Tests/test_imagecolor.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageColor
 
 
-def test_hash():
+def test_hash() -> None:
     # short 3 components
     assert (255, 0, 0) == ImageColor.getrgb("#f00")
     assert (0, 255, 0) == ImageColor.getrgb("#0f0")
@@ -56,7 +57,7 @@ def test_hash():
         ImageColor.getrgb("#f00000 ")
 
 
-def test_colormap():
+def test_colormap() -> None:
     assert (0, 0, 0) == ImageColor.getrgb("black")
     assert (255, 255, 255) == ImageColor.getrgb("white")
     assert (255, 255, 255) == ImageColor.getrgb("WHITE")
@@ -65,7 +66,7 @@ def test_colormap():
         ImageColor.getrgb("black ")
 
 
-def test_functions():
+def test_functions() -> None:
     # rgb numbers
     assert (255, 0, 0) == ImageColor.getrgb("rgb(255,0,0)")
     assert (0, 255, 0) == ImageColor.getrgb("rgb(0,255,0)")
@@ -159,7 +160,7 @@ def test_functions():
 
 
 # look for rounding errors (based on code by Tim Hatch)
-def test_rounding_errors():
+def test_rounding_errors() -> None:
     for color in ImageColor.colormap:
         expected = Image.new("RGB", (1, 1), color).convert("L").getpixel((0, 0))
         actual = ImageColor.getcolor(color, "L")
@@ -194,11 +195,11 @@ def test_rounding_errors():
     Image.new("LA", (1, 1), "white")
 
 
-def test_color_hsv():
+def test_color_hsv() -> None:
     assert (170, 255, 255) == ImageColor.getcolor("hsv(240, 100%, 100%)", "HSV")
 
 
-def test_color_too_long():
+def test_color_too_long() -> None:
     # Arrange
     color_too_long = "hsl(" + "1" * 40 + "," + "1" * 40 + "%," + "1" * 40 + "%)"
 
diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
index 379fe78cd8a..ed50dfbedf3 100644
--- a/Tests/test_imagedraw.py
+++ b/Tests/test_imagedraw.py
@@ -1,10 +1,13 @@
 from __future__ import annotations
-import contextlib
+
 import os.path
+from collections.abc import Sequence
+from typing import Callable
 
 import pytest
 
 from PIL import Image, ImageColor, ImageDraw, ImageFont, features
+from PIL._typing import Coords
 
 from .helper import (
     assert_image_equal,
@@ -46,7 +49,7 @@
 )
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper("RGB").copy()
 
     draw = ImageDraw.ImageDraw(im)
@@ -58,13 +61,13 @@ def test_sanity():
     draw.rectangle(list(range(4)))
 
 
-def test_valueerror():
+def test_valueerror() -> None:
     with Image.open("Tests/images/chi.gif") as im:
         draw = ImageDraw.Draw(im)
         draw.line((0, 0), fill=(0, 0, 0))
 
 
-def test_mode_mismatch():
+def test_mode_mismatch() -> None:
     im = hopper("RGB").copy()
 
     with pytest.raises(ValueError):
@@ -73,7 +76,7 @@ def test_mode_mismatch():
 
 @pytest.mark.parametrize("bbox", BBOX)
 @pytest.mark.parametrize("start, end", ((0, 180), (0.5, 180.4)))
-def test_arc(bbox, start, end):
+def test_arc(bbox: Coords, start: float, end: float) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -86,7 +89,7 @@ def test_arc(bbox, start, end):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_arc_end_le_start(bbox):
+def test_arc_end_le_start(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -101,7 +104,7 @@ def test_arc_end_le_start(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_arc_no_loops(bbox):
+def test_arc_no_loops(bbox: Coords) -> None:
     # No need to go in loops
     # Arrange
     im = Image.new("RGB", (W, H))
@@ -117,7 +120,7 @@ def test_arc_no_loops(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_arc_width(bbox):
+def test_arc_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -130,7 +133,7 @@ def test_arc_width(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_arc_width_pieslice_large(bbox):
+def test_arc_width_pieslice_large(bbox: Coords) -> None:
     # Tests an arc with a large enough width that it is a pieslice
     # Arrange
     im = Image.new("RGB", (W, H))
@@ -144,7 +147,7 @@ def test_arc_width_pieslice_large(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_arc_width_fill(bbox):
+def test_arc_width_fill(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -157,7 +160,7 @@ def test_arc_width_fill(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_arc_width_non_whole_angle(bbox):
+def test_arc_width_non_whole_angle(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -170,7 +173,7 @@ def test_arc_width_non_whole_angle(bbox):
     assert_image_similar_tofile(im, expected, 1)
 
 
-def test_arc_high():
+def test_arc_high() -> None:
     # Arrange
     im = Image.new("RGB", (200, 200))
     draw = ImageDraw.Draw(im)
@@ -183,7 +186,7 @@ def test_arc_high():
     assert_image_equal_tofile(im, "Tests/images/imagedraw_arc_high.png")
 
 
-def test_bitmap():
+def test_bitmap() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -199,7 +202,7 @@ def test_bitmap():
 
 @pytest.mark.parametrize("mode", ("RGB", "L"))
 @pytest.mark.parametrize("bbox", BBOX)
-def test_chord(mode, bbox):
+def test_chord(mode: str, bbox: Coords) -> None:
     # Arrange
     im = Image.new(mode, (W, H))
     draw = ImageDraw.Draw(im)
@@ -213,7 +216,7 @@ def test_chord(mode, bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_chord_width(bbox):
+def test_chord_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -226,7 +229,7 @@ def test_chord_width(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_chord_width_fill(bbox):
+def test_chord_width_fill(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -239,7 +242,7 @@ def test_chord_width_fill(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_chord_zero_width(bbox):
+def test_chord_zero_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -251,7 +254,7 @@ def test_chord_zero_width(bbox):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_chord_zero_width.png")
 
 
-def test_chord_too_fat():
+def test_chord_too_fat() -> None:
     # Arrange
     im = Image.new("RGB", (100, 100))
     draw = ImageDraw.Draw(im)
@@ -263,9 +266,24 @@ def test_chord_too_fat():
     assert_image_equal_tofile(im, "Tests/images/imagedraw_chord_too_fat.png")
 
 
+@pytest.mark.parametrize("mode", ("RGB", "L"))
+@pytest.mark.parametrize("xy", ((W / 2, H / 2), [W / 2, H / 2]))
+def test_circle(mode: str, xy: Sequence[float]) -> None:
+    # Arrange
+    im = Image.new(mode, (W, H))
+    draw = ImageDraw.Draw(im)
+    expected = f"Tests/images/imagedraw_ellipse_{mode}.png"
+
+    # Act
+    draw.circle(xy, 25, fill="green", outline="blue")
+
+    # Assert
+    assert_image_similar_tofile(im, expected, 1)
+
+
 @pytest.mark.parametrize("mode", ("RGB", "L"))
 @pytest.mark.parametrize("bbox", BBOX)
-def test_ellipse(mode, bbox):
+def test_ellipse(mode: str, bbox: Coords) -> None:
     # Arrange
     im = Image.new(mode, (W, H))
     draw = ImageDraw.Draw(im)
@@ -279,7 +297,7 @@ def test_ellipse(mode, bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_ellipse_translucent(bbox):
+def test_ellipse_translucent(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im, "RGBA")
@@ -292,7 +310,7 @@ def test_ellipse_translucent(bbox):
     assert_image_similar_tofile(im, expected, 1)
 
 
-def test_ellipse_edge():
+def test_ellipse_edge() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -304,7 +322,7 @@ def test_ellipse_edge():
     assert_image_similar_tofile(im, "Tests/images/imagedraw_ellipse_edge.png", 1)
 
 
-def test_ellipse_symmetric():
+def test_ellipse_symmetric() -> None:
     for width, bbox in (
         (100, (24, 24, 75, 75)),
         (101, (25, 25, 75, 75)),
@@ -316,7 +334,7 @@ def test_ellipse_symmetric():
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_ellipse_width(bbox):
+def test_ellipse_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -328,7 +346,7 @@ def test_ellipse_width(bbox):
     assert_image_similar_tofile(im, "Tests/images/imagedraw_ellipse_width.png", 1)
 
 
-def test_ellipse_width_large():
+def test_ellipse_width_large() -> None:
     # Arrange
     im = Image.new("RGB", (500, 500))
     draw = ImageDraw.Draw(im)
@@ -341,7 +359,7 @@ def test_ellipse_width_large():
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_ellipse_width_fill(bbox):
+def test_ellipse_width_fill(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -354,7 +372,7 @@ def test_ellipse_width_fill(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_ellipse_zero_width(bbox):
+def test_ellipse_zero_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -366,7 +384,7 @@ def test_ellipse_zero_width(bbox):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_ellipse_zero_width.png")
 
 
-def ellipse_various_sizes_helper(filled):
+def ellipse_various_sizes_helper(filled: bool) -> Image.Image:
     ellipse_sizes = range(32)
     image_size = sum(ellipse_sizes) + len(ellipse_sizes) + 1
     im = Image.new("RGB", (image_size, image_size))
@@ -393,13 +411,13 @@ def ellipse_various_sizes_helper(filled):
     return im
 
 
-def test_ellipse_various_sizes():
+def test_ellipse_various_sizes() -> None:
     im = ellipse_various_sizes_helper(False)
 
     assert_image_equal_tofile(im, "Tests/images/imagedraw_ellipse_various_sizes.png")
 
 
-def test_ellipse_various_sizes_filled():
+def test_ellipse_various_sizes_filled() -> None:
     im = ellipse_various_sizes_helper(True)
 
     assert_image_equal_tofile(
@@ -408,7 +426,7 @@ def test_ellipse_various_sizes_filled():
 
 
 @pytest.mark.parametrize("points", POINTS)
-def test_line(points):
+def test_line(points: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -420,7 +438,7 @@ def test_line(points):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_line.png")
 
 
-def test_shape1():
+def test_shape1() -> None:
     # Arrange
     im = Image.new("RGB", (100, 100), "white")
     draw = ImageDraw.Draw(im)
@@ -430,6 +448,7 @@ def test_shape1():
     x3, y3 = 95, 5
 
     # Act
+    assert ImageDraw.Outline is not None
     s = ImageDraw.Outline()
     s.move(x0, y0)
     s.curve(x1, y1, x2, y2, x3, y3)
@@ -441,7 +460,7 @@ def test_shape1():
     assert_image_equal_tofile(im, "Tests/images/imagedraw_shape1.png")
 
 
-def test_shape2():
+def test_shape2() -> None:
     # Arrange
     im = Image.new("RGB", (100, 100), "white")
     draw = ImageDraw.Draw(im)
@@ -451,6 +470,7 @@ def test_shape2():
     x3, y3 = 5, 95
 
     # Act
+    assert ImageDraw.Outline is not None
     s = ImageDraw.Outline()
     s.move(x0, y0)
     s.curve(x1, y1, x2, y2, x3, y3)
@@ -462,13 +482,14 @@ def test_shape2():
     assert_image_equal_tofile(im, "Tests/images/imagedraw_shape2.png")
 
 
-def test_transform():
+def test_transform() -> None:
     # Arrange
     im = Image.new("RGB", (100, 100), "white")
     expected = im.copy()
     draw = ImageDraw.Draw(im)
 
     # Act
+    assert ImageDraw.Outline is not None
     s = ImageDraw.Outline()
     s.line(0, 0)
     s.transform((0, 0, 0, 0, 0, 0))
@@ -481,7 +502,7 @@ def test_transform():
 
 @pytest.mark.parametrize("bbox", BBOX)
 @pytest.mark.parametrize("start, end", ((-92, 46), (-92.2, 46.2)))
-def test_pieslice(bbox, start, end):
+def test_pieslice(bbox: Coords, start: float, end: float) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -494,7 +515,7 @@ def test_pieslice(bbox, start, end):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_pieslice_width(bbox):
+def test_pieslice_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -507,7 +528,7 @@ def test_pieslice_width(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_pieslice_width_fill(bbox):
+def test_pieslice_width_fill(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -521,7 +542,7 @@ def test_pieslice_width_fill(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_pieslice_zero_width(bbox):
+def test_pieslice_zero_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -533,7 +554,7 @@ def test_pieslice_zero_width(bbox):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_pieslice_zero_width.png")
 
 
-def test_pieslice_wide():
+def test_pieslice_wide() -> None:
     # Arrange
     im = Image.new("RGB", (200, 100))
     draw = ImageDraw.Draw(im)
@@ -545,7 +566,7 @@ def test_pieslice_wide():
     assert_image_equal_tofile(im, "Tests/images/imagedraw_pieslice_wide.png")
 
 
-def test_pieslice_no_spikes():
+def test_pieslice_no_spikes() -> None:
     im = Image.new("RGB", (161, 161), "white")
     draw = ImageDraw.Draw(im)
     cxs = (
@@ -576,7 +597,7 @@ def test_pieslice_no_spikes():
 
 
 @pytest.mark.parametrize("points", POINTS)
-def test_point(points):
+def test_point(points: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -588,7 +609,7 @@ def test_point(points):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_point.png")
 
 
-def test_point_I16():
+def test_point_I16() -> None:
     # Arrange
     im = Image.new("I;16", (1, 1))
     draw = ImageDraw.Draw(im)
@@ -601,7 +622,7 @@ def test_point_I16():
 
 
 @pytest.mark.parametrize("points", POINTS)
-def test_polygon(points):
+def test_polygon(points: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -613,9 +634,24 @@ def test_polygon(points):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_polygon.png")
 
 
+@pytest.mark.parametrize("points", POINTS)
+def test_polygon_width_I16(points: Coords) -> None:
+    # Arrange
+    im = Image.new("I;16", (W, H))
+    draw = ImageDraw.Draw(im)
+
+    # Act
+    draw.polygon(points, outline=0xFFFF, width=2)
+
+    # Assert
+    assert_image_equal_tofile(im, "Tests/images/imagedraw_polygon_width_I.tiff")
+
+
 @pytest.mark.parametrize("mode", ("RGB", "L"))
 @pytest.mark.parametrize("kite_points", KITE_POINTS)
-def test_polygon_kite(mode, kite_points):
+def test_polygon_kite(
+    mode: str, kite_points: tuple[tuple[int, int], ...] | list[tuple[int, int]]
+) -> None:
     # Test drawing lines of different gradients (dx>dy, dy>dx) and
     # vertical (dx==0) and horizontal (dy==0) lines
     # Arrange
@@ -630,7 +666,7 @@ def test_polygon_kite(mode, kite_points):
     assert_image_equal_tofile(im, expected)
 
 
-def test_polygon_1px_high():
+def test_polygon_1px_high() -> None:
     # Test drawing a 1px high polygon
     # Arrange
     im = Image.new("RGB", (3, 3))
@@ -644,7 +680,7 @@ def test_polygon_1px_high():
     assert_image_equal_tofile(im, expected)
 
 
-def test_polygon_1px_high_translucent():
+def test_polygon_1px_high_translucent() -> None:
     # Test drawing a translucent 1px high polygon
     # Arrange
     im = Image.new("RGB", (4, 3))
@@ -658,7 +694,7 @@ def test_polygon_1px_high_translucent():
     assert_image_equal_tofile(im, expected)
 
 
-def test_polygon_translucent():
+def test_polygon_translucent() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im, "RGBA")
@@ -672,7 +708,7 @@ def test_polygon_translucent():
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_rectangle(bbox):
+def test_rectangle(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -684,7 +720,7 @@ def test_rectangle(bbox):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_rectangle.png")
 
 
-def test_big_rectangle():
+def test_big_rectangle() -> None:
     # Test drawing a rectangle bigger than the image
     # Arrange
     im = Image.new("RGB", (W, H))
@@ -699,7 +735,7 @@ def test_big_rectangle():
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_rectangle_width(bbox):
+def test_rectangle_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -713,7 +749,7 @@ def test_rectangle_width(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_rectangle_width_fill(bbox):
+def test_rectangle_width_fill(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -727,7 +763,7 @@ def test_rectangle_width_fill(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_rectangle_zero_width(bbox):
+def test_rectangle_zero_width(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -740,7 +776,7 @@ def test_rectangle_zero_width(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_rectangle_I16(bbox):
+def test_rectangle_I16(bbox: Coords) -> None:
     # Arrange
     im = Image.new("I;16", (W, H))
     draw = ImageDraw.Draw(im)
@@ -749,11 +785,11 @@ def test_rectangle_I16(bbox):
     draw.rectangle(bbox, outline=0xFFFF)
 
     # Assert
-    assert_image_equal_tofile(im.convert("I"), "Tests/images/imagedraw_rectangle_I.png")
+    assert_image_equal_tofile(im, "Tests/images/imagedraw_rectangle_I.tiff")
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_rectangle_translucent_outline(bbox):
+def test_rectangle_translucent_outline(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im, "RGBA")
@@ -771,7 +807,13 @@ def test_rectangle_translucent_outline(bbox):
     "xy",
     [(10, 20, 190, 180), ([10, 20], [190, 180]), ((10, 20), (190, 180))],
 )
-def test_rounded_rectangle(xy):
+def test_rounded_rectangle(
+    xy: (
+        tuple[int, int, int, int]
+        | tuple[list[int]]
+        | tuple[tuple[int, int], tuple[int, int]]
+    )
+) -> None:
     # Arrange
     im = Image.new("RGB", (200, 200))
     draw = ImageDraw.Draw(im)
@@ -787,7 +829,9 @@ def test_rounded_rectangle(xy):
 @pytest.mark.parametrize("top_right", (True, False))
 @pytest.mark.parametrize("bottom_right", (True, False))
 @pytest.mark.parametrize("bottom_left", (True, False))
-def test_rounded_rectangle_corners(top_left, top_right, bottom_right, bottom_left):
+def test_rounded_rectangle_corners(
+    top_left: bool, top_right: bool, bottom_right: bool, bottom_left: bool
+) -> None:
     corners = (top_left, top_right, bottom_right, bottom_left)
 
     # Arrange
@@ -813,6 +857,27 @@ def test_rounded_rectangle_corners(top_left, top_right, bottom_right, bottom_lef
     )
 
 
+def test_rounded_rectangle_joined_x_different_corners() -> None:
+    # Arrange
+    im = Image.new("RGB", (W, H))
+    draw = ImageDraw.Draw(im, "RGBA")
+
+    # Act
+    draw.rounded_rectangle(
+        (20, 10, 80, 90),
+        30,
+        fill="red",
+        outline="green",
+        width=5,
+        corners=(True, False, False, False),
+    )
+
+    # Assert
+    assert_image_equal_tofile(
+        im, "Tests/images/imagedraw_rounded_rectangle_joined_x_different_corners.png"
+    )
+
+
 @pytest.mark.parametrize(
     "xy, radius, type",
     [
@@ -821,7 +886,9 @@ def test_rounded_rectangle_corners(top_left, top_right, bottom_right, bottom_lef
         ((10, 20, 190, 181), 85, "height"),
     ],
 )
-def test_rounded_rectangle_non_integer_radius(xy, radius, type):
+def test_rounded_rectangle_non_integer_radius(
+    xy: tuple[int, int, int, int], radius: float, type: str
+) -> None:
     # Arrange
     im = Image.new("RGB", (200, 200))
     draw = ImageDraw.Draw(im)
@@ -837,7 +904,7 @@ def test_rounded_rectangle_non_integer_radius(xy, radius, type):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_rounded_rectangle_zero_radius(bbox):
+def test_rounded_rectangle_zero_radius(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -854,12 +921,16 @@ def test_rounded_rectangle_zero_radius(bbox):
     [
         ((20, 10, 80, 90), "x"),
         ((20, 10, 81, 90), "x_odd"),
+        ((20, 10, 81.1, 90), "x_odd"),
         ((10, 20, 90, 80), "y"),
         ((10, 20, 90, 81), "y_odd"),
+        ((10, 20, 90, 81.1), "y_odd"),
         ((20, 20, 80, 80), "both"),
     ],
 )
-def test_rounded_rectangle_translucent(xy, suffix):
+def test_rounded_rectangle_translucent(
+    xy: tuple[int, int, int, int], suffix: str
+) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im, "RGBA")
@@ -876,10 +947,15 @@ def test_rounded_rectangle_translucent(xy, suffix):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_floodfill(bbox):
+def test_floodfill(bbox: Coords) -> None:
     red = ImageColor.getrgb("red")
 
-    for mode, value in [("L", 1), ("RGBA", (255, 0, 0, 0)), ("RGB", red)]:
+    mode_values: list[tuple[str, int | tuple[int, ...]]] = [
+        ("L", 1),
+        ("RGBA", (255, 0, 0, 0)),
+        ("RGB", red),
+    ]
+    for mode, value in mode_values:
         # Arrange
         im = Image.new(mode, (W, H))
         draw = ImageDraw.Draw(im)
@@ -909,7 +985,7 @@ def test_floodfill(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_floodfill_border(bbox):
+def test_floodfill_border(bbox: Coords) -> None:
     # floodfill() is experimental
 
     # Arrange
@@ -931,7 +1007,7 @@ def test_floodfill_border(bbox):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_floodfill_thresh(bbox):
+def test_floodfill_thresh(bbox: Coords) -> None:
     # floodfill() is experimental
 
     # Arrange
@@ -947,7 +1023,7 @@ def test_floodfill_thresh(bbox):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_floodfill2.png")
 
 
-def test_floodfill_not_negative():
+def test_floodfill_not_negative() -> None:
     # floodfill() is experimental
     # Test that floodfill does not extend into negative coordinates
 
@@ -965,8 +1041,11 @@ def test_floodfill_not_negative():
 
 
 def create_base_image_draw(
-    size, mode=DEFAULT_MODE, background1=WHITE, background2=GRAY
-):
+    size: tuple[int, int],
+    mode: str = DEFAULT_MODE,
+    background1: tuple[int, int, int] = WHITE,
+    background2: tuple[int, int, int] = GRAY,
+) -> tuple[Image.Image, ImageDraw.ImageDraw]:
     img = Image.new(mode, size, background1)
     for x in range(0, size[0]):
         for y in range(0, size[1]):
@@ -975,7 +1054,7 @@ def create_base_image_draw(
     return img, ImageDraw.Draw(img)
 
 
-def test_square():
+def test_square() -> None:
     expected = os.path.join(IMAGES_PATH, "square.png")
     img, draw = create_base_image_draw((10, 10))
     draw.polygon([(2, 2), (2, 7), (7, 7), (7, 2)], BLACK)
@@ -988,7 +1067,7 @@ def test_square():
     assert_image_equal_tofile(img, expected, "square as normal rectangle failed")
 
 
-def test_triangle_right():
+def test_triangle_right() -> None:
     img, draw = create_base_image_draw((20, 20))
     draw.polygon([(3, 5), (17, 5), (10, 12)], BLACK)
     assert_image_equal_tofile(
@@ -1000,7 +1079,7 @@ def test_triangle_right():
     "fill, suffix",
     ((BLACK, "width"), (None, "width_no_fill")),
 )
-def test_triangle_right_width(fill, suffix):
+def test_triangle_right_width(fill: tuple[int, int, int] | None, suffix: str) -> None:
     img, draw = create_base_image_draw((100, 100))
     draw.polygon([(15, 25), (85, 25), (50, 60)], fill, WHITE, width=5)
     assert_image_equal_tofile(
@@ -1008,7 +1087,7 @@ def test_triangle_right_width(fill, suffix):
     )
 
 
-def test_line_horizontal():
+def test_line_horizontal() -> None:
     img, draw = create_base_image_draw((20, 20))
     draw.line((5, 5, 14, 5), BLACK, 2)
     assert_image_equal_tofile(
@@ -1046,8 +1125,8 @@ def test_line_horizontal():
     )
 
 
-def test_line_h_s1_w2():
-    pytest.skip("failing")
+@pytest.mark.xfail(reason="failing test")
+def test_line_h_s1_w2() -> None:
     img, draw = create_base_image_draw((20, 20))
     draw.line((5, 5, 14, 6), BLACK, 2)
     assert_image_equal_tofile(
@@ -1057,7 +1136,7 @@ def test_line_h_s1_w2():
     )
 
 
-def test_line_vertical():
+def test_line_vertical() -> None:
     img, draw = create_base_image_draw((20, 20))
     draw.line((5, 5, 5, 14), BLACK, 2)
     assert_image_equal_tofile(
@@ -1103,7 +1182,7 @@ def test_line_vertical():
     )
 
 
-def test_line_oblique_45():
+def test_line_oblique_45() -> None:
     expected = os.path.join(IMAGES_PATH, "line_oblique_45_w3px_a.png")
     img, draw = create_base_image_draw((20, 20))
     draw.line((5, 5, 14, 14), BLACK, 3)
@@ -1125,7 +1204,7 @@ def test_line_oblique_45():
     )
 
 
-def test_wide_line_dot():
+def test_wide_line_dot() -> None:
     # Test drawing a wide "line" from one point to another just draws a single point
     # Arrange
     im = Image.new("RGB", (W, H))
@@ -1138,7 +1217,7 @@ def test_wide_line_dot():
     assert_image_similar_tofile(im, "Tests/images/imagedraw_wide_line_dot.png", 1)
 
 
-def test_wide_line_larger_than_int():
+def test_wide_line_larger_than_int() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -1232,7 +1311,7 @@ def test_wide_line_larger_than_int():
         ],
     ],
 )
-def test_line_joint(xy):
+def test_line_joint(xy: list[tuple[int, int]] | tuple[int, ...] | list[int]) -> None:
     im = Image.new("RGB", (500, 325))
     draw = ImageDraw.Draw(im)
 
@@ -1243,7 +1322,7 @@ def test_line_joint(xy):
     assert_image_similar_tofile(im, "Tests/images/imagedraw_line_joint_curve.png", 3)
 
 
-def test_textsize_empty_string():
+def test_textsize_empty_string() -> None:
     # https://github.com/python-pillow/Pillow/issues/2783
     # Arrange
     im = Image.new("RGB", (W, H))
@@ -1259,7 +1338,7 @@ def test_textsize_empty_string():
 
 
 @skip_unless_feature("freetype2")
-def test_textbbox_stroke():
+def test_textbbox_stroke() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
@@ -1273,7 +1352,7 @@ def test_textbbox_stroke():
 
 
 @skip_unless_feature("freetype2")
-def test_stroke():
+def test_stroke() -> None:
     for suffix, stroke_fill in {"same": None, "different": "#0f0"}.items():
         # Arrange
         im = Image.new("RGB", (120, 130))
@@ -1290,7 +1369,21 @@ def test_stroke():
 
 
 @skip_unless_feature("freetype2")
-def test_stroke_descender():
+def test_stroke_float() -> None:
+    # Arrange
+    im = Image.new("RGB", (120, 130))
+    draw = ImageDraw.Draw(im)
+    font = ImageFont.truetype("Tests/fonts/FreeMono.ttf", 120)
+
+    # Act
+    draw.text((12, 12), "A", "#f00", font, stroke_width=0.5)
+
+    # Assert
+    assert_image_similar_tofile(im, "Tests/images/imagedraw_stroke_float.png", 3.1)
+
+
+@skip_unless_feature("freetype2")
+def test_stroke_descender() -> None:
     # Arrange
     im = Image.new("RGB", (120, 130))
     draw = ImageDraw.Draw(im)
@@ -1304,7 +1397,7 @@ def test_stroke_descender():
 
 
 @skip_unless_feature("freetype2")
-def test_split_word():
+def test_split_word() -> None:
     # Arrange
     im = Image.new("RGB", (230, 55))
     expected = im.copy()
@@ -1325,7 +1418,7 @@ def test_split_word():
 
 
 @skip_unless_feature("freetype2")
-def test_stroke_multiline():
+def test_stroke_multiline() -> None:
     # Arrange
     im = Image.new("RGB", (100, 250))
     draw = ImageDraw.Draw(im)
@@ -1341,7 +1434,7 @@ def test_stroke_multiline():
 
 
 @skip_unless_feature("freetype2")
-def test_setting_default_font():
+def test_setting_default_font() -> None:
     # Arrange
     im = Image.new("RGB", (100, 250))
     draw = ImageDraw.Draw(im)
@@ -1358,40 +1451,60 @@ def test_setting_default_font():
         assert isinstance(draw.getfont(), ImageFont.load_default().__class__)
 
 
-def test_default_font_size():
+def test_default_font_size() -> None:
     freetype_support = features.check_module("freetype2")
     text = "Default font at a specific size."
 
     im = Image.new("RGB", (220, 25))
     draw = ImageDraw.Draw(im)
-    with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError):
+
+    def check(func: Callable[[], None]) -> None:
+        if freetype_support:
+            func()
+        else:
+            with pytest.raises(ImportError):
+                func()
+
+    def draw_text() -> None:
         draw.text((0, 0), text, font_size=16)
         assert_image_equal_tofile(im, "Tests/images/imagedraw_default_font_size.png")
 
-    with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError):
+    check(draw_text)
+
+    def draw_textlength() -> None:
         assert draw.textlength(text, font_size=16) == 216
 
-    with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError):
+    check(draw_textlength)
+
+    def draw_textbbox() -> None:
         assert draw.textbbox((0, 0), text, font_size=16) == (0, 3, 216, 19)
 
+    check(draw_textbbox)
+
     im = Image.new("RGB", (220, 25))
     draw = ImageDraw.Draw(im)
-    with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError):
+
+    def draw_multiline_text() -> None:
         draw.multiline_text((0, 0), text, font_size=16)
         assert_image_equal_tofile(im, "Tests/images/imagedraw_default_font_size.png")
 
-    with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError):
+    check(draw_multiline_text)
+
+    def draw_multiline_textbbox() -> None:
         assert draw.multiline_textbbox((0, 0), text, font_size=16) == (0, 3, 216, 19)
 
+    check(draw_multiline_textbbox)
+
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_same_color_outline(bbox):
+def test_same_color_outline(bbox: Coords) -> None:
     # Prepare shape
     x0, y0 = 5, 5
     x1, y1 = 5, 50
     x2, y2 = 95, 50
     x3, y3 = 95, 5
 
+    assert ImageDraw.Outline is not None
     s = ImageDraw.Outline()
     s.move(x0, y0)
     s.curve(x1, y1, x2, y2, x3, y3)
@@ -1399,7 +1512,8 @@ def test_same_color_outline(bbox):
 
     # Begin
     for mode in ["RGB", "L"]:
-        for fill, outline in [["red", None], ["red", "red"], ["red", "#f00"]]:
+        fill = "red"
+        for outline in [None, "red", "#f00"]:
             for operation, args in {
                 "chord": [bbox, 0, 180],
                 "ellipse": [bbox],
@@ -1414,6 +1528,7 @@ def test_same_color_outline(bbox):
 
                 # Act
                 draw_method = getattr(draw, operation)
+                assert isinstance(args, list)
                 args += [fill, outline]
                 draw_method(*args)
 
@@ -1428,15 +1543,20 @@ def test_same_color_outline(bbox):
         (4, "square", {}),
         (8, "regular_octagon", {}),
         (4, "square_rotate_45", {"rotation": 45}),
-        (3, "triangle_width", {"width": 5, "outline": "yellow"}),
+        (3, "triangle_width", {"outline": "yellow", "width": 5}),
     ],
 )
-def test_draw_regular_polygon(n_sides, polygon_name, args):
+def test_draw_regular_polygon(
+    n_sides: int, polygon_name: str, args: dict[str, int | str]
+) -> None:
     im = Image.new("RGBA", size=(W, H), color=(255, 0, 0, 0))
     filename = f"Tests/images/imagedraw_{polygon_name}.png"
     draw = ImageDraw.Draw(im)
     bounding_circle = ((W // 2, H // 2), 25)
-    draw.regular_polygon(bounding_circle, n_sides, fill="red", **args)
+    rotation = int(args.get("rotation", 0))
+    outline = args.get("outline")
+    width = int(args.get("width", 1))
+    draw.regular_polygon(bounding_circle, n_sides, rotation, "red", outline, width)
     assert_image_equal_tofile(im, filename)
 
 
@@ -1468,7 +1588,9 @@ def test_draw_regular_polygon(n_sides, polygon_name, args):
         ),
     ],
 )
-def test_compute_regular_polygon_vertices(n_sides, expected_vertices):
+def test_compute_regular_polygon_vertices(
+    n_sides: int, expected_vertices: list[tuple[float, float]]
+) -> None:
     bounding_circle = (W // 2, H // 2, 25)
     vertices = ImageDraw._compute_regular_polygon_vertices(bounding_circle, n_sides, 0)
     assert vertices == expected_vertices
@@ -1479,7 +1601,7 @@ def test_compute_regular_polygon_vertices(n_sides, expected_vertices):
     [
         (None, (50, 50, 25), 0, TypeError, "n_sides should be an int"),
         (1, (50, 50, 25), 0, ValueError, "n_sides should be an int > 2"),
-        (3, 50, 0, TypeError, "bounding_circle should be a tuple"),
+        (3, 50, 0, TypeError, "bounding_circle should be a sequence"),
         (
             3,
             (50, 50, 100, 100),
@@ -1519,14 +1641,18 @@ def test_compute_regular_polygon_vertices(n_sides, expected_vertices):
     ],
 )
 def test_compute_regular_polygon_vertices_input_error_handling(
-    n_sides, bounding_circle, rotation, expected_error, error_message
-):
+    n_sides: int,
+    bounding_circle: int | tuple[int | tuple[int] | str, ...],
+    rotation: int | str,
+    expected_error: type[Exception],
+    error_message: str,
+) -> None:
     with pytest.raises(expected_error) as e:
-        ImageDraw._compute_regular_polygon_vertices(bounding_circle, n_sides, rotation)
+        ImageDraw._compute_regular_polygon_vertices(bounding_circle, n_sides, rotation)  # type: ignore[arg-type]
     assert str(e.value) == error_message
 
 
-def test_continuous_horizontal_edges_polygon():
+def test_continuous_horizontal_edges_polygon() -> None:
     xy = [
         (2, 6),
         (6, 6),
@@ -1545,7 +1671,7 @@ def test_continuous_horizontal_edges_polygon():
     )
 
 
-def test_discontiguous_corners_polygon():
+def test_discontiguous_corners_polygon() -> None:
     img, draw = create_base_image_draw((84, 68))
     draw.polygon(((1, 21), (34, 4), (71, 1), (38, 18)), BLACK)
     draw.polygon(((71, 44), (38, 27), (1, 24)), BLACK)
@@ -1557,7 +1683,7 @@ def test_discontiguous_corners_polygon():
     assert_image_similar_tofile(img, expected, 1)
 
 
-def test_polygon2():
+def test_polygon2() -> None:
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
     draw.polygon([(18, 30), (19, 31), (18, 30), (85, 30), (60, 72)], "red")
@@ -1566,7 +1692,7 @@ def test_polygon2():
 
 
 @pytest.mark.parametrize("xy", ((1, 1, 0, 1), (1, 1, 1, 0)))
-def test_incorrectly_ordered_coordinates(xy):
+def test_incorrectly_ordered_coordinates(xy: tuple[int, int, int, int]) -> None:
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
     with pytest.raises(ValueError):
@@ -1581,3 +1707,8 @@ def test_incorrectly_ordered_coordinates(xy):
         draw.rectangle(xy)
     with pytest.raises(ValueError):
         draw.rounded_rectangle(xy)
+
+
+def test_getdraw() -> None:
+    with pytest.warns(DeprecationWarning):
+        ImageDraw.getdraw(None, [])
diff --git a/Tests/test_imagedraw2.py b/Tests/test_imagedraw2.py
index d729af14d3a..e0d368228a0 100644
--- a/Tests/test_imagedraw2.py
+++ b/Tests/test_imagedraw2.py
@@ -1,9 +1,11 @@
 from __future__ import annotations
+
 import os.path
 
 import pytest
 
 from PIL import Image, ImageDraw, ImageDraw2, features
+from PIL._typing import Coords
 
 from .helper import (
     assert_image_equal,
@@ -42,20 +44,59 @@
 FONT_PATH = "Tests/fonts/FreeMono.ttf"
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper("RGB").copy()
 
     draw = ImageDraw2.Draw(im)
     pen = ImageDraw2.Pen("blue", width=7)
     draw.line(list(range(10)), pen)
 
-    draw, handler = ImageDraw.getdraw(im)
+    draw2, handler = ImageDraw.getdraw(im)
+    assert draw2 is not None
     pen = ImageDraw2.Pen("blue", width=7)
-    draw.line(list(range(10)), pen)
+    draw2.line(list(range(10)), pen)
+
+
+def test_mode() -> None:
+    draw = ImageDraw2.Draw("L", (1, 1))
+    assert draw.image.mode == "L"
+
+    with pytest.raises(ValueError):
+        ImageDraw2.Draw("L")
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_ellipse(bbox):
+@pytest.mark.parametrize("start, end", ((0, 180), (0.5, 180.4)))
+def test_arc(bbox: Coords, start: float, end: float) -> None:
+    # Arrange
+    im = Image.new("RGB", (W, H))
+    draw = ImageDraw2.Draw(im)
+    pen = ImageDraw2.Pen("white", width=1)
+
+    # Act
+    draw.arc(bbox, pen, start, end)
+
+    # Assert
+    assert_image_similar_tofile(im, "Tests/images/imagedraw_arc.png", 1)
+
+
+@pytest.mark.parametrize("bbox", BBOX)
+def test_chord(bbox: Coords) -> None:
+    # Arrange
+    im = Image.new("RGB", (W, H))
+    draw = ImageDraw2.Draw(im)
+    pen = ImageDraw2.Pen("yellow")
+    brush = ImageDraw2.Brush("red")
+
+    # Act
+    draw.chord(bbox, pen, 0, 180, brush)
+
+    # Assert
+    assert_image_similar_tofile(im, "Tests/images/imagedraw_chord_RGB.png", 1)
+
+
+@pytest.mark.parametrize("bbox", BBOX)
+def test_ellipse(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -69,7 +110,7 @@ def test_ellipse(bbox):
     assert_image_similar_tofile(im, "Tests/images/imagedraw_ellipse_RGB.png", 1)
 
 
-def test_ellipse_edge():
+def test_ellipse_edge() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -83,7 +124,7 @@ def test_ellipse_edge():
 
 
 @pytest.mark.parametrize("points", POINTS)
-def test_line(points):
+def test_line(points: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -97,7 +138,7 @@ def test_line(points):
 
 
 @pytest.mark.parametrize("points", POINTS)
-def test_line_pen_as_brush(points):
+def test_line_pen_as_brush(points: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -112,8 +153,24 @@ def test_line_pen_as_brush(points):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_line.png")
 
 
+@pytest.mark.parametrize("bbox", BBOX)
+@pytest.mark.parametrize("start, end", ((-92, 46), (-92.2, 46.2)))
+def test_pieslice(bbox: Coords, start: float, end: float) -> None:
+    # Arrange
+    im = Image.new("RGB", (W, H))
+    draw = ImageDraw2.Draw(im)
+    pen = ImageDraw2.Pen("blue")
+    brush = ImageDraw2.Brush("white")
+
+    # Act
+    draw.pieslice(bbox, pen, start, end, brush)
+
+    # Assert
+    assert_image_similar_tofile(im, "Tests/images/imagedraw_pieslice.png", 1)
+
+
 @pytest.mark.parametrize("points", POINTS)
-def test_polygon(points):
+def test_polygon(points: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -128,7 +185,7 @@ def test_polygon(points):
 
 
 @pytest.mark.parametrize("bbox", BBOX)
-def test_rectangle(bbox):
+def test_rectangle(bbox: Coords) -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -142,7 +199,7 @@ def test_rectangle(bbox):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_rectangle.png")
 
 
-def test_big_rectangle():
+def test_big_rectangle() -> None:
     # Test drawing a rectangle bigger than the image
     # Arrange
     im = Image.new("RGB", (W, H))
@@ -159,7 +216,7 @@ def test_big_rectangle():
 
 
 @skip_unless_feature("freetype2")
-def test_text():
+def test_text() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -174,7 +231,7 @@ def test_text():
 
 
 @skip_unless_feature("freetype2")
-def test_textbbox():
+def test_textbbox() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -189,7 +246,7 @@ def test_textbbox():
 
 
 @skip_unless_feature("freetype2")
-def test_textsize_empty_string():
+def test_textsize_empty_string() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
@@ -205,7 +262,7 @@ def test_textsize_empty_string():
 
 
 @skip_unless_feature("freetype2")
-def test_flush():
+def test_flush() -> None:
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw2.Draw(im)
diff --git a/Tests/test_imageenhance.py b/Tests/test_imageenhance.py
index f4e4d59be32..6ebc61e1bc4 100644
--- a/Tests/test_imageenhance.py
+++ b/Tests/test_imageenhance.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageEnhance
@@ -6,7 +7,7 @@
 from .helper import assert_image_equal, hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     # FIXME: assert_image
     # Implicit asserts no exception:
     ImageEnhance.Color(hopper()).enhance(0.5)
@@ -15,13 +16,13 @@ def test_sanity():
     ImageEnhance.Sharpness(hopper()).enhance(0.5)
 
 
-def test_crash():
+def test_crash() -> None:
     # crashes on small images
     im = Image.new("RGB", (1, 1))
     ImageEnhance.Sharpness(im).enhance(0.5)
 
 
-def _half_transparent_image():
+def _half_transparent_image() -> Image.Image:
     # returns an image, half transparent, half solid
     im = hopper("RGB")
 
@@ -33,7 +34,9 @@ def _half_transparent_image():
     return im
 
 
-def _check_alpha(im, original, op, amount):
+def _check_alpha(
+    im: Image.Image, original: Image.Image, op: str, amount: float
+) -> None:
     assert im.getbands() == original.getbands()
     assert_image_equal(
         im.getchannel("A"),
@@ -43,7 +46,7 @@ def _check_alpha(im, original, op, amount):
 
 
 @pytest.mark.parametrize("op", ("Color", "Brightness", "Contrast", "Sharpness"))
-def test_alpha(op):
+def test_alpha(op: str) -> None:
     # Issue https://github.com/python-pillow/Pillow/issues/899
     # Is alpha preserved through image enhancement?
 
diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py
index 4804a554f83..1ee68492630 100644
--- a/Tests/test_imagefile.py
+++ b/Tests/test_imagefile.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 from io import BytesIO
+from typing import Any
 
 import pytest
 
@@ -29,8 +31,8 @@
 
 
 class TestImageFile:
-    def test_parser(self):
-        def roundtrip(format):
+    def test_parser(self) -> None:
+        def roundtrip(format: str) -> tuple[Image.Image, Image.Image]:
             im = hopper("L").resize((1000, 1000), Image.Resampling.NEAREST)
             if format in ("MSP", "XBM"):
                 im = im.convert("1")
@@ -83,16 +85,16 @@ def roundtrip(format):
         with pytest.raises(OSError):
             roundtrip("PDF")
 
-    def test_ico(self):
+    def test_ico(self) -> None:
         with open("Tests/images/python.ico", "rb") as f:
             data = f.read()
         with ImageFile.Parser() as p:
             p.feed(data)
+            assert p.image is not None
             assert (48, 48) == p.image.size
 
     @skip_unless_feature("webp")
-    @skip_unless_feature("webp_anim")
-    def test_incremental_webp(self):
+    def test_incremental_webp(self) -> None:
         with ImageFile.Parser() as p:
             with open("Tests/images/hopper.webp", "rb") as f:
                 p.feed(f.read(1024))
@@ -101,10 +103,11 @@ def test_incremental_webp(self):
                 assert not p.image
 
                 p.feed(f.read())
+            assert p.image is not None
             assert (128, 128) == p.image.size
 
     @skip_unless_feature("zlib")
-    def test_safeblock(self):
+    def test_safeblock(self) -> None:
         im1 = hopper()
 
         try:
@@ -115,17 +118,17 @@ def test_safeblock(self):
 
         assert_image_equal(im1, im2)
 
-    def test_raise_oserror(self):
+    def test_raise_oserror(self) -> None:
         with pytest.warns(DeprecationWarning):
             with pytest.raises(OSError):
                 ImageFile.raise_oserror(1)
 
-    def test_raise_typeerror(self):
+    def test_raise_typeerror(self) -> None:
         with pytest.raises(TypeError):
             parser = ImageFile.Parser()
-            parser.feed(1)
+            parser.feed(1)  # type: ignore[arg-type]
 
-    def test_negative_stride(self):
+    def test_negative_stride(self) -> None:
         with open("Tests/images/raw_negative_stride.bin", "rb") as f:
             input = f.read()
         p = ImageFile.Parser()
@@ -133,11 +136,11 @@ def test_negative_stride(self):
         with pytest.raises(OSError):
             p.close()
 
-    def test_no_format(self):
+    def test_no_format(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         class DummyImageFile(ImageFile.ImageFile):
-            def _open(self):
+            def _open(self) -> None:
                 self._mode = "RGB"
                 self._size = (1, 1)
 
@@ -145,12 +148,12 @@ def _open(self):
         assert im.format is None
         assert im.get_format_mimetype() is None
 
-    def test_oserror(self):
+    def test_oserror(self) -> None:
         im = Image.new("RGB", (1, 1))
         with pytest.raises(OSError):
             im.save(BytesIO(), "JPEG2000", num_resolutions=2)
 
-    def test_truncated(self):
+    def test_truncated(self) -> None:
         b = BytesIO(
             b"BM000000000000"  # head_data
             + _binary.o32le(
@@ -165,7 +168,7 @@ def test_truncated(self):
         assert str(e.value) == "Truncated File Read"
 
     @skip_unless_feature("zlib")
-    def test_truncated_with_errors(self):
+    def test_truncated_with_errors(self) -> None:
         with Image.open("Tests/images/truncated_image.png") as im:
             with pytest.raises(OSError):
                 im.load()
@@ -175,7 +178,7 @@ def test_truncated_with_errors(self):
                 im.load()
 
     @skip_unless_feature("zlib")
-    def test_truncated_without_errors(self):
+    def test_truncated_without_errors(self) -> None:
         with Image.open("Tests/images/truncated_image.png") as im:
             ImageFile.LOAD_TRUNCATED_IMAGES = True
             try:
@@ -184,13 +187,13 @@ def test_truncated_without_errors(self):
                 ImageFile.LOAD_TRUNCATED_IMAGES = False
 
     @skip_unless_feature("zlib")
-    def test_broken_datastream_with_errors(self):
+    def test_broken_datastream_with_errors(self) -> None:
         with Image.open("Tests/images/broken_data_stream.png") as im:
             with pytest.raises(OSError):
                 im.load()
 
     @skip_unless_feature("zlib")
-    def test_broken_datastream_without_errors(self):
+    def test_broken_datastream_without_errors(self) -> None:
         with Image.open("Tests/images/broken_data_stream.png") as im:
             ImageFile.LOAD_TRUNCATED_IMAGES = True
             try:
@@ -200,16 +203,30 @@ def test_broken_datastream_without_errors(self):
 
 
 class MockPyDecoder(ImageFile.PyDecoder):
-    def decode(self, buffer):
+    last: MockPyDecoder
+
+    def __init__(self, mode: str, *args: Any) -> None:
+        MockPyDecoder.last = self
+
+        super().__init__(mode, *args)
+
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
         # eof
         return -1, 0
 
 
 class MockPyEncoder(ImageFile.PyEncoder):
-    def encode(self, buffer):
+    last: MockPyEncoder | None
+
+    def __init__(self, mode: str, *args: Any) -> None:
+        MockPyEncoder.last = self
+
+        super().__init__(mode, *args)
+
+    def encode(self, bufsize: int) -> tuple[int, int, bytes]:
         return 1, 1, b""
 
-    def cleanup(self):
+    def cleanup(self) -> None:
         self.cleanup_called = True
 
 
@@ -217,141 +234,154 @@ def cleanup(self):
 
 
 class MockImageFile(ImageFile.ImageFile):
-    def _open(self):
+    def _open(self) -> None:
         self.rawmode = "RGBA"
         self._mode = "RGBA"
         self._size = (200, 200)
-        self.tile = [("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize), 32, None)]
+        self.tile = [
+            ImageFile._Tile("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize), 32, None)
+        ]
 
 
 class CodecsTest:
     @classmethod
-    def setup_class(cls):
-        cls.decoder = MockPyDecoder(None)
-        cls.encoder = MockPyEncoder(None)
-
-        def decoder_closure(mode, *args):
-            cls.decoder.__init__(mode, *args)
-            return cls.decoder
-
-        def encoder_closure(mode, *args):
-            cls.encoder.__init__(mode, *args)
-            return cls.encoder
-
-        Image.register_decoder("MOCK", decoder_closure)
-        Image.register_encoder("MOCK", encoder_closure)
+    def setup_class(cls) -> None:
+        Image.register_decoder("MOCK", MockPyDecoder)
+        Image.register_encoder("MOCK", MockPyEncoder)
 
 
 class TestPyDecoder(CodecsTest):
-    def test_setimage(self):
+    def test_setimage(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         im = MockImageFile(buf)
 
         im.load()
 
-        assert self.decoder.state.xoff == xoff
-        assert self.decoder.state.yoff == yoff
-        assert self.decoder.state.xsize == xsize
-        assert self.decoder.state.ysize == ysize
+        assert MockPyDecoder.last.state.xoff == xoff
+        assert MockPyDecoder.last.state.yoff == yoff
+        assert MockPyDecoder.last.state.xsize == xsize
+        assert MockPyDecoder.last.state.ysize == ysize
 
         with pytest.raises(ValueError):
-            self.decoder.set_as_raw(b"\x00")
+            MockPyDecoder.last.set_as_raw(b"\x00")
 
-    def test_extents_none(self):
+    def test_extents_none(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         im = MockImageFile(buf)
-        im.tile = [("MOCK", None, 32, None)]
+        im.tile = [ImageFile._Tile("MOCK", None, 32, None)]
 
         im.load()
 
-        assert self.decoder.state.xoff == 0
-        assert self.decoder.state.yoff == 0
-        assert self.decoder.state.xsize == 200
-        assert self.decoder.state.ysize == 200
+        assert MockPyDecoder.last.state.xoff == 0
+        assert MockPyDecoder.last.state.yoff == 0
+        assert MockPyDecoder.last.state.xsize == 200
+        assert MockPyDecoder.last.state.ysize == 200
 
-    def test_negsize(self):
+    def test_negsize(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         im = MockImageFile(buf)
-        im.tile = [("MOCK", (xoff, yoff, -10, yoff + ysize), 32, None)]
+        im.tile = [ImageFile._Tile("MOCK", (xoff, yoff, -10, yoff + ysize), 32, None)]
 
         with pytest.raises(ValueError):
             im.load()
 
-        im.tile = [("MOCK", (xoff, yoff, xoff + xsize, -10), 32, None)]
+        im.tile = [ImageFile._Tile("MOCK", (xoff, yoff, xoff + xsize, -10), 32, None)]
         with pytest.raises(ValueError):
             im.load()
 
-    def test_oversize(self):
+    def test_oversize(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         im = MockImageFile(buf)
-        im.tile = [("MOCK", (xoff, yoff, xoff + xsize + 100, yoff + ysize), 32, None)]
+        im.tile = [
+            ImageFile._Tile(
+                "MOCK", (xoff, yoff, xoff + xsize + 100, yoff + ysize), 32, None
+            )
+        ]
 
         with pytest.raises(ValueError):
             im.load()
 
-        im.tile = [("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize + 100), 32, None)]
+        im.tile = [
+            ImageFile._Tile(
+                "MOCK", (xoff, yoff, xoff + xsize, yoff + ysize + 100), 32, None
+            )
+        ]
         with pytest.raises(ValueError):
             im.load()
 
-    def test_decode(self):
-        decoder = ImageFile.PyDecoder(None)
+    def test_decode(self) -> None:
+        decoder = ImageFile.PyDecoder("")
         with pytest.raises(NotImplementedError):
-            decoder.decode(None)
+            decoder.decode(b"")
 
 
 class TestPyEncoder(CodecsTest):
-    def test_setimage(self):
+    def test_setimage(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         im = MockImageFile(buf)
 
         fp = BytesIO()
         ImageFile._save(
-            im, fp, [("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize), 0, "RGB")]
+            im,
+            fp,
+            [
+                ImageFile._Tile(
+                    "MOCK", (xoff, yoff, xoff + xsize, yoff + ysize), 0, "RGB"
+                )
+            ],
         )
 
-        assert self.encoder.state.xoff == xoff
-        assert self.encoder.state.yoff == yoff
-        assert self.encoder.state.xsize == xsize
-        assert self.encoder.state.ysize == ysize
+        assert MockPyEncoder.last
+        assert MockPyEncoder.last.state.xoff == xoff
+        assert MockPyEncoder.last.state.yoff == yoff
+        assert MockPyEncoder.last.state.xsize == xsize
+        assert MockPyEncoder.last.state.ysize == ysize
 
-    def test_extents_none(self):
+    def test_extents_none(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         im = MockImageFile(buf)
-        im.tile = [("MOCK", None, 32, None)]
+        im.tile = [ImageFile._Tile("MOCK", None, 32, None)]
 
         fp = BytesIO()
-        ImageFile._save(im, fp, [("MOCK", None, 0, "RGB")])
+        ImageFile._save(im, fp, [ImageFile._Tile("MOCK", None, 0, "RGB")])
 
-        assert self.encoder.state.xoff == 0
-        assert self.encoder.state.yoff == 0
-        assert self.encoder.state.xsize == 200
-        assert self.encoder.state.ysize == 200
+        assert MockPyEncoder.last
+        assert MockPyEncoder.last.state.xoff == 0
+        assert MockPyEncoder.last.state.yoff == 0
+        assert MockPyEncoder.last.state.xsize == 200
+        assert MockPyEncoder.last.state.ysize == 200
 
-    def test_negsize(self):
+    def test_negsize(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         im = MockImageFile(buf)
 
         fp = BytesIO()
-        self.encoder.cleanup_called = False
+        MockPyEncoder.last = None
         with pytest.raises(ValueError):
             ImageFile._save(
-                im, fp, [("MOCK", (xoff, yoff, -10, yoff + ysize), 0, "RGB")]
+                im,
+                fp,
+                [ImageFile._Tile("MOCK", (xoff, yoff, -10, yoff + ysize), 0, "RGB")],
             )
-        assert self.encoder.cleanup_called
+        last: MockPyEncoder | None = MockPyEncoder.last
+        assert last
+        assert last.cleanup_called
 
         with pytest.raises(ValueError):
             ImageFile._save(
-                im, fp, [("MOCK", (xoff, yoff, xoff + xsize, -10), 0, "RGB")]
+                im,
+                fp,
+                [ImageFile._Tile("MOCK", (xoff, yoff, xoff + xsize, -10), 0, "RGB")],
             )
 
-    def test_oversize(self):
+    def test_oversize(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
         im = MockImageFile(buf)
@@ -361,20 +391,28 @@ def test_oversize(self):
             ImageFile._save(
                 im,
                 fp,
-                [("MOCK", (xoff, yoff, xoff + xsize + 100, yoff + ysize), 0, "RGB")],
+                [
+                    ImageFile._Tile(
+                        "MOCK", (xoff, yoff, xoff + xsize + 100, yoff + ysize), 0, "RGB"
+                    )
+                ],
             )
 
         with pytest.raises(ValueError):
             ImageFile._save(
                 im,
                 fp,
-                [("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize + 100), 0, "RGB")],
+                [
+                    ImageFile._Tile(
+                        "MOCK", (xoff, yoff, xoff + xsize, yoff + ysize + 100), 0, "RGB"
+                    )
+                ],
             )
 
-    def test_encode(self):
-        encoder = ImageFile.PyEncoder(None)
+    def test_encode(self) -> None:
+        encoder = ImageFile.PyEncoder("")
         with pytest.raises(NotImplementedError):
-            encoder.encode(None)
+            encoder.encode(0)
 
         bytes_consumed, errcode = encoder.encode_to_pyfd()
         assert bytes_consumed == 0
@@ -385,8 +423,8 @@ def test_encode(self):
             encoder.encode_to_pyfd()
 
         with pytest.raises(NotImplementedError):
-            encoder.encode_to_file(None, None)
+            encoder.encode_to_file(0, 0)
 
-    def test_zero_height(self):
+    def test_zero_height(self) -> None:
         with pytest.raises(UnidentifiedImageError):
             Image.open("Tests/images/zero_height.j2k")
diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
index 807d581edf0..6a0a940b987 100644
--- a/Tests/test_imagefont.py
+++ b/Tests/test_imagefont.py
@@ -1,16 +1,20 @@
 from __future__ import annotations
+
 import copy
 import os
 import re
 import shutil
 import sys
+import tempfile
 from io import BytesIO
 from pathlib import Path
+from typing import Any, BinaryIO
 
 import pytest
 from packaging.version import parse as parse_version
 
 from PIL import Image, ImageDraw, ImageFont, features
+from PIL._typing import StrOrBytesPath
 
 from .helper import (
     assert_image_equal,
@@ -30,8 +34,10 @@
 pytestmark = skip_unless_feature("freetype2")
 
 
-def test_sanity():
-    assert re.search(r"\d+\.\d+\.\d+$", features.version_module("freetype2"))
+def test_sanity() -> None:
+    version = features.version_module("freetype2")
+    assert version is not None
+    assert re.search(r"\d+\.\d+\.\d+$", version)
 
 
 @pytest.fixture(
@@ -41,16 +47,16 @@ def test_sanity():
         pytest.param(ImageFont.Layout.RAQM, marks=skip_unless_feature("raqm")),
     ],
 )
-def layout_engine(request):
+def layout_engine(request: pytest.FixtureRequest) -> ImageFont.Layout:
     return request.param
 
 
 @pytest.fixture(scope="module")
-def font(layout_engine):
+def font(layout_engine: ImageFont.Layout) -> ImageFont.FreeTypeFont:
     return ImageFont.truetype(FONT_PATH, FONT_SIZE, layout_engine=layout_engine)
 
 
-def test_font_properties(font):
+def test_font_properties(font: ImageFont.FreeTypeFont) -> None:
     assert font.path == FONT_PATH
     assert font.size == FONT_SIZE
 
@@ -66,7 +72,9 @@ def test_font_properties(font):
     assert font_copy.path == second_font_path
 
 
-def _render(font, layout_engine):
+def _render(
+    font: StrOrBytesPath | BinaryIO, layout_engine: ImageFont.Layout
+) -> Image.Image:
     txt = "Hello World!"
     ttf = ImageFont.truetype(font, FONT_SIZE, layout_engine=layout_engine)
     ttf.getbbox(txt)
@@ -79,12 +87,12 @@ def _render(font, layout_engine):
 
 
 @pytest.mark.parametrize("font", (FONT_PATH, Path(FONT_PATH)))
-def test_font_with_name(layout_engine, font):
+def test_font_with_name(layout_engine: ImageFont.Layout, font: str | Path) -> None:
     _render(font, layout_engine)
 
 
-def test_font_with_filelike(layout_engine):
-    def _font_as_bytes():
+def test_font_with_filelike(layout_engine: ImageFont.Layout) -> None:
+    def _font_as_bytes() -> BytesIO:
         with open(FONT_PATH, "rb") as f:
             font_bytes = BytesIO(f.read())
         return font_bytes
@@ -101,12 +109,12 @@ def _font_as_bytes():
     #   _render(shared_bytes)
 
 
-def test_font_with_open_file(layout_engine):
+def test_font_with_open_file(layout_engine: ImageFont.Layout) -> None:
     with open(FONT_PATH, "rb") as f:
         _render(f, layout_engine)
 
 
-def test_render_equal(layout_engine):
+def test_render_equal(layout_engine: ImageFont.Layout) -> None:
     img_path = _render(FONT_PATH, layout_engine)
     with open(FONT_PATH, "rb") as f:
         font_filelike = BytesIO(f.read())
@@ -115,7 +123,7 @@ def test_render_equal(layout_engine):
     assert_image_equal(img_path, img_filelike)
 
 
-def test_non_ascii_path(tmp_path, layout_engine):
+def test_non_ascii_path(tmp_path: Path, layout_engine: ImageFont.Layout) -> None:
     tempfile = str(tmp_path / ("temp_" + chr(128) + ".ttf"))
     try:
         shutil.copy(FONT_PATH, tempfile)
@@ -125,7 +133,7 @@ def test_non_ascii_path(tmp_path, layout_engine):
     ImageFont.truetype(tempfile, FONT_SIZE, layout_engine=layout_engine)
 
 
-def test_transparent_background(font):
+def test_transparent_background(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="RGBA", size=(300, 100))
     draw = ImageDraw.Draw(im)
 
@@ -139,7 +147,7 @@ def test_transparent_background(font):
     assert_image_similar_tofile(im.convert("L"), target, 0.01)
 
 
-def test_I16(font):
+def test_I16(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="I;16", size=(300, 100))
     draw = ImageDraw.Draw(im)
 
@@ -152,7 +160,7 @@ def test_I16(font):
     assert_image_similar_tofile(im.convert("L"), target, 0.01)
 
 
-def test_textbbox_equal(font):
+def test_textbbox_equal(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
 
@@ -180,8 +188,14 @@ def test_textbbox_equal(font):
     ),
 )
 def test_getlength(
-    text, mode, fontname, size, layout_engine, length_basic, length_raqm
-):
+    text: str,
+    mode: str,
+    fontname: str,
+    size: int,
+    layout_engine: ImageFont.Layout,
+    length_basic: int,
+    length_raqm: float,
+) -> None:
     f = ImageFont.truetype("Tests/fonts/" + fontname, size, layout_engine=layout_engine)
 
     im = Image.new(mode, (1, 1), 0)
@@ -196,7 +210,7 @@ def test_getlength(
         assert length == length_raqm
 
 
-def test_float_size():
+def test_float_size(layout_engine: ImageFont.Layout) -> None:
     lengths = []
     for size in (48, 48.5, 49):
         f = ImageFont.truetype(
@@ -206,12 +220,12 @@ def test_float_size():
     assert lengths[0] != lengths[1] != lengths[2]
 
 
-def test_render_multiline(font):
+def test_render_multiline(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
     line_spacing = font.getbbox("A")[3] + 4
     lines = TEST_TEXT.split("\n")
-    y = 0
+    y: float = 0
     for line in lines:
         draw.text((0, y), line, font=font)
         y += line_spacing
@@ -222,7 +236,7 @@ def test_render_multiline(font):
     assert_image_similar_tofile(im, "Tests/images/multiline_text.png", 6.2)
 
 
-def test_render_multiline_text(font):
+def test_render_multiline_text(font: ImageFont.FreeTypeFont) -> None:
     # Test that text() correctly connects to multiline_text()
     # and that align defaults to left
     im = Image.new(mode="RGB", size=(300, 100))
@@ -242,7 +256,9 @@ def test_render_multiline_text(font):
 @pytest.mark.parametrize(
     "align, ext", (("left", ""), ("center", "_center"), ("right", "_right"))
 )
-def test_render_multiline_text_align(font, align, ext):
+def test_render_multiline_text_align(
+    font: ImageFont.FreeTypeFont, align: str, ext: str
+) -> None:
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
     draw.multiline_text((0, 0), TEST_TEXT, font=font, align=align)
@@ -250,7 +266,7 @@ def test_render_multiline_text_align(font, align, ext):
     assert_image_similar_tofile(im, f"Tests/images/multiline_text{ext}.png", 0.01)
 
 
-def test_unknown_align(font):
+def test_unknown_align(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
 
@@ -259,14 +275,14 @@ def test_unknown_align(font):
         draw.multiline_text((0, 0), TEST_TEXT, font=font, align="unknown")
 
 
-def test_draw_align(font):
+def test_draw_align(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new("RGB", (300, 100), "white")
     draw = ImageDraw.Draw(im)
     line = "some text"
     draw.text((100, 40), line, (0, 0, 0), font=font, align="left")
 
 
-def test_multiline_bbox(font):
+def test_multiline_bbox(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
 
@@ -284,7 +300,7 @@ def test_multiline_bbox(font):
     draw.textbbox((0, 0), TEST_TEXT, font=font, spacing=4)
 
 
-def test_multiline_width(font):
+def test_multiline_width(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
 
@@ -294,7 +310,7 @@ def test_multiline_width(font):
     )
 
 
-def test_multiline_spacing(font):
+def test_multiline_spacing(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
     draw.multiline_text((0, 0), TEST_TEXT, font=font, spacing=10)
@@ -305,7 +321,9 @@ def test_multiline_spacing(font):
 @pytest.mark.parametrize(
     "orientation", (Image.Transpose.ROTATE_90, Image.Transpose.ROTATE_270)
 )
-def test_rotated_transposed_font(font, orientation):
+def test_rotated_transposed_font(
+    font: ImageFont.FreeTypeFont, orientation: Image.Transpose
+) -> None:
     img_gray = Image.new("L", (100, 100))
     draw = ImageDraw.Draw(img_gray)
     word = "testing"
@@ -346,7 +364,9 @@ def test_rotated_transposed_font(font, orientation):
         Image.Transpose.FLIP_TOP_BOTTOM,
     ),
 )
-def test_unrotated_transposed_font(font, orientation):
+def test_unrotated_transposed_font(
+    font: ImageFont.FreeTypeFont, orientation: Image.Transpose
+) -> None:
     img_gray = Image.new("L", (100, 100))
     draw = ImageDraw.Draw(img_gray)
     word = "testing"
@@ -381,7 +401,9 @@ def test_unrotated_transposed_font(font, orientation):
 @pytest.mark.parametrize(
     "orientation", (Image.Transpose.ROTATE_90, Image.Transpose.ROTATE_270)
 )
-def test_rotated_transposed_font_get_mask(font, orientation):
+def test_rotated_transposed_font_get_mask(
+    font: ImageFont.FreeTypeFont, orientation: Image.Transpose
+) -> None:
     # Arrange
     text = "mask this"
     transposed_font = ImageFont.TransposedFont(font, orientation=orientation)
@@ -402,7 +424,9 @@ def test_rotated_transposed_font_get_mask(font, orientation):
         Image.Transpose.FLIP_TOP_BOTTOM,
     ),
 )
-def test_unrotated_transposed_font_get_mask(font, orientation):
+def test_unrotated_transposed_font_get_mask(
+    font: ImageFont.FreeTypeFont, orientation: Image.Transpose
+) -> None:
     # Arrange
     text = "mask this"
     transposed_font = ImageFont.TransposedFont(font, orientation=orientation)
@@ -414,11 +438,11 @@ def test_unrotated_transposed_font_get_mask(font, orientation):
     assert mask.size == (108, 13)
 
 
-def test_free_type_font_get_name(font):
+def test_free_type_font_get_name(font: ImageFont.FreeTypeFont) -> None:
     assert ("FreeMono", "Regular") == font.getname()
 
 
-def test_free_type_font_get_metrics(font):
+def test_free_type_font_get_metrics(font: ImageFont.FreeTypeFont) -> None:
     ascent, descent = font.getmetrics()
 
     assert isinstance(ascent, int)
@@ -426,7 +450,7 @@ def test_free_type_font_get_metrics(font):
     assert (ascent, descent) == (16, 4)
 
 
-def test_free_type_font_get_mask(font):
+def test_free_type_font_get_mask(font: ImageFont.FreeTypeFont) -> None:
     # Arrange
     text = "mask this"
 
@@ -437,24 +461,50 @@ def test_free_type_font_get_mask(font):
     assert mask.size == (108, 13)
 
 
-def test_load_path_not_found():
+def test_load_when_image_not_found() -> None:
+    with tempfile.NamedTemporaryFile(delete=False) as tmp:
+        pass
+    with pytest.raises(OSError) as e:
+        ImageFont.load(tmp.name)
+
+    os.unlink(tmp.name)
+
+    root = os.path.splitext(tmp.name)[0]
+    assert str(e.value) == f"cannot find glyph data file {root}.{{gif|pbm|png}}"
+
+
+def test_load_path_not_found() -> None:
     # Arrange
     filename = "somefilenamethatdoesntexist.ttf"
 
     # Act/Assert
-    with pytest.raises(OSError):
+    with pytest.raises(OSError) as e:
         ImageFont.load_path(filename)
+
+    # The file doesn't exist, so don't suggest `load`
+    assert filename in str(e.value)
+    assert "did you mean" not in str(e.value)
     with pytest.raises(OSError):
         ImageFont.truetype(filename)
 
 
-def test_load_non_font_bytes():
+def test_load_path_existing_path() -> None:
+    with tempfile.NamedTemporaryFile() as tmp:
+        with pytest.raises(OSError) as e:
+            ImageFont.load_path(tmp.name)
+
+    # The file exists, so the error message suggests to use `load` instead
+    assert tmp.name in str(e.value)
+    assert " did you mean" in str(e.value)
+
+
+def test_load_non_font_bytes() -> None:
     with open("Tests/images/hopper.jpg", "rb") as f:
         with pytest.raises(OSError):
             ImageFont.truetype(f)
 
 
-def test_default_font():
+def test_default_font() -> None:
     # Arrange
     txt = "This is a default font using FreeType support."
     im = Image.new(mode="RGB", size=(300, 100))
@@ -471,17 +521,17 @@ def test_default_font():
     assert_image_equal_tofile(im, "Tests/images/default_font_freetype.png")
 
 
-@pytest.mark.parametrize("mode", (None, "1", "RGBA"))
-def test_getbbox(font, mode):
+@pytest.mark.parametrize("mode", ("", "1", "RGBA"))
+def test_getbbox(font: ImageFont.FreeTypeFont, mode: str) -> None:
     assert (0, 4, 12, 16) == font.getbbox("A", mode)
 
 
-def test_getbbox_empty(font):
+def test_getbbox_empty(font: ImageFont.FreeTypeFont) -> None:
     # issue #2614, should not crash.
     assert (0, 0, 0, 0) == font.getbbox("")
 
 
-def test_render_empty(font):
+def test_render_empty(font: ImageFont.FreeTypeFont) -> None:
     # issue 2666
     im = Image.new(mode="RGB", size=(300, 100))
     target = im.copy()
@@ -491,7 +541,7 @@ def test_render_empty(font):
     assert_image_equal(im, target)
 
 
-def test_unicode_extended(layout_engine):
+def test_unicode_extended(layout_engine: ImageFont.Layout) -> None:
     # issue #3777
     text = "A\u278A\U0001F12B"
     target = "Tests/images/unicode_extended.png"
@@ -514,21 +564,22 @@ def test_unicode_extended(layout_engine):
     (("linux", "/usr/local/share/fonts"), ("darwin", "/System/Library/Fonts")),
 )
 @pytest.mark.skipif(is_win32(), reason="requires Unix or macOS")
-def test_find_font(monkeypatch, platform, font_directory):
-    def _test_fake_loading_font(path_to_fake, fontname):
+def test_find_font(
+    monkeypatch: pytest.MonkeyPatch, platform: str, font_directory: str
+) -> None:
+    def _test_fake_loading_font(path_to_fake: str, fontname: str) -> None:
         # Make a copy of FreeTypeFont so we can patch the original
         free_type_font = copy.deepcopy(ImageFont.FreeTypeFont)
         with monkeypatch.context() as m:
             m.setattr(ImageFont, "_FreeTypeFont", free_type_font, raising=False)
 
-            def loadable_font(filepath, size, index, encoding, *args, **kwargs):
+            def loadable_font(
+                filepath: str, size: int, index: int, encoding: str, *args: Any
+            ) -> ImageFont.FreeTypeFont:
+                _freeTypeFont = getattr(ImageFont, "_FreeTypeFont")
                 if filepath == path_to_fake:
-                    return ImageFont._FreeTypeFont(
-                        FONT_PATH, size, index, encoding, *args, **kwargs
-                    )
-                return ImageFont._FreeTypeFont(
-                    filepath, size, index, encoding, *args, **kwargs
-                )
+                    return _freeTypeFont(FONT_PATH, size, index, encoding, *args)
+                return _freeTypeFont(filepath, size, index, encoding, *args)
 
             m.setattr(ImageFont, "FreeTypeFont", loadable_font)
             font = ImageFont.truetype(fontname)
@@ -540,9 +591,10 @@ def loadable_font(filepath, size, index, encoding, *args, **kwargs):
     # catching syntax like errors
     monkeypatch.setattr(sys, "platform", platform)
     if platform == "linux":
+        monkeypatch.setenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share"))
         monkeypatch.setenv("XDG_DATA_DIRS", "/usr/share/:/usr/local/share/")
 
-    def fake_walker(path):
+    def fake_walker(path: str) -> list[tuple[str, list[str], list[str]]]:
         if path == font_directory:
             return [
                 (
@@ -566,7 +618,7 @@ def fake_walker(path):
     _test_fake_loading_font(font_directory + "/Duplicate.ttf", "Duplicate")
 
 
-def test_imagefont_getters(font):
+def test_imagefont_getters(font: ImageFont.FreeTypeFont) -> None:
     assert font.getmetrics() == (16, 4)
     assert font.font.ascent == 16
     assert font.font.descent == 4
@@ -587,7 +639,7 @@ def test_imagefont_getters(font):
 
 
 @pytest.mark.parametrize("stroke_width", (0, 2))
-def test_getsize_stroke(font, stroke_width):
+def test_getsize_stroke(font: ImageFont.FreeTypeFont, stroke_width: int) -> None:
     assert font.getbbox("A", stroke_width=stroke_width) == (
         0 - stroke_width,
         4 - stroke_width,
@@ -596,7 +648,7 @@ def test_getsize_stroke(font, stroke_width):
     )
 
 
-def test_complex_font_settings():
+def test_complex_font_settings() -> None:
     t = ImageFont.truetype(FONT_PATH, FONT_SIZE, layout_engine=ImageFont.Layout.BASIC)
     with pytest.raises(KeyError):
         t.getmask("абвг", direction="rtl")
@@ -606,8 +658,10 @@ def test_complex_font_settings():
         t.getmask("абвг", language="sr")
 
 
-def test_variation_get(font):
-    freetype = parse_version(features.version_module("freetype2"))
+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()
@@ -661,7 +715,7 @@ def test_variation_get(font):
     ]
 
 
-def _check_text(font, path, epsilon):
+def _check_text(font: ImageFont.FreeTypeFont, path: str, epsilon: float) -> None:
     im = Image.new("RGB", (100, 75), "white")
     d = ImageDraw.Draw(im)
     d.text((10, 10), "Text", font=font, fill="black")
@@ -676,8 +730,10 @@ def _check_text(font, path, epsilon):
             raise
 
 
-def test_variation_set_by_name(font):
-    freetype = parse_version(features.version_module("freetype2"))
+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")
@@ -688,21 +744,23 @@ def test_variation_set_by_name(font):
 
     font = ImageFont.truetype("Tests/fonts/AdobeVFPrototype.ttf", 36)
     _check_text(font, "Tests/images/variation_adobe.png", 11)
-    for name in ["Bold", b"Bold"]:
+    for name in ("Bold", b"Bold"):
         font.set_variation_by_name(name)
         assert font.getname()[1] == "Bold"
     _check_text(font, "Tests/images/variation_adobe_name.png", 16)
 
     font = ImageFont.truetype("Tests/fonts/TINY5x3GX.ttf", 36)
     _check_text(font, "Tests/images/variation_tiny.png", 40)
-    for name in ["200", b"200"]:
+    for name in ("200", b"200"):
         font.set_variation_by_name(name)
         assert font.getname()[1] == "200"
     _check_text(font, "Tests/images/variation_tiny_name.png", 40)
 
 
-def test_variation_set_by_axes(font):
-    freetype = parse_version(features.version_module("freetype2"))
+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])
@@ -736,7 +794,9 @@ def test_variation_set_by_axes(font):
     ),
     ids=("ls", "ms", "rs", "ma", "mt", "mm", "mb", "md"),
 )
-def test_anchor(layout_engine, anchor, left, top):
+def test_anchor(
+    layout_engine: ImageFont.Layout, anchor: str, left: int, top: int
+) -> None:
     name, text = "quick", "Quick"
     path = f"Tests/images/test_anchor_{name}_{anchor}.png"
 
@@ -781,7 +841,9 @@ def test_anchor(layout_engine, anchor, left, top):
         ("md", "center"),
     ),
 )
-def test_anchor_multiline(layout_engine, anchor, align):
+def test_anchor_multiline(
+    layout_engine: ImageFont.Layout, anchor: str, align: str
+) -> None:
     target = f"Tests/images/test_anchor_multiline_{anchor}_{align}.png"
     text = "a\nlong\ntext sample"
 
@@ -799,7 +861,7 @@ def test_anchor_multiline(layout_engine, anchor, align):
     assert_image_similar_tofile(im, target, 4)
 
 
-def test_anchor_invalid(font):
+def test_anchor_invalid(font: ImageFont.FreeTypeFont) -> None:
     im = Image.new("RGB", (100, 100), "white")
     d = ImageDraw.Draw(im)
     d.font = font
@@ -825,7 +887,7 @@ def test_anchor_invalid(font):
 
 
 @pytest.mark.parametrize("bpp", (1, 2, 4, 8))
-def test_bitmap_font(layout_engine, bpp):
+def test_bitmap_font(layout_engine: ImageFont.Layout, bpp: int) -> None:
     text = "Bitmap Font"
     layout_name = ["basic", "raqm"][layout_engine]
     target = f"Tests/images/bitmap_font_{bpp}_{layout_name}.png"
@@ -842,7 +904,7 @@ def test_bitmap_font(layout_engine, bpp):
     assert_image_equal_tofile(im, target)
 
 
-def test_bitmap_font_stroke(layout_engine):
+def test_bitmap_font_stroke(layout_engine: ImageFont.Layout) -> None:
     text = "Bitmap Font"
     layout_name = ["basic", "raqm"][layout_engine]
     target = f"Tests/images/bitmap_font_stroke_{layout_name}.png"
@@ -860,7 +922,7 @@ def test_bitmap_font_stroke(layout_engine):
 
 
 @pytest.mark.parametrize("embedded_color", (False, True))
-def test_bitmap_blend(layout_engine, embedded_color):
+def test_bitmap_blend(layout_engine: ImageFont.Layout, embedded_color: bool) -> None:
     font = ImageFont.truetype(
         "Tests/fonts/EBDTTestFont.ttf", size=64, layout_engine=layout_engine
     )
@@ -872,7 +934,7 @@ def test_bitmap_blend(layout_engine, embedded_color):
     assert_image_equal_tofile(im, "Tests/images/bitmap_font_blend.png")
 
 
-def test_standard_embedded_color(layout_engine):
+def test_standard_embedded_color(layout_engine: ImageFont.Layout) -> None:
     txt = "Hello World!"
     ttf = ImageFont.truetype(FONT_PATH, 40, layout_engine=layout_engine)
     ttf.getbbox(txt)
@@ -885,7 +947,7 @@ def test_standard_embedded_color(layout_engine):
 
 
 @pytest.mark.parametrize("fontmode", ("1", "L", "RGBA"))
-def test_float_coord(layout_engine, fontmode):
+def test_float_coord(layout_engine: ImageFont.Layout, fontmode: str) -> None:
     txt = "Hello World!"
     ttf = ImageFont.truetype(FONT_PATH, 40, layout_engine=layout_engine)
 
@@ -907,7 +969,7 @@ def test_float_coord(layout_engine, fontmode):
             raise
 
 
-def test_cbdt(layout_engine):
+def test_cbdt(layout_engine: ImageFont.Layout) -> None:
     try:
         font = ImageFont.truetype(
             "Tests/fonts/CBDTTestFont.ttf", size=64, layout_engine=layout_engine
@@ -924,7 +986,7 @@ def test_cbdt(layout_engine):
         pytest.skip("freetype compiled without libpng or CBDT support")
 
 
-def test_cbdt_mask(layout_engine):
+def test_cbdt_mask(layout_engine: ImageFont.Layout) -> None:
     try:
         font = ImageFont.truetype(
             "Tests/fonts/CBDTTestFont.ttf", size=64, layout_engine=layout_engine
@@ -941,7 +1003,7 @@ def test_cbdt_mask(layout_engine):
         pytest.skip("freetype compiled without libpng or CBDT support")
 
 
-def test_sbix(layout_engine):
+def test_sbix(layout_engine: ImageFont.Layout) -> None:
     try:
         font = ImageFont.truetype(
             "Tests/fonts/chromacheck-sbix.woff", size=300, layout_engine=layout_engine
@@ -958,7 +1020,7 @@ def test_sbix(layout_engine):
         pytest.skip("freetype compiled without libpng or SBIX support")
 
 
-def test_sbix_mask(layout_engine):
+def test_sbix_mask(layout_engine: ImageFont.Layout) -> None:
     try:
         font = ImageFont.truetype(
             "Tests/fonts/chromacheck-sbix.woff", size=300, layout_engine=layout_engine
@@ -976,7 +1038,7 @@ def test_sbix_mask(layout_engine):
 
 
 @skip_unless_feature_version("freetype2", "2.10.0")
-def test_colr(layout_engine):
+def test_colr(layout_engine: ImageFont.Layout) -> None:
     font = ImageFont.truetype(
         "Tests/fonts/BungeeColor-Regular_colr_Windows.ttf",
         size=64,
@@ -992,7 +1054,7 @@ def test_colr(layout_engine):
 
 
 @skip_unless_feature_version("freetype2", "2.10.0")
-def test_colr_mask(layout_engine):
+def test_colr_mask(layout_engine: ImageFont.Layout) -> None:
     font = ImageFont.truetype(
         "Tests/fonts/BungeeColor-Regular_colr_Windows.ttf",
         size=64,
@@ -1007,7 +1069,7 @@ def test_colr_mask(layout_engine):
     assert_image_similar_tofile(im, "Tests/images/colr_bungee_mask.png", 22)
 
 
-def test_woff2(layout_engine):
+def test_woff2(layout_engine: ImageFont.Layout) -> None:
     try:
         font = ImageFont.truetype(
             "Tests/fonts/OpenSans.woff2",
@@ -1026,7 +1088,7 @@ def test_woff2(layout_engine):
     assert_image_similar_tofile(im, "Tests/images/test_woff2.png", 5)
 
 
-def test_render_mono_size():
+def test_render_mono_size() -> None:
     # issue 4177
 
     im = Image.new("P", (100, 30), "white")
@@ -1041,7 +1103,7 @@ def test_render_mono_size():
     assert_image_equal_tofile(im, "Tests/images/text_mono.gif")
 
 
-def test_too_many_characters(font):
+def test_too_many_characters(font: ImageFont.FreeTypeFont) -> None:
     with pytest.raises(ValueError):
         font.getlength("A" * 1_000_001)
     with pytest.raises(ValueError):
@@ -1062,6 +1124,26 @@ def test_too_many_characters(font):
         imagefont.getmask("A" * 1_000_001)
 
 
+def test_bytes(font: ImageFont.FreeTypeFont) -> None:
+    assert font.getlength(b"test") == font.getlength("test")
+
+    assert font.getbbox(b"test") == font.getbbox("test")
+
+    assert_image_equal(
+        Image.Image()._new(font.getmask(b"test")),
+        Image.Image()._new(font.getmask("test")),
+    )
+
+    assert_image_equal(
+        Image.Image()._new(font.getmask2(b"test")[0]),
+        Image.Image()._new(font.getmask2("test")[0]),
+    )
+    assert font.getmask2(b"test")[1] == font.getmask2("test")[1]
+
+    with pytest.raises(TypeError):
+        font.getlength((0, 0))  # type: ignore[arg-type]
+
+
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -1069,14 +1151,14 @@ def test_too_many_characters(font):
         "Tests/fonts/oom-4da0210eb7081b0bf15bf16cc4c52ce02c1e1bbc.ttf",
     ],
 )
-def test_oom(test_file):
+def test_oom(test_file: str) -> None:
     with open(test_file, "rb") as f:
         font = ImageFont.truetype(BytesIO(f.read()))
         with pytest.raises(Image.DecompressionBombError):
             font.getmask("Test Text")
 
 
-def test_raqm_missing_warning(monkeypatch):
+def test_raqm_missing_warning(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(ImageFont.core, "HAVE_RAQM", False)
     with pytest.warns(UserWarning) as record:
         font = ImageFont.truetype(
@@ -1090,6 +1172,20 @@ def test_raqm_missing_warning(monkeypatch):
 
 
 @pytest.mark.parametrize("size", [-1, 0])
-def test_invalid_truetype_sizes_raise_valueerror(layout_engine, size):
+def test_invalid_truetype_sizes_raise_valueerror(
+    layout_engine: ImageFont.Layout, size: int
+) -> None:
     with pytest.raises(ValueError):
         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):
+        ImageFont.truetype(FONT_PATH, FONT_SIZE)
diff --git a/Tests/test_imagefontctl.py b/Tests/test_imagefontctl.py
index bea532b051e..24c7b871a68 100644
--- a/Tests/test_imagefontctl.py
+++ b/Tests/test_imagefontctl.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageDraw, ImageFont
@@ -11,7 +12,7 @@
 pytestmark = skip_unless_feature("raqm")
 
 
-def test_english():
+def test_english() -> None:
     # smoke test, this should not fail
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
     im = Image.new(mode="RGB", size=(300, 100))
@@ -19,7 +20,7 @@ def test_english():
     draw.text((0, 0), "TEST", font=ttf, fill=500, direction="ltr")
 
 
-def test_complex_text():
+def test_complex_text() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -30,7 +31,7 @@ def test_complex_text():
     assert_image_similar_tofile(im, target, 0.5)
 
 
-def test_y_offset():
+def test_y_offset() -> None:
     ttf = ImageFont.truetype("Tests/fonts/NotoNastaliqUrdu-Regular.ttf", FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -41,7 +42,7 @@ def test_y_offset():
     assert_image_similar_tofile(im, target, 1.7)
 
 
-def test_complex_unicode_text():
+def test_complex_unicode_text() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -61,7 +62,7 @@ def test_complex_unicode_text():
     assert_image_similar_tofile(im, target, 2.33)
 
 
-def test_text_direction_rtl():
+def test_text_direction_rtl() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -72,7 +73,7 @@ def test_text_direction_rtl():
     assert_image_similar_tofile(im, target, 0.5)
 
 
-def test_text_direction_ltr():
+def test_text_direction_ltr() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -83,7 +84,7 @@ def test_text_direction_ltr():
     assert_image_similar_tofile(im, target, 0.5)
 
 
-def test_text_direction_rtl2():
+def test_text_direction_rtl2() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -94,7 +95,7 @@ def test_text_direction_rtl2():
     assert_image_similar_tofile(im, target, 0.5)
 
 
-def test_text_direction_ttb():
+def test_text_direction_ttb() -> None:
     ttf = ImageFont.truetype("Tests/fonts/NotoSansJP-Regular.otf", FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(100, 300))
@@ -109,7 +110,7 @@ def test_text_direction_ttb():
     assert_image_similar_tofile(im, target, 2.8)
 
 
-def test_text_direction_ttb_stroke():
+def test_text_direction_ttb_stroke() -> None:
     ttf = ImageFont.truetype("Tests/fonts/NotoSansJP-Regular.otf", 50)
 
     im = Image.new(mode="RGB", size=(100, 300))
@@ -132,7 +133,7 @@ def test_text_direction_ttb_stroke():
     assert_image_similar_tofile(im, target, 19.4)
 
 
-def test_ligature_features():
+def test_ligature_features() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -145,7 +146,7 @@ def test_ligature_features():
     assert liga_bbox == (0, 4, 13, 19)
 
 
-def test_kerning_features():
+def test_kerning_features() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -156,7 +157,7 @@ def test_kerning_features():
     assert_image_similar_tofile(im, target, 0.5)
 
 
-def test_arabictext_features():
+def test_arabictext_features() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -173,7 +174,7 @@ def test_arabictext_features():
     assert_image_similar_tofile(im, target, 0.5)
 
 
-def test_x_max_and_y_offset():
+def test_x_max_and_y_offset() -> None:
     ttf = ImageFont.truetype("Tests/fonts/ArefRuqaa-Regular.ttf", 40)
 
     im = Image.new(mode="RGB", size=(50, 100))
@@ -184,7 +185,7 @@ def test_x_max_and_y_offset():
     assert_image_similar_tofile(im, target, 0.5)
 
 
-def test_language():
+def test_language() -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
     im = Image.new(mode="RGB", size=(300, 100))
@@ -207,7 +208,9 @@ def test_language():
     ),
     ids=("None", "ltr", "rtl2", "rtl", "ttb"),
 )
-def test_getlength(mode, text, direction, expected):
+def test_getlength(
+    mode: str, text: str, direction: str | None, expected: float
+) -> None:
     ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
     im = Image.new(mode, (1, 1), 0)
     d = ImageDraw.Draw(im)
@@ -229,7 +232,7 @@ def test_getlength(mode, text, direction, expected):
     ("i" + ("\u030C" * 15) + "i", "i" + "\u032C" * 15 + "i", "\u035Cii", "i\u0305i"),
     ids=("caron-above", "caron-below", "double-breve", "overline"),
 )
-def test_getlength_combine(mode, direction, text):
+def test_getlength_combine(mode: str, direction: str, text: str) -> None:
     if text == "i\u0305i" and direction == "ttb":
         pytest.skip("fails with this font")
 
@@ -249,7 +252,7 @@ def test_getlength_combine(mode, direction, text):
 
 
 @pytest.mark.parametrize("anchor", ("lt", "mm", "rb", "sm"))
-def test_anchor_ttb(anchor):
+def test_anchor_ttb(anchor: str) -> None:
     text = "f"
     path = f"Tests/images/test_anchor_ttb_{text}_{anchor}.png"
     f = ImageFont.truetype("Tests/fonts/NotoSans-Regular.ttf", 120)
@@ -305,7 +308,9 @@ def test_anchor_ttb(anchor):
 @pytest.mark.parametrize(
     "name, text, anchor, dir, epsilon", combine_tests, ids=[r[0] for r in combine_tests]
 )
-def test_combine(name, text, dir, anchor, epsilon):
+def test_combine(
+    name: str, text: str, dir: str | None, anchor: str | None, epsilon: float
+) -> None:
     path = f"Tests/images/test_combine_{name}.png"
     f = ImageFont.truetype("Tests/fonts/NotoSans-Regular.ttf", 48)
 
@@ -336,7 +341,7 @@ def test_combine(name, text, dir, anchor, epsilon):
         ("rm", "right"),  # pass with getsize
     ),
 )
-def test_combine_multiline(anchor, align):
+def test_combine_multiline(anchor: str, align: str) -> None:
     # test that multiline text uses getlength, not getsize or getbbox
 
     path = f"Tests/images/test_combine_multiline_{anchor}_{align}.png"
@@ -354,7 +359,7 @@ def test_combine_multiline(anchor, align):
     assert_image_similar_tofile(im, path, 0.015)
 
 
-def test_anchor_invalid_ttb():
+def test_anchor_invalid_ttb() -> None:
     font = ImageFont.truetype(FONT_PATH, FONT_SIZE)
     im = Image.new("RGB", (100, 100), "white")
     d = ImageDraw.Draw(im)
diff --git a/Tests/test_imagefontpil.py b/Tests/test_imagefontpil.py
index 9e085510149..695aecbded2 100644
--- a/Tests/test_imagefontpil.py
+++ b/Tests/test_imagefontpil.py
@@ -1,60 +1,68 @@
 from __future__ import annotations
+
 import struct
-import pytest
 from io import BytesIO
 
-from PIL import Image, ImageDraw, ImageFont, features, _util
-
-from .helper import assert_image_equal_tofile
-
-original_core = ImageFont.core
-
+import pytest
 
-def setup_module():
-    if features.check_module("freetype2"):
-        ImageFont.core = _util.DeferredError(ImportError)
+from PIL import Image, ImageDraw, ImageFont, _util, features
 
+from .helper import assert_image_equal_tofile
 
-def teardown_module():
-    ImageFont.core = original_core
+fonts = [ImageFont.load_default_imagefont()]
+if not features.check_module("freetype2"):
+    default_font = ImageFont.load_default()
+    if isinstance(default_font, ImageFont.ImageFont):
+        fonts.append(default_font)
 
 
-def test_default_font():
+@pytest.mark.parametrize("font", fonts)
+def test_default_font(font: ImageFont.ImageFont) -> None:
     # Arrange
     txt = 'This is a "better than nothing" default font.'
     im = Image.new(mode="RGB", size=(300, 100))
     draw = ImageDraw.Draw(im)
 
     # Act
-    default_font = ImageFont.load_default()
-    draw.text((10, 10), txt, font=default_font)
+    draw.text((10, 10), txt, font=font)
 
     # Assert
     assert_image_equal_tofile(im, "Tests/images/default_font.png")
 
 
-def test_size_without_freetype():
-    with pytest.raises(ImportError):
-        ImageFont.load_default(size=14)
+def test_without_freetype() -> None:
+    original_core = ImageFont.core
+    if features.check_module("freetype2"):
+        ImageFont.core = _util.DeferredError(ImportError("Disabled for testing"))
+    try:
+        with pytest.raises(ImportError):
+            ImageFont.truetype("Tests/fonts/FreeMono.ttf")
 
+        assert isinstance(ImageFont.load_default(), ImageFont.ImageFont)
 
-def test_unicode():
+        with pytest.raises(ImportError):
+            ImageFont.load_default(size=14)
+    finally:
+        ImageFont.core = original_core
+
+
+@pytest.mark.parametrize("font", fonts)
+def test_unicode(font: ImageFont.ImageFont) -> None:
     # should not segfault, should return UnicodeDecodeError
     # issue #2826
-    font = ImageFont.load_default()
     with pytest.raises(UnicodeEncodeError):
         font.getbbox("’")
 
 
-def test_textbbox():
+@pytest.mark.parametrize("font", fonts)
+def test_textbbox(font: ImageFont.ImageFont) -> None:
     im = Image.new("RGB", (200, 200))
     d = ImageDraw.Draw(im)
-    default_font = ImageFont.load_default()
-    assert d.textlength("test", font=default_font) == 24
-    assert d.textbbox((0, 0), "test", font=default_font) == (0, 0, 24, 11)
+    assert d.textlength("test", font=font) == 24
+    assert d.textbbox((0, 0), "test", font=font) == (0, 0, 24, 11)
 
 
-def test_decompression_bomb():
+def test_decompression_bomb() -> None:
     glyph = struct.pack(">hhhhhhhhhh", 1, 0, 0, 0, 256, 256, 0, 0, 256, 256)
     fp = BytesIO(b"PILfont\n\nDATA\n" + glyph * 256)
 
@@ -65,7 +73,7 @@ def test_decompression_bomb():
 
 
 @pytest.mark.timeout(4)
-def test_oom():
+def test_oom() -> None:
     glyph = struct.pack(
         ">hhhhhhhhhh", 1, 0, -32767, -32767, 32767, 32767, -32767, -32767, 32767, 32767
     )
diff --git a/Tests/test_imagegrab.py b/Tests/test_imagegrab.py
index b7683ec1817..5cd510751e2 100644
--- a/Tests/test_imagegrab.py
+++ b/Tests/test_imagegrab.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import os
 import shutil
 import subprocess
@@ -19,7 +20,7 @@ class TestImageGrab:
     @pytest.mark.skipif(
         sys.platform not in ("win32", "darwin"), reason="requires Windows or macOS"
     )
-    def test_grab(self):
+    def test_grab(self) -> None:
         ImageGrab.grab()
         ImageGrab.grab(include_layered_windows=True)
         ImageGrab.grab(all_screens=True)
@@ -28,7 +29,7 @@ def test_grab(self):
         assert im.size == (40, 60)
 
     @skip_unless_feature("xcb")
-    def test_grab_x11(self):
+    def test_grab_x11(self) -> None:
         try:
             if sys.platform not in ("win32", "darwin"):
                 ImageGrab.grab()
@@ -38,7 +39,7 @@ def test_grab_x11(self):
             pytest.skip(str(e))
 
     @pytest.mark.skipif(Image.core.HAVE_XCB, reason="tests missing XCB")
-    def test_grab_no_xcb(self):
+    def test_grab_no_xcb(self) -> None:
         if sys.platform not in ("win32", "darwin") and not shutil.which(
             "gnome-screenshot"
         ):
@@ -51,14 +52,16 @@ def test_grab_no_xcb(self):
         assert str(e.value).startswith("Pillow was built without XCB support")
 
     @skip_unless_feature("xcb")
-    def test_grab_invalid_xdisplay(self):
+    def test_grab_invalid_xdisplay(self) -> None:
         with pytest.raises(OSError) as e:
             ImageGrab.grab(xdisplay="error.test:0.0")
         assert str(e.value).startswith("X connection failed")
 
-    def test_grabclipboard(self):
+    def test_grabclipboard(self) -> None:
         if sys.platform == "darwin":
             subprocess.call(["screencapture", "-cx"])
+
+            ImageGrab.grabclipboard()
         elif sys.platform == "win32":
             p = subprocess.Popen(["powershell", "-command", "-"], stdin=subprocess.PIPE)
             p.stdin.write(
@@ -68,6 +71,8 @@ def test_grabclipboard(self):
 [Windows.Forms.Clipboard]::SetImage($bmp)"""
             )
             p.communicate()
+
+            ImageGrab.grabclipboard()
         else:
             if not shutil.which("wl-paste") and not shutil.which("xclip"):
                 with pytest.raises(
@@ -76,23 +81,23 @@ def test_grabclipboard(self):
                     r" ImageGrab.grabclipboard\(\) on Linux",
                 ):
                     ImageGrab.grabclipboard()
-            return
-
-        ImageGrab.grabclipboard()
 
     @pytest.mark.skipif(sys.platform != "win32", reason="Windows only")
-    def test_grabclipboard_file(self):
+    def test_grabclipboard_file(self) -> None:
         p = subprocess.Popen(["powershell", "-command", "-"], stdin=subprocess.PIPE)
+        assert p.stdin is not None
         p.stdin.write(rb'Set-Clipboard -Path "Tests\images\hopper.gif"')
         p.communicate()
 
         im = ImageGrab.grabclipboard()
+        assert isinstance(im, list)
         assert len(im) == 1
         assert os.path.samefile(im[0], "Tests/images/hopper.gif")
 
     @pytest.mark.skipif(sys.platform != "win32", reason="Windows only")
-    def test_grabclipboard_png(self):
+    def test_grabclipboard_png(self) -> None:
         p = subprocess.Popen(["powershell", "-command", "-"], stdin=subprocess.PIPE)
+        assert p.stdin is not None
         p.stdin.write(
             rb"""$bytes = [System.IO.File]::ReadAllBytes("Tests\images\hopper.png")
 $ms = new-object System.IO.MemoryStream(, $bytes)
@@ -102,6 +107,7 @@ def test_grabclipboard_png(self):
         p.communicate()
 
         im = ImageGrab.grabclipboard()
+        assert isinstance(im, Image.Image)
         assert_image_equal_tofile(im, "Tests/images/hopper.png")
 
     @pytest.mark.skipif(
@@ -112,9 +118,22 @@ def test_grabclipboard_png(self):
         reason="Linux with wl-clipboard only",
     )
     @pytest.mark.parametrize("ext", ("gif", "png", "ico"))
-    def test_grabclipboard_wl_clipboard(self, ext):
+    def test_grabclipboard_wl_clipboard(self, ext: str) -> None:
         image_path = "Tests/images/hopper." + ext
         with open(image_path, "rb") as fp:
             subprocess.call(["wl-copy"], stdin=fp)
         im = ImageGrab.grabclipboard()
+        assert isinstance(im, Image.Image)
         assert_image_equal_tofile(im, image_path)
+
+    @pytest.mark.skipif(
+        (
+            sys.platform != "linux"
+            or not all(shutil.which(cmd) for cmd in ("wl-paste", "wl-copy"))
+        ),
+        reason="Linux with wl-clipboard only",
+    )
+    @pytest.mark.parametrize("arg", ("text", "--clear"))
+    def test_grabclipboard_wl_clipboard_errors(self, arg: str) -> None:
+        subprocess.call(["wl-copy", arg])
+        assert ImageGrab.grabclipboard() is None
diff --git a/Tests/test_imagemath.py b/Tests/test_imagemath.py
deleted file mode 100644
index 9281de6f66a..00000000000
--- a/Tests/test_imagemath.py
+++ /dev/null
@@ -1,213 +0,0 @@
-from __future__ import annotations
-import pytest
-
-from PIL import Image, ImageMath
-
-
-def pixel(im):
-    if hasattr(im, "im"):
-        return f"{im.mode} {repr(im.getpixel((0, 0)))}"
-    if isinstance(im, int):
-        return int(im)  # hack to deal with booleans
-
-
-A = Image.new("L", (1, 1), 1)
-B = Image.new("L", (1, 1), 2)
-Z = Image.new("L", (1, 1), 0)  # Z for zero
-F = Image.new("F", (1, 1), 3)
-I = Image.new("I", (1, 1), 4)  # noqa: E741
-
-A2 = A.resize((2, 2))
-B2 = B.resize((2, 2))
-
-images = {"A": A, "B": B, "F": F, "I": I}
-
-
-def test_sanity():
-    assert ImageMath.eval("1") == 1
-    assert ImageMath.eval("1+A", A=2) == 3
-    assert pixel(ImageMath.eval("A+B", A=A, B=B)) == "I 3"
-    assert pixel(ImageMath.eval("A+B", images)) == "I 3"
-    assert pixel(ImageMath.eval("float(A)+B", images)) == "F 3.0"
-    assert pixel(ImageMath.eval("int(float(A)+B)", images)) == "I 3"
-
-
-def test_ops():
-    assert pixel(ImageMath.eval("-A", images)) == "I -1"
-    assert pixel(ImageMath.eval("+B", images)) == "L 2"
-
-    assert pixel(ImageMath.eval("A+B", images)) == "I 3"
-    assert pixel(ImageMath.eval("A-B", images)) == "I -1"
-    assert pixel(ImageMath.eval("A*B", images)) == "I 2"
-    assert pixel(ImageMath.eval("A/B", images)) == "I 0"
-    assert pixel(ImageMath.eval("B**2", images)) == "I 4"
-    assert pixel(ImageMath.eval("B**33", images)) == "I 2147483647"
-
-    assert pixel(ImageMath.eval("float(A)+B", images)) == "F 3.0"
-    assert pixel(ImageMath.eval("float(A)-B", images)) == "F -1.0"
-    assert pixel(ImageMath.eval("float(A)*B", images)) == "F 2.0"
-    assert pixel(ImageMath.eval("float(A)/B", images)) == "F 0.5"
-    assert pixel(ImageMath.eval("float(B)**2", images)) == "F 4.0"
-    assert pixel(ImageMath.eval("float(B)**33", images)) == "F 8589934592.0"
-
-
-@pytest.mark.parametrize(
-    "expression",
-    (
-        "exec('pass')",
-        "(lambda: exec('pass'))()",
-        "(lambda: (lambda: exec('pass'))())()",
-    ),
-)
-def test_prevent_exec(expression):
-    with pytest.raises(ValueError):
-        ImageMath.eval(expression)
-
-
-def test_prevent_double_underscores():
-    with pytest.raises(ValueError):
-        ImageMath.eval("1", {"__": None})
-
-
-def test_prevent_builtins():
-    with pytest.raises(ValueError):
-        ImageMath.eval("(lambda: exec('exit()'))()", {"exec": None})
-
-
-def test_logical():
-    assert pixel(ImageMath.eval("not A", images)) == 0
-    assert pixel(ImageMath.eval("A and B", images)) == "L 2"
-    assert pixel(ImageMath.eval("A or B", images)) == "L 1"
-
-
-def test_convert():
-    assert pixel(ImageMath.eval("convert(A+B, 'L')", images)) == "L 3"
-    assert pixel(ImageMath.eval("convert(A+B, '1')", images)) == "1 0"
-    assert pixel(ImageMath.eval("convert(A+B, 'RGB')", images)) == "RGB (3, 3, 3)"
-
-
-def test_compare():
-    assert pixel(ImageMath.eval("min(A, B)", images)) == "I 1"
-    assert pixel(ImageMath.eval("max(A, B)", images)) == "I 2"
-    assert pixel(ImageMath.eval("A == 1", images)) == "I 1"
-    assert pixel(ImageMath.eval("A == 2", images)) == "I 0"
-
-
-def test_one_image_larger():
-    assert pixel(ImageMath.eval("A+B", A=A2, B=B)) == "I 3"
-    assert pixel(ImageMath.eval("A+B", A=A, B=B2)) == "I 3"
-
-
-def test_abs():
-    assert pixel(ImageMath.eval("abs(A)", A=A)) == "I 1"
-    assert pixel(ImageMath.eval("abs(B)", B=B)) == "I 2"
-
-
-def test_binary_mod():
-    assert pixel(ImageMath.eval("A%A", A=A)) == "I 0"
-    assert pixel(ImageMath.eval("B%B", B=B)) == "I 0"
-    assert pixel(ImageMath.eval("A%B", A=A, B=B)) == "I 1"
-    assert pixel(ImageMath.eval("B%A", A=A, B=B)) == "I 0"
-    assert pixel(ImageMath.eval("Z%A", A=A, Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("Z%B", B=B, Z=Z)) == "I 0"
-
-
-def test_bitwise_invert():
-    assert pixel(ImageMath.eval("~Z", Z=Z)) == "I -1"
-    assert pixel(ImageMath.eval("~A", A=A)) == "I -2"
-    assert pixel(ImageMath.eval("~B", B=B)) == "I -3"
-
-
-def test_bitwise_and():
-    assert pixel(ImageMath.eval("Z&Z", A=A, Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("Z&A", A=A, Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("A&Z", A=A, Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("A&A", A=A, Z=Z)) == "I 1"
-
-
-def test_bitwise_or():
-    assert pixel(ImageMath.eval("Z|Z", A=A, Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("Z|A", A=A, Z=Z)) == "I 1"
-    assert pixel(ImageMath.eval("A|Z", A=A, Z=Z)) == "I 1"
-    assert pixel(ImageMath.eval("A|A", A=A, Z=Z)) == "I 1"
-
-
-def test_bitwise_xor():
-    assert pixel(ImageMath.eval("Z^Z", A=A, Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("Z^A", A=A, Z=Z)) == "I 1"
-    assert pixel(ImageMath.eval("A^Z", A=A, Z=Z)) == "I 1"
-    assert pixel(ImageMath.eval("A^A", A=A, Z=Z)) == "I 0"
-
-
-def test_bitwise_leftshift():
-    assert pixel(ImageMath.eval("Z<<0", Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("Z<<1", Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("A<<0", A=A)) == "I 1"
-    assert pixel(ImageMath.eval("A<<1", A=A)) == "I 2"
-
-
-def test_bitwise_rightshift():
-    assert pixel(ImageMath.eval("Z>>0", Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("Z>>1", Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("A>>0", A=A)) == "I 1"
-    assert pixel(ImageMath.eval("A>>1", A=A)) == "I 0"
-
-
-def test_logical_eq():
-    assert pixel(ImageMath.eval("A==A", A=A)) == "I 1"
-    assert pixel(ImageMath.eval("B==B", B=B)) == "I 1"
-    assert pixel(ImageMath.eval("A==B", A=A, B=B)) == "I 0"
-    assert pixel(ImageMath.eval("B==A", A=A, B=B)) == "I 0"
-
-
-def test_logical_ne():
-    assert pixel(ImageMath.eval("A!=A", A=A)) == "I 0"
-    assert pixel(ImageMath.eval("B!=B", B=B)) == "I 0"
-    assert pixel(ImageMath.eval("A!=B", A=A, B=B)) == "I 1"
-    assert pixel(ImageMath.eval("B!=A", A=A, B=B)) == "I 1"
-
-
-def test_logical_lt():
-    assert pixel(ImageMath.eval("A<A", A=A)) == "I 0"
-    assert pixel(ImageMath.eval("B<B", B=B)) == "I 0"
-    assert pixel(ImageMath.eval("A<B", A=A, B=B)) == "I 1"
-    assert pixel(ImageMath.eval("B<A", A=A, B=B)) == "I 0"
-
-
-def test_logical_le():
-    assert pixel(ImageMath.eval("A<=A", A=A)) == "I 1"
-    assert pixel(ImageMath.eval("B<=B", B=B)) == "I 1"
-    assert pixel(ImageMath.eval("A<=B", A=A, B=B)) == "I 1"
-    assert pixel(ImageMath.eval("B<=A", A=A, B=B)) == "I 0"
-
-
-def test_logical_gt():
-    assert pixel(ImageMath.eval("A>A", A=A)) == "I 0"
-    assert pixel(ImageMath.eval("B>B", B=B)) == "I 0"
-    assert pixel(ImageMath.eval("A>B", A=A, B=B)) == "I 0"
-    assert pixel(ImageMath.eval("B>A", A=A, B=B)) == "I 1"
-
-
-def test_logical_ge():
-    assert pixel(ImageMath.eval("A>=A", A=A)) == "I 1"
-    assert pixel(ImageMath.eval("B>=B", B=B)) == "I 1"
-    assert pixel(ImageMath.eval("A>=B", A=A, B=B)) == "I 0"
-    assert pixel(ImageMath.eval("B>=A", A=A, B=B)) == "I 1"
-
-
-def test_logical_equal():
-    assert pixel(ImageMath.eval("equal(A, A)", A=A)) == "I 1"
-    assert pixel(ImageMath.eval("equal(B, B)", B=B)) == "I 1"
-    assert pixel(ImageMath.eval("equal(Z, Z)", Z=Z)) == "I 1"
-    assert pixel(ImageMath.eval("equal(A, B)", A=A, B=B)) == "I 0"
-    assert pixel(ImageMath.eval("equal(B, A)", A=A, B=B)) == "I 0"
-    assert pixel(ImageMath.eval("equal(A, Z)", A=A, Z=Z)) == "I 0"
-
-
-def test_logical_not_equal():
-    assert pixel(ImageMath.eval("notequal(A, A)", A=A)) == "I 0"
-    assert pixel(ImageMath.eval("notequal(B, B)", B=B)) == "I 0"
-    assert pixel(ImageMath.eval("notequal(Z, Z)", Z=Z)) == "I 0"
-    assert pixel(ImageMath.eval("notequal(A, B)", A=A, B=B)) == "I 1"
-    assert pixel(ImageMath.eval("notequal(B, A)", A=A, B=B)) == "I 1"
-    assert pixel(ImageMath.eval("notequal(A, Z)", A=A, Z=Z)) == "I 1"
diff --git a/Tests/test_imagemath_lambda_eval.py b/Tests/test_imagemath_lambda_eval.py
new file mode 100644
index 00000000000..360325780bb
--- /dev/null
+++ b/Tests/test_imagemath_lambda_eval.py
@@ -0,0 +1,507 @@
+from __future__ import annotations
+
+from typing import Any
+
+import pytest
+
+from PIL import Image, ImageMath
+
+
+def pixel(im: Image.Image | int) -> str | int:
+    if isinstance(im, int):
+        return int(im)  # hack to deal with booleans
+
+    return f"{im.mode} {repr(im.getpixel((0, 0)))}"
+
+
+A = Image.new("L", (1, 1), 1)
+B = Image.new("L", (1, 1), 2)
+Z = Image.new("L", (1, 1), 0)  # Z for zero
+F = Image.new("F", (1, 1), 3)
+I = Image.new("I", (1, 1), 4)  # noqa: E741
+
+A2 = A.resize((2, 2))
+B2 = B.resize((2, 2))
+
+images: dict[str, Any] = {"A": A, "B": B, "F": F, "I": I}
+
+
+def test_sanity() -> None:
+    assert ImageMath.lambda_eval(lambda args: 1) == 1
+    assert ImageMath.lambda_eval(lambda args: 1 + args["A"], A=2) == 3
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] + args["B"], A=A, B=B))
+        == "I 3"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] + args["B"], **images))
+        == "I 3"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["float"](args["A"]) + args["B"], **images
+            )
+        )
+        == "F 3.0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["int"](args["float"](args["A"]) + args["B"]), **images
+            )
+        )
+        == "I 3"
+    )
+
+
+def test_options_deprecated() -> None:
+    with pytest.warns(DeprecationWarning):
+        assert ImageMath.lambda_eval(lambda args: 1, images) == 1
+
+
+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"] + args["B"], **images))
+        == "I 3"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] - args["B"], **images))
+        == "I -1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] * args["B"], **images))
+        == "I 2"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] / args["B"], **images))
+        == "I 0"
+    )
+    assert pixel(ImageMath.lambda_eval(lambda args: args["B"] ** 2, **images)) == "I 4"
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] ** 33, **images))
+        == "I 2147483647"
+    )
+
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["float"](args["A"]) + args["B"], **images
+            )
+        )
+        == "F 3.0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["float"](args["A"]) - args["B"], **images
+            )
+        )
+        == "F -1.0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["float"](args["A"]) * args["B"], **images
+            )
+        )
+        == "F 2.0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["float"](args["A"]) / args["B"], **images
+            )
+        )
+        == "F 0.5"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(lambda args: args["float"](args["B"]) ** 2, **images)
+        )
+        == "F 4.0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(lambda args: args["float"](args["B"]) ** 33, **images)
+        )
+        == "F 8589934592.0"
+    )
+
+
+def test_logical() -> None:
+    assert pixel(ImageMath.lambda_eval(lambda args: not args["A"], **images)) == 0
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] and args["B"], **images))
+        == "L 2"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] or args["B"], **images))
+        == "L 1"
+    )
+
+
+def test_convert() -> None:
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["convert"](args["A"] + args["B"], "L"), **images
+            )
+        )
+        == "L 3"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["convert"](args["A"] + args["B"], "1"), **images
+            )
+        )
+        == "1 0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["convert"](args["A"] + args["B"], "RGB"), **images
+            )
+        )
+        == "RGB (3, 3, 3)"
+    )
+
+
+def test_compare() -> None:
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["min"](args["A"], args["B"]), **images
+            )
+        )
+        == "I 1"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["max"](args["A"], args["B"]), **images
+            )
+        )
+        == "I 2"
+    )
+    assert pixel(ImageMath.lambda_eval(lambda args: args["A"] == 1, **images)) == "I 1"
+    assert pixel(ImageMath.lambda_eval(lambda args: args["A"] == 2, **images)) == "I 0"
+
+
+def test_one_image_larger() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] + args["B"], A=A2, B=B))
+        == "I 3"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] + args["B"], A=A, B=B2))
+        == "I 3"
+    )
+
+
+def test_abs() -> None:
+    assert pixel(ImageMath.lambda_eval(lambda args: abs(args["A"]), A=A)) == "I 1"
+    assert pixel(ImageMath.lambda_eval(lambda args: abs(args["B"]), B=B)) == "I 2"
+
+
+def test_binary_mod() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] % args["A"], A=A)) == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] % args["B"], B=B)) == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] % args["B"], A=A, B=B))
+        == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] % args["A"], A=A, B=B))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["Z"] % args["A"], A=A, Z=Z))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["Z"] % args["B"], B=B, Z=Z))
+        == "I 0"
+    )
+
+
+def test_bitwise_invert() -> None:
+    assert pixel(ImageMath.lambda_eval(lambda args: ~args["Z"], Z=Z)) == "I -1"
+    assert pixel(ImageMath.lambda_eval(lambda args: ~args["A"], A=A)) == "I -2"
+    assert pixel(ImageMath.lambda_eval(lambda args: ~args["B"], B=B)) == "I -3"
+
+
+def test_bitwise_and() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["Z"] & args["Z"], A=A, Z=Z))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["Z"] & args["A"], A=A, Z=Z))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] & args["Z"], A=A, Z=Z))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] & args["A"], A=A, Z=Z))
+        == "I 1"
+    )
+
+
+def test_bitwise_or() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["Z"] | args["Z"], A=A, Z=Z))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["Z"] | args["A"], A=A, Z=Z))
+        == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] | args["Z"], A=A, Z=Z))
+        == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] | args["A"], A=A, Z=Z))
+        == "I 1"
+    )
+
+
+def test_bitwise_xor() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["Z"] ^ args["Z"], A=A, Z=Z))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["Z"] ^ args["A"], A=A, Z=Z))
+        == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] ^ args["Z"], A=A, Z=Z))
+        == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] ^ args["A"], A=A, Z=Z))
+        == "I 0"
+    )
+
+
+def test_bitwise_leftshift() -> None:
+    assert pixel(ImageMath.lambda_eval(lambda args: args["Z"] << 0, Z=Z)) == "I 0"
+    assert pixel(ImageMath.lambda_eval(lambda args: args["Z"] << 1, Z=Z)) == "I 0"
+    assert pixel(ImageMath.lambda_eval(lambda args: args["A"] << 0, A=A)) == "I 1"
+    assert pixel(ImageMath.lambda_eval(lambda args: args["A"] << 1, A=A)) == "I 2"
+
+
+def test_bitwise_rightshift() -> None:
+    assert pixel(ImageMath.lambda_eval(lambda args: args["Z"] >> 0, Z=Z)) == "I 0"
+    assert pixel(ImageMath.lambda_eval(lambda args: args["Z"] >> 1, Z=Z)) == "I 0"
+    assert pixel(ImageMath.lambda_eval(lambda args: args["A"] >> 0, A=A)) == "I 1"
+    assert pixel(ImageMath.lambda_eval(lambda args: args["A"] >> 1, A=A)) == "I 0"
+
+
+def test_logical_eq() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] == args["A"], A=A)) == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] == args["B"], B=B)) == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] == args["B"], A=A, B=B))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] == args["A"], A=A, B=B))
+        == "I 0"
+    )
+
+
+def test_logical_ne() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] != args["A"], A=A)) == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] != args["B"], B=B)) == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] != args["B"], A=A, B=B))
+        == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] != args["A"], A=A, B=B))
+        == "I 1"
+    )
+
+
+def test_logical_lt() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] < args["A"], A=A)) == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] < args["B"], B=B)) == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] < args["B"], A=A, B=B))
+        == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] < args["A"], A=A, B=B))
+        == "I 0"
+    )
+
+
+def test_logical_le() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] <= args["A"], A=A)) == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] <= args["B"], B=B)) == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] <= args["B"], A=A, B=B))
+        == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] <= args["A"], A=A, B=B))
+        == "I 0"
+    )
+
+
+def test_logical_gt() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] > args["A"], A=A)) == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] > args["B"], B=B)) == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] > args["B"], A=A, B=B))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] > args["A"], A=A, B=B))
+        == "I 1"
+    )
+
+
+def test_logical_ge() -> None:
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] >= args["A"], A=A)) == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] >= args["B"], B=B)) == "I 1"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["A"] >= args["B"], A=A, B=B))
+        == "I 0"
+    )
+    assert (
+        pixel(ImageMath.lambda_eval(lambda args: args["B"] >= args["A"], A=A, B=B))
+        == "I 1"
+    )
+
+
+def test_logical_equal() -> None:
+    assert (
+        pixel(
+            ImageMath.lambda_eval(lambda args: args["equal"](args["A"], args["A"]), A=A)
+        )
+        == "I 1"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(lambda args: args["equal"](args["B"], args["B"]), B=B)
+        )
+        == "I 1"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(lambda args: args["equal"](args["Z"], args["Z"]), Z=Z)
+        )
+        == "I 1"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["equal"](args["A"], args["B"]), A=A, B=B
+            )
+        )
+        == "I 0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["equal"](args["B"], args["A"]), A=A, B=B
+            )
+        )
+        == "I 0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["equal"](args["A"], args["Z"]), A=A, Z=Z
+            )
+        )
+        == "I 0"
+    )
+
+
+def test_logical_not_equal() -> None:
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["notequal"](args["A"], args["A"]), A=A
+            )
+        )
+        == "I 0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["notequal"](args["B"], args["B"]), B=B
+            )
+        )
+        == "I 0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["notequal"](args["Z"], args["Z"]), Z=Z
+            )
+        )
+        == "I 0"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["notequal"](args["A"], args["B"]), A=A, B=B
+            )
+        )
+        == "I 1"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["notequal"](args["B"], args["A"]), A=A, B=B
+            )
+        )
+        == "I 1"
+    )
+    assert (
+        pixel(
+            ImageMath.lambda_eval(
+                lambda args: args["notequal"](args["A"], args["Z"]), A=A, Z=Z
+            )
+        )
+        == "I 1"
+    )
diff --git a/Tests/test_imagemath_unsafe_eval.py b/Tests/test_imagemath_unsafe_eval.py
new file mode 100644
index 00000000000..b7ac8469180
--- /dev/null
+++ b/Tests/test_imagemath_unsafe_eval.py
@@ -0,0 +1,228 @@
+from __future__ import annotations
+
+from typing import Any
+
+import pytest
+
+from PIL import Image, ImageMath
+
+
+def pixel(im: Image.Image | int) -> str | int:
+    if isinstance(im, int):
+        return int(im)  # hack to deal with booleans
+
+    return f"{im.mode} {repr(im.getpixel((0, 0)))}"
+
+
+A = Image.new("L", (1, 1), 1)
+B = Image.new("L", (1, 1), 2)
+Z = Image.new("L", (1, 1), 0)  # Z for zero
+F = Image.new("F", (1, 1), 3)
+I = Image.new("I", (1, 1), 4)  # noqa: E741
+
+A2 = A.resize((2, 2))
+B2 = B.resize((2, 2))
+
+images: dict[str, Any] = {"A": A, "B": B, "F": F, "I": I}
+
+
+def test_sanity() -> None:
+    assert ImageMath.unsafe_eval("1") == 1
+    assert ImageMath.unsafe_eval("1+A", A=2) == 3
+    assert pixel(ImageMath.unsafe_eval("A+B", A=A, B=B)) == "I 3"
+    assert pixel(ImageMath.unsafe_eval("A+B", **images)) == "I 3"
+    assert pixel(ImageMath.unsafe_eval("float(A)+B", **images)) == "F 3.0"
+    assert pixel(ImageMath.unsafe_eval("int(float(A)+B)", **images)) == "I 3"
+
+
+def test_eval_deprecated() -> None:
+    with pytest.warns(DeprecationWarning):
+        assert ImageMath.eval("1") == 1
+
+
+def test_options_deprecated() -> None:
+    with pytest.warns(DeprecationWarning):
+        assert ImageMath.unsafe_eval("1", images) == 1
+
+
+def test_ops() -> None:
+    assert pixel(ImageMath.unsafe_eval("-A", **images)) == "I -1"
+    assert pixel(ImageMath.unsafe_eval("+B", **images)) == "L 2"
+
+    assert pixel(ImageMath.unsafe_eval("A+B", **images)) == "I 3"
+    assert pixel(ImageMath.unsafe_eval("A-B", **images)) == "I -1"
+    assert pixel(ImageMath.unsafe_eval("A*B", **images)) == "I 2"
+    assert pixel(ImageMath.unsafe_eval("A/B", **images)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("B**2", **images)) == "I 4"
+    assert pixel(ImageMath.unsafe_eval("B**33", **images)) == "I 2147483647"
+
+    assert pixel(ImageMath.unsafe_eval("float(A)+B", **images)) == "F 3.0"
+    assert pixel(ImageMath.unsafe_eval("float(A)-B", **images)) == "F -1.0"
+    assert pixel(ImageMath.unsafe_eval("float(A)*B", **images)) == "F 2.0"
+    assert pixel(ImageMath.unsafe_eval("float(A)/B", **images)) == "F 0.5"
+    assert pixel(ImageMath.unsafe_eval("float(B)**2", **images)) == "F 4.0"
+    assert pixel(ImageMath.unsafe_eval("float(B)**33", **images)) == "F 8589934592.0"
+
+
+@pytest.mark.parametrize(
+    "expression",
+    (
+        "exec('pass')",
+        "(lambda: exec('pass'))()",
+        "(lambda: (lambda: exec('pass'))())()",
+    ),
+)
+def test_prevent_exec(expression: str) -> None:
+    with pytest.raises(ValueError):
+        ImageMath.unsafe_eval(expression)
+
+
+def test_prevent_double_underscores() -> None:
+    with pytest.raises(ValueError):
+        ImageMath.unsafe_eval("1", __=None)
+
+
+def test_prevent_builtins() -> None:
+    with pytest.raises(ValueError):
+        ImageMath.unsafe_eval("(lambda: exec('exit()'))()", exec=None)
+
+
+def test_logical() -> None:
+    assert pixel(ImageMath.unsafe_eval("not A", **images)) == 0
+    assert pixel(ImageMath.unsafe_eval("A and B", **images)) == "L 2"
+    assert pixel(ImageMath.unsafe_eval("A or B", **images)) == "L 1"
+
+
+def test_convert() -> None:
+    assert pixel(ImageMath.unsafe_eval("convert(A+B, 'L')", **images)) == "L 3"
+    assert pixel(ImageMath.unsafe_eval("convert(A+B, '1')", **images)) == "1 0"
+    assert (
+        pixel(ImageMath.unsafe_eval("convert(A+B, 'RGB')", **images)) == "RGB (3, 3, 3)"
+    )
+
+
+def test_compare() -> None:
+    assert pixel(ImageMath.unsafe_eval("min(A, B)", **images)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("max(A, B)", **images)) == "I 2"
+    assert pixel(ImageMath.unsafe_eval("A == 1", **images)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A == 2", **images)) == "I 0"
+
+
+def test_one_image_larger() -> None:
+    assert pixel(ImageMath.unsafe_eval("A+B", A=A2, B=B)) == "I 3"
+    assert pixel(ImageMath.unsafe_eval("A+B", A=A, B=B2)) == "I 3"
+
+
+def test_abs() -> None:
+    assert pixel(ImageMath.unsafe_eval("abs(A)", A=A)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("abs(B)", B=B)) == "I 2"
+
+
+def test_binary_mod() -> None:
+    assert pixel(ImageMath.unsafe_eval("A%A", A=A)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("B%B", B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("A%B", A=A, B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("B%A", A=A, B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("Z%A", A=A, Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("Z%B", B=B, Z=Z)) == "I 0"
+
+
+def test_bitwise_invert() -> None:
+    assert pixel(ImageMath.unsafe_eval("~Z", Z=Z)) == "I -1"
+    assert pixel(ImageMath.unsafe_eval("~A", A=A)) == "I -2"
+    assert pixel(ImageMath.unsafe_eval("~B", B=B)) == "I -3"
+
+
+def test_bitwise_and() -> None:
+    assert pixel(ImageMath.unsafe_eval("Z&Z", A=A, Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("Z&A", A=A, Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("A&Z", A=A, Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("A&A", A=A, Z=Z)) == "I 1"
+
+
+def test_bitwise_or() -> None:
+    assert pixel(ImageMath.unsafe_eval("Z|Z", A=A, Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("Z|A", A=A, Z=Z)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A|Z", A=A, Z=Z)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A|A", A=A, Z=Z)) == "I 1"
+
+
+def test_bitwise_xor() -> None:
+    assert pixel(ImageMath.unsafe_eval("Z^Z", A=A, Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("Z^A", A=A, Z=Z)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A^Z", A=A, Z=Z)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A^A", A=A, Z=Z)) == "I 0"
+
+
+def test_bitwise_leftshift() -> None:
+    assert pixel(ImageMath.unsafe_eval("Z<<0", Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("Z<<1", Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("A<<0", A=A)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A<<1", A=A)) == "I 2"
+
+
+def test_bitwise_rightshift() -> None:
+    assert pixel(ImageMath.unsafe_eval("Z>>0", Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("Z>>1", Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("A>>0", A=A)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A>>1", A=A)) == "I 0"
+
+
+def test_logical_eq() -> None:
+    assert pixel(ImageMath.unsafe_eval("A==A", A=A)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("B==B", B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A==B", A=A, B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("B==A", A=A, B=B)) == "I 0"
+
+
+def test_logical_ne() -> None:
+    assert pixel(ImageMath.unsafe_eval("A!=A", A=A)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("B!=B", B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("A!=B", A=A, B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("B!=A", A=A, B=B)) == "I 1"
+
+
+def test_logical_lt() -> None:
+    assert pixel(ImageMath.unsafe_eval("A<A", A=A)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("B<B", B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("A<B", A=A, B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("B<A", A=A, B=B)) == "I 0"
+
+
+def test_logical_le() -> None:
+    assert pixel(ImageMath.unsafe_eval("A<=A", A=A)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("B<=B", B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A<=B", A=A, B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("B<=A", A=A, B=B)) == "I 0"
+
+
+def test_logical_gt() -> None:
+    assert pixel(ImageMath.unsafe_eval("A>A", A=A)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("B>B", B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("A>B", A=A, B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("B>A", A=A, B=B)) == "I 1"
+
+
+def test_logical_ge() -> None:
+    assert pixel(ImageMath.unsafe_eval("A>=A", A=A)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("B>=B", B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("A>=B", A=A, B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("B>=A", A=A, B=B)) == "I 1"
+
+
+def test_logical_equal() -> None:
+    assert pixel(ImageMath.unsafe_eval("equal(A, A)", A=A)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("equal(B, B)", B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("equal(Z, Z)", Z=Z)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("equal(A, B)", A=A, B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("equal(B, A)", A=A, B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("equal(A, Z)", A=A, Z=Z)) == "I 0"
+
+
+def test_logical_not_equal() -> None:
+    assert pixel(ImageMath.unsafe_eval("notequal(A, A)", A=A)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("notequal(B, B)", B=B)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("notequal(Z, Z)", Z=Z)) == "I 0"
+    assert pixel(ImageMath.unsafe_eval("notequal(A, B)", A=A, B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("notequal(B, A)", A=A, B=B)) == "I 1"
+    assert pixel(ImageMath.unsafe_eval("notequal(A, Z)", A=A, Z=Z)) == "I 1"
diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py
index 64a1785ea97..6180a7b5d90 100644
--- a/Tests/test_imagemorph.py
+++ b/Tests/test_imagemorph.py
@@ -1,5 +1,8 @@
 # Test the ImageMorphology functionality
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image, ImageMorph, _imagingmorph
@@ -7,7 +10,7 @@
 from .helper import assert_image_equal_tofile, hopper
 
 
-def string_to_img(image_string):
+def string_to_img(image_string: str) -> Image.Image:
     """Turn a string image representation into a binary image"""
     rows = [s for s in image_string.replace(" ", "").split("\n") if len(s)]
     height = len(rows)
@@ -35,32 +38,37 @@ def string_to_img(image_string):
 )
 
 
-def img_to_string(im):
+def img_to_string(im: Image.Image) -> str:
     """Turn a (small) binary image into a string representation"""
     chars = ".1"
-    width, height = im.size
-    return "\n".join(
-        "".join(chars[im.getpixel((c, r)) > 0] for c in range(width))
-        for r in range(height)
-    )
-
-
-def img_string_normalize(im):
+    result = []
+    for r in range(im.height):
+        line = ""
+        for c in range(im.width):
+            value = im.getpixel((c, r))
+            assert not isinstance(value, tuple)
+            assert value is not None
+            line += chars[value > 0]
+        result.append(line)
+    return "\n".join(result)
+
+
+def img_string_normalize(im: str) -> str:
     return img_to_string(string_to_img(im))
 
 
-def assert_img_equal_img_string(a, b_string):
+def assert_img_equal_img_string(a: Image.Image, b_string: str) -> None:
     assert img_to_string(a) == img_string_normalize(b_string)
 
 
-def test_str_to_img():
+def test_str_to_img() -> None:
     assert_image_equal_tofile(A, "Tests/images/morph_a.png")
 
 
 @pytest.mark.parametrize(
     "op", ("corner", "dilation4", "dilation8", "erosion4", "erosion8", "edge")
 )
-def test_lut(op):
+def test_lut(op: str) -> None:
     lb = ImageMorph.LutBuilder(op_name=op)
     assert lb.get_lut() is None
 
@@ -69,21 +77,22 @@ def test_lut(op):
         assert lut == bytearray(f.read())
 
 
-def test_no_operator_loaded():
+def test_no_operator_loaded() -> None:
+    im = Image.new("L", (1, 1))
     mop = ImageMorph.MorphOp()
     with pytest.raises(Exception) as e:
-        mop.apply(None)
+        mop.apply(im)
     assert str(e.value) == "No operator loaded"
     with pytest.raises(Exception) as e:
-        mop.match(None)
+        mop.match(im)
     assert str(e.value) == "No operator loaded"
     with pytest.raises(Exception) as e:
-        mop.save_lut(None)
+        mop.save_lut("")
     assert str(e.value) == "No operator loaded"
 
 
 # Test the named patterns
-def test_erosion8():
+def test_erosion8() -> None:
     # erosion8
     mop = ImageMorph.MorphOp(op_name="erosion8")
     count, Aout = mop.apply(A)
@@ -102,7 +111,7 @@ def test_erosion8():
     )
 
 
-def test_dialation8():
+def test_dialation8() -> None:
     # dialation8
     mop = ImageMorph.MorphOp(op_name="dilation8")
     count, Aout = mop.apply(A)
@@ -121,7 +130,7 @@ def test_dialation8():
     )
 
 
-def test_erosion4():
+def test_erosion4() -> None:
     # erosion4
     mop = ImageMorph.MorphOp(op_name="dilation4")
     count, Aout = mop.apply(A)
@@ -140,7 +149,7 @@ def test_erosion4():
     )
 
 
-def test_edge():
+def test_edge() -> None:
     # edge
     mop = ImageMorph.MorphOp(op_name="edge")
     count, Aout = mop.apply(A)
@@ -159,7 +168,7 @@ def test_edge():
     )
 
 
-def test_corner():
+def test_corner() -> None:
     # Create a corner detector pattern
     mop = ImageMorph.MorphOp(patterns=["1:(... ... ...)->0", "4:(00. 01. ...)->1"])
     count, Aout = mop.apply(A)
@@ -187,7 +196,7 @@ def test_corner():
     assert tuple(coords) == ((2, 2), (4, 2), (2, 4), (4, 4))
 
 
-def test_mirroring():
+def test_mirroring() -> None:
     # Test 'M' for mirroring
     mop = ImageMorph.MorphOp(patterns=["1:(... ... ...)->0", "M:(00. 01. ...)->1"])
     count, Aout = mop.apply(A)
@@ -206,7 +215,7 @@ def test_mirroring():
     )
 
 
-def test_negate():
+def test_negate() -> None:
     # Test 'N' for negate
     mop = ImageMorph.MorphOp(patterns=["1:(... ... ...)->0", "N:(00. 01. ...)->1"])
     count, Aout = mop.apply(A)
@@ -225,7 +234,7 @@ def test_negate():
     )
 
 
-def test_incorrect_mode():
+def test_incorrect_mode() -> None:
     im = hopper("RGB")
     mop = ImageMorph.MorphOp(op_name="erosion8")
 
@@ -240,7 +249,7 @@ def test_incorrect_mode():
     assert str(e.value) == "Image mode must be L"
 
 
-def test_add_patterns():
+def test_add_patterns() -> None:
     # Arrange
     lb = ImageMorph.LutBuilder(op_name="corner")
     assert lb.patterns == ["1:(... ... ...)->0", "4:(00. 01. ...)->1"]
@@ -258,12 +267,12 @@ def test_add_patterns():
     ]
 
 
-def test_unknown_pattern():
+def test_unknown_pattern() -> None:
     with pytest.raises(Exception):
         ImageMorph.LutBuilder(op_name="unknown")
 
 
-def test_pattern_syntax_error():
+def test_pattern_syntax_error() -> None:
     # Arrange
     lb = ImageMorph.LutBuilder(op_name="corner")
     new_patterns = ["a pattern with a syntax error"]
@@ -275,7 +284,7 @@ def test_pattern_syntax_error():
     assert str(e.value) == 'Syntax error in pattern "a pattern with a syntax error"'
 
 
-def test_load_invalid_mrl():
+def test_load_invalid_mrl() -> None:
     # Arrange
     invalid_mrl = "Tests/images/hopper.png"
     mop = ImageMorph.MorphOp()
@@ -286,7 +295,7 @@ def test_load_invalid_mrl():
     assert str(e.value) == "Wrong size operator file!"
 
 
-def test_roundtrip_mrl(tmp_path):
+def test_roundtrip_mrl(tmp_path: Path) -> None:
     # Arrange
     tempfile = str(tmp_path / "temp.mrl")
     mop = ImageMorph.MorphOp(op_name="corner")
@@ -300,7 +309,7 @@ def test_roundtrip_mrl(tmp_path):
     assert mop.lut == initial_lut
 
 
-def test_set_lut():
+def test_set_lut() -> None:
     # Arrange
     lb = ImageMorph.LutBuilder(op_name="corner")
     lut = lb.build_lut()
@@ -313,19 +322,19 @@ def test_set_lut():
     assert mop.lut == lut
 
 
-def test_wrong_mode():
+def test_wrong_mode() -> None:
     lut = ImageMorph.LutBuilder(op_name="corner").build_lut()
-    imrgb = Image.new("RGB", (10, 10))
-    iml = Image.new("L", (10, 10))
+    imrgb_ptr = Image.new("RGB", (10, 10)).getim()
+    iml_ptr = Image.new("L", (10, 10)).getim()
 
     with pytest.raises(RuntimeError):
-        _imagingmorph.apply(bytes(lut), imrgb.im.id, iml.im.id)
+        _imagingmorph.apply(bytes(lut), imrgb_ptr, iml_ptr)
 
     with pytest.raises(RuntimeError):
-        _imagingmorph.apply(bytes(lut), iml.im.id, imrgb.im.id)
+        _imagingmorph.apply(bytes(lut), iml_ptr, imrgb_ptr)
 
     with pytest.raises(RuntimeError):
-        _imagingmorph.match(bytes(lut), imrgb.im.id)
+        _imagingmorph.match(bytes(lut), imrgb_ptr)
 
     # Should not raise
-    _imagingmorph.match(bytes(lut), iml.im.id)
+    _imagingmorph.match(bytes(lut), iml_ptr)
diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py
index 7980bead0a4..2fb2a60b632 100644
--- a/Tests/test_imageops.py
+++ b/Tests/test_imageops.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageDraw, ImageOps, ImageStat, features
@@ -12,8 +13,12 @@
 )
 
 
-class Deformer:
-    def getmesh(self, im):
+class Deformer(ImageOps.SupportsGetMesh):
+    def getmesh(
+        self, im: Image.Image
+    ) -> list[
+        tuple[tuple[int, int, int, int], tuple[int, int, int, int, int, int, int, int]]
+    ]:
         x, y = im.size
         return [((0, 0, x, y), (0, 0, x, 0, x, y, y, 0))]
 
@@ -21,7 +26,7 @@ def getmesh(self, im):
 deformer = Deformer()
 
 
-def test_sanity():
+def test_sanity() -> None:
     ImageOps.autocontrast(hopper("L"))
     ImageOps.autocontrast(hopper("RGB"))
 
@@ -83,7 +88,7 @@ def test_sanity():
     ImageOps.exif_transpose(hopper("RGB"))
 
 
-def test_1pxfit():
+def test_1pxfit() -> None:
     # Division by zero in equalize if image is 1 pixel high
     newimg = ImageOps.fit(hopper("RGB").resize((1, 1)), (35, 35))
     assert newimg.size == (35, 35)
@@ -95,7 +100,7 @@ def test_1pxfit():
     assert newimg.size == (35, 35)
 
 
-def test_fit_same_ratio():
+def test_fit_same_ratio() -> None:
     # The ratio for this image is 1000.0 / 755 = 1.3245033112582782
     # If the ratios are not acknowledged to be the same,
     # and Pillow attempts to adjust the width to
@@ -107,13 +112,13 @@ def test_fit_same_ratio():
 
 
 @pytest.mark.parametrize("new_size", ((256, 256), (512, 256), (256, 512)))
-def test_contain(new_size):
+def test_contain(new_size: tuple[int, int]) -> None:
     im = hopper()
     new_im = ImageOps.contain(im, new_size)
     assert new_im.size == (256, 256)
 
 
-def test_contain_round():
+def test_contain_round() -> None:
     im = Image.new("1", (43, 63), 1)
     new_im = ImageOps.contain(im, (5, 7))
     assert new_im.width == 5
@@ -131,13 +136,13 @@ def test_contain_round():
         ("hopper.png", (256, 256)),  # square
     ),
 )
-def test_cover(image_name, expected_size):
+def test_cover(image_name: str, expected_size: tuple[int, int]) -> None:
     with Image.open("Tests/images/" + image_name) as im:
         new_im = ImageOps.cover(im, (256, 256))
         assert new_im.size == expected_size
 
 
-def test_pad():
+def test_pad() -> None:
     # Same ratio
     im = hopper()
     new_size = (im.width * 2, im.height * 2)
@@ -157,17 +162,21 @@ def test_pad():
             )
 
 
-def test_pad_round():
+def test_pad_round() -> None:
     im = Image.new("1", (1, 1), 1)
     new_im = ImageOps.pad(im, (4, 1))
-    assert new_im.load()[2, 0] == 1
+    px = new_im.load()
+    assert px is not None
+    assert px[2, 0] == 1
 
     new_im = ImageOps.pad(im, (1, 4))
-    assert new_im.load()[0, 2] == 1
+    px = new_im.load()
+    assert px is not None
+    assert px[0, 2] == 1
 
 
 @pytest.mark.parametrize("mode", ("P", "PA"))
-def test_palette(mode):
+def test_palette(mode: str) -> None:
     im = hopper(mode)
 
     # Expand
@@ -181,7 +190,7 @@ def test_palette(mode):
     )
 
 
-def test_pil163():
+def test_pil163() -> None:
     # Division by zero in equalize if < 255 pixels in image (@PIL163)
 
     i = hopper("RGB").resize((15, 16))
@@ -191,7 +200,7 @@ def test_pil163():
     ImageOps.equalize(i.convert("RGB"))
 
 
-def test_scale():
+def test_scale() -> None:
     # Test the scaling function
     i = hopper("L").resize((50, 50))
 
@@ -209,7 +218,7 @@ def test_scale():
 
 
 @pytest.mark.parametrize("border", (10, (1, 2, 3, 4)))
-def test_expand_palette(border):
+def test_expand_palette(border: int | tuple[int, int, int, int]) -> None:
     with Image.open("Tests/images/p_16.tga") as im:
         im_expanded = ImageOps.expand(im, border, (255, 0, 0))
 
@@ -218,6 +227,7 @@ def test_expand_palette(border):
         else:
             left, top, right, bottom = border
         px = im_expanded.convert("RGB").load()
+        assert px is not None
         for x in range(im_expanded.width):
             for b in range(top):
                 assert px[x, b] == (255, 0, 0)
@@ -235,7 +245,7 @@ def test_expand_palette(border):
         assert_image_equal(im_cropped, im)
 
 
-def test_colorize_2color():
+def test_colorize_2color() -> None:
     # Test the colorizing function with 2-color functionality
 
     # Open test image (256px by 10px, black to white)
@@ -249,27 +259,33 @@ def test_colorize_2color():
     left = (0, 1)
     middle = (127, 1)
     right = (255, 1)
+    value = im_test.getpixel(left)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(left),
+        value,
         (255, 0, 0),
         threshold=1,
         msg="black test pixel incorrect",
     )
+    value = im_test.getpixel(middle)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(middle),
+        value,
         (127, 63, 0),
         threshold=1,
         msg="mid test pixel incorrect",
     )
+    value = im_test.getpixel(right)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(right),
+        value,
         (0, 127, 0),
         threshold=1,
         msg="white test pixel incorrect",
     )
 
 
-def test_colorize_2color_offset():
+def test_colorize_2color_offset() -> None:
     # Test the colorizing function with 2-color functionality and offset
 
     # Open test image (256px by 10px, black to white)
@@ -285,27 +301,33 @@ def test_colorize_2color_offset():
     left = (25, 1)
     middle = (75, 1)
     right = (125, 1)
+    value = im_test.getpixel(left)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(left),
+        value,
         (255, 0, 0),
         threshold=1,
         msg="black test pixel incorrect",
     )
+    value = im_test.getpixel(middle)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(middle),
+        value,
         (127, 63, 0),
         threshold=1,
         msg="mid test pixel incorrect",
     )
+    value = im_test.getpixel(right)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(right),
+        value,
         (0, 127, 0),
         threshold=1,
         msg="white test pixel incorrect",
     )
 
 
-def test_colorize_3color_offset():
+def test_colorize_3color_offset() -> None:
     # Test the colorizing function with 3-color functionality and offset
 
     # Open test image (256px by 10px, black to white)
@@ -329,43 +351,51 @@ def test_colorize_3color_offset():
     middle = (100, 1)
     right_middle = (150, 1)
     right = (225, 1)
+    value = im_test.getpixel(left)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(left),
+        value,
         (255, 0, 0),
         threshold=1,
         msg="black test pixel incorrect",
     )
+    value = im_test.getpixel(left_middle)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(left_middle),
+        value,
         (127, 0, 127),
         threshold=1,
         msg="low-mid test pixel incorrect",
     )
+    value = im_test.getpixel(middle)
+    assert isinstance(value, tuple)
+    assert_tuple_approx_equal(value, (0, 0, 255), threshold=1, msg="mid incorrect")
+    value = im_test.getpixel(right_middle)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(middle), (0, 0, 255), threshold=1, msg="mid incorrect"
-    )
-    assert_tuple_approx_equal(
-        im_test.getpixel(right_middle),
+        value,
         (0, 63, 127),
         threshold=1,
         msg="high-mid test pixel incorrect",
     )
+    value = im_test.getpixel(right)
+    assert isinstance(value, tuple)
     assert_tuple_approx_equal(
-        im_test.getpixel(right),
+        value,
         (0, 127, 0),
         threshold=1,
         msg="white test pixel incorrect",
     )
 
 
-def test_exif_transpose():
+def test_exif_transpose() -> None:
     exts = [".jpg"]
-    if features.check("webp") and features.check("webp_anim"):
+    if features.check("webp"):
         exts.append(".webp")
     for ext in exts:
         with Image.open("Tests/images/hopper" + ext) as base_im:
 
-            def check(orientation_im):
+            def check(orientation_im: Image.Image) -> None:
                 for im in [
                     orientation_im,
                     orientation_im.copy(),
@@ -375,6 +405,7 @@ def check(orientation_im):
                     else:
                         original_exif = im.info["exif"]
                     transposed_im = ImageOps.exif_transpose(im)
+                    assert transposed_im is not None
                     assert_image_similar(base_im, transposed_im, 17)
                     if orientation_im is base_im:
                         assert "exif" not in im.info
@@ -386,6 +417,7 @@ def check(orientation_im):
 
                     # Repeat the operation to test that it does not keep transposing
                     transposed_im2 = ImageOps.exif_transpose(transposed_im)
+                    assert transposed_im2 is not None
                     assert_image_equal(transposed_im2, transposed_im)
 
             check(base_im)
@@ -401,6 +433,7 @@ def check(orientation_im):
             assert im.getexif()[0x0112] == 3
 
             transposed_im = ImageOps.exif_transpose(im)
+            assert transposed_im is not None
             assert 0x0112 not in transposed_im.getexif()
 
             transposed_im._reload_exif()
@@ -413,16 +446,29 @@ def check(orientation_im):
         assert im.getexif()[0x0112] == 3
 
         transposed_im = ImageOps.exif_transpose(im)
+        assert transposed_im is not None
         assert 0x0112 not in transposed_im.getexif()
 
     # Orientation set directly on Image.Exif
     im = hopper()
     im.getexif()[0x0112] = 3
     transposed_im = ImageOps.exif_transpose(im)
+    assert transposed_im is not None
     assert 0x0112 not in transposed_im.getexif()
 
 
-def test_exif_transpose_in_place():
+def test_exif_transpose_xml_without_xmp() -> None:
+    with Image.open("Tests/images/xmp_tags_orientation.png") as im:
+        assert im.getexif()[0x0112] == 3
+        assert "XML:com.adobe.xmp" in im.info
+
+        del im.info["xmp"]
+        transposed_im = ImageOps.exif_transpose(im)
+        assert transposed_im is not None
+        assert 0x0112 not in transposed_im.getexif()
+
+
+def test_exif_transpose_in_place() -> None:
     with Image.open("Tests/images/orientation_rectangle.jpg") as im:
         assert im.size == (2, 1)
         assert im.getexif()[0x0112] == 8
@@ -434,24 +480,24 @@ def test_exif_transpose_in_place():
         assert_image_equal(im, expected)
 
 
-def test_autocontrast_unsupported_mode():
+def test_autocontrast_unsupported_mode() -> None:
     im = Image.new("RGBA", (1, 1))
     with pytest.raises(OSError):
         ImageOps.autocontrast(im)
 
 
-def test_autocontrast_cutoff():
+def test_autocontrast_cutoff() -> None:
     # Test the cutoff argument of autocontrast
     with Image.open("Tests/images/bw_gradient.png") as img:
 
-        def autocontrast(cutoff):
+        def autocontrast(cutoff: int | tuple[int, int]) -> list[int]:
             return ImageOps.autocontrast(img, cutoff).histogram()
 
         assert autocontrast(10) == autocontrast((10, 10))
         assert autocontrast(10) != autocontrast((1, 10))
 
 
-def test_autocontrast_mask_toy_input():
+def test_autocontrast_mask_toy_input() -> None:
     # Test the mask argument of autocontrast
     with Image.open("Tests/images/bw_gradient.png") as img:
         rect_mask = Image.new("L", img.size, 0)
@@ -470,7 +516,7 @@ def test_autocontrast_mask_toy_input():
         assert ImageStat.Stat(result_nomask).median == [128]
 
 
-def test_autocontrast_mask_real_input():
+def test_autocontrast_mask_real_input() -> None:
     # Test the autocontrast with a rectangular mask
     with Image.open("Tests/images/iptc.jpg") as img:
         rect_mask = Image.new("L", img.size, 0)
@@ -485,20 +531,20 @@ def test_autocontrast_mask_real_input():
         assert result_nomask != result
         assert_tuple_approx_equal(
             ImageStat.Stat(result, mask=rect_mask).median,
-            [195, 202, 184],
+            (195, 202, 184),
             threshold=2,
             msg="autocontrast with mask pixel incorrect",
         )
         assert_tuple_approx_equal(
             ImageStat.Stat(result_nomask).median,
-            [119, 106, 79],
+            (119, 106, 79),
             threshold=2,
             msg="autocontrast without mask pixel incorrect",
         )
 
 
-def test_autocontrast_preserve_tone():
-    def autocontrast(mode, preserve_tone):
+def test_autocontrast_preserve_tone() -> None:
+    def autocontrast(mode: str, preserve_tone: bool) -> list[int]:
         im = hopper(mode)
         return ImageOps.autocontrast(im, preserve_tone=preserve_tone).histogram()
 
@@ -506,7 +552,7 @@ def autocontrast(mode, preserve_tone):
     assert autocontrast("L", True) == autocontrast("L", False)
 
 
-def test_autocontrast_preserve_gradient():
+def test_autocontrast_preserve_gradient() -> None:
     gradient = Image.linear_gradient("L")
 
     # test with a grayscale gradient that extends to 0,255.
@@ -532,7 +578,7 @@ def test_autocontrast_preserve_gradient():
 @pytest.mark.parametrize(
     "color", ((255, 255, 255), (127, 255, 0), (127, 127, 127), (0, 0, 0))
 )
-def test_autocontrast_preserve_one_color(color):
+def test_autocontrast_preserve_one_color(color: tuple[int, int, int]) -> None:
     img = Image.new("RGB", (10, 10), color)
 
     # single color images shouldn't change
diff --git a/Tests/test_imageops_usm.py b/Tests/test_imageops_usm.py
index 84d3a69507a..920012d8639 100644
--- a/Tests/test_imageops_usm.py
+++ b/Tests/test_imageops_usm.py
@@ -1,11 +1,14 @@
 from __future__ import annotations
+
+from collections.abc import Generator
+
 import pytest
 
-from PIL import Image, ImageFilter
+from PIL import Image, ImageFile, ImageFilter
 
 
 @pytest.fixture
-def test_images():
+def test_images() -> Generator[dict[str, ImageFile.ImageFile], None, None]:
     ims = {
         "im": Image.open("Tests/images/hopper.ppm"),
         "snakes": Image.open("Tests/images/color_snakes.png"),
@@ -17,7 +20,7 @@ def test_images():
             im.close()
 
 
-def test_filter_api(test_images):
+def test_filter_api(test_images: dict[str, ImageFile.ImageFile]) -> None:
     im = test_images["im"]
 
     test_filter = ImageFilter.GaussianBlur(2.0)
@@ -25,13 +28,13 @@ def test_filter_api(test_images):
     assert i.mode == "RGB"
     assert i.size == (128, 128)
 
-    test_filter = ImageFilter.UnsharpMask(2.0, 125, 8)
-    i = im.filter(test_filter)
+    test_filter2 = ImageFilter.UnsharpMask(2.0, 125, 8)
+    i = im.filter(test_filter2)
     assert i.mode == "RGB"
     assert i.size == (128, 128)
 
 
-def test_usm_formats(test_images):
+def test_usm_formats(test_images: dict[str, ImageFile.ImageFile]) -> None:
     im = test_images["im"]
 
     usm = ImageFilter.UnsharpMask
@@ -49,13 +52,12 @@ def test_usm_formats(test_images):
         im.convert("YCbCr").filter(usm)
 
 
-def test_blur_formats(test_images):
+def test_blur_formats(test_images: dict[str, ImageFile.ImageFile]) -> None:
     im = test_images["im"]
 
     blur = ImageFilter.GaussianBlur
     with pytest.raises(ValueError):
         im.convert("1").filter(blur)
-    blur(im.convert("L"))
     with pytest.raises(ValueError):
         im.convert("I").filter(blur)
     with pytest.raises(ValueError):
@@ -67,7 +69,7 @@ def test_blur_formats(test_images):
         im.convert("YCbCr").filter(blur)
 
 
-def test_usm_accuracy(test_images):
+def test_usm_accuracy(test_images: dict[str, ImageFile.ImageFile]) -> None:
     snakes = test_images["snakes"]
 
     src = snakes.convert("RGB")
@@ -76,7 +78,7 @@ def test_usm_accuracy(test_images):
     assert i.tobytes() == src.tobytes()
 
 
-def test_blur_accuracy(test_images):
+def test_blur_accuracy(test_images: dict[str, ImageFile.ImageFile]) -> None:
     snakes = test_images["snakes"]
 
     i = snakes.filter(ImageFilter.GaussianBlur(0.4))
@@ -99,7 +101,7 @@ def test_blur_accuracy(test_images):
         assert i.im.getpixel((x, y))[c] >= 250
     # Fuzzy match.
 
-    def gp(x, y):
+    def gp(x: int, y: int) -> tuple[int, ...]:
         return i.im.getpixel((x, y))
 
     assert 236 <= gp(7, 4)[0] <= 239
diff --git a/Tests/test_imagepalette.py b/Tests/test_imagepalette.py
index e5b59b74a84..6cf0079dda7 100644
--- a/Tests/test_imagepalette.py
+++ b/Tests/test_imagepalette.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image, ImagePalette
@@ -6,19 +9,19 @@
 from .helper import assert_image_equal, assert_image_equal_tofile
 
 
-def test_sanity():
+def test_sanity() -> None:
     palette = ImagePalette.ImagePalette("RGB", list(range(256)) * 3)
     assert len(palette.colors) == 256
 
 
-def test_reload():
+def test_reload() -> None:
     with Image.open("Tests/images/hopper.gif") as im:
         original = im.copy()
         im.palette.dirty = 1
         assert_image_equal(im.convert("RGB"), original.convert("RGB"))
 
 
-def test_getcolor():
+def test_getcolor() -> None:
     palette = ImagePalette.ImagePalette()
     assert len(palette.palette) == 0
     assert len(palette.colors) == 0
@@ -42,10 +45,10 @@ def test_getcolor():
 
     # Test unknown color specifier
     with pytest.raises(ValueError):
-        palette.getcolor("unknown")
+        palette.getcolor("unknown")  # type: ignore[arg-type]
 
 
-def test_getcolor_rgba_color_rgb_palette():
+def test_getcolor_rgba_color_rgb_palette() -> None:
     palette = ImagePalette.ImagePalette("RGB")
 
     # Opaque RGBA colors are converted
@@ -64,7 +67,7 @@ def test_getcolor_rgba_color_rgb_palette():
         (255, ImagePalette.ImagePalette("RGB", list(range(256)) * 3)),
     ],
 )
-def test_getcolor_not_special(index, palette):
+def test_getcolor_not_special(index: int, palette: ImagePalette.ImagePalette) -> None:
     im = Image.new("P", (1, 1))
 
     # Do not use transparency index as a new color
@@ -78,25 +81,25 @@ def test_getcolor_not_special(index, palette):
     assert index2 not in (index, index1)
 
 
-def test_file(tmp_path):
+def test_file(tmp_path: Path) -> None:
     palette = ImagePalette.ImagePalette("RGB", list(range(256)) * 3)
 
     f = str(tmp_path / "temp.lut")
 
     palette.save(f)
 
-    p = ImagePalette.load(f)
+    lut = ImagePalette.load(f)
 
     # load returns raw palette information
-    assert len(p[0]) == 768
-    assert p[1] == "RGB"
+    assert len(lut[0]) == 768
+    assert lut[1] == "RGB"
 
-    p = ImagePalette.raw(p[1], p[0])
+    p = ImagePalette.raw(lut[1], lut[0])
     assert isinstance(p, ImagePalette.ImagePalette)
     assert p.palette == palette.tobytes()
 
 
-def test_make_linear_lut():
+def test_make_linear_lut() -> None:
     # Arrange
     black = 0
     white = 255
@@ -112,7 +115,7 @@ def test_make_linear_lut():
         assert lut[i] == i
 
 
-def test_make_linear_lut_not_yet_implemented():
+def test_make_linear_lut_not_yet_implemented() -> None:
     # Update after FIXME
     # Arrange
     black = 1
@@ -123,7 +126,7 @@ def test_make_linear_lut_not_yet_implemented():
         ImagePalette.make_linear_lut(black, white)
 
 
-def test_make_gamma_lut():
+def test_make_gamma_lut() -> None:
     # Arrange
     exp = 5
 
@@ -141,7 +144,7 @@ def test_make_gamma_lut():
     assert lut[255] == 255
 
 
-def test_rawmode_valueerrors(tmp_path):
+def test_rawmode_valueerrors(tmp_path: Path) -> None:
     # Arrange
     palette = ImagePalette.raw("RGB", list(range(256)) * 3)
 
@@ -155,7 +158,7 @@ def test_rawmode_valueerrors(tmp_path):
         palette.save(f)
 
 
-def test_getdata():
+def test_getdata() -> None:
     # Arrange
     data_in = list(range(256)) * 3
     palette = ImagePalette.ImagePalette("RGB", data_in)
@@ -167,7 +170,7 @@ def test_getdata():
     assert mode == "RGB"
 
 
-def test_rawmode_getdata():
+def test_rawmode_getdata() -> None:
     # Arrange
     data_in = list(range(256)) * 3
     palette = ImagePalette.raw("RGB", data_in)
@@ -180,7 +183,7 @@ def test_rawmode_getdata():
     assert data_in == data_out
 
 
-def test_2bit_palette(tmp_path):
+def test_2bit_palette(tmp_path: Path) -> None:
     # issue #2258, 2 bit palettes are corrupted.
     outfile = str(tmp_path / "temp.png")
 
@@ -192,6 +195,6 @@ def test_2bit_palette(tmp_path):
     assert_image_equal_tofile(img, outfile)
 
 
-def test_invalid_palette():
+def test_invalid_palette() -> None:
     with pytest.raises(OSError):
         ImagePalette.load("Tests/images/hopper.jpg")
diff --git a/Tests/test_imagepath.py b/Tests/test_imagepath.py
index ac3ea3281f5..76bdf1e5f6e 100644
--- a/Tests/test_imagepath.py
+++ b/Tests/test_imagepath.py
@@ -1,14 +1,16 @@
 from __future__ import annotations
+
 import array
 import math
 import struct
+from collections.abc import Sequence
 
 import pytest
 
 from PIL import Image, ImagePath
 
 
-def test_path():
+def test_path() -> None:
     p = ImagePath.Path(list(range(10)))
 
     # sequence interface
@@ -56,7 +58,9 @@ def test_path():
         ImagePath.Path((0, 1)),
     ),
 )
-def test_path_constructors(coords):
+def test_path_constructors(
+    coords: Sequence[float] | array.array[float] | ImagePath.Path,
+) -> None:
     # Arrange / Act
     p = ImagePath.Path(coords)
 
@@ -74,7 +78,9 @@ def test_path_constructors(coords):
         [[0.0, 1.0]],
     ),
 )
-def test_invalid_path_constructors(coords):
+def test_invalid_path_constructors(
+    coords: tuple[str, str] | Sequence[Sequence[int]]
+) -> None:
     # Act
     with pytest.raises(ValueError) as e:
         ImagePath.Path(coords)
@@ -92,7 +98,7 @@ def test_invalid_path_constructors(coords):
         [0, 1, 2],
     ),
 )
-def test_path_odd_number_of_coordinates(coords):
+def test_path_odd_number_of_coordinates(coords: Sequence[int]) -> None:
     # Act
     with pytest.raises(ValueError) as e:
         ImagePath.Path(coords)
@@ -110,7 +116,9 @@ def test_path_odd_number_of_coordinates(coords):
         (1, (0.0, 0.0, 0.0, 0.0)),
     ],
 )
-def test_getbbox(coords, expected):
+def test_getbbox(
+    coords: int | list[int], expected: tuple[float, float, float, float]
+) -> None:
     # Arrange
     p = ImagePath.Path(coords)
 
@@ -118,7 +126,7 @@ def test_getbbox(coords, expected):
     assert p.getbbox() == expected
 
 
-def test_getbbox_no_args():
+def test_getbbox_no_args() -> None:
     # Arrange
     p = ImagePath.Path([0, 1, 2, 3])
 
@@ -134,7 +142,7 @@ def test_getbbox_no_args():
         (list(range(6)), [(0.0, 3.0), (4.0, 9.0), (8.0, 15.0)]),
     ],
 )
-def test_map(coords, expected):
+def test_map(coords: int | list[int], expected: list[tuple[float, float]]) -> None:
     # Arrange
     p = ImagePath.Path(coords)
 
@@ -146,7 +154,7 @@ def test_map(coords, expected):
     assert list(p) == expected
 
 
-def test_transform():
+def test_transform() -> None:
     # Arrange
     p = ImagePath.Path([0, 1, 2, 3])
     theta = math.pi / 15
@@ -164,7 +172,7 @@ def test_transform():
     ]
 
 
-def test_transform_with_wrap():
+def test_transform_with_wrap() -> None:
     # Arrange
     p = ImagePath.Path([0, 1, 2, 3])
     theta = math.pi / 15
@@ -183,7 +191,7 @@ def test_transform_with_wrap():
     ]
 
 
-def test_overflow_segfault():
+def test_overflow_segfault() -> None:
     # Some Pythons fail getting the argument as an integer, and it falls
     # through to the sequence. Seeing this on 32-bit Windows.
     with pytest.raises((TypeError, MemoryError)):
@@ -196,13 +204,24 @@ def test_overflow_segfault():
             x[i] = b"0" * 16
 
 
+def test_compact_within_map() -> None:
+    p = ImagePath.Path([0, 1])
+
+    def map_func(x: float, y: float) -> tuple[float, float]:
+        p.compact()
+        return 0, 0
+
+    with pytest.raises(ValueError):
+        p.map(map_func)
+
+
 class Evil:
-    def __init__(self):
+    def __init__(self) -> None:
         self.corrupt = Image.core.path(0x4000000000000000)
 
-    def __getitem__(self, i):
+    def __getitem__(self, i: int) -> bytes:
         x = self.corrupt[i]
         return struct.pack("dd", x[0], x[1])
 
-    def __setitem__(self, i, x):
+    def __setitem__(self, i: int, x: bytes) -> None:
         self.corrupt[i] = struct.unpack("dd", x)
diff --git a/Tests/test_imageqt.py b/Tests/test_imageqt.py
index 41d247f429f..22cd674ce28 100644
--- a/Tests/test_imageqt.py
+++ b/Tests/test_imageqt.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import warnings
 
 import pytest
@@ -15,7 +16,7 @@
     from PIL.ImageQt import qRgba
 
 
-def test_rgb():
+def test_rgb() -> None:
     # from https://doc.qt.io/archives/qt-4.8/qcolor.html
     # typedef QRgb
     # An ARGB quadruplet on the format #AARRGGBB,
@@ -27,7 +28,7 @@ def test_rgb():
 
     assert qRgb(0, 0, 0) == qRgba(0, 0, 0, 255)
 
-    def checkrgb(r, g, b):
+    def checkrgb(r: int, g: int, b: int) -> None:
         val = ImageQt.rgb(r, g, b)
         val = val % 2**24  # drop the alpha
         assert val >> 16 == r
@@ -40,20 +41,15 @@ def checkrgb(r, g, b):
     checkrgb(0, 0, 255)
 
 
-def test_image():
-    modes = ["1", "RGB", "RGBA", "L", "P"]
-    qt_format = ImageQt.QImage.Format if ImageQt.qt_version == "6" else ImageQt.QImage
-    if hasattr(qt_format, "Format_Grayscale16"):  # Qt 5.13+
-        modes.append("I;16")
-
-    for mode in modes:
-        im = hopper(mode)
-        roundtripped_im = ImageQt.fromqimage(ImageQt.ImageQt(im))
-        if mode not in ("RGB", "RGBA"):
-            im = im.convert("RGB")
-        assert_image_similar(roundtripped_im, im, 1)
+@pytest.mark.parametrize("mode", ("1", "RGB", "RGBA", "L", "P", "I;16"))
+def test_image(mode: str) -> None:
+    im = hopper(mode)
+    roundtripped_im = ImageQt.fromqimage(ImageQt.ImageQt(im))
+    if mode not in ("RGB", "RGBA"):
+        im = im.convert("RGB")
+    assert_image_similar(roundtripped_im, im, 1)
 
 
-def test_closed_file():
+def test_closed_file() -> None:
     with warnings.catch_warnings():
         ImageQt.ImageQt("Tests/images/hopper.gif")
diff --git a/Tests/test_imagesequence.py b/Tests/test_imagesequence.py
index 6d71e4d87af..9b37435eb61 100644
--- a/Tests/test_imagesequence.py
+++ b/Tests/test_imagesequence.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image, ImageSequence, TiffImagePlugin
@@ -6,7 +9,7 @@
 from .helper import assert_image_equal, hopper, skip_unless_feature
 
 
-def test_sanity(tmp_path):
+def test_sanity(tmp_path: Path) -> None:
     test_file = str(tmp_path / "temp.im")
 
     im = hopper("RGB")
@@ -23,10 +26,10 @@ def test_sanity(tmp_path):
     assert index == 1
 
     with pytest.raises(AttributeError):
-        ImageSequence.Iterator(0)
+        ImageSequence.Iterator(0)  # type: ignore[arg-type]
 
 
-def test_iterator():
+def test_iterator() -> None:
     with Image.open("Tests/images/multipage.tiff") as im:
         i = ImageSequence.Iterator(im)
         for index in range(0, im.n_frames):
@@ -37,14 +40,18 @@ def test_iterator():
             next(i)
 
 
-def test_iterator_min_frame():
+def test_iterator_min_frame() -> None:
     with Image.open("Tests/images/hopper.psd") as im:
         i = ImageSequence.Iterator(im)
         for index in range(1, im.n_frames):
             assert i[index] == next(i)
 
 
-def _test_multipage_tiff():
+@pytest.mark.parametrize(
+    "libtiff", (pytest.param(True, marks=skip_unless_feature("libtiff")), False)
+)
+def test_multipage_tiff(monkeypatch: pytest.MonkeyPatch, libtiff: bool) -> None:
+    monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", libtiff)
     with Image.open("Tests/images/multipage.tiff") as im:
         for index, frame in enumerate(ImageSequence.Iterator(im)):
             frame.load()
@@ -52,29 +59,19 @@ def _test_multipage_tiff():
             frame.convert("RGB")
 
 
-def test_tiff():
-    _test_multipage_tiff()
-
-
-@skip_unless_feature("libtiff")
-def test_libtiff():
-    TiffImagePlugin.READ_LIBTIFF = True
-    _test_multipage_tiff()
-    TiffImagePlugin.READ_LIBTIFF = False
-
-
-def test_consecutive():
+def test_consecutive() -> None:
     with Image.open("Tests/images/multipage.tiff") as im:
         first_frame = None
         for frame in ImageSequence.Iterator(im):
             if first_frame is None:
                 first_frame = frame.copy()
+        assert first_frame is not None
         for frame in ImageSequence.Iterator(im):
             assert_image_equal(frame, first_frame)
             break
 
 
-def test_palette_mmap():
+def test_palette_mmap() -> None:
     # Using mmap in ImageFile can require to reload the palette.
     with Image.open("Tests/images/multipage-mmap.tiff") as im:
         color1 = im.getpalette()[:3]
@@ -83,7 +80,7 @@ def test_palette_mmap():
         assert color1 == color2
 
 
-def test_all_frames():
+def test_all_frames() -> None:
     # Test a single image
     with Image.open("Tests/images/iss634.gif") as im:
         ims = ImageSequence.all_frames(im)
diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py
index 761d28d3019..7a2f5876757 100644
--- a/Tests/test_imageshow.py
+++ b/Tests/test_imageshow.py
@@ -1,4 +1,8 @@
 from __future__ import annotations
+
+import os
+from typing import Any
+
 import pytest
 
 from PIL import Image, ImageShow
@@ -6,14 +10,17 @@
 from .helper import hopper, is_win32, on_ci
 
 
-def test_sanity():
+def test_sanity() -> None:
     dir(Image)
     dir(ImageShow)
 
 
-def test_register():
-    # Test registering a viewer that is not a class
-    ImageShow.register("not a class")
+def test_register() -> None:
+    # Test registering a viewer that is an instance
+    class TestViewer(ImageShow.Viewer):
+        pass
+
+    ImageShow.register(TestViewer())
 
     # Restore original state
     ImageShow._viewers.pop()
@@ -23,9 +30,9 @@ def test_register():
     "order",
     [-1, 0],
 )
-def test_viewer_show(order):
+def test_viewer_show(order: int) -> None:
     class TestViewer(ImageShow.Viewer):
-        def show_image(self, image, **options):
+        def show_image(self, image: Image.Image, **options: Any) -> bool:
             self.methodCalled = True
             return True
 
@@ -47,12 +54,12 @@ def show_image(self, image, **options):
     reason="Only run on CIs; hangs on Windows CIs",
 )
 @pytest.mark.parametrize("mode", ("1", "I;16", "LA", "RGB", "RGBA"))
-def test_show(mode):
+def test_show(mode: str) -> None:
     im = hopper(mode)
     assert ImageShow.show(im)
 
 
-def test_show_without_viewers():
+def test_show_without_viewers() -> None:
     viewers = ImageShow._viewers
     ImageShow._viewers = []
 
@@ -62,31 +69,53 @@ def test_show_without_viewers():
     ImageShow._viewers = viewers
 
 
-def test_viewer():
+@pytest.mark.parametrize(
+    "viewer",
+    (
+        ImageShow.Viewer(),
+        ImageShow.WindowsViewer(),
+        ImageShow.MacViewer(),
+        ImageShow.XDGViewer(),
+        ImageShow.DisplayViewer(),
+        ImageShow.GmDisplayViewer(),
+        ImageShow.EogViewer(),
+        ImageShow.XVViewer(),
+        ImageShow.IPythonViewer(),
+    ),
+)
+def test_show_file(viewer: ImageShow.Viewer) -> None:
+    assert not os.path.exists("missing.png")
+
+    with pytest.raises(FileNotFoundError):
+        viewer.show_file("missing.png")
+
+
+def test_viewer() -> None:
     viewer = ImageShow.Viewer()
 
-    assert viewer.get_format(None) is None
+    im = Image.new("L", (1, 1))
+    assert viewer.get_format(im) is None
 
     with pytest.raises(NotImplementedError):
-        viewer.get_command(None)
+        viewer.get_command("")
 
 
 @pytest.mark.parametrize("viewer", ImageShow._viewers)
-def test_viewers(viewer):
+def test_viewers(viewer: ImageShow.Viewer) -> None:
     try:
         viewer.get_command("test.jpg")
     except NotImplementedError:
         pass
 
 
-def test_ipythonviewer():
+def test_ipythonviewer() -> None:
     pytest.importorskip("IPython", reason="IPython not installed")
     for viewer in ImageShow._viewers:
         if isinstance(viewer, ImageShow.IPythonViewer):
             test_viewer = viewer
             break
     else:
-        pytest.fail()
+        pytest.fail("IPythonViewer not found")
 
-    im = hopper()
-    assert test_viewer.show(im) == 1
+    with hopper() as im:
+        assert test_viewer.show(im) == 1
diff --git a/Tests/test_imagestat.py b/Tests/test_imagestat.py
index 7b56b89cc4b..0dfbc5a2abb 100644
--- a/Tests/test_imagestat.py
+++ b/Tests/test_imagestat.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image, ImageStat
@@ -6,7 +7,7 @@
 from .helper import hopper
 
 
-def test_sanity():
+def test_sanity() -> None:
     im = hopper()
 
     st = ImageStat.Stat(im)
@@ -24,13 +25,13 @@ def test_sanity():
     st.stddev
 
     with pytest.raises(AttributeError):
-        st.spam()
+        st.spam()  # type: ignore[attr-defined]
 
     with pytest.raises(TypeError):
-        ImageStat.Stat(1)
+        ImageStat.Stat(1)  # type: ignore[arg-type]
 
 
-def test_hopper():
+def test_hopper() -> None:
     im = hopper()
 
     st = ImageStat.Stat(im)
@@ -43,7 +44,7 @@ def test_hopper():
     assert st.sum[2] == 1563008
 
 
-def test_constant():
+def test_constant() -> None:
     im = Image.new("L", (128, 128), 128)
 
     st = ImageStat.Stat(im)
diff --git a/Tests/test_imagetk.py b/Tests/test_imagetk.py
index bb20fbb6f92..4484dca1064 100644
--- a/Tests/test_imagetk.py
+++ b/Tests/test_imagetk.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -22,7 +23,7 @@
 pytestmark = pytest.mark.skipif(not HAS_TK, reason="Tk not installed")
 
 
-def setup_module():
+def setup_module() -> None:
     try:
         # setup tk
         tk.Frame()
@@ -33,7 +34,7 @@ def setup_module():
         pytest.skip(f"TCL Error: {v}")
 
 
-def test_kw():
+def test_kw() -> None:
     TEST_JPG = "Tests/images/hopper.jpg"
     TEST_PNG = "Tests/images/hopper.png"
     with Image.open(TEST_JPG) as im1:
@@ -44,10 +45,12 @@ def test_kw():
 
             # Test "file"
             im = ImageTk._get_image_from_kw(kw)
+            assert im is not None
             assert_image_equal(im, im1)
 
             # Test "data"
             im = ImageTk._get_image_from_kw(kw)
+            assert im is not None
             assert_image_equal(im, im2)
 
     # Test no relevant entry
@@ -56,7 +59,7 @@ def test_kw():
 
 
 @pytest.mark.parametrize("mode", TK_MODES)
-def test_photoimage(mode):
+def test_photoimage(mode: str) -> None:
     # test as image:
     im = hopper(mode)
 
@@ -69,8 +72,13 @@ def test_photoimage(mode):
     reloaded = ImageTk.getimage(im_tk)
     assert_image_equal(reloaded, im.convert("RGBA"))
 
+    with pytest.raises(ValueError):
+        ImageTk.PhotoImage()
+    with pytest.raises(ValueError):
+        ImageTk.PhotoImage(mode)
+
 
-def test_photoimage_apply_transparency():
+def test_photoimage_apply_transparency() -> None:
     with Image.open("Tests/images/pil123p.png") as im:
         im_tk = ImageTk.PhotoImage(im)
         reloaded = ImageTk.getimage(im_tk)
@@ -78,7 +86,7 @@ def test_photoimage_apply_transparency():
 
 
 @pytest.mark.parametrize("mode", TK_MODES)
-def test_photoimage_blank(mode):
+def test_photoimage_blank(mode: str) -> None:
     # test a image using mode/size:
     im_tk = ImageTk.PhotoImage(mode, (100, 100))
 
@@ -90,7 +98,7 @@ def test_photoimage_blank(mode):
     assert_image_equal(reloaded.convert(mode), im)
 
 
-def test_bitmapimage():
+def test_bitmapimage() -> None:
     im = hopper("1")
 
     # this should not crash
@@ -101,3 +109,6 @@ def test_bitmapimage():
 
     # reloaded = ImageTk.getimage(im_tk)
     # assert_image_equal(reloaded, im)
+
+    with pytest.raises(ValueError):
+        ImageTk.BitmapImage()
diff --git a/Tests/test_imagewin.py b/Tests/test_imagewin.py
index 6927eedcf86..e7af160ddd2 100644
--- a/Tests/test_imagewin.py
+++ b/Tests/test_imagewin.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import ImageWin
@@ -7,10 +8,10 @@
 
 
 class TestImageWin:
-    def test_sanity(self):
+    def test_sanity(self) -> None:
         dir(ImageWin)
 
-    def test_hdc(self):
+    def test_hdc(self) -> None:
         # Arrange
         dc = 50
 
@@ -21,7 +22,7 @@ def test_hdc(self):
         # Assert
         assert dc2 == 50
 
-    def test_hwnd(self):
+    def test_hwnd(self) -> None:
         # Arrange
         wnd = 50
 
@@ -35,7 +36,7 @@ def test_hwnd(self):
 
 @pytest.mark.skipif(not is_win32(), reason="Windows only")
 class TestImageWinDib:
-    def test_dib_image(self):
+    def test_dib_image(self) -> None:
         # Arrange
         im = hopper()
 
@@ -45,7 +46,7 @@ def test_dib_image(self):
         # Assert
         assert dib.size == im.size
 
-    def test_dib_mode_string(self):
+    def test_dib_mode_string(self) -> None:
         # Arrange
         mode = "RGBA"
         size = (128, 128)
@@ -56,7 +57,22 @@ def test_dib_mode_string(self):
         # Assert
         assert dib.size == (128, 128)
 
-    def test_dib_paste(self):
+        with pytest.raises(ValueError):
+            ImageWin.Dib(mode)
+
+    def test_dib_hwnd(self) -> None:
+        mode = "RGBA"
+        size = (128, 128)
+        wnd = 0
+
+        dib = ImageWin.Dib(mode, size)
+        hwnd = ImageWin.HWND(wnd)
+
+        dib.expose(hwnd)
+        dib.draw(hwnd, (0, 0) + size)
+        assert isinstance(dib.query_palette(hwnd), int)
+
+    def test_dib_paste(self) -> None:
         # Arrange
         im = hopper()
 
@@ -70,7 +86,7 @@ def test_dib_paste(self):
         # Assert
         assert dib.size == (128, 128)
 
-    def test_dib_paste_bbox(self):
+    def test_dib_paste_bbox(self) -> None:
         # Arrange
         im = hopper()
         bbox = (0, 0, 10, 10)
@@ -85,7 +101,7 @@ def test_dib_paste_bbox(self):
         # Assert
         assert dib.size == (128, 128)
 
-    def test_dib_frombytes_tobytes_roundtrip(self):
+    def test_dib_frombytes_tobytes_roundtrip(self) -> None:
         # Arrange
         # Make two different DIB images
         im = hopper()
diff --git a/Tests/test_imagewin_pointers.py b/Tests/test_imagewin_pointers.py
index bd154335af7..c23a5c690a2 100644
--- a/Tests/test_imagewin_pointers.py
+++ b/Tests/test_imagewin_pointers.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 from io import BytesIO
+from pathlib import Path
 
 from PIL import Image, ImageWin
 
@@ -43,21 +45,22 @@ class BITMAPINFOHEADER(ctypes.Structure):
     memcpy = ctypes.cdll.msvcrt.memcpy
     memcpy.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_size_t]
 
-    CreateCompatibleDC = ctypes.windll.gdi32.CreateCompatibleDC
+    windll = getattr(ctypes, "windll")
+    CreateCompatibleDC = windll.gdi32.CreateCompatibleDC
     CreateCompatibleDC.argtypes = [ctypes.wintypes.HDC]
     CreateCompatibleDC.restype = ctypes.wintypes.HDC
 
-    DeleteDC = ctypes.windll.gdi32.DeleteDC
+    DeleteDC = windll.gdi32.DeleteDC
     DeleteDC.argtypes = [ctypes.wintypes.HDC]
 
-    SelectObject = ctypes.windll.gdi32.SelectObject
+    SelectObject = windll.gdi32.SelectObject
     SelectObject.argtypes = [ctypes.wintypes.HDC, ctypes.wintypes.HGDIOBJ]
     SelectObject.restype = ctypes.wintypes.HGDIOBJ
 
-    DeleteObject = ctypes.windll.gdi32.DeleteObject
+    DeleteObject = windll.gdi32.DeleteObject
     DeleteObject.argtypes = [ctypes.wintypes.HGDIOBJ]
 
-    CreateDIBSection = ctypes.windll.gdi32.CreateDIBSection
+    CreateDIBSection = windll.gdi32.CreateDIBSection
     CreateDIBSection.argtypes = [
         ctypes.wintypes.HDC,
         ctypes.c_void_p,
@@ -68,7 +71,7 @@ class BITMAPINFOHEADER(ctypes.Structure):
     ]
     CreateDIBSection.restype = ctypes.wintypes.HBITMAP
 
-    def serialize_dib(bi, pixels):
+    def serialize_dib(bi: BITMAPINFOHEADER, pixels: ctypes.c_void_p) -> bytearray:
         bf = BITMAPFILEHEADER()
         bf.bfType = 0x4D42
         bf.bfOffBits = ctypes.sizeof(bf) + bi.biSize
@@ -82,7 +85,7 @@ def serialize_dib(bi, pixels):
         memcpy(bp + bf.bfOffBits, pixels, bi.biSizeImage)
         return bytearray(buf)
 
-    def test_pointer(tmp_path):
+    def test_pointer(tmp_path: Path) -> None:
         im = hopper()
         (width, height) = im.size
         opath = str(tmp_path / "temp.png")
diff --git a/Tests/test_lib_image.py b/Tests/test_lib_image.py
index 92cad4ac1b1..31548bbc91f 100644
--- a/Tests/test_lib_image.py
+++ b/Tests/test_lib_image.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
 
 
-def test_setmode():
+def test_setmode() -> None:
     im = Image.new("L", (1, 1), 255)
     im.im.setmode("1")
     assert im.im.getpixel((0, 0)) == 255
diff --git a/Tests/test_lib_pack.py b/Tests/test_lib_pack.py
index 1293f7628be..b4a300d0c59 100644
--- a/Tests/test_lib_pack.py
+++ b/Tests/test_lib_pack.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import sys
 
 import pytest
@@ -9,7 +10,13 @@
 
 
 class TestLibPack:
-    def assert_pack(self, mode, rawmode, data, *pixels):
+    def assert_pack(
+        self,
+        mode: str,
+        rawmode: str,
+        data: int | bytes,
+        *pixels: float | tuple[int, ...],
+    ) -> None:
         """
         data - either raw bytes with data or just number of bytes in rawmode.
         """
@@ -23,7 +30,7 @@ def assert_pack(self, mode, rawmode, data, *pixels):
 
         assert data == im.tobytes("raw", rawmode)
 
-    def test_1(self):
+    def test_1(self) -> None:
         self.assert_pack("1", "1", b"\x01", 0, 0, 0, 0, 0, 0, 0, X)
         self.assert_pack("1", "1;I", b"\x01", X, X, X, X, X, X, X, 0)
         self.assert_pack("1", "1;R", b"\x01", X, 0, 0, 0, 0, 0, 0, 0)
@@ -36,29 +43,29 @@ def test_1(self):
 
         self.assert_pack("1", "L", b"\xff\x00\x00\xff\x00\x00", X, 0, 0, X, 0, 0)
 
-    def test_L(self):
+    def test_L(self) -> None:
         self.assert_pack("L", "L", 1, 1, 2, 3, 4)
         self.assert_pack("L", "L;16", b"\x00\xc6\x00\xaf", 198, 175)
         self.assert_pack("L", "L;16B", b"\xc6\x00\xaf\x00", 198, 175)
 
-    def test_LA(self):
+    def test_LA(self) -> None:
         self.assert_pack("LA", "LA", 2, (1, 2), (3, 4), (5, 6))
         self.assert_pack("LA", "LA;L", 2, (1, 4), (2, 5), (3, 6))
 
-    def test_La(self):
+    def test_La(self) -> None:
         self.assert_pack("La", "La", 2, (1, 2), (3, 4), (5, 6))
 
-    def test_P(self):
+    def test_P(self) -> None:
         self.assert_pack("P", "P;1", b"\xe4", 1, 1, 1, 0, 0, 255, 0, 0)
         self.assert_pack("P", "P;2", b"\xe4", 3, 2, 1, 0)
         self.assert_pack("P", "P;4", b"\x02\xef", 0, 2, 14, 15)
         self.assert_pack("P", "P", 1, 1, 2, 3, 4)
 
-    def test_PA(self):
+    def test_PA(self) -> None:
         self.assert_pack("PA", "PA", 2, (1, 2), (3, 4), (5, 6))
         self.assert_pack("PA", "PA;L", 2, (1, 4), (2, 5), (3, 6))
 
-    def test_RGB(self):
+    def test_RGB(self) -> None:
         self.assert_pack("RGB", "RGB", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
         self.assert_pack(
             "RGB", "RGBX", b"\x01\x02\x03\xff\x05\x06\x07\xff", (1, 2, 3), (5, 6, 7)
@@ -78,7 +85,7 @@ def test_RGB(self):
         self.assert_pack("RGB", "G", 1, (9, 1, 9), (9, 2, 9), (9, 3, 9))
         self.assert_pack("RGB", "B", 1, (9, 9, 1), (9, 9, 2), (9, 9, 3))
 
-    def test_RGBA(self):
+    def test_RGBA(self) -> None:
         self.assert_pack("RGBA", "RGBA", 4, (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12))
         self.assert_pack(
             "RGBA", "RGBA;L", 4, (1, 4, 7, 10), (2, 5, 8, 11), (3, 6, 9, 12)
@@ -100,12 +107,12 @@ def test_RGBA(self):
         self.assert_pack("RGBA", "B", 1, (6, 7, 1, 9), (6, 7, 2, 0), (6, 7, 3, 9))
         self.assert_pack("RGBA", "A", 1, (6, 7, 0, 1), (6, 7, 0, 2), (0, 7, 0, 3))
 
-    def test_RGBa(self):
+    def test_RGBa(self) -> None:
         self.assert_pack("RGBa", "RGBa", 4, (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12))
         self.assert_pack("RGBa", "BGRa", 4, (3, 2, 1, 4), (7, 6, 5, 8), (11, 10, 9, 12))
         self.assert_pack("RGBa", "aBGR", 4, (4, 3, 2, 1), (8, 7, 6, 5), (12, 11, 10, 9))
 
-    def test_RGBX(self):
+    def test_RGBX(self) -> None:
         self.assert_pack("RGBX", "RGBX", 4, (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12))
         self.assert_pack(
             "RGBX", "RGBX;L", 4, (1, 4, 7, 10), (2, 5, 8, 11), (3, 6, 9, 12)
@@ -133,7 +140,7 @@ def test_RGBX(self):
         self.assert_pack("RGBX", "B", 1, (6, 7, 1, 9), (6, 7, 2, 0), (6, 7, 3, 9))
         self.assert_pack("RGBX", "X", 1, (6, 7, 0, 1), (6, 7, 0, 2), (0, 7, 0, 3))
 
-    def test_CMYK(self):
+    def test_CMYK(self) -> None:
         self.assert_pack("CMYK", "CMYK", 4, (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12))
         self.assert_pack(
             "CMYK",
@@ -148,7 +155,7 @@ def test_CMYK(self):
         )
         self.assert_pack("CMYK", "K", 1, (6, 7, 0, 1), (6, 7, 0, 2), (0, 7, 0, 3))
 
-    def test_YCbCr(self):
+    def test_YCbCr(self) -> None:
         self.assert_pack("YCbCr", "YCbCr", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
         self.assert_pack("YCbCr", "YCbCr;L", 3, (1, 4, 7), (2, 5, 8), (3, 6, 9))
         self.assert_pack(
@@ -171,19 +178,19 @@ def test_YCbCr(self):
         self.assert_pack("YCbCr", "Cb", 1, (6, 1, 8, 9), (6, 2, 8, 9), (6, 3, 8, 9))
         self.assert_pack("YCbCr", "Cr", 1, (6, 7, 1, 9), (6, 7, 2, 0), (6, 7, 3, 9))
 
-    def test_LAB(self):
+    def test_LAB(self) -> None:
         self.assert_pack("LAB", "LAB", 3, (1, 130, 131), (4, 133, 134), (7, 136, 137))
         self.assert_pack("LAB", "L", 1, (1, 9, 9), (2, 9, 9), (3, 9, 9))
         self.assert_pack("LAB", "A", 1, (9, 1, 9), (9, 2, 9), (9, 3, 9))
         self.assert_pack("LAB", "B", 1, (9, 9, 1), (9, 9, 2), (9, 9, 3))
 
-    def test_HSV(self):
+    def test_HSV(self) -> None:
         self.assert_pack("HSV", "HSV", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
         self.assert_pack("HSV", "H", 1, (1, 9, 9), (2, 9, 9), (3, 9, 9))
         self.assert_pack("HSV", "S", 1, (9, 1, 9), (9, 2, 9), (9, 3, 9))
         self.assert_pack("HSV", "V", 1, (9, 9, 1), (9, 9, 2), (9, 9, 3))
 
-    def test_I(self):
+    def test_I(self) -> None:
         self.assert_pack("I", "I;16B", 2, 0x0102, 0x0304)
         self.assert_pack(
             "I", "I;32S", b"\x83\x00\x00\x01\x01\x00\x00\x83", 0x01000083, -2097151999
@@ -208,10 +215,13 @@ def test_I(self):
                 0x01000083,
             )
 
-    def test_I16(self):
-        self.assert_pack("I;16N", "I;16N", 2, 0x0201, 0x0403, 0x0605)
+    def test_I16(self) -> None:
+        if sys.byteorder == "little":
+            self.assert_pack("I;16N", "I;16N", 2, 0x0201, 0x0403, 0x0605)
+        else:
+            self.assert_pack("I;16N", "I;16N", 2, 0x0102, 0x0304, 0x0506)
 
-    def test_F_float(self):
+    def test_F_float(self) -> None:
         self.assert_pack("F", "F;32F", 4, 1.539989614439558e-36, 4.063216068939723e-34)
 
         if sys.byteorder == "little":
@@ -227,7 +237,13 @@ def test_F_float(self):
 
 
 class TestLibUnpack:
-    def assert_unpack(self, mode, rawmode, data, *pixels):
+    def assert_unpack(
+        self,
+        mode: str,
+        rawmode: str,
+        data: int | bytes,
+        *pixels: float | tuple[int, ...],
+    ) -> None:
         """
         data - either raw bytes with data or just number of bytes in rawmode.
         """
@@ -240,7 +256,7 @@ def assert_unpack(self, mode, rawmode, data, *pixels):
         for x, pixel in enumerate(pixels):
             assert pixel == im.getpixel((x, 0))
 
-    def test_1(self):
+    def test_1(self) -> None:
         self.assert_unpack("1", "1", b"\x01", 0, 0, 0, 0, 0, 0, 0, X)
         self.assert_unpack("1", "1;I", b"\x01", X, X, X, X, X, X, X, 0)
         self.assert_unpack("1", "1;R", b"\x01", X, 0, 0, 0, 0, 0, 0, 0)
@@ -253,7 +269,7 @@ def test_1(self):
 
         self.assert_unpack("1", "1;8", b"\x00\x01\x02\xff", 0, X, X, X)
 
-    def test_L(self):
+    def test_L(self) -> None:
         self.assert_unpack("L", "L;2", b"\xe4", 255, 170, 85, 0)
         self.assert_unpack("L", "L;2I", b"\xe4", 0, 85, 170, 255)
         self.assert_unpack("L", "L;2R", b"\xe4", 0, 170, 85, 255)
@@ -272,14 +288,14 @@ def test_L(self):
         self.assert_unpack("L", "L;16", b"\x00\xc6\x00\xaf", 198, 175)
         self.assert_unpack("L", "L;16B", b"\xc6\x00\xaf\x00", 198, 175)
 
-    def test_LA(self):
+    def test_LA(self) -> None:
         self.assert_unpack("LA", "LA", 2, (1, 2), (3, 4), (5, 6))
         self.assert_unpack("LA", "LA;L", 2, (1, 4), (2, 5), (3, 6))
 
-    def test_La(self):
+    def test_La(self) -> None:
         self.assert_unpack("La", "La", 2, (1, 2), (3, 4), (5, 6))
 
-    def test_P(self):
+    def test_P(self) -> None:
         self.assert_unpack("P", "P;1", b"\xe4", 1, 1, 1, 0, 0, 1, 0, 0)
         self.assert_unpack("P", "P;2", b"\xe4", 3, 2, 1, 0)
         # erroneous?
@@ -290,11 +306,11 @@ def test_P(self):
         self.assert_unpack("P", "P", 1, 1, 2, 3, 4)
         self.assert_unpack("P", "P;R", 1, 128, 64, 192, 32)
 
-    def test_PA(self):
+    def test_PA(self) -> None:
         self.assert_unpack("PA", "PA", 2, (1, 2), (3, 4), (5, 6))
         self.assert_unpack("PA", "PA;L", 2, (1, 4), (2, 5), (3, 6))
 
-    def test_RGB(self):
+    def test_RGB(self) -> None:
         self.assert_unpack("RGB", "RGB", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
         self.assert_unpack("RGB", "RGB;L", 3, (1, 4, 7), (2, 5, 8), (3, 6, 9))
         self.assert_unpack("RGB", "RGB;R", 3, (128, 64, 192), (32, 160, 96))
@@ -345,14 +361,17 @@ def test_RGB(self):
             "RGB", "CMYK", 4, (250, 249, 248), (242, 241, 240), (234, 233, 233)
         )
 
-    def test_BGR(self):
-        self.assert_unpack("BGR;15", "BGR;15", 3, (8, 131, 0), (24, 0, 8), (41, 131, 8))
-        self.assert_unpack(
-            "BGR;16", "BGR;16", 3, (8, 64, 0), (24, 129, 0), (41, 194, 0)
-        )
-        self.assert_unpack("BGR;24", "BGR;24", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
+    def test_BGR(self) -> None:
+        with pytest.warns(DeprecationWarning):
+            self.assert_unpack(
+                "BGR;15", "BGR;15", 3, (8, 131, 0), (24, 0, 8), (41, 131, 8)
+            )
+            self.assert_unpack(
+                "BGR;16", "BGR;16", 3, (8, 64, 0), (24, 129, 0), (41, 194, 0)
+            )
+            self.assert_unpack("BGR;24", "BGR;24", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
 
-    def test_RGBA(self):
+    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;16B", 4, (1, 1, 1, 3), (5, 5, 5, 7), (9, 9, 9, 11)
@@ -521,7 +540,7 @@ def test_RGBA(self):
                 "RGBA", "A;16N", 2, (0, 0, 0, 1), (0, 0, 0, 3), (0, 0, 0, 5)
             )
 
-    def test_RGBa(self):
+    def test_RGBa(self) -> None:
         self.assert_unpack(
             "RGBa", "RGBa", 4, (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)
         )
@@ -535,7 +554,7 @@ def test_RGBa(self):
             "RGBa", "aBGR", 4, (4, 3, 2, 1), (8, 7, 6, 5), (12, 11, 10, 9)
         )
 
-    def test_RGBX(self):
+    def test_RGBX(self) -> None:
         self.assert_unpack("RGBX", "RGB", 3, (1, 2, 3, X), (4, 5, 6, X), (7, 8, 9, X))
         self.assert_unpack("RGBX", "RGB;L", 3, (1, 4, 7, X), (2, 5, 8, X), (3, 6, 9, X))
         self.assert_unpack("RGBX", "RGB;16B", 6, (1, 3, 5, X), (7, 9, 11, X))
@@ -580,7 +599,7 @@ def test_RGBX(self):
         self.assert_unpack("RGBX", "B", 1, (0, 0, 1, 0), (0, 0, 2, 0), (0, 0, 3, 0))
         self.assert_unpack("RGBX", "X", 1, (0, 0, 0, 1), (0, 0, 0, 2), (0, 0, 0, 3))
 
-    def test_CMYK(self):
+    def test_CMYK(self) -> None:
         self.assert_unpack(
             "CMYK", "CMYK", 4, (1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)
         )
@@ -618,25 +637,25 @@ def test_CMYK(self):
             "CMYK", "K;I", 1, (0, 0, 0, 254), (0, 0, 0, 253), (0, 0, 0, 252)
         )
 
-    def test_YCbCr(self):
+    def test_YCbCr(self) -> None:
         self.assert_unpack("YCbCr", "YCbCr", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
         self.assert_unpack("YCbCr", "YCbCr;L", 3, (1, 4, 7), (2, 5, 8), (3, 6, 9))
         self.assert_unpack("YCbCr", "YCbCrK", 4, (1, 2, 3), (5, 6, 7), (9, 10, 11))
         self.assert_unpack("YCbCr", "YCbCrX", 4, (1, 2, 3), (5, 6, 7), (9, 10, 11))
 
-    def test_LAB(self):
+    def test_LAB(self) -> None:
         self.assert_unpack("LAB", "LAB", 3, (1, 130, 131), (4, 133, 134), (7, 136, 137))
         self.assert_unpack("LAB", "L", 1, (1, 0, 0), (2, 0, 0), (3, 0, 0))
         self.assert_unpack("LAB", "A", 1, (0, 1, 0), (0, 2, 0), (0, 3, 0))
         self.assert_unpack("LAB", "B", 1, (0, 0, 1), (0, 0, 2), (0, 0, 3))
 
-    def test_HSV(self):
+    def test_HSV(self) -> None:
         self.assert_unpack("HSV", "HSV", 3, (1, 2, 3), (4, 5, 6), (7, 8, 9))
         self.assert_unpack("HSV", "H", 1, (1, 0, 0), (2, 0, 0), (3, 0, 0))
         self.assert_unpack("HSV", "S", 1, (0, 1, 0), (0, 2, 0), (0, 3, 0))
         self.assert_unpack("HSV", "V", 1, (0, 0, 1), (0, 0, 2), (0, 0, 3))
 
-    def test_I(self):
+    def test_I(self) -> None:
         self.assert_unpack("I", "I;8", 1, 0x01, 0x02, 0x03, 0x04)
         self.assert_unpack("I", "I;8S", b"\x01\x83", 1, -125)
         self.assert_unpack("I", "I;16", 2, 0x0201, 0x0403)
@@ -677,7 +696,7 @@ def test_I(self):
                 0x01000083,
             )
 
-    def test_F_int(self):
+    def test_F_int(self) -> None:
         self.assert_unpack("F", "F;8", 1, 0x01, 0x02, 0x03, 0x04)
         self.assert_unpack("F", "F;8S", b"\x01\x83", 1, -125)
         self.assert_unpack("F", "F;16", 2, 0x0201, 0x0403)
@@ -716,7 +735,7 @@ def test_F_int(self):
                 16777348,
             )
 
-    def test_F_float(self):
+    def test_F_float(self) -> None:
         self.assert_unpack(
             "F", "F;32F", 4, 1.539989614439558e-36, 4.063216068939723e-34
         )
@@ -767,7 +786,7 @@ def test_F_float(self):
                 -1234.5,
             )
 
-    def test_I16(self):
+    def test_I16(self) -> None:
         self.assert_unpack("I;16", "I;16", 2, 0x0201, 0x0403, 0x0605)
         self.assert_unpack("I;16", "I;16B", 2, 0x0102, 0x0304, 0x0506)
         self.assert_unpack("I;16B", "I;16B", 2, 0x0102, 0x0304, 0x0506)
@@ -784,7 +803,7 @@ def test_I16(self):
             self.assert_unpack("I;16L", "I;16N", 2, 0x0102, 0x0304, 0x0506)
             self.assert_unpack("I;16N", "I;16N", 2, 0x0102, 0x0304, 0x0506)
 
-    def test_CMYK16(self):
+    def test_CMYK16(self) -> None:
         self.assert_unpack("CMYK", "CMYK;16L", 8, (2, 4, 6, 8), (10, 12, 14, 16))
         self.assert_unpack("CMYK", "CMYK;16B", 8, (1, 3, 5, 7), (9, 11, 13, 15))
         if sys.byteorder == "little":
@@ -792,7 +811,7 @@ def test_CMYK16(self):
         else:
             self.assert_unpack("CMYK", "CMYK;16N", 8, (1, 3, 5, 7), (9, 11, 13, 15))
 
-    def test_value_error(self):
+    def test_value_error(self) -> None:
         with pytest.raises(ValueError):
             self.assert_unpack("L", "L", 0, 0)
         with pytest.raises(ValueError):
diff --git a/Tests/test_locale.py b/Tests/test_locale.py
index 49b052fa485..386c57cc01f 100644
--- a/Tests/test_locale.py
+++ b/Tests/test_locale.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import locale
 
 import pytest
@@ -18,12 +19,12 @@
 # 7
 # 160
 
-# one of string.whitespace is not freely convertable into ascii.
+# one of string.whitespace is not freely convertible into ascii.
 
 path = "Tests/images/hopper.jpg"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(path):
         pass
     try:
diff --git a/Tests/test_main.py b/Tests/test_main.py
index a84e61a7b7d..2582dbee3db 100644
--- a/Tests/test_main.py
+++ b/Tests/test_main.py
@@ -1,11 +1,19 @@
 from __future__ import annotations
+
 import os
 import subprocess
 import sys
 
+import pytest
+
 
-def test_main():
-    out = subprocess.check_output([sys.executable, "-m", "PIL"]).decode("utf-8")
+@pytest.mark.parametrize(
+    "args, report",
+    ((["PIL"], False), (["PIL", "--report"], True), (["PIL.report"], True)),
+)
+def test_main(args: list[str], report: bool) -> None:
+    args = [sys.executable, "-m"] + args
+    out = subprocess.check_output(args).decode("utf-8")
     lines = out.splitlines()
     assert lines[0] == "-" * 68
     assert lines[1].startswith("Pillow ")
@@ -14,9 +22,15 @@ def test_main():
     while lines[0].startswith("    "):
         lines = lines[1:]
     assert lines[0] == "-" * 68
-    assert lines[1].startswith("Python modules loaded from ")
-    assert lines[2].startswith("Binary modules loaded from ")
-    assert lines[3] == "-" * 68
+    assert lines[1].startswith("Python executable is")
+    lines = lines[2:]
+    if lines[0].startswith("Environment Python files loaded from"):
+        lines = lines[1:]
+    assert lines[0].startswith("System Python files loaded from")
+    assert lines[1] == "-" * 68
+    assert lines[2].startswith("Python Pillow modules loaded from ")
+    assert lines[3].startswith("Binary Pillow modules loaded from ")
+    assert lines[4] == "-" * 68
     jpeg = (
         os.linesep
         + "-" * 68
@@ -30,4 +44,4 @@ def test_main():
         + "-" * 68
         + os.linesep
     )
-    assert jpeg in out
+    assert report == (jpeg not in out)
diff --git a/Tests/test_map.py b/Tests/test_map.py
index 76444f33d1c..93140f6e5a5 100644
--- a/Tests/test_map.py
+++ b/Tests/test_map.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import sys
 
 import pytest
@@ -6,7 +7,7 @@
 from PIL import Image
 
 
-def test_overflow():
+def test_overflow() -> None:
     # There is the potential to overflow comparisons in map.c
     # if there are > SIZE_MAX bytes in the image or if
     # the file encodes an offset that makes
@@ -24,7 +25,7 @@ def test_overflow():
     Image.MAX_IMAGE_PIXELS = max_pixels
 
 
-def test_tobytes():
+def test_tobytes() -> None:
     # Note that this image triggers the decompression bomb warning:
     max_pixels = Image.MAX_IMAGE_PIXELS
     Image.MAX_IMAGE_PIXELS = None
@@ -38,7 +39,7 @@ def test_tobytes():
 
 
 @pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system")
-def test_ysize():
+def test_ysize() -> None:
     numpy = pytest.importorskip("numpy", reason="NumPy not installed")
 
     # Should not raise 'Integer overflow in ysize'
diff --git a/Tests/test_mode_i16.py b/Tests/test_mode_i16.py
index 3e17d8dccde..e26f5d283ab 100644
--- a/Tests/test_mode_i16.py
+++ b/Tests/test_mode_i16.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import Image
@@ -8,11 +11,13 @@
 original = hopper().resize((32, 32)).convert("I")
 
 
-def verify(im1):
+def verify(im1: Image.Image) -> None:
     im2 = original.copy()
     assert im1.size == im2.size
     pix1 = im1.load()
     pix2 = im2.load()
+    assert pix1 is not None
+    assert pix2 is not None
     for y in range(im1.size[1]):
         for x in range(im1.size[0]):
             xy = x, y
@@ -24,7 +29,7 @@ def verify(im1):
 
 
 @pytest.mark.parametrize("mode", ("L", "I;16", "I;16B", "I;16L", "I"))
-def test_basic(tmp_path, mode):
+def test_basic(tmp_path: Path, mode: str) -> None:
     # PIL 1.1 has limited support for 16-bit image data.  Check that
     # create/copy/transform and save works as expected.
 
@@ -74,8 +79,8 @@ def test_basic(tmp_path, mode):
     assert im_in.getpixel((0, 0)) == min(512, maximum)
 
 
-def test_tobytes():
-    def tobytes(mode):
+def test_tobytes() -> None:
+    def tobytes(mode: str) -> bytes:
         return Image.new(mode, (1, 1), 1).tobytes()
 
     order = 1 if Image._ENDIAN == "<" else -1
@@ -86,7 +91,7 @@ def tobytes(mode):
     assert tobytes("I") == b"\x01\x00\x00\x00"[::order]
 
 
-def test_convert():
+def test_convert() -> None:
     im = original.copy()
 
     for mode in ("I;16", "I;16B", "I;16N"):
diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py
index 6f0e99b3f93..040472d69e3 100644
--- a/Tests/test_numpy.py
+++ b/Tests/test_numpy.py
@@ -1,19 +1,25 @@
 from __future__ import annotations
+
 import warnings
+from typing import TYPE_CHECKING
 
 import pytest
 
-from PIL import Image
+from PIL import Image, _typing
 
 from .helper import assert_deep_equal, assert_image, hopper, skip_unless_feature
 
-numpy = pytest.importorskip("numpy", reason="NumPy not installed")
+if TYPE_CHECKING:
+    import numpy
+    import numpy.typing as npt
+else:
+    numpy = pytest.importorskip("numpy", reason="NumPy not installed")
 
 TEST_IMAGE_SIZE = (10, 10)
 
 
-def test_numpy_to_image():
-    def to_image(dtype, bands=1, boolean=0):
+def test_numpy_to_image() -> None:
+    def to_image(dtype: npt.DTypeLike, bands: int = 1, boolean: int = 0) -> Image.Image:
         if bands == 1:
             if boolean:
                 data = [0, 255] * 50
@@ -81,7 +87,7 @@ def to_image(dtype, bands=1, boolean=0):
 
 # Based on an erring example at
 # https://stackoverflow.com/questions/10854903/what-is-causing-dimension-dependent-attributeerror-in-pil-fromarray-function
-def test_3d_array():
+def test_3d_array() -> None:
     size = (5, TEST_IMAGE_SIZE[0], TEST_IMAGE_SIZE[1])
     a = numpy.ones(size, dtype=numpy.uint8)
     assert_image(Image.fromarray(a[1, :, :]), "L", TEST_IMAGE_SIZE)
@@ -93,29 +99,30 @@ def test_3d_array():
     assert_image(Image.fromarray(a[:, :, 1]), "L", TEST_IMAGE_SIZE)
 
 
-def test_1d_array():
+def test_1d_array() -> None:
     a = numpy.ones(5, dtype=numpy.uint8)
     assert_image(Image.fromarray(a), "L", (1, 5))
 
 
-def _test_img_equals_nparray(img, np):
-    assert len(np.shape) >= 2
-    np_size = np.shape[1], np.shape[0]
+def _test_img_equals_nparray(img: Image.Image, np_img: _typing.NumpyArray) -> None:
+    assert len(np_img.shape) >= 2
+    np_size = np_img.shape[1], np_img.shape[0]
     assert img.size == np_size
     px = img.load()
+    assert px is not None
     for x in range(0, img.size[0], int(img.size[0] / 10)):
         for y in range(0, img.size[1], int(img.size[1] / 10)):
-            assert_deep_equal(px[x, y], np[y, x])
+            assert_deep_equal(px[x, y], np_img[y, x])
 
 
-def test_16bit():
+def test_16bit() -> None:
     with Image.open("Tests/images/16bit.cropped.tif") as img:
         np_img = numpy.array(img)
         _test_img_equals_nparray(img, np_img)
     assert np_img.dtype == numpy.dtype("<u2")
 
 
-def test_1bit():
+def test_1bit() -> None:
     # Test that 1-bit arrays convert to numpy and back
     # See: https://github.com/python-pillow/Pillow/issues/350
     arr = numpy.array([[1, 0, 0, 1, 0], [0, 1, 0, 0, 0]], "u1")
@@ -125,7 +132,7 @@ def test_1bit():
     numpy.testing.assert_array_equal(arr, arr_back)
 
 
-def test_save_tiff_uint16():
+def test_save_tiff_uint16() -> None:
     # Tests that we're getting the pixel value in the right byte order.
     pixel_value = 0x1234
     a = numpy.array(
@@ -135,6 +142,7 @@ def test_save_tiff_uint16():
     img = Image.fromarray(a)
 
     img_px = img.load()
+    assert img_px is not None
     assert img_px[0, 0] == pixel_value
 
 
@@ -156,7 +164,7 @@ def test_save_tiff_uint16():
         ("HSV", numpy.uint8),
     ),
 )
-def test_to_array(mode, dtype):
+def test_to_array(mode: str, dtype: npt.DTypeLike) -> None:
     img = hopper(mode)
 
     # Resize to non-square
@@ -168,7 +176,7 @@ def test_to_array(mode, dtype):
     assert np_img.dtype == dtype
 
 
-def test_point_lut():
+def test_point_lut() -> None:
     # See https://github.com/python-pillow/Pillow/issues/439
 
     data = list(range(256)) * 3
@@ -179,7 +187,7 @@ def test_point_lut():
     im.point(lut)
 
 
-def test_putdata():
+def test_putdata() -> None:
     # Shouldn't segfault
     # See https://github.com/python-pillow/Pillow/issues/1008
 
@@ -190,6 +198,15 @@ def test_putdata():
     assert len(im.getdata()) == len(arr)
 
 
+def test_resize() -> None:
+    im = hopper()
+    size = (64, 64)
+
+    im_resized = im.resize(numpy.array(size))
+
+    assert im_resized.size == size
+
+
 @pytest.mark.parametrize(
     "dtype",
     (
@@ -206,12 +223,12 @@ def test_putdata():
         numpy.float64,
     ),
 )
-def test_roundtrip_eye(dtype):
+def test_roundtrip_eye(dtype: npt.DTypeLike) -> None:
     arr = numpy.eye(10, dtype=dtype)
     numpy.testing.assert_array_equal(arr, numpy.array(Image.fromarray(arr)))
 
 
-def test_zero_size():
+def test_zero_size() -> None:
     # Shouldn't cause floating point exception
     # See https://github.com/python-pillow/Pillow/issues/2259
 
@@ -221,13 +238,15 @@ def test_zero_size():
 
 
 @skip_unless_feature("libtiff")
-def test_load_first():
+def test_transposed() -> None:
     with Image.open("Tests/images/g4_orientation_5.tif") as im:
+        assert im.size == (590, 88)
+
         a = numpy.array(im)
         assert a.shape == (88, 590)
 
 
-def test_bool():
+def test_bool() -> None:
     # https://github.com/python-pillow/Pillow/issues/2044
     a = numpy.zeros((10, 2), dtype=bool)
     a[0][0] = True
@@ -236,7 +255,7 @@ def test_bool():
     assert im2.getdata()[0] == 255
 
 
-def test_no_resource_warning_for_numpy_array():
+def test_no_resource_warning_for_numpy_array() -> None:
     # https://github.com/python-pillow/Pillow/issues/835
     # Arrange
     from numpy import array
diff --git a/Tests/test_pdfparser.py b/Tests/test_pdfparser.py
index aeeafb6f1df..f6b12cb2047 100644
--- a/Tests/test_pdfparser.py
+++ b/Tests/test_pdfparser.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import time
 
 import pytest
@@ -18,14 +19,14 @@
 )
 
 
-def test_text_encode_decode():
+def test_text_encode_decode() -> None:
     assert encode_text("abc") == b"\xFE\xFF\x00a\x00b\x00c"
     assert decode_text(b"\xFE\xFF\x00a\x00b\x00c") == "abc"
     assert decode_text(b"abc") == "abc"
     assert decode_text(b"\x1B a \x1C") == "\u02D9 a \u02DD"
 
 
-def test_indirect_refs():
+def test_indirect_refs() -> None:
     assert IndirectReference(1, 2) == IndirectReference(1, 2)
     assert IndirectReference(1, 2) != IndirectReference(1, 3)
     assert IndirectReference(1, 2) != IndirectObjectDef(1, 2)
@@ -36,7 +37,7 @@ def test_indirect_refs():
     assert IndirectObjectDef(1, 2) != (1, 2)
 
 
-def test_parsing():
+def test_parsing() -> None:
     assert PdfParser.interpret_name(b"Name#23Hash") == b"Name#Hash"
     assert PdfParser.interpret_name(b"Name#23Hash", as_text=True) == "Name#Hash"
     assert PdfParser.get_value(b"1 2 R ", 0) == (IndirectReference(1, 2), 5)
@@ -94,7 +95,7 @@ def test_parsing():
             assert time.strftime("%Y%m%d%H%M%S", getattr(d, name)) == value
 
 
-def test_pdf_repr():
+def test_pdf_repr() -> None:
     assert bytes(IndirectReference(1, 2)) == b"1 2 R"
     assert bytes(IndirectObjectDef(*IndirectReference(1, 2))) == b"1 2 obj"
     assert bytes(PdfName(b"Name#Hash")) == b"/Name#23Hash"
@@ -120,7 +121,7 @@ def test_pdf_repr():
     assert pdf_repr(PdfBinary(b"\x90\x1F\xA0")) == b"<901FA0>"
 
 
-def test_duplicate_xref_entry():
+def test_duplicate_xref_entry() -> None:
     pdf = PdfParser("Tests/images/duplicate_xref_entry.pdf")
     assert pdf.xref_table.existing_entries[6][0] == 1197
     pdf.close()
diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py
index eb687b57b62..d250ba36965 100644
--- a/Tests/test_pickle.py
+++ b/Tests/test_pickle.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
+
 import pickle
+from pathlib import Path
 
 import pytest
 
@@ -11,7 +13,9 @@
 FONT_PATH = "Tests/fonts/DejaVuSans/DejaVuSans.ttf"
 
 
-def helper_pickle_file(tmp_path, pickle, protocol, test_file, mode):
+def helper_pickle_file(
+    tmp_path: Path, protocol: int, test_file: str, mode: str | None
+) -> None:
     # Arrange
     with Image.open(test_file) as im:
         filename = str(tmp_path / "temp.pkl")
@@ -28,7 +32,7 @@ def helper_pickle_file(tmp_path, pickle, protocol, test_file, mode):
         assert im == loaded_im
 
 
-def helper_pickle_string(pickle, protocol, test_file, mode):
+def helper_pickle_string(protocol: int, test_file: str, mode: str | None) -> None:
     with Image.open(test_file) as im:
         if mode:
             im = im.convert(mode)
@@ -42,7 +46,7 @@ def helper_pickle_string(pickle, protocol, test_file, mode):
 
 
 @pytest.mark.parametrize(
-    ("test_file", "test_mode"),
+    "test_file, test_mode",
     [
         ("Tests/images/hopper.jpg", None),
         ("Tests/images/hopper.jpg", "L"),
@@ -52,23 +56,25 @@ def helper_pickle_string(pickle, protocol, test_file, mode):
         ),
         ("Tests/images/hopper.tif", None),
         ("Tests/images/test-card.png", None),
-        ("Tests/images/zero_bb.png", None),
-        ("Tests/images/zero_bb_scale2.png", None),
-        ("Tests/images/non_zero_bb.png", None),
-        ("Tests/images/non_zero_bb_scale2.png", None),
+        ("Tests/images/eps/zero_bb.png", None),
+        ("Tests/images/eps/zero_bb_scale2.png", None),
+        ("Tests/images/eps/non_zero_bb.png", None),
+        ("Tests/images/eps/non_zero_bb_scale2.png", None),
         ("Tests/images/p_trns_single.png", None),
         ("Tests/images/pil123p.png", None),
         ("Tests/images/itxt_chunks.png", None),
     ],
 )
 @pytest.mark.parametrize("protocol", range(0, pickle.HIGHEST_PROTOCOL + 1))
-def test_pickle_image(tmp_path, test_file, test_mode, protocol):
+def test_pickle_image(
+    tmp_path: Path, test_file: str, test_mode: str | None, protocol: int
+) -> None:
     # Act / Assert
-    helper_pickle_string(pickle, protocol, test_file, test_mode)
-    helper_pickle_file(tmp_path, pickle, protocol, test_file, test_mode)
+    helper_pickle_string(protocol, test_file, test_mode)
+    helper_pickle_file(tmp_path, protocol, test_file, test_mode)
 
 
-def test_pickle_la_mode_with_palette(tmp_path):
+def test_pickle_la_mode_with_palette(tmp_path: Path) -> None:
     # Arrange
     filename = str(tmp_path / "temp.pkl")
     with Image.open("Tests/images/hopper.jpg") as im:
@@ -87,7 +93,7 @@ def test_pickle_la_mode_with_palette(tmp_path):
 
 
 @skip_unless_feature("webp")
-def test_pickle_tell():
+def test_pickle_tell() -> None:
     # Arrange
     with Image.open("Tests/images/hopper.webp") as image:
         # Act: roundtrip
@@ -97,7 +103,9 @@ def test_pickle_tell():
     assert unpickled_image.tell() == 0
 
 
-def helper_assert_pickled_font_images(font1, font2):
+def helper_assert_pickled_font_images(
+    font1: ImageFont.FreeTypeFont, font2: ImageFont.FreeTypeFont
+) -> None:
     # Arrange
     im1 = Image.new(mode="RGBA", size=(300, 100))
     im2 = Image.new(mode="RGBA", size=(300, 100))
@@ -115,7 +123,7 @@ def helper_assert_pickled_font_images(font1, font2):
 
 @skip_unless_feature("freetype2")
 @pytest.mark.parametrize("protocol", list(range(0, pickle.HIGHEST_PROTOCOL + 1)))
-def test_pickle_font_string(protocol):
+def test_pickle_font_string(protocol: int) -> None:
     # Arrange
     font = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
@@ -129,7 +137,7 @@ def test_pickle_font_string(protocol):
 
 @skip_unless_feature("freetype2")
 @pytest.mark.parametrize("protocol", list(range(0, pickle.HIGHEST_PROTOCOL + 1)))
-def test_pickle_font_file(tmp_path, protocol):
+def test_pickle_font_file(tmp_path: Path, protocol: int) -> None:
     # Arrange
     font = ImageFont.truetype(FONT_PATH, FONT_SIZE)
     filename = str(tmp_path / "temp.pkl")
diff --git a/Tests/test_psdraw.py b/Tests/test_psdraw.py
index 77c7952e912..a743d831f5a 100644
--- a/Tests/test_psdraw.py
+++ b/Tests/test_psdraw.py
@@ -1,14 +1,14 @@
 from __future__ import annotations
+
 import os
 import sys
 from io import BytesIO
-
-import pytest
+from pathlib import Path
 
 from PIL import Image, PSDraw
 
 
-def _create_document(ps):
+def _create_document(ps: PSDraw.PSDraw) -> None:
     title = "hopper"
     box = (1 * 72, 2 * 72, 7 * 72, 10 * 72)  # in points
 
@@ -30,7 +30,7 @@ def _create_document(ps):
     ps.end_document()
 
 
-def test_draw_postscript(tmp_path):
+def test_draw_postscript(tmp_path: Path) -> None:
     # Based on Pillow tutorial, but there is no textsize:
     # https://pillow.readthedocs.io/en/latest/handbook/tutorial.html#drawing-postscript
 
@@ -47,19 +47,14 @@ def test_draw_postscript(tmp_path):
     assert os.path.getsize(tempfile) > 0
 
 
-@pytest.mark.parametrize("buffer", (True, False))
-def test_stdout(buffer):
+def test_stdout() -> None:
     # Temporarily redirect stdout
     old_stdout = sys.stdout
 
-    if buffer:
-
-        class MyStdOut:
-            buffer = BytesIO()
+    class MyStdOut:
+        buffer = BytesIO()
 
-        mystdout = MyStdOut()
-    else:
-        mystdout = BytesIO()
+    mystdout = MyStdOut()
 
     sys.stdout = mystdout
 
@@ -69,6 +64,4 @@ class MyStdOut:
     # Reset stdout
     sys.stdout = old_stdout
 
-    if buffer:
-        mystdout = mystdout.buffer
-    assert mystdout.getvalue() != b""
+    assert mystdout.buffer.getvalue() != b""
diff --git a/Tests/test_pyroma.py b/Tests/test_pyroma.py
index 08133b6c30c..c2f7fe22ecb 100644
--- a/Tests/test_pyroma.py
+++ b/Tests/test_pyroma.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import __version__
@@ -6,7 +7,7 @@
 pyroma = pytest.importorskip("pyroma", reason="Pyroma not installed")
 
 
-def test_pyroma():
+def test_pyroma() -> None:
     # Arrange
     data = pyroma.projectdata.get_data(".")
 
diff --git a/Tests/test_qt_image_qapplication.py b/Tests/test_qt_image_qapplication.py
index 49ca016771f..0ed9fbfa5cb 100644
--- a/Tests/test_qt_image_qapplication.py
+++ b/Tests/test_qt_image_qapplication.py
@@ -1,10 +1,28 @@
 from __future__ import annotations
+
+from pathlib import Path
+from typing import TYPE_CHECKING, Union
+
 import pytest
 
-from PIL import ImageQt
+from PIL import Image, ImageQt
 
 from .helper import assert_image_equal_tofile, assert_image_similar, hopper
 
+if TYPE_CHECKING:
+    import PyQt6
+    import PySide6
+
+    QApplication = Union[PyQt6.QtWidgets.QApplication, PySide6.QtWidgets.QApplication]
+    QHBoxLayout = Union[PyQt6.QtWidgets.QHBoxLayout, PySide6.QtWidgets.QHBoxLayout]
+    QImage = Union[PyQt6.QtGui.QImage, PySide6.QtGui.QImage]
+    QLabel = Union[PyQt6.QtWidgets.QLabel, PySide6.QtWidgets.QLabel]
+    QPainter = Union[PyQt6.QtGui.QPainter, PySide6.QtGui.QPainter]
+    QPixmap = Union[PyQt6.QtGui.QPixmap, PySide6.QtGui.QPixmap]
+    QPoint = Union[PyQt6.QtCore.QPoint, PySide6.QtCore.QPoint]
+    QRegion = Union[PyQt6.QtGui.QRegion, PySide6.QtGui.QRegion]
+    QWidget = Union[PyQt6.QtWidgets.QWidget, PySide6.QtWidgets.QWidget]
+
 if ImageQt.qt_is_installed:
     from PIL.ImageQt import QPixmap
 
@@ -17,33 +35,34 @@
         from PySide6.QtGui import QImage, QPainter, QRegion
         from PySide6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
 
-    class Example(QWidget):
-        def __init__(self):
+    class Example(QWidget):  # type: ignore[misc]
+        def __init__(self) -> None:
             super().__init__()
 
             img = hopper().resize((1000, 1000))
 
             qimage = ImageQt.ImageQt(img)
 
-            pixmap1 = ImageQt.QPixmap.fromImage(qimage)
+            pixmap1 = getattr(ImageQt.QPixmap, "fromImage")(qimage)
 
-            QHBoxLayout(self)  # hbox
+            # hbox
+            QHBoxLayout(self)  # type: ignore[operator]
 
-            lbl = QLabel(self)
+            lbl = QLabel(self)  # type: ignore[operator]
             # Segfault in the problem
             lbl.setPixmap(pixmap1.copy())
 
 
-def roundtrip(expected):
+def roundtrip(expected: Image.Image) -> None:
     result = ImageQt.fromqpixmap(ImageQt.toqpixmap(expected))
     # Qt saves all pixmaps as rgb
     assert_image_similar(result, expected.convert("RGB"), 1)
 
 
 @pytest.mark.skipif(not ImageQt.qt_is_installed, reason="Qt bindings are not installed")
-def test_sanity(tmp_path):
+def test_sanity(tmp_path: Path) -> None:
     # Segfault test
-    app = QApplication([])
+    app: QApplication | None = QApplication([])  # type: ignore[operator]
     ex = Example()
     assert app  # Silence warning
     assert ex  # Silence warning
@@ -53,7 +72,7 @@ def test_sanity(tmp_path):
         im = hopper(mode)
         data = ImageQt.toqpixmap(im)
 
-        assert isinstance(data, QPixmap)
+        assert data.__class__.__name__ == "QPixmap"
         assert not data.isNull()
 
         # Test saving the file
@@ -61,14 +80,14 @@ def test_sanity(tmp_path):
         data.save(tempfile)
 
         # Render the image
-        qimage = ImageQt.ImageQt(im)
-        data = QPixmap.fromImage(qimage)
-        qt_format = QImage.Format if ImageQt.qt_version == "6" else QImage
-        qimage = QImage(128, 128, qt_format.Format_ARGB32)
-        painter = QPainter(qimage)
-        image_label = QLabel()
+        imageqt = ImageQt.ImageQt(im)
+        data = getattr(QPixmap, "fromImage")(imageqt)
+        qt_format = getattr(QImage, "Format") if ImageQt.qt_version == "6" else QImage
+        qimage = QImage(128, 128, getattr(qt_format, "Format_ARGB32"))  # type: ignore[operator]
+        painter = QPainter(qimage)  # type: ignore[operator]
+        image_label = QLabel()  # type: ignore[operator]
         image_label.setPixmap(data)
-        image_label.render(painter, QPoint(0, 0), QRegion(0, 0, 128, 128))
+        image_label.render(painter, QPoint(0, 0), QRegion(0, 0, 128, 128))  # type: ignore[operator]
         painter.end()
         rendered_tempfile = str(tmp_path / f"temp_rendered_{mode}.png")
         qimage.save(rendered_tempfile)
diff --git a/Tests/test_qt_image_toqimage.py b/Tests/test_qt_image_toqimage.py
index 396bd9080ca..8cb7ffb9b40 100644
--- a/Tests/test_qt_image_toqimage.py
+++ b/Tests/test_qt_image_toqimage.py
@@ -1,4 +1,7 @@
 from __future__ import annotations
+
+from pathlib import Path
+
 import pytest
 
 from PIL import ImageQt
@@ -14,11 +17,11 @@
 
 
 @pytest.mark.parametrize("mode", ("RGB", "RGBA", "L", "P", "1"))
-def test_sanity(mode, tmp_path):
+def test_sanity(mode: str, tmp_path: Path) -> None:
     src = hopper(mode)
     data = ImageQt.toqimage(src)
 
-    assert isinstance(data, QImage)
+    assert isinstance(data, QImage)  # type: ignore[arg-type, misc]
     assert not data.isNull()
 
     # reload directly from the qimage
diff --git a/Tests/test_sgi_crash.py b/Tests/test_sgi_crash.py
index 37d72d451de..3ce31cd2d1e 100644
--- a/Tests/test_sgi_crash.py
+++ b/Tests/test_sgi_crash.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import pytest
 
 from PIL import Image
@@ -20,7 +21,7 @@
         "Tests/images/crash-db8bfa78b19721225425530c5946217720d7df4e.sgi",
     ],
 )
-def test_crashes(test_file):
+def test_crashes(test_file: str) -> None:
     with open(test_file, "rb") as f:
         with Image.open(f) as im:
             with pytest.raises(OSError):
diff --git a/Tests/test_shell_injection.py b/Tests/test_shell_injection.py
index d93b0390416..dd4fc46c374 100644
--- a/Tests/test_shell_injection.py
+++ b/Tests/test_shell_injection.py
@@ -1,5 +1,9 @@
 from __future__ import annotations
+
 import shutil
+from io import BytesIO
+from pathlib import Path
+from typing import IO, Callable
 
 import pytest
 
@@ -15,16 +19,21 @@
 
 @pytest.mark.skipif(is_win32(), reason="Requires Unix or macOS")
 class TestShellInjection:
-    def assert_save_filename_check(self, tmp_path, src_img, save_func):
+    def assert_save_filename_check(
+        self,
+        tmp_path: Path,
+        src_img: Image.Image,
+        save_func: Callable[[Image.Image, IO[bytes], str | bytes], None],
+    ) -> None:
         for filename in test_filenames:
             dest_file = str(tmp_path / filename)
-            save_func(src_img, 0, dest_file)
+            save_func(src_img, BytesIO(), dest_file)
             # If file can't be opened, shell injection probably occurred
             with Image.open(dest_file) as im:
                 im.load()
 
     @pytest.mark.skipif(not djpeg_available(), reason="djpeg not available")
-    def test_load_djpeg_filename(self, tmp_path):
+    def test_load_djpeg_filename(self, tmp_path: Path) -> None:
         for filename in test_filenames:
             src_file = str(tmp_path / filename)
             shutil.copy(TEST_JPG, src_file)
@@ -33,18 +42,18 @@ def test_load_djpeg_filename(self, tmp_path):
                 im.load_djpeg()
 
     @pytest.mark.skipif(not cjpeg_available(), reason="cjpeg not available")
-    def test_save_cjpeg_filename(self, tmp_path):
+    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")
-    def test_save_netpbm_filename_bmp_mode(self, tmp_path):
+    def test_save_netpbm_filename_bmp_mode(self, tmp_path: Path) -> None:
         with Image.open(TEST_GIF) as im:
             im = im.convert("RGB")
             self.assert_save_filename_check(tmp_path, im, GifImagePlugin._save_netpbm)
 
     @pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
-    def test_save_netpbm_filename_l_mode(self, tmp_path):
+    def test_save_netpbm_filename_l_mode(self, tmp_path: Path) -> None:
         with Image.open(TEST_GIF) as im:
             im = im.convert("L")
             self.assert_save_filename_check(tmp_path, im, GifImagePlugin._save_netpbm)
diff --git a/Tests/test_tiff_crashes.py b/Tests/test_tiff_crashes.py
index 64e781cbada..073e5415c41 100644
--- a/Tests/test_tiff_crashes.py
+++ b/Tests/test_tiff_crashes.py
@@ -42,14 +42,13 @@
 @pytest.mark.filterwarnings("ignore:Possibly corrupt EXIF data")
 @pytest.mark.filterwarnings("ignore:Metadata warning")
 @pytest.mark.filterwarnings("ignore:Truncated File Read")
-def test_tiff_crashes(test_file):
+def test_tiff_crashes(test_file: str) -> None:
     try:
         with Image.open(test_file) as im:
             im.load()
     except FileNotFoundError:
-        if not on_ci():
-            pytest.skip("test image not found")
-            return
-        raise
+        if on_ci():
+            raise
+        pytest.skip("test image not found")
     except OSError:
         pass
diff --git a/Tests/test_tiff_ifdrational.py b/Tests/test_tiff_ifdrational.py
index e7b41fb4738..13f1f9c80fe 100644
--- a/Tests/test_tiff_ifdrational.py
+++ b/Tests/test_tiff_ifdrational.py
@@ -1,20 +1,28 @@
 from __future__ import annotations
+
 from fractions import Fraction
+from pathlib import Path
+
+import pytest
 
-from PIL import Image, TiffImagePlugin, features
+from PIL import Image, TiffImagePlugin
 from PIL.TiffImagePlugin import IFDRational
 
-from .helper import hopper
+from .helper import hopper, skip_unless_feature
 
 
-def _test_equal(num, denom, target):
+def _test_equal(
+    num: float | Fraction | IFDRational,
+    denom: int,
+    target: float | Fraction | IFDRational,
+) -> None:
     t = IFDRational(num, denom)
 
     assert target == t
     assert t == target
 
 
-def test_sanity():
+def test_sanity() -> None:
     _test_equal(1, 1, 1)
     _test_equal(1, 1, Fraction(1, 1))
 
@@ -30,13 +38,13 @@ def test_sanity():
     _test_equal(7, 5, 1.4)
 
 
-def test_ranges():
+def test_ranges() -> None:
     for num in range(1, 10):
         for denom in range(1, 10):
             assert IFDRational(num, denom) == IFDRational(num, denom)
 
 
-def test_nonetype():
+def test_nonetype() -> None:
     # Fails if the _delegate function doesn't return a valid function
 
     xres = IFDRational(72)
@@ -46,22 +54,22 @@ def test_nonetype():
     assert xres.denominator is not None
     assert yres._val is not None
 
-    assert xres and 1
-    assert xres and yres
-
+    assert xres
+    assert yres
 
-def test_ifd_rational_save(tmp_path):
-    methods = (True, False)
-    if not features.check("libtiff"):
-        methods = (False,)
 
-    for libtiff in methods:
-        TiffImagePlugin.WRITE_LIBTIFF = libtiff
+@pytest.mark.parametrize(
+    "libtiff", (pytest.param(True, marks=skip_unless_feature("libtiff")), False)
+)
+def test_ifd_rational_save(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool
+) -> None:
+    im = hopper()
+    out = str(tmp_path / "temp.tiff")
+    res = IFDRational(301, 1)
 
-        im = hopper()
-        out = str(tmp_path / "temp.tiff")
-        res = IFDRational(301, 1)
-        im.save(out, dpi=(res, res), compression="raw")
+    monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", libtiff)
+    im.save(out, dpi=(res, res), compression="raw")
 
-        with Image.open(out) as reloaded:
-            assert float(IFDRational(301, 1)) == float(reloaded.tag_v2[282])
+    with Image.open(out) as reloaded:
+        assert float(IFDRational(301, 1)) == float(reloaded.tag_v2[282])
diff --git a/Tests/test_uploader.py b/Tests/test_uploader.py
index 6b693f7cd5d..d55ceb4be17 100644
--- a/Tests/test_uploader.py
+++ b/Tests/test_uploader.py
@@ -1,14 +1,15 @@
 from __future__ import annotations
+
 from .helper import assert_image_equal, assert_image_similar, hopper
 
 
-def check_upload_equal():
+def check_upload_equal() -> None:
     result = hopper("P").convert("RGB")
     target = hopper("RGB")
     assert_image_equal(result, target)
 
 
-def check_upload_similar():
+def check_upload_similar() -> None:
     result = hopper("P").convert("RGB")
     target = hopper("RGB")
     assert_image_similar(result, target, 0)
diff --git a/Tests/test_util.py b/Tests/test_util.py
index 4a312beb440..9eaabf18a73 100644
--- a/Tests/test_util.py
+++ b/Tests/test_util.py
@@ -1,26 +1,16 @@
 from __future__ import annotations
-import pytest
-
-from PIL import _util
-
 
-def test_is_path():
-    # Arrange
-    fp = "filename.ext"
-
-    # Act
-    it_is = _util.is_path(fp)
-
-    # Assert
-    assert it_is
+from pathlib import Path, PurePath
 
+import pytest
 
-def test_path_obj_is_path():
-    # Arrange
-    from pathlib import Path
+from PIL import _util
 
-    test_path = Path("filename.ext")
 
+@pytest.mark.parametrize(
+    "test_path", ["filename.ext", Path("filename.ext"), PurePath("filename.ext")]
+)
+def test_is_path(test_path: str | Path | PurePath) -> None:
     # Act
     it_is = _util.is_path(test_path)
 
@@ -28,7 +18,7 @@ def test_path_obj_is_path():
     assert it_is
 
 
-def test_is_not_path(tmp_path):
+def test_is_not_path(tmp_path: Path) -> None:
     # Arrange
     with (tmp_path / "temp.ext").open("w") as fp:
         pass
@@ -40,29 +30,7 @@ def test_is_not_path(tmp_path):
     assert not it_is_not
 
 
-def test_is_directory():
-    # Arrange
-    directory = "Tests"
-
-    # Act
-    it_is = _util.is_directory(directory)
-
-    # Assert
-    assert it_is
-
-
-def test_is_not_directory():
-    # Arrange
-    text = "abc"
-
-    # Act
-    it_is_not = _util.is_directory(text)
-
-    # Assert
-    assert not it_is_not
-
-
-def test_deferred_error():
+def test_deferred_error() -> None:
     # Arrange
 
     # Act
diff --git a/Tests/test_webp_leaks.py b/Tests/test_webp_leaks.py
index 28ebc7d79f1..626fe427cab 100644
--- a/Tests/test_webp_leaks.py
+++ b/Tests/test_webp_leaks.py
@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from io import BytesIO
 
 from PIL import Image
@@ -13,11 +14,11 @@ class TestWebPLeaks(PillowLeakTestCase):
     mem_limit = 3 * 1024  # kb
     iterations = 100
 
-    def test_leak_load(self):
+    def test_leak_load(self) -> None:
         with open(test_file, "rb") as f:
             im_data = f.read()
 
-        def core():
+        def core() -> None:
             with Image.open(BytesIO(im_data)) as im:
                 im.load()
 
diff --git a/_custom_build/backend.py b/_custom_build/backend.py
index d1537b80987..44ec6efe5c6 100644
--- a/_custom_build/backend.py
+++ b/_custom_build/backend.py
@@ -11,41 +11,12 @@
 class _CustomBuildMetaBackend(backend_class):
     def run_setup(self, setup_script="setup.py"):
         if self.config_settings:
+            for key, values in self.config_settings.items():
+                if not isinstance(values, list):
+                    values = [values]
+                for value in values:
+                    sys.argv.append(f"--pillow-configuration={key}={value}")
 
-            def config_has(key, value):
-                settings = self.config_settings.get(key)
-                if settings:
-                    if not isinstance(settings, list):
-                        settings = [settings]
-                    return value in settings
-
-            flags = []
-            for dependency in (
-                "zlib",
-                "jpeg",
-                "tiff",
-                "freetype",
-                "raqm",
-                "lcms",
-                "webp",
-                "webpmux",
-                "jpeg2000",
-                "imagequant",
-                "xcb",
-            ):
-                if config_has(dependency, "enable"):
-                    flags.append("--enable-" + dependency)
-                elif config_has(dependency, "disable"):
-                    flags.append("--disable-" + dependency)
-            for dependency in ("raqm", "fribidi"):
-                if config_has(dependency, "vendor"):
-                    flags.append("--vendor-" + dependency)
-            if self.config_settings.get("platform-guessing") == "disable":
-                flags.append("--disable-platform-guessing")
-            if self.config_settings.get("debug") == "true":
-                flags.append("--debug")
-            if flags:
-                sys.argv = sys.argv[:1] + ["build_ext"] + flags + sys.argv[1:]
         return super().run_setup(setup_script)
 
     def build_wheel(
@@ -54,5 +25,15 @@ def build_wheel(
         self.config_settings = config_settings
         return super().build_wheel(wheel_directory, config_settings, metadata_directory)
 
+    def build_editable(
+        self, wheel_directory, config_settings=None, metadata_directory=None
+    ):
+        self.config_settings = config_settings
+        return super().build_editable(
+            wheel_directory, config_settings, metadata_directory
+        )
+
 
-build_wheel = _CustomBuildMetaBackend().build_wheel
+_backend = _CustomBuildMetaBackend()
+build_wheel = _backend.build_wheel
+build_editable = _backend.build_editable
diff --git a/codecov.yml b/codecov.yml
index 1ea7974ebbe..8646576bb44 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -17,6 +17,5 @@ coverage:
 # Matches 'omit:' in .coveragerc
 ignore:
   - "Tests/32bit_segfault_check.py"
-  - "Tests/bench_cffi_access.py"
   - "Tests/check_*.py"
   - "Tests/createfontdatachunk.py"
diff --git a/depends/download-and-extract.sh b/depends/download-and-extract.sh
index a318bfafd9f..04bfbc7556b 100755
--- a/depends/download-and-extract.sh
+++ b/depends/download-and-extract.sh
@@ -5,7 +5,7 @@ archive=$1
 url=$2
 
 if [ ! -f $archive.tar.gz ]; then
-    wget -O $archive.tar.gz $url
+    wget --no-verbose -O $archive.tar.gz $url
 fi
 
 rmdir $archive
diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh
index b7cebbdbf60..8d62d5ac733 100755
--- a/depends/install_imagequant.sh
+++ b/depends/install_imagequant.sh
@@ -1,15 +1,39 @@
 #!/bin/bash
 # install libimagequant
 
-archive=libimagequant-4.2.2
+archive_name=libimagequant
+archive_version=4.3.3
 
-./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
+archive=$archive_name-$archive_version
 
-pushd $archive/imagequant-sys
+if [[ "$GHA_LIBIMAGEQUANT_CACHE_HIT" == "true" ]]; then
 
-cargo install cargo-c
-cargo cinstall --prefix=/usr --destdir=.
-sudo cp usr/lib/libimagequant.so* /usr/lib/
-sudo cp usr/include/libimagequant.h /usr/include/
+    # Copy cached files into place
+    sudo cp ~/cache-$archive_name/libimagequant.so* /usr/lib/
+    sudo cp ~/cache-$archive_name/libimagequant.h /usr/include/
 
-popd
+else
+
+    # Build from source
+    ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
+
+    pushd $archive/imagequant-sys
+
+    cargo install cargo-c
+    cargo cinstall --prefix=/usr --destdir=.
+
+    # Copy into place
+    sudo find usr -name libimagequant.so* -exec cp {} /usr/lib/ \;
+    sudo cp usr/include/libimagequant.h /usr/include/
+
+    if [ -n "$GITHUB_ACTIONS" ]; then
+        # Copy to cache
+        rm -rf ~/cache-$archive_name
+        mkdir ~/cache-$archive_name
+        find usr -name libimagequant.so* -exec cp {} ~/cache-$archive_name/ \;
+        cp usr/include/libimagequant.h ~/cache-$archive_name/
+    fi
+
+    popd
+
+fi
diff --git a/depends/install_openjpeg.sh b/depends/install_openjpeg.sh
index 4f4b81a628b..8c2967bc21b 100755
--- a/depends/install_openjpeg.sh
+++ b/depends/install_openjpeg.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # install openjpeg
 
-archive=openjpeg-2.5.0
+archive=openjpeg-2.5.2
 
 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
 
diff --git a/depends/install_raqm.sh b/depends/install_raqm.sh
index 070ba23a178..5d862403ee0 100755
--- a/depends/install_raqm.sh
+++ b/depends/install_raqm.sh
@@ -2,7 +2,7 @@
 # install raqm
 
 
-archive=libraqm-0.10.1
+archive=libraqm-0.10.2
 
 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
 
diff --git a/depends/install_webp.sh b/depends/install_webp.sh
index 6f867ab3788..c47fb35f125 100755
--- a/depends/install_webp.sh
+++ b/depends/install_webp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # install webp
 
-archive=libwebp-1.3.2
+archive=libwebp-1.4.0
 
 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
 
diff --git a/docs/COPYING b/docs/COPYING
index 73af6d99c0f..d5ee19f81a6 100644
--- a/docs/COPYING
+++ b/docs/COPYING
@@ -1,11 +1,11 @@
 The Python Imaging Library (PIL) is
 
     Copyright © 1997-2011 by Secret Labs AB
-    Copyright © 1995-2011 by Fredrik Lundh
+    Copyright © 1995-2011 by Fredrik Lundh and contributors
 
 Pillow is the friendly PIL fork. It is
 
-    Copyright © 2010-2024 by Jeffrey A. Clark (Alex) and contributors
+    Copyright © 2010-2024 by Jeffrey A. Clark and contributors
 
 Like PIL, Pillow is licensed under the open source PIL
 Software License:
diff --git a/docs/Makefile b/docs/Makefile
index 3b4deb9bf9d..e90af0519c6 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -9,9 +9,9 @@ PAPER         =
 BUILDDIR      = _build
 
 # Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+PAPEROPT_a4     = --define latex_paper_size=a4
+PAPEROPT_letter = --define latex_paper_size=letter
+ALLSPHINXOPTS   = --doctree-dir $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
@@ -46,47 +46,47 @@ clean:
 	-rm -rf $(BUILDDIR)/*
 
 install-sphinx:
-	$(PYTHON) -m pip install --quiet furo olefile sphinx sphinx-copybutton sphinx-inline-tabs sphinx-removed-in sphinxext-opengraph
+	$(PYTHON) -m pip install -e ..[docs]
 
 .PHONY: html
 html:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b html -W --keep-going $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	$(SPHINXBUILD) --builder html --fail-on-warning --keep-going $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
 .PHONY: dirhtml
 dirhtml:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	$(SPHINXBUILD) --builder dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
 .PHONY: singlehtml
 singlehtml:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	$(SPHINXBUILD) --builder singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
 
 .PHONY: pickle
 pickle:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	$(SPHINXBUILD) --builder pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
 	@echo
 	@echo "Build finished; now you can process the pickle files."
 
 .PHONY: json
 json:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	$(SPHINXBUILD) --builder json $(ALLSPHINXOPTS) $(BUILDDIR)/json
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 
 .PHONY: htmlhelp
 htmlhelp:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	$(SPHINXBUILD) --builder htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILDDIR)/htmlhelp."
@@ -94,7 +94,7 @@ htmlhelp:
 .PHONY: qthelp
 qthelp:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	$(SPHINXBUILD) --builder qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@@ -105,7 +105,7 @@ qthelp:
 .PHONY: devhelp
 devhelp:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	$(SPHINXBUILD) --builder devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
@@ -116,14 +116,14 @@ devhelp:
 .PHONY: epub
 epub:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	$(SPHINXBUILD) --builder epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
 .PHONY: latex
 latex:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	$(SPHINXBUILD) --builder latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
@@ -132,7 +132,7 @@ latex:
 .PHONY: latexpdf
 latexpdf:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	$(SPHINXBUILD) --builder latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
@@ -140,21 +140,21 @@ latexpdf:
 .PHONY: text
 text:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	$(SPHINXBUILD) --builder text $(ALLSPHINXOPTS) $(BUILDDIR)/text
 	@echo
 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
 
 .PHONY: man
 man:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	$(SPHINXBUILD) --builder man $(ALLSPHINXOPTS) $(BUILDDIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
 
 .PHONY: texinfo
 texinfo:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	$(SPHINXBUILD) --builder texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
 	@echo
 	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
 	@echo "Run \`make' in that directory to run these through makeinfo" \
@@ -163,7 +163,7 @@ texinfo:
 .PHONY: info
 info:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	$(SPHINXBUILD) --builder texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
 	@echo "Running Texinfo files through makeinfo..."
 	make -C $(BUILDDIR)/texinfo info
 	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
@@ -171,21 +171,21 @@ info:
 .PHONY: gettext
 gettext:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	$(SPHINXBUILD) --builder gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
 	@echo
 	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
 
 .PHONY: changes
 changes:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	$(SPHINXBUILD) --builder changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
 	@echo
 	@echo "The overview file is in $(BUILDDIR)/changes."
 
 .PHONY: linkcheck
 linkcheck:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck -j auto
+	$(SPHINXBUILD) --builder linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck -j auto
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 	      "or in $(BUILDDIR)/linkcheck/output.txt."
@@ -193,7 +193,7 @@ linkcheck:
 .PHONY: doctest
 doctest:
 	$(MAKE) install-sphinx
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	$(SPHINXBUILD) --builder doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
 
diff --git a/docs/PIL.rst b/docs/PIL.rst
index b6944e234a5..bdbf1373d88 100644
--- a/docs/PIL.rst
+++ b/docs/PIL.rst
@@ -77,14 +77,6 @@ can be found here.
     :undoc-members:
     :show-inheritance:
 
-:mod:`~PIL.ImageTransform` Module
----------------------------------
-
-.. automodule:: PIL.ImageTransform
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 :mod:`~PIL.PaletteFile` Module
 ------------------------------
 
diff --git a/docs/about.rst b/docs/about.rst
index 872ac0ea690..98cdd8e5ab0 100644
--- a/docs/about.rst
+++ b/docs/about.rst
@@ -6,15 +6,14 @@ Goals
 
 The fork author's goal is to foster and support active development of PIL through:
 
-- Continuous integration testing via `GitHub Actions`_, `AppVeyor`_ and `Travis CI`_
+- Continuous integration testing via `GitHub Actions`_ and `AppVeyor`_
 - Publicized development activity on `GitHub`_
 - Regular releases to the `Python Package Index`_
 
 .. _GitHub Actions: https://github.com/python-pillow/Pillow/actions
 .. _AppVeyor: https://ci.appveyor.com/project/Python-pillow/pillow
-.. _Travis CI: https://app.travis-ci.com/github/python-pillow/Pillow
 .. _GitHub: https://github.com/python-pillow/Pillow
-.. _Python Package Index: https://pypi.org/project/Pillow/
+.. _Python Package Index: https://pypi.org/project/pillow/
 
 License
 -------
@@ -24,7 +23,7 @@ Like PIL, Pillow is `licensed under the open source HPND License <https://raw.gi
 Why a fork?
 -----------
 
-PIL is not setuptools compatible. Please see `this Image-SIG post`_ for a more detailed explanation. Also, PIL's current bi-yearly (or greater) release schedule is too infrequent to accommodate the large number and frequency of issues reported.
+PIL is not setuptools compatible. Please see `this Image-SIG post`_ for a more detailed explanation. Also, PIL's bi-yearly (or greater) release schedule was too infrequent to accommodate the large number and frequency of issues reported.
 
 .. _this Image-SIG post: https://mail.python.org/pipermail/image-sig/2010-August/006480.html
 
@@ -36,4 +35,4 @@ What about PIL?
     Prior to Pillow 2.0.0, very few image code changes were made. Pillow 2.0.0
     added Python 3 support and includes many bug fixes from many contributors.
 
-As more time passes since the last PIL release (1.1.7 in 2009), the likelihood of a new PIL release decreases. However, we've yet to hear an official "PIL is dead" announcement.
+The last PIL release was in 2009 (1.1.7) and `no future releases are expected <https://github.com/python-pillow/Pillow/issues/1535>`_. In January 2020, `the PyPI moderators exhausted the PEP 541 process for contacting the PIL project owner <https://github.com/python-pillow/Pillow/issues/1535#issuecomment-570308446>`_ and the `PIL project on PyPI <https://pypi.org/project/PIL>`_ was transferred to the `Pillow team <https://github.com/python-pillow/Pillow/graphs/contributors>`_. The Pillow team has no plans to update the PIL project on PyPI.
diff --git a/docs/conf.py b/docs/conf.py
index 9ae7ae605fd..b81d86c6ca2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,19 +22,19 @@
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = "2.4"
+needs_sphinx = "8.1"
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    "dater",
     "sphinx.ext.autodoc",
     "sphinx.ext.extlinks",
     "sphinx.ext.intersphinx",
     "sphinx.ext.viewcode",
     "sphinx_copybutton",
     "sphinx_inline_tabs",
-    "sphinx_removed_in",
     "sphinxext.opengraph",
 ]
 
@@ -54,9 +54,10 @@
 # General information about the project.
 project = "Pillow (PIL Fork)"
 copyright = (
-    "1995-2011 Fredrik Lundh, 2010-2024 Jeffrey A. Clark (Alex) and contributors"
+    "1995-2011 Fredrik Lundh and contributors, "
+    "2010-2024 Jeffrey A. Clark and contributors."
 )
-author = "Fredrik Lundh, Jeffrey A. Clark (Alex), contributors"
+author = "Fredrik Lundh (PIL), Jeffrey A. Clark (Pillow)"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -120,7 +121,7 @@
 # generating warnings in “nitpicky mode”. Note that type should include the domain name
 # if present. Example entries would be ('py:func', 'int') or
 # ('envvar', 'LD_LIBRARY_PATH').
-# nitpick_ignore = []
+nitpick_ignore = [("py:class", "_io.BytesIO"), ("py:class", "_CmsProfileCompatible")]
 
 
 # -- Options for HTML output ----------------------------------------------
@@ -252,7 +253,7 @@
         master_doc,
         "PillowPILFork.tex",
         "Pillow (PIL Fork) Documentation",
-        "Jeffrey A. Clark (Alex)",
+        "Jeffrey A. Clark",
         "manual",
     )
 ]
@@ -302,7 +303,7 @@
         "Pillow (PIL Fork) Documentation",
         author,
         "PillowPILFork",
-        "Pillow is the friendly PIL fork by Jeffrey A. Clark (Alex) and contributors.",
+        "Pillow is the friendly PIL fork by Jeffrey A. Clark and contributors.",
         "Miscellaneous",
     )
 ]
@@ -326,7 +327,7 @@
     r"https://gitter.im/python-pillow/Pillow?.*": r"https://app.gitter.im/#/room/#python-pillow_Pillow:gitter.im?.*",
     r"https://pillow.readthedocs.io/?badge=latest": r"https://pillow.readthedocs.io/en/stable/?badge=latest",
     r"https://pillow.readthedocs.io": r"https://pillow.readthedocs.io/en/stable/",
-    r"https://tidelift.com/badges/package/pypi/Pillow?.*": r"https://img.shields.io/badge/.*",
+    r"https://tidelift.com/badges/package/pypi/pillow?.*": r"https://img.shields.io/badge/.*",
     r"https://zenodo.org/badge/17549/python-pillow/Pillow.svg": r"https://zenodo.org/badge/doi/[\.0-9]+/zenodo.[0-9]+.svg",
     r"https://zenodo.org/badge/latestdoi/17549/python-pillow/Pillow": r"https://zenodo.org/record/[0-9]+",
 }
@@ -337,8 +338,6 @@
 # https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html
 _repo = "https://github.com/python-pillow/Pillow/"
 extlinks = {
-    "cve": ("https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-%s", "CVE-%s"),
-    "cwe": ("https://cwe.mitre.org/data/definitions/%s.html", "CWE-%s"),
     "issue": (_repo + "issues/%s", "#%s"),
     "pr": (_repo + "pull/%s", "#%s"),
     "pypi": ("https://pypi.org/project/%s/", "%s"),
diff --git a/docs/dater.py b/docs/dater.py
new file mode 100644
index 00000000000..f9fb0c1da6e
--- /dev/null
+++ b/docs/dater.py
@@ -0,0 +1,48 @@
+"""
+Sphinx extension to add timestamps to release notes based on Git versions.
+
+Based on https://github.com/jaraco/rst.linker, with thanks to Jason R. Coombs.
+"""
+
+from __future__ import annotations
+
+import re
+import subprocess
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from sphinx.application import Sphinx
+
+DOC_NAME_REGEX = re.compile(r"releasenotes/\d+\.\d+\.\d+")
+VERSION_TITLE_REGEX = re.compile(r"^(\d+\.\d+\.\d+)\n-+\n")
+
+
+def get_date_for(git_version: str) -> str | None:
+    cmd = ["git", "log", "-1", "--format=%ai", git_version]
+    try:
+        out = subprocess.check_output(
+            cmd, stderr=subprocess.DEVNULL, text=True, encoding="utf-8"
+        )
+    except subprocess.CalledProcessError:
+        return None
+    return out.split()[0]
+
+
+def add_date(app: Sphinx, doc_name: str, source: list[str]) -> None:
+    if DOC_NAME_REGEX.match(doc_name) and (m := VERSION_TITLE_REGEX.match(source[0])):
+        old_title = m.group(1)
+
+        if tag_date := get_date_for(old_title):
+            new_title = f"{old_title} ({tag_date})"
+        else:
+            new_title = f"{old_title} (unreleased)"
+
+        new_underline = "-" * len(new_title)
+
+        result = source[0].replace(m.group(0), f"{new_title}\n{new_underline}\n", 1)
+        source[0] = result
+
+
+def setup(app: Sphinx) -> dict[str, bool]:
+    app.connect("source-read", add_date)
+    return {"parallel_read_safe": True}
diff --git a/docs/deprecations.rst b/docs/deprecations.rst
index a42dc555fea..25607e27c3b 100644
--- a/docs/deprecations.rst
+++ b/docs/deprecations.rst
@@ -12,28 +12,6 @@ Deprecated features
 Below are features which are considered deprecated. Where appropriate,
 a :py:exc:`DeprecationWarning` is issued.
 
-PSFile
-~~~~~~
-
-.. deprecated:: 9.5.0
-
-The :py:class:`~PIL.EpsImagePlugin.PSFile` class has been deprecated and will
-be removed in Pillow 11 (2024-10-15). This class was only made as a helper to
-be used internally, so there is no replacement. If you need this functionality
-though, it is a very short class that can easily be recreated in your own code.
-
-PyAccess and Image.USE_CFFI_ACCESS
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 10.0.0
-
-Since Pillow's C API is now faster than PyAccess on PyPy,
-:py:mod:`~PIL.PyAccess` has been deprecated and will be removed in Pillow
-11.0.0 (2024-10-15). Pillow's C API will now be used by default on PyPy instead.
-
-``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, is
-similarly deprecated.
-
 ImageFile.raise_oserror
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -55,12 +33,184 @@ The functions ``IptcImageFile.dump`` and ``IptcImageFile.i``, and the constant
 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.
+
 Removed features
 ----------------
 
 Deprecated features are only removed in major releases after an appropriate
 period of deprecation has passed.
 
+TiffImagePlugin IFD_LEGACY_API
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 11.0.0
+
+``TiffImagePlugin.IFD_LEGACY_API`` was removed, as it was an unused setting.
+
+PSFile
+~~~~~~
+
+.. deprecated:: 9.5.0
+.. versionremoved:: 11.0.0
+
+The :py:class:`!PSFile` class was removed in Pillow 11 (2024-10-15).
+This class was only made as a helper to be used internally,
+so there is no replacement. If you need this functionality though,
+it is a very short class that can easily be recreated in your own code.
+
+PyAccess and Image.USE_CFFI_ACCESS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 10.0.0
+.. versionremoved:: 11.0.0
+
+Since Pillow's C API is now faster than PyAccess on PyPy, ``PyAccess`` has been
+removed. Pillow's C API will now be used on PyPy instead.
+
+``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, was
+similarly removed.
+
 Tk/Tcl 8.4
 ~~~~~~~~~~
 
@@ -118,7 +268,7 @@ Constants
 .. versionremoved:: 10.0.0
 
 A number of constants have been removed.
-Instead, ``enum.IntEnum`` classes have been added.
+Instead, :py:class:`enum.IntEnum` classes have been added.
 
 .. note::
 
@@ -195,10 +345,10 @@ Previous code::
 
     im = Image.new("RGB", (100, 100))
     draw = ImageDraw.Draw(im)
-    width, height = draw.textsize("Hello world")
+    width, height = draw.textsize("Hello world", font)
 
     width, height = font.getsize_multiline("Hello\nworld")
-    width, height = draw.multiline_textsize("Hello\nworld")
+    width, height = draw.multiline_textsize("Hello\nworld", font)
 
 Use instead::
 
@@ -210,11 +360,43 @@ Use instead::
 
     im = Image.new("RGB", (100, 100))
     draw = ImageDraw.Draw(im)
-    width = draw.textlength("Hello world")
+    width = draw.textlength("Hello world", font)
 
-    left, top, right, bottom = draw.multiline_textbbox((0, 0), "Hello\nworld")
+    left, top, right, bottom = draw.multiline_textbbox((0, 0), "Hello\nworld", font)
     width, height = right - left, bottom - top
 
+Previously, the ``size`` methods returned a ``height`` that included the vertical
+offset of the text, while the new ``bbox`` methods distinguish this as a ``top``
+offset.
+
+.. image:: ./example/size_vs_bbox.webp
+    :alt: In bbox methods, top measures the vertical distance above the text, while bottom measures that plus the vertical distance of the text itself. In size methods, height also measures the vertical distance above the text plus the vertical distance of the text itself.
+    :align: center
+
+If you are using these methods for aligning text, consider using :ref:`text-anchors` instead
+which avoid issues that can occur with non-English text or unusual fonts.
+For example, instead of the following code::
+
+    from PIL import Image, ImageDraw, ImageFont
+
+    font = ImageFont.truetype("Tests/fonts/FreeMono.ttf")
+
+    im = Image.new("RGB", (100, 100))
+    draw = ImageDraw.Draw(im)
+    width, height = draw.textsize("Hello world", font)
+    x, y = (100 - width) / 2, (100 - height) / 2
+    draw.text((x, y), "Hello world", font=font)
+
+Use instead::
+
+    from PIL import Image, ImageDraw, ImageFont
+
+    font = ImageFont.truetype("Tests/fonts/FreeMono.ttf")
+
+    im = Image.new("RGB", (100, 100))
+    draw = ImageDraw.Draw(im)
+    draw.text((100 / 2, 100 / 2), "Hello world", font=font, anchor="mm")
+
 FreeTypeFont.getmask2 fill parameter
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -338,8 +520,8 @@ ImageCms.CmsProfile attributes
 .. deprecated:: 3.2.0
 .. versionremoved:: 8.0.0
 
-Some attributes in :py:class:`PIL.ImageCms.CmsProfile` have been removed. From 6.0.0,
-they issued a :py:exc:`DeprecationWarning`:
+Some attributes in :py:class:`PIL.ImageCms.core.CmsProfile` have been removed.
+From 6.0.0, they issued a :py:exc:`DeprecationWarning`:
 
 ========================  ===================================================
 Removed                   Use instead
@@ -467,3 +649,27 @@ PIL.OleFileIO
 the upstream :pypi:`olefile` Python package, and replaced with an :py:exc:`ImportError` in 5.0.0
 (2018-01). The deprecated file has now been removed from Pillow. If needed, install from
 PyPI (eg. ``python3 -m pip install olefile``).
+
+import _imaging
+~~~~~~~~~~~~~~~
+
+.. versionremoved:: 2.1.0
+
+Pillow >= 2.1.0 no longer supports ``import _imaging``.
+Please use ``from PIL.Image import core as _imaging`` instead.
+
+Pillow and PIL
+~~~~~~~~~~~~~~
+
+.. versionremoved:: 1.0.0
+
+Pillow and PIL cannot co-exist in the same environment.
+Before installing Pillow, please uninstall PIL.
+
+import Image
+~~~~~~~~~~~~
+
+.. versionremoved:: 1.0.0
+
+Pillow >= 1.0 no longer supports ``import Image``.
+Please use ``from PIL import Image`` instead.
diff --git a/docs/example/DdsImagePlugin.py b/docs/example/DdsImagePlugin.py
index e98bb86806f..10828bff031 100644
--- a/docs/example/DdsImagePlugin.py
+++ b/docs/example/DdsImagePlugin.py
@@ -9,10 +9,12 @@
 Full text of the CC0 license:
   https://creativecommons.org/publicdomain/zero/1.0/
 """
+
 from __future__ import annotations
 
 import struct
 from io import BytesIO
+from typing import IO
 
 from PIL import Image, ImageFile
 
@@ -93,26 +95,26 @@
 DXT5_FOURCC = 0x35545844
 
 
-def _decode565(bits):
+def _decode565(bits: int) -> tuple[int, int, int]:
     a = ((bits >> 11) & 0x1F) << 3
     b = ((bits >> 5) & 0x3F) << 2
     c = (bits & 0x1F) << 3
     return a, b, c
 
 
-def _c2a(a, b):
+def _c2a(a: int, b: int) -> int:
     return (2 * a + b) // 3
 
 
-def _c2b(a, b):
+def _c2b(a: int, b: int) -> int:
     return (a + b) // 2
 
 
-def _c3(a, b):
+def _c3(a: int, b: int) -> int:
     return (2 * b + a) // 3
 
 
-def _dxt1(data, width, height):
+def _dxt1(data: IO[bytes], width: int, height: int) -> bytes:
     # TODO implement this function as pixel format in decode.c
     ret = bytearray(4 * width * height)
 
@@ -150,7 +152,7 @@ def _dxt1(data, width, height):
     return bytes(ret)
 
 
-def _dxtc_alpha(a0, a1, ac0, ac1, ai):
+def _dxtc_alpha(a0: int, a1: int, ac0: int, ac1: int, ai: int) -> int:
     if ai <= 12:
         ac = (ac0 >> ai) & 7
     elif ai == 15:
@@ -174,7 +176,7 @@ def _dxtc_alpha(a0, a1, ac0, ac1, ai):
     return alpha
 
 
-def _dxt5(data, width, height):
+def _dxt5(data: IO[bytes], width: int, height: int) -> bytes:
     # TODO implement this function as pixel format in decode.c
     ret = bytearray(4 * width * height)
 
@@ -210,7 +212,7 @@ class DdsImageFile(ImageFile.ImageFile):
     format = "DDS"
     format_description = "DirectDraw Surface"
 
-    def _open(self):
+    def _open(self) -> None:
         if not _accept(self.fp.read(4)):
             msg = "not a DDS file"
             raise SyntaxError(msg)
@@ -241,19 +243,22 @@ def _open(self):
         elif fourcc == b"DXT5":
             self.decoder = "DXT5"
         else:
-            msg = f"Unimplemented pixel format {fourcc}"
+            msg = f"Unimplemented pixel format {repr(fourcc)}"
             raise NotImplementedError(msg)
 
-        self.tile = [(self.decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))]
+        self.tile = [
+            ImageFile._Tile(self.decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))
+        ]
 
-    def load_seek(self, pos):
+    def load_seek(self, pos: int) -> None:
         pass
 
 
 class DXT1Decoder(ImageFile.PyDecoder):
     _pulls_fd = True
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
         try:
             self.set_as_raw(_dxt1(self.fd, self.state.xsize, self.state.ysize))
         except struct.error as e:
@@ -265,7 +270,8 @@ def decode(self, buffer):
 class DXT5Decoder(ImageFile.PyDecoder):
     _pulls_fd = True
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
         try:
             self.set_as_raw(_dxt5(self.fd, self.state.xsize, self.state.ysize))
         except struct.error as e:
@@ -278,7 +284,7 @@ def decode(self, buffer):
 Image.register_decoder("DXT5", DXT5Decoder)
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"DDS "
 
 
diff --git a/docs/example/anchors.png b/docs/example/anchors.png
deleted file mode 100644
index 40476b0922b..00000000000
Binary files a/docs/example/anchors.png and /dev/null differ
diff --git a/docs/example/anchors.py b/docs/example/anchors.py
index b5d76b4fe40..2ee11103f1a 100644
--- a/docs/example/anchors.py
+++ b/docs/example/anchors.py
@@ -26,5 +26,5 @@ def test(anchor: str) -> Image.Image:
                 d.line(((x * 200, y * 100), (x * 200, (y + 1) * 100)), "black", 3)
             if y != 0:
                 d.line(((x * 200, y * 100), ((x + 1) * 200, y * 100)), "black", 3)
-    im.save("docs/example/anchors.png")
+    im.save("docs/example/anchors.webp")
     im.show()
diff --git a/docs/example/anchors.webp b/docs/example/anchors.webp
new file mode 100644
index 00000000000..216b6c235a2
Binary files /dev/null and b/docs/example/anchors.webp differ
diff --git a/docs/example/image_thumbnail.png b/docs/example/image_thumbnail.png
deleted file mode 100644
index 293b0579465..00000000000
Binary files a/docs/example/image_thumbnail.png and /dev/null differ
diff --git a/docs/example/image_thumbnail.webp b/docs/example/image_thumbnail.webp
new file mode 100644
index 00000000000..9780f2852fe
Binary files /dev/null and b/docs/example/image_thumbnail.webp differ
diff --git a/docs/example/imageops_contain.png b/docs/example/imageops_contain.png
deleted file mode 100644
index 293b0579465..00000000000
Binary files a/docs/example/imageops_contain.png and /dev/null differ
diff --git a/docs/example/imageops_contain.webp b/docs/example/imageops_contain.webp
new file mode 100644
index 00000000000..9780f2852fe
Binary files /dev/null and b/docs/example/imageops_contain.webp differ
diff --git a/docs/example/imageops_cover.png b/docs/example/imageops_cover.png
deleted file mode 100644
index 929e1d87403..00000000000
Binary files a/docs/example/imageops_cover.png and /dev/null differ
diff --git a/docs/example/imageops_cover.webp b/docs/example/imageops_cover.webp
new file mode 100644
index 00000000000..a0b6c10bf2f
Binary files /dev/null and b/docs/example/imageops_cover.webp differ
diff --git a/docs/example/imageops_fit.png b/docs/example/imageops_fit.png
deleted file mode 100644
index 13a3d5e3feb..00000000000
Binary files a/docs/example/imageops_fit.png and /dev/null differ
diff --git a/docs/example/imageops_fit.webp b/docs/example/imageops_fit.webp
new file mode 100644
index 00000000000..803ee66d244
Binary files /dev/null and b/docs/example/imageops_fit.webp differ
diff --git a/docs/example/imageops_pad.png b/docs/example/imageops_pad.png
deleted file mode 100644
index 69649d6e5fc..00000000000
Binary files a/docs/example/imageops_pad.png and /dev/null differ
diff --git a/docs/example/imageops_pad.webp b/docs/example/imageops_pad.webp
new file mode 100644
index 00000000000..0ab63ef42e0
Binary files /dev/null and b/docs/example/imageops_pad.webp differ
diff --git a/docs/example/size_vs_bbox.webp b/docs/example/size_vs_bbox.webp
new file mode 100644
index 00000000000..391162d2d4b
Binary files /dev/null and b/docs/example/size_vs_bbox.webp differ
diff --git a/docs/handbook/animated_hopper.gif b/docs/handbook/animated_hopper.gif
new file mode 100644
index 00000000000..e6eeaffcc4e
Binary files /dev/null and b/docs/handbook/animated_hopper.gif differ
diff --git a/docs/handbook/concepts.rst b/docs/handbook/concepts.rst
index e0975a12132..7da1078c14e 100644
--- a/docs/handbook/concepts.rst
+++ b/docs/handbook/concepts.rst
@@ -59,9 +59,6 @@ Pillow also provides limited support for a few additional modes, including:
     * ``I;16L`` (16-bit little endian unsigned integer pixels)
     * ``I;16B`` (16-bit big endian unsigned integer pixels)
     * ``I;16N`` (16-bit native endian unsigned integer pixels)
-    * ``BGR;15`` (15-bit reversed true colour)
-    * ``BGR;16`` (16-bit reversed true colour)
-    * ``BGR;24`` (24-bit reversed true colour)
 
 Premultiplied alpha is where the values for each other channel have been
 multiplied by the alpha. For example, an RGBA pixel of ``(10, 20, 30, 127)``
@@ -147,10 +144,12 @@ pixel, the Python Imaging Library provides different resampling *filters*.
 .. py:currentmodule:: PIL.Image
 
 .. data:: Resampling.NEAREST
+    :noindex:
 
     Pick one nearest pixel from the input image. Ignore all other input pixels.
 
 .. data:: Resampling.BOX
+    :noindex:
 
     Each pixel of source image contributes to one pixel of the
     destination image with identical weights.
@@ -161,6 +160,7 @@ pixel, the Python Imaging Library provides different resampling *filters*.
     .. versionadded:: 3.4.0
 
 .. data:: Resampling.BILINEAR
+    :noindex:
 
     For resize calculate the output pixel value using linear interpolation
     on all pixels that may contribute to the output value.
@@ -168,6 +168,7 @@ pixel, the Python Imaging Library provides different resampling *filters*.
     in the input image is used.
 
 .. data:: Resampling.HAMMING
+    :noindex:
 
     Produces a sharper image than :data:`Resampling.BILINEAR`, doesn't have
     dislocations on local level like with :data:`Resampling.BOX`.
@@ -177,6 +178,7 @@ pixel, the Python Imaging Library provides different resampling *filters*.
     .. versionadded:: 3.4.0
 
 .. data:: Resampling.BICUBIC
+    :noindex:
 
     For resize calculate the output pixel value using cubic interpolation
     on all pixels that may contribute to the output value.
@@ -184,6 +186,7 @@ pixel, the Python Imaging Library provides different resampling *filters*.
     in the input image is used.
 
 .. data:: Resampling.LANCZOS
+    :noindex:
 
     Calculate the output pixel value using a high-quality Lanczos filter (a
     truncated sinc) on all pixels that may contribute to the output value.
diff --git a/docs/handbook/contrasted_hopper.jpg b/docs/handbook/contrasted_hopper.jpg
new file mode 100644
index 00000000000..b2d7cfacbb6
Binary files /dev/null and b/docs/handbook/contrasted_hopper.jpg differ
diff --git a/docs/handbook/cropped_hopper.webp b/docs/handbook/cropped_hopper.webp
new file mode 100644
index 00000000000..8d0ae4f9757
Binary files /dev/null and b/docs/handbook/cropped_hopper.webp differ
diff --git a/docs/handbook/enhanced_hopper.webp b/docs/handbook/enhanced_hopper.webp
new file mode 100644
index 00000000000..a582ac0c216
Binary files /dev/null and b/docs/handbook/enhanced_hopper.webp differ
diff --git a/docs/handbook/flip_left_right_hopper.webp b/docs/handbook/flip_left_right_hopper.webp
new file mode 100644
index 00000000000..59452268dfe
Binary files /dev/null and b/docs/handbook/flip_left_right_hopper.webp differ
diff --git a/docs/handbook/flip_top_bottom_hopper.webp b/docs/handbook/flip_top_bottom_hopper.webp
new file mode 100644
index 00000000000..28af4bf3659
Binary files /dev/null and b/docs/handbook/flip_top_bottom_hopper.webp differ
diff --git a/docs/handbook/hopper_ps.webp b/docs/handbook/hopper_ps.webp
new file mode 100644
index 00000000000..3dd2943d682
Binary files /dev/null and b/docs/handbook/hopper_ps.webp differ
diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst
index 276838bed1b..8183473e4f5 100644
--- a/docs/handbook/image-file-formats.rst
+++ b/docs/handbook/image-file-formats.rst
@@ -324,12 +324,19 @@ sets the following :py:attr:`~PIL.Image.Image.info` property:
 **sizes**
     A list of supported sizes found in this icon file; these are a
     3-tuple, ``(width, height, scale)``, where ``scale`` is 2 for a retina
-    icon and 1 for a standard icon.  You *are* permitted to use this 3-tuple
-    format for the :py:attr:`~PIL.Image.Image.size` property if you set it
-    before calling :py:meth:`~PIL.Image.Image.load`; after loading, the size
-    will be reset to a 2-tuple containing pixel dimensions (so, e.g. if you
-    ask for ``(512, 512, 2)``, the final value of
-    :py:attr:`~PIL.Image.Image.size` will be ``(1024, 1024)``).
+    icon and 1 for a standard icon.
+
+.. _icns-loading:
+
+Loading
+~~~~~~~
+
+You can call the :py:meth:`~PIL.Image.Image.load` method with the following parameter.
+
+**scale**
+    Affects the scale of the resultant image. If the size is set to ``(512, 512)``,
+    after loading at scale 2, the final value of :py:attr:`~PIL.Image.Image.size` will
+    be ``(1024, 1024)``.
 
 .. _icns-saving:
 
@@ -696,6 +703,25 @@ PCX
 
 Pillow reads and writes PCX files containing ``1``, ``L``, ``P``, or ``RGB`` data.
 
+PFM
+^^^
+
+.. versionadded:: 10.3.0
+
+Pillow reads and writes grayscale (Pf format) Portable FloatMap (PFM) files
+containing ``F`` data.
+
+Color (PF format) PFM files are not supported.
+
+Opening
+~~~~~~~
+
+The :py:func:`~PIL.Image.open` function sets the following
+:py:attr:`~PIL.Image.Image.info` properties:
+
+**scale**
+    The absolute value of the number stored in the *Scale Factor / Endianness* line.
+
 PNG
 ^^^
 
@@ -1201,8 +1227,7 @@ using the general tags available through tiffinfo.
 WebP
 ^^^^
 
-Pillow reads and writes WebP files. The specifics of Pillow's capabilities with
-this format are currently undocumented.
+Pillow reads and writes WebP files. Requires libwebp v0.5.0 or later.
 
 .. _webp-saving:
 
@@ -1215,40 +1240,34 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options:
     If present and true, instructs the WebP writer to use lossless compression.
 
 **quality**
-    Integer, 0-100, Defaults to 80. For lossy, 0 gives the smallest
+    Integer, 0-100, defaults to 80. For lossy, 0 gives the smallest
     size and 100 the largest. For lossless, this parameter is the amount
     of effort put into the compression: 0 is the fastest, but gives larger
     files compared to the slowest, but best, 100.
 
+**alpha_quality**
+    Integer, 0-100, defaults to 100. For lossy compression only. 0 gives the
+    smallest size and 100 is lossless.
+
 **method**
     Quality/speed trade-off (0=fast, 6=slower-better). Defaults to 4.
 
 **exact**
     If true, preserve the transparent RGB values. Otherwise, discard
     invisible RGB values for better compression. Defaults to false.
-    Requires libwebp 0.5.0 or later.
 
 **icc_profile**
-    The ICC Profile to include in the saved file. Only supported if
-    the system WebP library was built with webpmux support.
+    The ICC Profile to include in the saved file.
 
 **exif**
-    The exif data to include in the saved file. Only supported if
-    the system WebP library was built with webpmux support.
+    The exif data to include in the saved file.
 
 **xmp**
-    The XMP data to include in the saved file. Only supported if
-    the system WebP library was built with webpmux support.
+    The XMP data to include in the saved file.
 
 Saving sequences
 ~~~~~~~~~~~~~~~~
 
-.. note::
-
-    Support for animated WebP files will only be enabled if the system WebP
-    library is v0.5.0 or later. You can check webp animation support at
-    runtime by calling ``features.check("webp_anim")``.
-
 When calling :py:meth:`~PIL.Image.Image.save` to write a WebP file, by default
 only the first frame of a multiframe image will be saved. If the ``save_all``
 argument is present and true, then all frames will be saved, and the following
@@ -1316,7 +1335,8 @@ FITS
 
 .. versionadded:: 9.1.0
 
-Pillow identifies and reads FITS files, commonly used for astronomy.
+Pillow identifies and reads FITS files, commonly used for astronomy. Uncompressed and
+GZIP_1 compressed images can be read.
 
 FLI, FLC
 ^^^^^^^^
@@ -1332,9 +1352,8 @@ The :py:meth:`~PIL.Image.open` method sets the following
 FPX
 ^^^
 
-Pillow reads Kodak FlashPix files. In the current version, only the highest
-resolution image is read from the file, and the viewing transform is not taken
-into account.
+Pillow reads Kodak FlashPix files. Only the highest resolution image is read from the
+file, and the viewing transform is not taken into account.
 
 To enable FPX support, you must install :pypi:`olefile`.
 
@@ -1465,7 +1484,9 @@ QOI
 
 .. versionadded:: 9.5.0
 
-Pillow identifies and reads images in Quite OK Image format.
+Pillow reads images in Quite OK Image format using a Python decoder. If you wish to
+write code specifically for this format, :pypi:`qoi` is an alternative library that
+uses C to decode the image and interfaces with NumPy.
 
 SUN
 ^^^
@@ -1503,19 +1524,21 @@ To add other read or write support, use
 :py:func:`PIL.WmfImagePlugin.register_handler` to register a WMF and EMF
 handler. ::
 
-    from PIL import Image
+    from typing import IO
+
+    from PIL import Image, ImageFile
     from PIL import WmfImagePlugin
 
 
-    class WmfHandler:
-        def open(self, im):
+    class WmfHandler(ImageFile.StubHandler):
+        def open(self, im: ImageFile.StubImageFile) -> None:
             ...
 
-        def load(self, im):
+        def load(self, im: ImageFile.StubImageFile) -> Image.Image:
             ...
             return image
 
-        def save(self, im, fp, filename):
+        def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None:
             ...
 
 
diff --git a/docs/handbook/masked_hopper.webp b/docs/handbook/masked_hopper.webp
new file mode 100644
index 00000000000..ef892cb94f7
Binary files /dev/null and b/docs/handbook/masked_hopper.webp differ
diff --git a/docs/handbook/merged_hopper.webp b/docs/handbook/merged_hopper.webp
new file mode 100644
index 00000000000..324628358e8
Binary files /dev/null and b/docs/handbook/merged_hopper.webp differ
diff --git a/docs/handbook/pasted_hopper.webp b/docs/handbook/pasted_hopper.webp
new file mode 100644
index 00000000000..90dc3199405
Binary files /dev/null and b/docs/handbook/pasted_hopper.webp differ
diff --git a/docs/handbook/rebanded_hopper.webp b/docs/handbook/rebanded_hopper.webp
new file mode 100644
index 00000000000..7a9069c9f3d
Binary files /dev/null and b/docs/handbook/rebanded_hopper.webp differ
diff --git a/docs/handbook/rolled_hopper.webp b/docs/handbook/rolled_hopper.webp
new file mode 100644
index 00000000000..7fe80246363
Binary files /dev/null and b/docs/handbook/rolled_hopper.webp differ
diff --git a/docs/handbook/rotated_hopper_180.webp b/docs/handbook/rotated_hopper_180.webp
new file mode 100644
index 00000000000..08e14f0e3a1
Binary files /dev/null and b/docs/handbook/rotated_hopper_180.webp differ
diff --git a/docs/handbook/rotated_hopper_270.webp b/docs/handbook/rotated_hopper_270.webp
new file mode 100644
index 00000000000..ead2e102e23
Binary files /dev/null and b/docs/handbook/rotated_hopper_270.webp differ
diff --git a/docs/handbook/rotated_hopper_90.webp b/docs/handbook/rotated_hopper_90.webp
new file mode 100644
index 00000000000..9a5f70b2030
Binary files /dev/null and b/docs/handbook/rotated_hopper_90.webp differ
diff --git a/docs/handbook/show_hopper.webp b/docs/handbook/show_hopper.webp
new file mode 100644
index 00000000000..5cb73325b35
Binary files /dev/null and b/docs/handbook/show_hopper.webp differ
diff --git a/docs/handbook/text-anchors.rst b/docs/handbook/text-anchors.rst
index 3a9572ab221..48de4bc9531 100644
--- a/docs/handbook/text-anchors.rst
+++ b/docs/handbook/text-anchors.rst
@@ -132,7 +132,7 @@ of the two lines.
 
 .. comment: Image generated with ../example/anchors.py
 
-.. image:: ../example/anchors.png
+.. image:: ../example/anchors.webp
     :alt: Text anchor examples
     :align: center
 
diff --git a/docs/handbook/thumbnail_hopper.jpg b/docs/handbook/thumbnail_hopper.jpg
new file mode 100644
index 00000000000..8c10589c2cf
Binary files /dev/null and b/docs/handbook/thumbnail_hopper.jpg differ
diff --git a/docs/handbook/transformed_hopper.webp b/docs/handbook/transformed_hopper.webp
new file mode 100644
index 00000000000..be5e90f9677
Binary files /dev/null and b/docs/handbook/transformed_hopper.webp differ
diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst
index 523e2ad7494..3df8e0d20be 100644
--- a/docs/handbook/tutorial.rst
+++ b/docs/handbook/tutorial.rst
@@ -37,6 +37,9 @@ example, let’s display the image we just loaded::
 
     >>> im.show()
 
+.. image:: show_hopper.webp
+    :align: center
+
 .. note::
 
     The standard version of :py:meth:`~PIL.Image.Image.show` is not very
@@ -79,6 +82,9 @@ Convert files to JPEG
             except OSError:
                 print("cannot convert", infile)
 
+.. image:: ../../Tests/images/hopper.jpg
+    :align: center
+
 A second argument can be supplied to the :py:meth:`~PIL.Image.Image.save`
 method which explicitly specifies a file format. If you use a non-standard
 extension, you must always specify the format this way:
@@ -103,6 +109,9 @@ Create JPEG thumbnails
             except OSError:
                 print("cannot create thumbnail for", infile)
 
+.. image:: thumbnail_hopper.jpg
+    :align: center
+
 It is important to note that the library doesn’t decode or load the raster data
 unless it really has to. When you open a file, the file header is read to
 determine the file format and extract things like mode, size, and other
@@ -140,16 +149,19 @@ Copying a subrectangle from an image
 
 ::
 
-    box = (100, 100, 400, 400)
+    box = (0, 0, 64, 64)
     region = im.crop(box)
 
 The region is defined by a 4-tuple, where coordinates are (left, upper, right,
 lower). The Python Imaging Library uses a coordinate system with (0, 0) in the
 upper left corner. Also note that coordinates refer to positions between the
-pixels, so the region in the above example is exactly 300x300 pixels.
+pixels, so the region in the above example is exactly 64x64 pixels.
 
 The region could now be processed in a certain manner and pasted back.
 
+.. image:: cropped_hopper.webp
+    :align: center
+
 Processing a subrectangle, and pasting it back
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -164,6 +176,9 @@ modes of the original image and the region do not need to match. If they don’t
 the region is automatically converted before being pasted (see the section on
 :ref:`color-transforms` below for details).
 
+.. image:: pasted_hopper.webp
+    :align: center
+
 Here’s an additional example:
 
 Rolling an image
@@ -171,7 +186,7 @@ Rolling an image
 
 ::
 
-    def roll(im, delta):
+    def roll(im: Image.Image, delta: int) -> Image.Image:
         """Roll an image sideways."""
         xsize, ysize = im.size
 
@@ -186,6 +201,9 @@ Rolling an image
 
         return im
 
+.. image:: rolled_hopper.webp
+    :align: center
+
 Or if you would like to merge two images into a wider image:
 
 Merging images
@@ -193,7 +211,7 @@ Merging images
 
 ::
 
-    def merge(im1, im2):
+    def merge(im1: Image.Image, im2: Image.Image) -> Image.Image:
         w = im1.size[0] + im2.size[0]
         h = max(im1.size[1], im2.size[1])
         im = Image.new("RGBA", (w, h))
@@ -203,6 +221,9 @@ Merging images
 
         return im
 
+.. image:: merged_hopper.webp
+    :align: center
+
 For more advanced tricks, the paste method can also take a transparency mask as
 an optional argument. In this mask, the value 255 indicates that the pasted
 image is opaque in that position (that is, the pasted image should be used as
@@ -229,6 +250,9 @@ Note that for a single-band image, :py:meth:`~PIL.Image.Image.split` returns
 the image itself. To work with individual color bands, you may want to convert
 the image to “RGB” first.
 
+.. image:: rebanded_hopper.webp
+    :align: center
+
 Geometrical transforms
 ----------------------
 
@@ -245,6 +269,9 @@ Simple geometry transforms
     out = im.resize((128, 128))
     out = im.rotate(45) # degrees counter-clockwise
 
+.. image:: rotated_hopper_90.webp
+    :align: center
+
 To rotate the image in 90 degree steps, you can either use the
 :py:meth:`~PIL.Image.Image.rotate` method or the
 :py:meth:`~PIL.Image.Image.transpose` method. The latter can also be used to
@@ -256,11 +283,38 @@ Transposing an image
 ::
 
     out = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
+
+.. image:: flip_left_right_hopper.webp
+    :align: center
+
+::
+
     out = im.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
+
+.. image:: flip_top_bottom_hopper.webp
+    :align: center
+
+::
+
     out = im.transpose(Image.Transpose.ROTATE_90)
+
+.. image:: rotated_hopper_90.webp
+    :align: center
+
+::
+
     out = im.transpose(Image.Transpose.ROTATE_180)
+
+.. image:: rotated_hopper_180.webp
+    :align: center
+
+::
+
     out = im.transpose(Image.Transpose.ROTATE_270)
 
+.. image:: rotated_hopper_270.webp
+    :align: center
+
 ``transpose(ROTATE)`` operations can also be performed identically with
 :py:meth:`~PIL.Image.Image.rotate` operations, provided the ``expand`` flag is
 true, to provide for the same changes to the image's size.
@@ -278,26 +332,26 @@ choose to resize relative to a given size.
 
     from PIL import Image, ImageOps
     size = (100, 150)
-    with Image.open("Tests/images/hopper.png") as im:
-        ImageOps.contain(im, size).save("imageops_contain.png")
-        ImageOps.cover(im, size).save("imageops_cover.png")
-        ImageOps.fit(im, size).save("imageops_fit.png")
-        ImageOps.pad(im, size, color="#f00").save("imageops_pad.png")
+    with Image.open("hopper.webp") as im:
+        ImageOps.contain(im, size).save("imageops_contain.webp")
+        ImageOps.cover(im, size).save("imageops_cover.webp")
+        ImageOps.fit(im, size).save("imageops_fit.webp")
+        ImageOps.pad(im, size, color="#f00").save("imageops_pad.webp")
 
         # thumbnail() can also be used,
         # but will modify the image object in place
         im.thumbnail(size)
-        im.save("imageops_thumbnail.png")
-
-+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+
-|                | :py:meth:`~PIL.Image.Image.thumbnail`     | :py:meth:`~PIL.ImageOps.contain`           | :py:meth:`~PIL.ImageOps.cover`           | :py:meth:`~PIL.ImageOps.fit`           | :py:meth:`~PIL.ImageOps.pad`           |
-+================+===========================================+============================================+==========================================+========================================+========================================+
-|Given size      | ``(100, 150)``                            | ``(100, 150)``                             | ``(100, 150)``                           | ``(100, 150)``                         | ``(100, 150)``                         |
-+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+
-|Resulting image | .. image:: ../example/image_thumbnail.png | .. image:: ../example/imageops_contain.png | .. image:: ../example/imageops_cover.png | .. image:: ../example/imageops_fit.png | .. image:: ../example/imageops_pad.png |
-+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+
-|Resulting size  | ``100×100``                               | ``100×100``                                | ``150×150``                              | ``100×150``                            | ``100×150``                            |
-+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+
+        im.save("image_thumbnail.webp")
+
++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+
+|                | :py:meth:`~PIL.Image.Image.thumbnail`      | :py:meth:`~PIL.ImageOps.contain`            | :py:meth:`~PIL.ImageOps.cover`            | :py:meth:`~PIL.ImageOps.fit`            | :py:meth:`~PIL.ImageOps.pad`            |
++================+============================================+=============================================+===========================================+=========================================+=========================================+
+|Given size      | ``(100, 150)``                             | ``(100, 150)``                              | ``(100, 150)``                            | ``(100, 150)``                          | ``(100, 150)``                          |
++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+
+|Resulting image | .. image:: ../example/image_thumbnail.webp | .. image:: ../example/imageops_contain.webp | .. image:: ../example/imageops_cover.webp | .. image:: ../example/imageops_fit.webp | .. image:: ../example/imageops_pad.webp |
++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+
+|Resulting size  | ``100×100``                                | ``100×100``                                 | ``150×150``                               | ``100×150``                             | ``100×150``                             |
++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+
 
 .. _color-transforms:
 
@@ -342,6 +396,9 @@ Applying filters
     from PIL import ImageFilter
     out = im.filter(ImageFilter.DETAIL)
 
+.. image:: enhanced_hopper.webp
+    :align: center
+
 Point Operations
 ^^^^^^^^^^^^^^^^
 
@@ -355,8 +412,11 @@ Applying point transforms
 
 ::
 
-    # multiply each pixel by 1.2
-    out = im.point(lambda i: i * 1.2)
+    # multiply each pixel by 20
+    out = im.point(lambda i: i * 20)
+
+.. image:: transformed_hopper.webp
+    :align: center
 
 Using the above technique, you can quickly apply any simple expression to an
 image. You can also combine the :py:meth:`~PIL.Image.Image.point` and
@@ -388,6 +448,9 @@ Note the syntax used to create the mask::
 
     imout = im.point(lambda i: expression and 255)
 
+.. image:: masked_hopper.webp
+    :align: center
+
 Python only evaluates the portion of a logical expression as is necessary to
 determine the outcome, and returns the last value examined as the result of the
 expression. So if the expression above is false (0), Python does not look at
@@ -412,6 +475,10 @@ Enhancing images
     enh = ImageEnhance.Contrast(im)
     enh.enhance(1.3).show("30% more contrast")
 
+
+.. image:: contrasted_hopper.jpg
+    :align: center
+
 Image sequences
 ---------------
 
@@ -444,10 +511,43 @@ Reading sequences
 As seen in this example, you’ll get an :py:exc:`EOFError` exception when the
 sequence ends.
 
+Writing sequences
+^^^^^^^^^^^^^^^^^
+
+You can create animated GIFs with Pillow, e.g.
+
+::
+
+    from PIL import Image
+
+    # List of image filenames
+    image_filenames = [
+        "hopper.jpg",
+        "rotated_hopper_270.jpg",
+        "rotated_hopper_180.jpg",
+        "rotated_hopper_90.jpg",
+    ]
+
+    # Open images and create a list
+    images = [Image.open(filename) for filename in image_filenames]
+
+    # Save the images as an animated GIF
+    images[0].save(
+        "animated_hopper.gif",
+        save_all=True,
+        append_images=images[1:],
+        duration=500,  # duration of each frame in milliseconds
+        loop=0,  # loop forever
+    )
+
+
+.. image:: animated_hopper.gif
+    :align: center
+
 The following class lets you use the for-statement to loop over the sequence:
 
-Using the ImageSequence Iterator class
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Using the :py:class:`~PIL.ImageSequence.Iterator` class
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ::
 
@@ -467,25 +567,61 @@ Drawing PostScript
 
 ::
 
-    from PIL import Image
-    from PIL import PSDraw
+    from PIL import Image, PSDraw
+    import os
 
-    with Image.open("hopper.ppm") as im:
-        title = "hopper"
-        box = (1 * 72, 2 * 72, 7 * 72, 10 * 72)  # in points
+    # Define the PostScript file
+    ps_file = open("hopper.ps", "wb")
+
+    # Create a PSDraw object
+    ps = PSDraw.PSDraw(ps_file)
+
+    # Start the document
+    ps.begin_document()
+
+    # Set the text to be drawn
+    text = "Hopper"
+
+    # Define the PostScript font
+    font_name = "Helvetica-Narrow-Bold"
+    font_size = 36
+
+    # Calculate text size (approximation as PSDraw doesn't provide direct method)
+    # Assuming average character width as 0.6 of the font size
+    text_width = len(text) * font_size * 0.6
+    text_height = font_size
 
-        ps = PSDraw.PSDraw()  # default is sys.stdout or sys.stdout.buffer
-        ps.begin_document(title)
+    # Set the position (top-center)
+    page_width, page_height = 595, 842  # A4 size in points
+    text_x = (page_width - text_width) // 2
+    text_y = page_height - text_height - 50  # Distance from the top of the page
 
-        # draw the image (75 dpi)
-        ps.image(box, im, 75)
-        ps.rectangle(box)
+    # Load the image
+    image_path = "hopper.ppm"  # Update this with your image path
+    with Image.open(image_path) as im:
+        # Resize the image if it's too large
+        im.thumbnail((page_width - 100, page_height // 2))
 
-        # draw title
-        ps.setfont("HelveticaNarrow-Bold", 36)
-        ps.text((3 * 72, 4 * 72), title)
+        # Define the box where the image will be placed
+        img_x = (page_width - im.width) // 2
+        img_y = text_y + text_height - 200  # 200 points below the text
 
-        ps.end_document()
+        # Draw the image (75 dpi)
+        ps.image((img_x, img_y, img_x + im.width, img_y + im.height), im, 75)
+
+    # Draw the text
+    ps.setfont(font_name, font_size)
+    ps.text((text_x, text_y), text)
+
+    # End the document
+    ps.end_document()
+    ps_file.close()
+
+.. image:: hopper_ps.webp
+
+.. note::
+
+    PostScript converted to PDF for display purposes
 
 More on reading images
 ----------------------
@@ -553,7 +689,7 @@ Reading from a tar archive
 
     from PIL import Image, TarIO
 
-    fp = TarIO.TarIO("Tests/images/hopper.tar", "hopper.jpg")
+    fp = TarIO.TarIO("hopper.tar", "hopper.jpg")
     im = Image.open(fp)
 
 
@@ -568,8 +704,7 @@ in the current directory can be saved as JPEGs at reduced quality.
     import glob
     from PIL import Image
 
-
-    def compress_image(source_path, dest_path):
+    def compress_image(source_path: str, dest_path: str) -> None:
         with Image.open(source_path) as img:
             if img.mode != "RGB":
                 img = img.convert("RGB")
diff --git a/docs/handbook/writing-your-own-image-plugin.rst b/docs/handbook/writing-your-own-image-plugin.rst
index 956d63aa771..2e853224d5a 100644
--- a/docs/handbook/writing-your-own-image-plugin.rst
+++ b/docs/handbook/writing-your-own-image-plugin.rst
@@ -53,7 +53,7 @@ true color.
     from PIL import Image, ImageFile
 
 
-    def _accept(prefix):
+    def _accept(prefix: bytes) -> bool:
         return prefix[:4] == b"SPAM"
 
 
@@ -62,7 +62,7 @@ true color.
         format = "SPAM"
         format_description = "Spam raster image"
 
-        def _open(self):
+        def _open(self) -> None:
 
             header = self.fp.read(128).split()
 
@@ -82,7 +82,7 @@ true color.
                 raise SyntaxError(msg)
 
             # data descriptor
-            self.tile = [("raw", (0, 0) + self.size, 128, (self.mode, 0, 1))]
+            self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 128, (self.mode, 0, 1))]
 
 
     Image.register_open(SpamImageFile.format, SpamImageFile, _accept)
diff --git a/docs/index.rst b/docs/index.rst
index 4f577fe9c22..18f5c3d13e7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,7 +1,7 @@
 Pillow
 ======
 
-Pillow is the friendly PIL fork by `Jeffrey A. Clark (Alex) and contributors <https://github.com/python-pillow/Pillow/graphs/contributors>`_. PIL is the Python Imaging Library by Fredrik Lundh and contributors.
+Pillow is the friendly PIL fork by `Jeffrey A. Clark and contributors <https://github.com/python-pillow/Pillow/graphs/contributors>`_. PIL is the Python Imaging Library by Fredrik Lundh and contributors.
 
 Pillow for enterprise is available via the Tidelift Subscription. `Learn more <https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=docs&utm_campaign=enterprise>`_.
 
@@ -41,10 +41,6 @@ Pillow for enterprise is available via the Tidelift Subscription. `Learn more <h
    :target: https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml
    :alt: GitHub Actions build status (Wheels)
 
-.. image:: https://img.shields.io/travis/com/python-pillow/Pillow/main.svg?label=aarch64%20wheels
-   :target: https://app.travis-ci.com/github/python-pillow/Pillow
-   :alt: Travis CI wheels build status (aarch64)
-
 .. image:: https://codecov.io/gh/python-pillow/Pillow/branch/main/graph/badge.svg
    :target: https://app.codecov.io/gh/python-pillow/Pillow
    :alt: Code coverage
@@ -53,20 +49,20 @@ Pillow for enterprise is available via the Tidelift Subscription. `Learn more <h
    :target: https://zenodo.org/badge/latestdoi/17549/python-pillow/Pillow
    :alt: Zenodo
 
-.. image:: https://tidelift.com/badges/package/pypi/Pillow?style=flat
+.. image:: https://tidelift.com/badges/package/pypi/pillow?style=flat
    :target: https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=badge
    :alt: Tidelift
 
 .. image:: https://oss-fuzz-build-logs.storage.googleapis.com/badges/pillow.svg
-   :target: https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:pillow
+   :target: https://issues.oss-fuzz.com/issues?q=title:pillow
    :alt: Fuzzing Status
 
 .. image:: https://img.shields.io/pypi/v/pillow.svg
-   :target: https://pypi.org/project/Pillow/
+   :target: https://pypi.org/project/pillow/
    :alt: Latest PyPI version
 
 .. image:: https://img.shields.io/pypi/dm/pillow.svg
-   :target: https://pypi.org/project/Pillow/
+   :target: https://pypi.org/project/pillow/
    :alt: Number of PyPI downloads
 
 .. image:: https://www.bestpractices.dev/projects/6331/badge
@@ -77,10 +73,6 @@ Pillow for enterprise is available via the Tidelift Subscription. `Learn more <h
    :target: https://gitter.im/python-pillow/Pillow?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
    :alt: Join the chat at https://gitter.im/python-pillow/Pillow
 
-.. image:: https://img.shields.io/badge/tweet-on%20Twitter-00aced.svg
-   :target: https://twitter.com/PythonPillow
-   :alt: Follow on https://twitter.com/PythonPillow
-
 .. image:: https://img.shields.io/badge/publish-on%20Mastodon-595aff.svg
    :target: https://fosstodon.org/@pillow
    :alt: Follow on https://fosstodon.org/@pillow
@@ -101,7 +93,7 @@ The core image library is designed for fast access to data stored in a few basic
 .. toctree::
    :maxdepth: 2
 
-   installation.rst
+   installation/index.rst
    handbook/index.rst
    reference/index.rst
    porting.rst
diff --git a/docs/installation.rst b/docs/installation.rst
index fbcfbb90724..b4bf2fa00e8 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -1,606 +1,29 @@
+:orphan:
+
 Installation
 ============
 
-.. raw:: html
-
-    <script>
-    document.addEventListener('DOMContentLoaded', function() {
-      activateTab(getOS());
-    });
-    </script>
-
-Warnings
---------
-
-.. warning:: Pillow and PIL cannot co-exist in the same environment. Before installing Pillow, please uninstall PIL.
-
-.. warning:: Pillow >= 1.0 no longer supports ``import Image``. Please use ``from PIL import Image`` instead.
-
-.. warning:: Pillow >= 2.1.0 no longer supports ``import _imaging``. Please use ``from PIL.Image import core as _imaging`` instead.
-
-Python Support
---------------
-
-Pillow supports these Python versions.
-
-.. csv-table:: Newer versions
-   :file: newer-versions.csv
-   :header-rows: 1
-
-.. csv-table:: Older versions
-   :file: older-versions.csv
-   :header-rows: 1
-
-.. _Linux Installation:
-.. _macOS Installation:
-.. _Windows Installation:
-.. _FreeBSD Installation:
-
 Basic Installation
 ------------------
 
-.. note::
-
-    The following instructions will install Pillow with support for
-    most common image formats. See :ref:`external-libraries` for a
-    full list of external libraries supported.
-
-Install Pillow with :command:`pip`::
-
-    python3 -m pip install --upgrade pip
-    python3 -m pip install --upgrade Pillow
-
-Optionally, install :pypi:`defusedxml` for Pillow to read XMP data,
-and :pypi:`olefile` for Pillow to read FPX and MIC images::
-
-    python3 -m pip install --upgrade defusedxml olefile
-
-
-.. tab:: Linux
-
-    We provide binaries for Linux for each of the supported Python
-    versions in the manylinux wheel format. These include support for all
-    optional libraries except libimagequant. Raqm support requires
-    FriBiDi to be installed separately::
-
-        python3 -m pip install --upgrade pip
-        python3 -m pip install --upgrade Pillow
-
-    Most major Linux distributions, including Fedora, Ubuntu and ArchLinux
-    also include Pillow in packages that previously contained PIL e.g.
-    ``python-imaging``. Debian splits it into two packages, ``python3-pil``
-    and ``python3-pil.imagetk``.
-
-.. tab:: macOS
-
-    We provide binaries for macOS for each of the supported Python
-    versions in the wheel format. These include support for all optional
-    libraries except libimagequant. Raqm support requires
-    FriBiDi to be installed separately::
-
-        python3 -m pip install --upgrade pip
-        python3 -m pip install --upgrade Pillow
-
-    While we provide binaries for both x86-64 and arm64, we do not provide universal2
-    binaries. However, it is simple to combine our current binaries to create one::
-
-        python3 -m pip download --only-binary=:all: --platform macosx_10_10_x86_64 Pillow
-        python3 -m pip download --only-binary=:all: --platform macosx_11_0_arm64 Pillow
-        python3 -m pip install delocate
-
-    Then, with the names of the downloaded wheels, use Python to combine them::
-
-        from delocate.fuse import fuse_wheels
-        fuse_wheels('Pillow-9.4.0-2-cp39-cp39-macosx_10_10_x86_64.whl', 'Pillow-9.4.0-cp39-cp39-macosx_11_0_arm64.whl', 'Pillow-9.4.0-cp39-cp39-macosx_11_0_universal2.whl')
-
-.. tab:: Windows
-
-    We provide Pillow binaries for Windows compiled for the matrix of supported
-    Pythons in the wheel format. These include x86, x86-64 and arm64 versions
-    (with the exception of Python 3.8 on arm64). These binaries include support
-    for all optional libraries except libimagequant and libxcb. Raqm support
-    requires FriBiDi to be installed separately::
-
-        python3 -m pip install --upgrade pip
-        python3 -m pip install --upgrade Pillow
-
-    To install Pillow in MSYS2, see `Building on Windows using MSYS2/MinGW`_.
-
-.. tab:: FreeBSD
-
-    Pillow can be installed on FreeBSD via the official Ports or Packages systems:
-
-    **Ports**::
-
-        cd /usr/ports/graphics/py-pillow && make install clean
-
-    **Packages**::
-
-        pkg install py38-pillow
-
-    .. note::
-
-        The `Pillow FreeBSD port
-        <https://www.freshports.org/graphics/py-pillow/>`_ and packages
-        are tested by the ports team with all supported FreeBSD versions.
-
-
-.. _Building on Linux:
-.. _Building on macOS:
-.. _Building on Windows:
-.. _Building on Windows using MSYS2/MinGW:
-.. _Building on FreeBSD:
-.. _Building on Android:
-
-Building From Source
---------------------
-
-.. _external-libraries:
-
-External Libraries
-^^^^^^^^^^^^^^^^^^
-
-.. note::
-
-    You **do not need to install all supported external libraries** to
-    use Pillow's basic features. **Zlib** and **libjpeg** are required
-    by default.
-
-.. note::
-
-   There are Dockerfiles in our `Docker images repo
-   <https://github.com/python-pillow/docker-images>`_ to install the
-   dependencies for some operating systems.
-
-Many of Pillow's features require external libraries:
-
-* **libjpeg** provides JPEG functionality.
-
-  * Pillow has been tested with libjpeg versions **6b**, **8**, **9-9d** and
-    libjpeg-turbo version **8**.
-  * Starting with Pillow 3.0.0, libjpeg is required by default. It can be
-    disabled with the ``-C jpeg=disable`` flag.
-
-* **zlib** provides access to compressed PNGs
-
-  * Starting with Pillow 3.0.0, zlib is required by default. It can be
-    disabled with the ``-C zlib=disable`` flag.
-
-* **libtiff** provides compressed TIFF functionality
-
-  * Pillow has been tested with libtiff versions **3.x** and **4.0-4.6.0**
-
-* **libfreetype** provides type related services
-
-* **littlecms** provides color management
-
-  * Pillow version 2.2.1 and below uses liblcms1, Pillow 2.3.0 and
-    above uses liblcms2. Tested with **1.19** and **2.7-2.16**.
-
-* **libwebp** provides the WebP format.
-
-  * Pillow has been tested with version **0.1.3**, which does not read
-    transparent WebP files. Versions **0.3.0** and above support
-    transparency.
-
-* **openjpeg** provides JPEG 2000 functionality.
-
-  * Pillow has been tested with openjpeg **2.0.0**, **2.1.0**, **2.3.1**,
-    **2.4.0** and **2.5.0**.
-  * Pillow does **not** support the earlier **1.5** series which ships
-    with Debian Jessie.
-
-* **libimagequant** provides improved color quantization
-
-  * Pillow has been tested with libimagequant **2.6-4.2.2**
-  * Libimagequant is licensed GPLv3, which is more restrictive than
-    the Pillow license, therefore we will not be distributing binaries
-    with libimagequant support enabled.
-
-* **libraqm** provides complex text layout support.
-
-  * libraqm provides bidirectional text support (using FriBiDi),
-    shaping (using HarfBuzz), and proper script itemization. As a
-    result, Raqm can support most writing systems covered by Unicode.
-  * libraqm depends on the following libraries: FreeType, HarfBuzz,
-    FriBiDi, make sure that you install them before installing libraqm
-    if not available as package in your system.
-  * Setting text direction or font features is not supported without libraqm.
-  * Pillow wheels since version 8.2.0 include a modified version of libraqm that
-    loads libfribidi at runtime if it is installed.
-    On Windows this requires compiling FriBiDi and installing ``fribidi.dll``
-    into a directory listed in the `Dynamic-link library search order (Microsoft Learn)
-    <https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-search-order#search-order-for-unpackaged-apps>`_
-    (``fribidi-0.dll`` or ``libfribidi-0.dll`` are also detected).
-    See `Build Options`_ to see how to build this version.
-  * Previous versions of Pillow (5.0.0 to 8.1.2) linked libraqm dynamically at runtime.
-
-* **libxcb** provides X11 screengrab support.
-
-.. tab:: Linux
-
-    If you didn't build Python from source, make sure you have Python's
-    development libraries installed.
+.. Note:: This section has moved to :ref:`basic-installation`. Please update references accordingly.
 
-    In Debian or Ubuntu::
-
-        sudo apt-get install python3-dev python3-setuptools
-
-    In Fedora, the command is::
-
-        sudo dnf install python3-devel redhat-rpm-config
-
-    In Alpine, the command is::
-
-        sudo apk add python3-dev py3-setuptools
-
-    .. Note:: ``redhat-rpm-config`` is required on Fedora 23, but not earlier versions.
-
-    Prerequisites for **Ubuntu 16.04 LTS - 22.04 LTS** are installed with::
-
-        sudo apt-get install libtiff5-dev libjpeg8-dev libopenjp2-7-dev zlib1g-dev \
-            libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
-            libharfbuzz-dev libfribidi-dev libxcb1-dev
-
-    To install libraqm, ``sudo apt-get install meson`` and then see
-    ``depends/install_raqm.sh``.
-
-    Prerequisites are installed on recent **Red Hat**, **CentOS** or **Fedora** with::
-
-        sudo dnf install libtiff-devel libjpeg-devel openjpeg2-devel zlib-devel \
-            freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel \
-            harfbuzz-devel fribidi-devel libraqm-devel libimagequant-devel libxcb-devel
-
-    Note that the package manager may be yum or DNF, depending on the
-    exact distribution.
-
-    Prerequisites are installed for **Alpine** with::
-
-        sudo apk add tiff-dev jpeg-dev openjpeg-dev zlib-dev freetype-dev lcms2-dev \
-            libwebp-dev tcl-dev tk-dev harfbuzz-dev fribidi-dev libimagequant-dev \
-            libxcb-dev libpng-dev
-
-    See also the ``Dockerfile``\s in the Test Infrastructure repo
-    (https://github.com/python-pillow/docker-images) for a known working
-    install process for other tested distros.
-
-.. tab:: macOS
-
-    The Xcode command line tools are required to compile portions of
-    Pillow. The tools are installed by running ``xcode-select --install``
-    from the command line. The command line tools are required even if you
-    have the full Xcode package installed.  It may be necessary to run
-    ``sudo xcodebuild -license`` to accept the license prior to using the
-    tools.
-
-    The easiest way to install external libraries is via `Homebrew
-    <https://brew.sh/>`_. After you install Homebrew, run::
-
-        brew install libjpeg libtiff little-cms2 openjpeg webp
-
-    To install libraqm on macOS use Homebrew to install its dependencies::
-
-        brew install freetype harfbuzz fribidi
-
-    Then see ``depends/install_raqm_cmake.sh`` to install libraqm.
-
-.. tab:: Windows
-
-    We recommend you use prebuilt wheels from PyPI.
-    If you wish to compile Pillow manually, you can use the build scripts
-    in the ``winbuild`` directory used for CI testing and development.
-    These scripts require Visual Studio 2017 or newer and NASM.
-
-    The scripts also install Pillow from the local copy of the source code, so the
-    `Installing`_ instructions will not be necessary afterwards.
-
-.. tab:: Windows using MSYS2/MinGW
-
-    To build Pillow using MSYS2, make sure you run the **MSYS2 MinGW 32-bit** or
-    **MSYS2 MinGW 64-bit** console, *not* **MSYS2** directly.
-
-    The following instructions target the 64-bit build, for 32-bit
-    replace all occurrences of ``mingw-w64-x86_64-`` with ``mingw-w64-i686-``.
-
-    Make sure you have Python and GCC installed::
-
-        pacman -S \
-            mingw-w64-x86_64-gcc \
-            mingw-w64-x86_64-python3 \
-            mingw-w64-x86_64-python3-pip \
-            mingw-w64-x86_64-python3-setuptools
-
-    Prerequisites are installed on **MSYS2 MinGW 64-bit** with::
-
-        pacman -S \
-            mingw-w64-x86_64-libjpeg-turbo \
-            mingw-w64-x86_64-zlib \
-            mingw-w64-x86_64-libtiff \
-            mingw-w64-x86_64-freetype \
-            mingw-w64-x86_64-lcms2 \
-            mingw-w64-x86_64-libwebp \
-            mingw-w64-x86_64-openjpeg2 \
-            mingw-w64-x86_64-libimagequant \
-            mingw-w64-x86_64-libraqm
-
-    https://www.msys2.org/docs/python/ states that setuptools >= 60 does not work with
-    MSYS2. To workaround this, before installing Pillow you must run::
-
-        export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-.. tab:: FreeBSD
-
-    .. Note:: Only FreeBSD 10 and 11 tested
-
-    Make sure you have Python's development libraries installed::
-
-        sudo pkg install python3
-
-    Prerequisites are installed on **FreeBSD 10 or 11** with::
-
-        sudo pkg install jpeg-turbo tiff webp lcms2 freetype2 openjpeg harfbuzz fribidi libxcb
-
-    Then see ``depends/install_raqm_cmake.sh`` to install libraqm.
-
-.. tab:: Android
-
-    Basic Android support has been added for compilation within the Termux
-    environment. The dependencies can be installed by::
-
-        pkg install -y python ndk-sysroot clang make \
-            libjpeg-turbo
-
-    This has been tested within the Termux app on ChromeOS, on x86.
-
-Installing
-^^^^^^^^^^
-
-Once you have installed the prerequisites, to install Pillow from the source
-code on PyPI, run::
-
-    python3 -m pip install --upgrade pip
-    python3 -m pip install --upgrade Pillow --no-binary :all:
-
-If the prerequisites are installed in the standard library locations
-for your machine (e.g. :file:`/usr` or :file:`/usr/local`), no
-additional configuration should be required. If they are installed in
-a non-standard location, you may need to configure setuptools to use
-those locations by editing :file:`setup.py` or
-:file:`pyproject.toml`, or by adding environment variables on the command
-line::
-
-    CFLAGS="-I/usr/pkg/include" python3 -m pip install --upgrade Pillow --no-binary :all:
-
-If Pillow has been previously built without the required
-prerequisites, it may be necessary to manually clear the pip cache or
-build without cache using the ``--no-cache-dir`` option to force a
-build with newly installed external libraries.
-
-If you would like to install from a local copy of the source code instead, you
-can clone from GitHub with ``git clone https://github.com/python-pillow/Pillow``
-or download and extract the `compressed archive from PyPI`_.
-
-After navigating to the Pillow directory, run::
-
-    python3 -m pip install --upgrade pip
-    python3 -m pip install .
-
-.. _compressed archive from PyPI: https://pypi.org/project/Pillow/#files
-
-Build Options
-"""""""""""""
-
-* Environment variable: ``MAX_CONCURRENCY=n``. Pillow can use
-  multiprocessing to build the extension. Setting ``MAX_CONCURRENCY``
-  sets the number of CPUs to use, or can disable parallel building by
-  using a setting of 1. By default, it uses 4 CPUs, or if 4 are not
-  available, as many as are present.
-
-* Config settings: ``-C zlib=disable``, ``-C jpeg=disable``,
-  ``-C tiff=disable``, ``-C freetype=disable``, ``-C raqm=disable``,
-  ``-C lcms=disable``, ``-C webp=disable``, ``-C webpmux=disable``,
-  ``-C jpeg2000=disable``, ``-C imagequant=disable``, ``-C xcb=disable``.
-  Disable building the corresponding feature even if the development
-  libraries are present on the building machine.
-
-* Config settings: ``-C zlib=enable``, ``-C jpeg=enable``,
-  ``-C tiff=enable``, ``-C freetype=enable``, ``-C raqm=enable``,
-  ``-C lcms=enable``, ``-C webp=enable``, ``-C webpmux=enable``,
-  ``-C jpeg2000=enable``, ``-C imagequant=enable``, ``-C xcb=enable``.
-  Require that the corresponding feature is built. The build will raise
-  an exception if the libraries are not found. Webpmux (WebP metadata)
-  relies on WebP support. Tcl and Tk also must be used together.
-
-* Config settings: ``-C raqm=vendor``, ``-C fribidi=vendor``.
-  These flags are used to compile a modified version of libraqm and
-  a shim that dynamically loads libfribidi at runtime. These are
-  used to compile the standard Pillow wheels. Compiling libraqm requires
-  a C99-compliant compiler.
-
-* Build flag: ``-C platform-guessing=disable``. Skips all of the
-  platform dependent guessing of include and library directories for
-  automated build systems that configure the proper paths in the
-  environment variables (e.g. Buildroot).
-
-* Build flag: ``-C debug=true``. Adds a debugging flag to the include and
-  library search process to dump all paths searched for and found to
-  stdout.
-
-
-Sample usage::
+Python Support
+--------------
 
-    python3 -m pip install --upgrade Pillow -C [feature]=enable
+.. Note:: This section has moved to :ref:`python-support`. Please update references accordingly.
 
 Platform Support
 ----------------
 
-Current platform support for Pillow. Binary distributions are
-contributed for each release on a volunteer basis, but the source
-should compile and run everywhere platform support is listed. In
-general, we aim to support all current versions of Linux, macOS, and
-Windows.
+.. Note:: This section has moved to :ref:`platform-support`. Please update references accordingly.
 
-Continuous Integration Targets
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-These platforms are built and tested for every change.
-
-+----------------------------------+----------------------------+---------------------+
-| Operating system                 | Tested Python versions     | Tested architecture |
-+==================================+============================+=====================+
-| Alpine                           | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Amazon Linux 2                   | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Amazon Linux 2023                | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Arch                             | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| CentOS 7                         | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| CentOS Stream 8                  | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| CentOS Stream 9                  | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Debian 11 Bullseye               | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Debian 12 Bookworm               | 3.11                       | x86, x86-64         |
-+----------------------------------+----------------------------+---------------------+
-| Fedora 38                        | 3.11                       | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Fedora 39                        | 3.12                       | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Gentoo                           | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| macOS 12 Monterey                | 3.8, 3.9, 3.10, 3.11,      | x86-64              |
-|                                  | 3.12, PyPy3                |                     |
-+----------------------------------+----------------------------+---------------------+
-| Ubuntu Linux 20.04 LTS (Focal)   | 3.8                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Ubuntu Linux 22.04 LTS (Jammy)   | 3.8, 3.9, 3.10, 3.11,      | x86-64              |
-|                                  | 3.12, PyPy3                |                     |
-|                                  +----------------------------+---------------------+
-|                                  | 3.10                       | arm64v8, ppc64le,   |
-|                                  |                            | s390x               |
-+----------------------------------+----------------------------+---------------------+
-| Windows Server 2016              | 3.8                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-| Windows Server 2022              | 3.8, 3.9, 3.10, 3.11,      | x86-64              |
-|                                  | 3.12, PyPy3                |                     |
-|                                  +----------------------------+---------------------+
-|                                  | 3.12                       | x86                 |
-|                                  +----------------------------+---------------------+
-|                                  | 3.9 (MinGW)                | x86-64              |
-|                                  +----------------------------+---------------------+
-|                                  | 3.8, 3.9 (Cygwin)          | x86-64              |
-+----------------------------------+----------------------------+---------------------+
-
-
-Other Platforms
-^^^^^^^^^^^^^^^
-
-These platforms have been reported to work at the versions mentioned.
-
-.. note::
-
-    Contributors please test Pillow on your platform then update this
-    document and send a pull request.
+Building From Source
+--------------------
 
-+----------------------------------+----------------------------+------------------+--------------+
-| Operating system                 | | Tested Python            | | Latest tested  | | Tested     |
-|                                  | | versions                 | | Pillow version | | processors |
-+==================================+============================+==================+==============+
-| macOS 14 Sonoma                  | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.1.0           |arm           |
-+----------------------------------+----------------------------+------------------+--------------+
-| macOS 13 Ventura                 | 3.8, 3.9, 3.10, 3.11       | 10.0.1           |arm           |
-|                                  +----------------------------+------------------+              |
-|                                  | 3.7                        | 9.5.0            |              |
-+----------------------------------+----------------------------+------------------+--------------+
-| macOS 12 Monterey                | 3.7, 3.8, 3.9, 3.10, 3.11  | 9.3.0            |arm           |
-+----------------------------------+----------------------------+------------------+--------------+
-| macOS 11 Big Sur                 | 3.7, 3.8, 3.9, 3.10        | 8.4.0            |arm           |
-|                                  +----------------------------+------------------+--------------+
-|                                  | 3.7, 3.8, 3.9, 3.10, 3.11  | 9.4.0            |x86-64        |
-|                                  +----------------------------+------------------+              |
-|                                  | 3.6                        | 8.4.0            |              |
-+----------------------------------+----------------------------+------------------+--------------+
-| macOS 10.15 Catalina             | 3.6, 3.7, 3.8, 3.9         | 8.3.2            |x86-64        |
-|                                  +----------------------------+------------------+              |
-|                                  | 3.5                        | 7.2.0            |              |
-+----------------------------------+----------------------------+------------------+--------------+
-| macOS 10.14 Mojave               | 3.5, 3.6, 3.7, 3.8         | 7.2.0            |x86-64        |
-|                                  +----------------------------+------------------+              |
-|                                  | 2.7                        | 6.0.0            |              |
-|                                  +----------------------------+------------------+              |
-|                                  | 3.4                        | 5.4.1            |              |
-+----------------------------------+----------------------------+------------------+--------------+
-| macOS 10.13 High Sierra          | 2.7, 3.4, 3.5, 3.6         | 4.2.1            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| macOS 10.12 Sierra               | 2.7, 3.4, 3.5, 3.6         | 4.1.1            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Mac OS X 10.11 El Capitan        | 2.7, 3.4, 3.5, 3.6, 3.7    | 5.4.1            |x86-64        |
-|                                  +----------------------------+------------------+              |
-|                                  | 3.3                        | 4.1.0            |              |
-+----------------------------------+----------------------------+------------------+--------------+
-| Mac OS X 10.9 Mavericks          | 2.7, 3.2, 3.3, 3.4         | 3.0.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Mac OS X 10.8 Mountain Lion      | 2.6, 2.7, 3.2, 3.3         |                  |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Redhat Linux 6                   | 2.6                        |                  |x86           |
-+----------------------------------+----------------------------+------------------+--------------+
-| CentOS 6.3                       | 2.7, 3.3                   |                  |x86           |
-+----------------------------------+----------------------------+------------------+--------------+
-| CentOS 8                         | 3.9                        | 9.0.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Fedora 23                        | 2.7, 3.4                   | 3.1.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Ubuntu Linux 12.04 LTS (Precise) | | 2.6, 3.2, 3.3, 3.4, 3.5  | 3.4.1            |x86,x86-64    |
-|                                  | | PyPy5.3.1, PyPy3 v2.4.0  |                  |              |
-|                                  +----------------------------+------------------+--------------+
-|                                  | 2.7                        | 4.3.0            |x86-64        |
-|                                  +----------------------------+------------------+--------------+
-|                                  | 2.7, 3.2                   | 3.4.1            |ppc           |
-+----------------------------------+----------------------------+------------------+--------------+
-| Ubuntu Linux 10.04 LTS (Lucid)   | 2.6                        | 2.3.0            |x86,x86-64    |
-+----------------------------------+----------------------------+------------------+--------------+
-| Debian 8.2 Jessie                | 2.7, 3.4                   | 3.1.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Raspbian Jessie                  | 2.7, 3.4                   | 3.1.0            |arm           |
-+----------------------------------+----------------------------+------------------+--------------+
-| Raspbian Stretch                 | 2.7, 3.5                   | 4.0.0            |arm           |
-+----------------------------------+----------------------------+------------------+--------------+
-| Raspberry Pi OS                  | 3.6, 3.7, 3.8, 3.9         | 8.2.0            |arm           |
-|                                  +----------------------------+------------------+              |
-|                                  | 2.7                        | 6.2.2            |              |
-+----------------------------------+----------------------------+------------------+--------------+
-| Gentoo Linux                     | 2.7, 3.2                   | 2.1.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| FreeBSD 11.1                     | 2.7, 3.4, 3.5, 3.6         | 4.3.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| FreeBSD 10.3                     | 2.7, 3.4, 3.5              | 4.2.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| FreeBSD 10.2                     | 2.7, 3.4                   | 3.1.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Windows 11                       | 3.9, 3.10, 3.11, 3.12      | 10.1.0           |arm64         |
-+----------------------------------+----------------------------+------------------+--------------+
-| Windows 11 Pro                   | 3.11, 3.12                 | 10.1.0           |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Windows 10                       | 3.7                        | 7.1.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Windows 10/Cygwin 3.3            | 3.6, 3.7, 3.8, 3.9         | 8.4.0            |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
-| Windows 8.1 Pro                  | 2.6, 2.7, 3.2, 3.3, 3.4    | 2.4.0            |x86,x86-64    |
-+----------------------------------+----------------------------+------------------+--------------+
-| Windows 8 Pro                    | 2.6, 2.7, 3.2, 3.3, 3.4a3  | 2.2.0            |x86,x86-64    |
-+----------------------------------+----------------------------+------------------+--------------+
-| Windows 7 Professional           | 3.7                        | 7.0.0            |x86,x86-64    |
-+----------------------------------+----------------------------+------------------+--------------+
-| Windows Server 2008 R2 Enterprise| 3.3                        |                  |x86-64        |
-+----------------------------------+----------------------------+------------------+--------------+
+.. Note:: This section has moved to :ref:`building-from-source`. Please update references accordingly.
 
 Old Versions
 ------------
 
-You can download old distributions from the `release history at PyPI
-<https://pypi.org/project/Pillow/#history>`_ and by direct URL access
-eg. https://pypi.org/project/Pillow/1.0/.
+.. Note:: This section has moved to :ref:`old-versions`. Please update references accordingly.
diff --git a/docs/installation/basic-installation.rst b/docs/installation/basic-installation.rst
new file mode 100644
index 00000000000..989f72dddde
--- /dev/null
+++ b/docs/installation/basic-installation.rst
@@ -0,0 +1,97 @@
+.. raw:: html
+
+    <script>
+    document.addEventListener('DOMContentLoaded', function() {
+      activateTab(getOS());
+    });
+    </script>
+
+.. _basic-installation:
+
+Basic Installation
+==================
+
+.. note::
+
+    The following instructions will install Pillow with support for
+    most common image formats. See :ref:`external-libraries` for a
+    full list of external libraries supported.
+
+Install Pillow with :command:`pip`::
+
+    python3 -m pip install --upgrade pip
+    python3 -m pip install --upgrade Pillow
+
+Optionally, install :pypi:`defusedxml` for Pillow to read XMP data,
+and :pypi:`olefile` for Pillow to read FPX and MIC images::
+
+    python3 -m pip install --upgrade defusedxml olefile
+
+
+.. tab:: Linux
+
+    We provide binaries for Linux for each of the supported Python
+    versions in the manylinux wheel format. These include support for all
+    optional libraries except libimagequant. Raqm support requires
+    FriBiDi to be installed separately::
+
+        python3 -m pip install --upgrade pip
+        python3 -m pip install --upgrade Pillow
+
+    Most major Linux distributions, including Fedora, Ubuntu and ArchLinux
+    also include Pillow in packages that previously contained PIL e.g.
+    ``python-imaging``. Debian splits it into two packages, ``python3-pil``
+    and ``python3-pil.imagetk``.
+
+.. tab:: macOS
+
+    We provide binaries for macOS for each of the supported Python
+    versions in the wheel format. These include support for all optional
+    libraries except libimagequant. Raqm support requires
+    FriBiDi to be installed separately::
+
+        python3 -m pip install --upgrade pip
+        python3 -m pip install --upgrade Pillow
+
+    While we provide binaries for both x86-64 and arm64, we do not provide universal2
+    binaries. However, it is simple to combine our current binaries to create one::
+
+        python3 -m pip download --only-binary=:all: --platform macosx_10_10_x86_64 Pillow
+        python3 -m pip download --only-binary=:all: --platform macosx_11_0_arm64 Pillow
+        python3 -m pip install delocate
+
+    Then, with the names of the downloaded wheels, use Python to combine them::
+
+        from delocate.fuse import fuse_wheels
+        fuse_wheels('Pillow-9.4.0-2-cp39-cp39-macosx_10_10_x86_64.whl', 'Pillow-9.4.0-cp39-cp39-macosx_11_0_arm64.whl', 'Pillow-9.4.0-cp39-cp39-macosx_11_0_universal2.whl')
+
+.. tab:: Windows
+
+    We provide Pillow binaries for Windows compiled for the matrix of supported
+    Pythons in the wheel format. These include x86, x86-64 and arm64 versions.
+    These binaries include support
+    for all optional libraries except libimagequant and libxcb. Raqm support
+    requires FriBiDi to be installed separately::
+
+        python3 -m pip install --upgrade pip
+        python3 -m pip install --upgrade Pillow
+
+    To install Pillow in MSYS2, see :ref:`building-from-source`.
+
+.. tab:: FreeBSD
+
+    Pillow can be installed on FreeBSD via the official Ports or Packages systems:
+
+    **Ports**::
+
+        cd /usr/ports/graphics/py-pillow && make install clean
+
+    **Packages**::
+
+        pkg install py38-pillow
+
+    .. note::
+
+        The `Pillow FreeBSD port
+        <https://www.freshports.org/graphics/py-pillow/>`_ and packages
+        are tested by the ports team with all supported FreeBSD versions.
diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst
new file mode 100644
index 00000000000..4b517582786
--- /dev/null
+++ b/docs/installation/building-from-source.rst
@@ -0,0 +1,313 @@
+.. raw:: html
+
+    <script>
+    document.addEventListener('DOMContentLoaded', function() {
+      activateTab(getOS());
+    });
+    </script>
+
+.. _building-from-source:
+
+Building From Source
+====================
+
+.. _external-libraries:
+
+External Libraries
+------------------
+
+.. note::
+
+    You **do not need to install all supported external libraries** to
+    use Pillow's basic features. **Zlib** and **libjpeg** are required
+    by default.
+
+.. note::
+
+   There are Dockerfiles in our `Docker images repo
+   <https://github.com/python-pillow/docker-images>`_ to install the
+   dependencies for some operating systems.
+
+Many of Pillow's features require external libraries:
+
+* **libjpeg** provides JPEG functionality.
+
+  * Pillow has been tested with libjpeg versions **6b**, **8**, **9-9d** and
+    libjpeg-turbo version **8**.
+  * Starting with Pillow 3.0.0, libjpeg is required by default. It can be
+    disabled with the ``-C jpeg=disable`` flag.
+
+* **zlib** provides access to compressed PNGs
+
+  * Starting with Pillow 3.0.0, zlib is required by default. It can be
+    disabled with the ``-C zlib=disable`` flag.
+
+* **libtiff** provides compressed TIFF functionality
+
+  * Pillow has been tested with libtiff versions **3.x** and **4.0-4.6.0**
+
+* **libfreetype** provides type related services
+
+* **littlecms** provides color management
+
+  * Pillow version 2.2.1 and below uses liblcms1, Pillow 2.3.0 and
+    above uses liblcms2. Tested with **1.19** and **2.7-2.16**.
+
+* **libwebp** provides the WebP format.
+
+* **openjpeg** provides JPEG 2000 functionality.
+
+  * Pillow has been tested with openjpeg **2.0.0**, **2.1.0**, **2.3.1**,
+    **2.4.0**, **2.5.0** and **2.5.2**.
+  * Pillow does **not** support the earlier **1.5** series which ships
+    with Debian Jessie.
+
+* **libimagequant** provides improved color quantization
+
+  * Pillow has been tested with libimagequant **2.6-4.3.3**
+  * Libimagequant is licensed GPLv3, which is more restrictive than
+    the Pillow license, therefore we will not be distributing binaries
+    with libimagequant support enabled.
+
+* **libraqm** provides complex text layout support.
+
+  * libraqm provides bidirectional text support (using FriBiDi),
+    shaping (using HarfBuzz), and proper script itemization. As a
+    result, Raqm can support most writing systems covered by Unicode.
+  * libraqm depends on the following libraries: FreeType, HarfBuzz,
+    FriBiDi, make sure that you install them before installing libraqm
+    if not available as package in your system.
+  * Setting text direction or font features is not supported without libraqm.
+  * Pillow wheels since version 8.2.0 include a modified version of libraqm that
+    loads libfribidi at runtime if it is installed.
+    On Windows this requires compiling FriBiDi and installing ``fribidi.dll``
+    into a directory listed in the `Dynamic-link library search order (Microsoft Learn)
+    <https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-search-order#search-order-for-unpackaged-apps>`_
+    (``fribidi-0.dll`` or ``libfribidi-0.dll`` are also detected).
+    See `Build Options`_ to see how to build this version.
+  * Previous versions of Pillow (5.0.0 to 8.1.2) linked libraqm dynamically at runtime.
+
+* **libxcb** provides X11 screengrab support.
+
+.. tab:: Linux
+
+    If you didn't build Python from source, make sure you have Python's
+    development libraries installed.
+
+    In Debian or Ubuntu::
+
+        sudo apt-get install python3-dev python3-setuptools
+
+    In Fedora, the command is::
+
+        sudo dnf install python3-devel redhat-rpm-config
+
+    In Alpine, the command is::
+
+        sudo apk add python3-dev py3-setuptools
+
+    .. Note:: ``redhat-rpm-config`` is required on Fedora 23, but not earlier versions.
+
+    Prerequisites for **Ubuntu 16.04 LTS - 22.04 LTS** are installed with::
+
+        sudo apt-get install libtiff5-dev libjpeg8-dev libopenjp2-7-dev zlib1g-dev \
+            libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
+            libharfbuzz-dev libfribidi-dev libxcb1-dev
+
+    To install libraqm, ``sudo apt-get install meson`` and then see
+    ``depends/install_raqm.sh``.
+
+    Prerequisites are installed on recent **Red Hat**, **CentOS** or **Fedora** with::
+
+        sudo dnf install libtiff-devel libjpeg-devel openjpeg2-devel zlib-devel \
+            freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel \
+            harfbuzz-devel fribidi-devel libraqm-devel libimagequant-devel libxcb-devel
+
+    Note that the package manager may be yum or DNF, depending on the
+    exact distribution.
+
+    Prerequisites are installed for **Alpine** with::
+
+        sudo apk add tiff-dev jpeg-dev openjpeg-dev zlib-dev freetype-dev lcms2-dev \
+            libwebp-dev tcl-dev tk-dev harfbuzz-dev fribidi-dev libimagequant-dev \
+            libxcb-dev libpng-dev
+
+    See also the ``Dockerfile``\s in the Test Infrastructure repo
+    (https://github.com/python-pillow/docker-images) for a known working
+    install process for other tested distros.
+
+.. tab:: macOS
+
+    The Xcode command line tools are required to compile portions of
+    Pillow. The tools are installed by running ``xcode-select --install``
+    from the command line. The command line tools are required even if you
+    have the full Xcode package installed.  It may be necessary to run
+    ``sudo xcodebuild -license`` to accept the license prior to using the
+    tools.
+
+    The easiest way to install external libraries is via `Homebrew
+    <https://brew.sh/>`_. After you install Homebrew, run::
+
+        brew install libjpeg libtiff little-cms2 openjpeg webp
+
+    To install libraqm on macOS use Homebrew to install its dependencies::
+
+        brew install freetype harfbuzz fribidi
+
+    Then see ``depends/install_raqm_cmake.sh`` to install libraqm.
+
+.. tab:: Windows
+
+    We recommend you use prebuilt wheels from PyPI.
+    If you wish to compile Pillow manually, you can use the build scripts
+    in the ``winbuild`` directory used for CI testing and development.
+    These scripts require Visual Studio 2017 or newer and NASM.
+
+    The scripts also install Pillow from the local copy of the source code, so the
+    `Installing`_ instructions will not be necessary afterwards.
+
+.. tab:: Windows using MSYS2/MinGW
+
+    To build Pillow using MSYS2, make sure you run the **MSYS2 MinGW 32-bit** or
+    **MSYS2 MinGW 64-bit** console, *not* **MSYS2** directly.
+
+    The following instructions target the 64-bit build, for 32-bit
+    replace all occurrences of ``mingw-w64-x86_64-`` with ``mingw-w64-i686-``.
+
+    Make sure you have Python and GCC installed::
+
+        pacman -S \
+            mingw-w64-x86_64-gcc \
+            mingw-w64-x86_64-python3 \
+            mingw-w64-x86_64-python3-pip \
+            mingw-w64-x86_64-python3-setuptools
+
+    Prerequisites are installed on **MSYS2 MinGW 64-bit** with::
+
+        pacman -S \
+            mingw-w64-x86_64-libjpeg-turbo \
+            mingw-w64-x86_64-zlib \
+            mingw-w64-x86_64-libtiff \
+            mingw-w64-x86_64-freetype \
+            mingw-w64-x86_64-lcms2 \
+            mingw-w64-x86_64-libwebp \
+            mingw-w64-x86_64-openjpeg2 \
+            mingw-w64-x86_64-libimagequant \
+            mingw-w64-x86_64-libraqm
+
+    https://www.msys2.org/docs/python/ states that setuptools >= 60 does not work with
+    MSYS2. To workaround this, before installing Pillow you must run::
+
+        export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+.. tab:: FreeBSD
+
+    .. Note:: Only FreeBSD 10 and 11 tested
+
+    Make sure you have Python's development libraries installed::
+
+        sudo pkg install python3
+
+    Prerequisites are installed on **FreeBSD 10 or 11** with::
+
+        sudo pkg install jpeg-turbo tiff webp lcms2 freetype2 openjpeg harfbuzz fribidi libxcb
+
+    Then see ``depends/install_raqm_cmake.sh`` to install libraqm.
+
+.. tab:: Android
+
+    Basic Android support has been added for compilation within the Termux
+    environment. The dependencies can be installed by::
+
+        pkg install -y python ndk-sysroot clang make \
+            libjpeg-turbo
+
+    This has been tested within the Termux app on ChromeOS, on x86.
+
+Installing
+----------
+
+Once you have installed the prerequisites, to install Pillow from the source
+code on PyPI, run::
+
+    python3 -m pip install --upgrade pip
+    python3 -m pip install --upgrade Pillow --no-binary :all:
+
+If the prerequisites are installed in the standard library locations
+for your machine (e.g. :file:`/usr` or :file:`/usr/local`), no
+additional configuration should be required. If they are installed in
+a non-standard location, you may need to configure setuptools to use
+those locations by editing :file:`setup.py` or
+:file:`pyproject.toml`, or by adding environment variables on the command
+line::
+
+    CFLAGS="-I/usr/pkg/include" python3 -m pip install --upgrade Pillow --no-binary :all:
+
+If Pillow has been previously built without the required
+prerequisites, it may be necessary to manually clear the pip cache or
+build without cache using the ``--no-cache-dir`` option to force a
+build with newly installed external libraries.
+
+If you would like to install from a local copy of the source code instead, you
+can clone from GitHub with ``git clone https://github.com/python-pillow/Pillow``
+or download and extract the `compressed archive from PyPI`_.
+
+After navigating to the Pillow directory, run::
+
+    python3 -m pip install --upgrade pip
+    python3 -m pip install .
+
+.. _compressed archive from PyPI: https://pypi.org/project/pillow/#files
+
+Build Options
+^^^^^^^^^^^^^
+
+* Config setting: ``-C parallel=n``. Can also be given
+  with environment variable: ``MAX_CONCURRENCY=n``. Pillow can use
+  multiprocessing to build the extension. Setting ``-C parallel=n``
+  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
+  available, as many as are present.
+
+* Config settings: ``-C zlib=disable``, ``-C jpeg=disable``,
+  ``-C tiff=disable``, ``-C freetype=disable``, ``-C raqm=disable``,
+  ``-C lcms=disable``, ``-C webp=disable``,
+  ``-C jpeg2000=disable``, ``-C imagequant=disable``, ``-C xcb=disable``.
+  Disable building the corresponding feature even if the development
+  libraries are present on the building machine.
+
+* Config settings: ``-C zlib=enable``, ``-C jpeg=enable``,
+  ``-C tiff=enable``, ``-C freetype=enable``, ``-C raqm=enable``,
+  ``-C lcms=enable``, ``-C webp=enable``,
+  ``-C jpeg2000=enable``, ``-C imagequant=enable``, ``-C xcb=enable``.
+  Require that the corresponding feature is built. The build will raise
+  an exception if the libraries are not found. Tcl and Tk must be used
+  together.
+
+* Config settings: ``-C raqm=vendor``, ``-C fribidi=vendor``.
+  These flags are used to compile a modified version of libraqm and
+  a shim that dynamically loads libfribidi at runtime. These are
+  used to compile the standard Pillow wheels. Compiling libraqm requires
+  a C99-compliant compiler.
+
+* Config setting: ``-C platform-guessing=disable``. Skips all of the
+  platform dependent guessing of include and library directories for
+  automated build systems that configure the proper paths in the
+  environment variables (e.g. Buildroot).
+
+* Config setting: ``-C debug=true``. Adds a debugging flag to the include and
+  library search process to dump all paths searched for and found to stdout.
+
+
+Sample usage::
+
+    python3 -m pip install --upgrade Pillow -C [feature]=enable
+
+.. _old-versions:
+
+Old Versions
+============
+
+You can download old distributions from the `release history at PyPI
+<https://pypi.org/project/pillow/#history>`_ and by direct URL access
+eg. https://pypi.org/project/pillow/1.0/.
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
new file mode 100644
index 00000000000..a94204b6bbe
--- /dev/null
+++ b/docs/installation/index.rst
@@ -0,0 +1,10 @@
+Installation
+============
+
+.. toctree::
+  :maxdepth: 2
+
+  basic-installation
+  python-support
+  platform-support
+  building-from-source
diff --git a/docs/installation/newer-versions.csv b/docs/installation/newer-versions.csv
new file mode 100644
index 00000000000..19816af58da
--- /dev/null
+++ b/docs/installation/newer-versions.csv
@@ -0,0 +1,9 @@
+Python,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 10.1 - 10.4,,Yes,Yes,Yes,Yes,Yes,,,
+Pillow 10.0,,,Yes,Yes,Yes,Yes,,,
+Pillow 9.3 - 9.5,,,Yes,Yes,Yes,Yes,Yes,,
+Pillow 9.0 - 9.2,,,,Yes,Yes,Yes,Yes,,
+Pillow 8.3.2 - 8.4,,,,Yes,Yes,Yes,Yes,Yes,
+Pillow 8.0 - 8.3.1,,,,,Yes,Yes,Yes,Yes,
+Pillow 7.0 - 7.2,,,,,,Yes,Yes,Yes,Yes
diff --git a/docs/older-versions.csv b/docs/installation/older-versions.csv
similarity index 100%
rename from docs/older-versions.csv
rename to docs/installation/older-versions.csv
diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
new file mode 100644
index 00000000000..00dec41d165
--- /dev/null
+++ b/docs/installation/platform-support.rst
@@ -0,0 +1,166 @@
+.. _platform-support:
+
+Platform Support
+================
+
+Current platform support for Pillow. Binary distributions are
+contributed for each release on a volunteer basis, but the source
+should compile and run everywhere platform support is listed. In
+general, we aim to support all current versions of Linux, macOS, and
+Windows.
+
+Continuous Integration Targets
+------------------------------
+
+These platforms are built and tested for every change.
+
++----------------------------------+----------------------------+---------------------+
+| Operating system                 | Tested Python versions     | Tested architecture |
++==================================+============================+=====================+
+| Alpine                           | 3.12                       | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| Amazon Linux 2                   | 3.9                        | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| Amazon Linux 2023                | 3.9                        | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| Arch                             | 3.12                       | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| CentOS Stream 9                  | 3.9                        | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| Debian 12 Bookworm               | 3.11                       | x86, x86-64         |
++----------------------------------+----------------------------+---------------------+
+| Fedora 39                        | 3.12                       | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| Fedora 40                        | 3.12                       | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| Gentoo                           | 3.12                       | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| macOS 13 Ventura                 | 3.9                        | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| macOS 14 Sonoma                  | 3.10, 3.11, 3.12, 3.13,    | arm64               |
+|                                  | PyPy3                      |                     |
++----------------------------------+----------------------------+---------------------+
+| Ubuntu Linux 22.04 LTS (Jammy)   | 3.9, 3.10, 3.11,           | x86-64              |
+|                                  | 3.12, 3.13, PyPy3          |                     |
+|                                  +----------------------------+---------------------+
+|                                  | 3.10                       | arm64v8             |
++----------------------------------+----------------------------+---------------------+
+| Ubuntu Linux 24.04 LTS (Noble)   | 3.12                       | x86-64, ppc64le,    |
+|                                  |                            | s390x               |
++----------------------------------+----------------------------+---------------------+
+| Windows Server 2019              | 3.9                        | x86-64              |
++----------------------------------+----------------------------+---------------------+
+| Windows Server 2022              | 3.9, 3.10, 3.11,           | x86-64              |
+|                                  | 3.12, 3.13, PyPy3          |                     |
+|                                  +----------------------------+---------------------+
+|                                  | 3.13                       | x86                 |
+|                                  +----------------------------+---------------------+
+|                                  | 3.9 (MinGW)                | x86-64              |
+|                                  +----------------------------+---------------------+
+|                                  | 3.9 (Cygwin)               | x86-64              |
++----------------------------------+----------------------------+---------------------+
+
+
+Other Platforms
+---------------
+
+These platforms have been reported to work at the versions mentioned.
+
+.. note::
+
+    Contributors please test Pillow on your platform then update this
+    document and send a pull request.
+
++----------------------------------+----------------------------+------------------+--------------+
+| Operating system                 | | Tested Python            | | Latest tested  | | Tested     |
+|                                  | | versions                 | | Pillow version | | processors |
++==================================+============================+==================+==============+
+| macOS 15 Sequoia                 | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.4.0           |arm           |
++----------------------------------+----------------------------+------------------+--------------+
+| macOS 14 Sonoma                  | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.4.0           |arm           |
++----------------------------------+----------------------------+------------------+--------------+
+| macOS 13 Ventura                 | 3.8, 3.9, 3.10, 3.11       | 10.0.1           |arm           |
+|                                  +----------------------------+------------------+              |
+|                                  | 3.7                        | 9.5.0            |              |
++----------------------------------+----------------------------+------------------+--------------+
+| macOS 12 Monterey                | 3.7, 3.8, 3.9, 3.10, 3.11  | 9.3.0            |arm           |
++----------------------------------+----------------------------+------------------+--------------+
+| macOS 11 Big Sur                 | 3.7, 3.8, 3.9, 3.10        | 8.4.0            |arm           |
+|                                  +----------------------------+------------------+--------------+
+|                                  | 3.7, 3.8, 3.9, 3.10, 3.11  | 9.4.0            |x86-64        |
+|                                  +----------------------------+------------------+              |
+|                                  | 3.6                        | 8.4.0            |              |
++----------------------------------+----------------------------+------------------+--------------+
+| macOS 10.15 Catalina             | 3.6, 3.7, 3.8, 3.9         | 8.3.2            |x86-64        |
+|                                  +----------------------------+------------------+              |
+|                                  | 3.5                        | 7.2.0            |              |
++----------------------------------+----------------------------+------------------+--------------+
+| macOS 10.14 Mojave               | 3.5, 3.6, 3.7, 3.8         | 7.2.0            |x86-64        |
+|                                  +----------------------------+------------------+              |
+|                                  | 2.7                        | 6.0.0            |              |
+|                                  +----------------------------+------------------+              |
+|                                  | 3.4                        | 5.4.1            |              |
++----------------------------------+----------------------------+------------------+--------------+
+| macOS 10.13 High Sierra          | 2.7, 3.4, 3.5, 3.6         | 4.2.1            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| macOS 10.12 Sierra               | 2.7, 3.4, 3.5, 3.6         | 4.1.1            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Mac OS X 10.11 El Capitan        | 2.7, 3.4, 3.5, 3.6, 3.7    | 5.4.1            |x86-64        |
+|                                  +----------------------------+------------------+              |
+|                                  | 3.3                        | 4.1.0            |              |
++----------------------------------+----------------------------+------------------+--------------+
+| Mac OS X 10.9 Mavericks          | 2.7, 3.2, 3.3, 3.4         | 3.0.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Mac OS X 10.8 Mountain Lion      | 2.6, 2.7, 3.2, 3.3         |                  |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Redhat Linux 6                   | 2.6                        |                  |x86           |
++----------------------------------+----------------------------+------------------+--------------+
+| CentOS 6.3                       | 2.7, 3.3                   |                  |x86           |
++----------------------------------+----------------------------+------------------+--------------+
+| CentOS 8                         | 3.9                        | 9.0.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Fedora 23                        | 2.7, 3.4                   | 3.1.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Ubuntu Linux 12.04 LTS (Precise) | | 2.6, 3.2, 3.3, 3.4, 3.5  | 3.4.1            |x86,x86-64    |
+|                                  | | PyPy5.3.1, PyPy3 v2.4.0  |                  |              |
+|                                  +----------------------------+------------------+--------------+
+|                                  | 2.7                        | 4.3.0            |x86-64        |
+|                                  +----------------------------+------------------+--------------+
+|                                  | 2.7, 3.2                   | 3.4.1            |ppc           |
++----------------------------------+----------------------------+------------------+--------------+
+| Ubuntu Linux 10.04 LTS (Lucid)   | 2.6                        | 2.3.0            |x86,x86-64    |
++----------------------------------+----------------------------+------------------+--------------+
+| Debian 8.2 Jessie                | 2.7, 3.4                   | 3.1.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Raspbian Jessie                  | 2.7, 3.4                   | 3.1.0            |arm           |
++----------------------------------+----------------------------+------------------+--------------+
+| Raspbian Stretch                 | 2.7, 3.5                   | 4.0.0            |arm           |
++----------------------------------+----------------------------+------------------+--------------+
+| Raspberry Pi OS                  | 3.6, 3.7, 3.8, 3.9         | 8.2.0            |arm           |
+|                                  +----------------------------+------------------+              |
+|                                  | 2.7                        | 6.2.2            |              |
++----------------------------------+----------------------------+------------------+--------------+
+| Gentoo Linux                     | 2.7, 3.2                   | 2.1.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| FreeBSD 11.1                     | 2.7, 3.4, 3.5, 3.6         | 4.3.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| FreeBSD 10.3                     | 2.7, 3.4, 3.5              | 4.2.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| FreeBSD 10.2                     | 2.7, 3.4                   | 3.1.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Windows 11                       | 3.9, 3.10, 3.11, 3.12      | 10.2.0           |arm64         |
++----------------------------------+----------------------------+------------------+--------------+
+| Windows 11 Pro                   | 3.11, 3.12                 | 10.2.0           |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Windows 10                       | 3.7                        | 7.1.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Windows 10/Cygwin 3.3            | 3.6, 3.7, 3.8, 3.9         | 8.4.0            |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
+| Windows 8.1 Pro                  | 2.6, 2.7, 3.2, 3.3, 3.4    | 2.4.0            |x86,x86-64    |
++----------------------------------+----------------------------+------------------+--------------+
+| Windows 8 Pro                    | 2.6, 2.7, 3.2, 3.3, 3.4a3  | 2.2.0            |x86,x86-64    |
++----------------------------------+----------------------------+------------------+--------------+
+| Windows 7 Professional           | 3.7                        | 7.0.0            |x86,x86-64    |
++----------------------------------+----------------------------+------------------+--------------+
+| Windows Server 2008 R2 Enterprise| 3.3                        |                  |x86-64        |
++----------------------------------+----------------------------+------------------+--------------+
diff --git a/docs/installation/python-support.rst b/docs/installation/python-support.rst
new file mode 100644
index 00000000000..dd5765b6b70
--- /dev/null
+++ b/docs/installation/python-support.rst
@@ -0,0 +1,14 @@
+.. _python-support:
+
+Python Support
+==============
+
+Pillow supports these Python versions.
+
+.. csv-table:: Newer versions
+   :file: newer-versions.csv
+   :header-rows: 1
+
+.. csv-table:: Older versions
+   :file: older-versions.csv
+   :header-rows: 1
diff --git a/docs/newer-versions.csv b/docs/newer-versions.csv
deleted file mode 100644
index e21caf52071..00000000000
--- a/docs/newer-versions.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-Python,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5
-Pillow >= 10.1,Yes,Yes,Yes,Yes,Yes,,,
-Pillow 10.0,,Yes,Yes,Yes,Yes,,,
-Pillow 9.3 - 9.5,,Yes,Yes,Yes,Yes,Yes,,
-Pillow 9.0 - 9.2,,,Yes,Yes,Yes,Yes,,
-Pillow 8.3.2 - 8.4,,,Yes,Yes,Yes,Yes,Yes,
-Pillow 8.0 - 8.3.1,,,,Yes,Yes,Yes,Yes,
-Pillow 7.0 - 7.2,,,,,Yes,Yes,Yes,Yes
diff --git a/docs/reference/ExifTags.rst b/docs/reference/ExifTags.rst
index 464ab77ea35..06965ead3f0 100644
--- a/docs/reference/ExifTags.rst
+++ b/docs/reference/ExifTags.rst
@@ -4,8 +4,9 @@
 :py:mod:`~PIL.ExifTags` Module
 ==============================
 
-The :py:mod:`~PIL.ExifTags` module exposes several ``enum.IntEnum`` classes
-which provide constants and clear-text names for various well-known EXIF tags.
+The :py:mod:`~PIL.ExifTags` module exposes several :py:class:`enum.IntEnum`
+classes which provide constants and clear-text names for various well-known
+EXIF tags.
 
 .. py:data:: Base
 
diff --git a/docs/reference/Image.rst b/docs/reference/Image.rst
index 4281b182ce7..bc3758218db 100644
--- a/docs/reference/Image.rst
+++ b/docs/reference/Image.rst
@@ -195,6 +195,7 @@ This helps to get the bounding box coordinates of the input image::
 .. automethod:: PIL.Image.Image.getpalette
 .. automethod:: PIL.Image.Image.getpixel
 .. automethod:: PIL.Image.Image.getprojection
+.. automethod:: PIL.Image.Image.getxmp
 .. automethod:: PIL.Image.Image.histogram
 .. automethod:: PIL.Image.Image.paste
 .. automethod:: PIL.Image.Image.point
@@ -361,8 +362,17 @@ Classes
     :undoc-members:
     :show-inheritance:
 .. autoclass:: PIL.Image.ImagePointHandler
+.. autoclass:: PIL.Image.ImagePointTransform
 .. autoclass:: PIL.Image.ImageTransformHandler
 
+Protocols
+---------
+
+.. autoclass:: SupportsArrayInterface
+    :show-inheritance:
+.. autoclass:: SupportsGetData
+    :show-inheritance:
+
 Constants
 ---------
 
@@ -372,6 +382,11 @@ Constants
     Set to 89,478,485, approximately 0.25GB for a 24-bit (3 bpp) image.
     See :py:meth:`~PIL.Image.open` for more information about how this is used.
 
+.. data:: WARN_POSSIBLE_FORMATS
+
+    Set to false. If true, when an image cannot be identified, warnings will be raised
+    from formats that attempted to read the data.
+
 Transpose methods
 ^^^^^^^^^^^^^^^^^
 
@@ -416,7 +431,6 @@ See :ref:`concept-filters` for details.
 .. autoclass:: Resampling
     :members:
     :undoc-members:
-    :noindex:
 
 Dither modes
 ^^^^^^^^^^^^
diff --git a/docs/reference/ImageCms.rst b/docs/reference/ImageCms.rst
index 9b9b5e7b29e..96bd14dd32c 100644
--- a/docs/reference/ImageCms.rst
+++ b/docs/reference/ImageCms.rst
@@ -8,9 +8,34 @@ The :py:mod:`~PIL.ImageCms` module provides color profile management
 support using the LittleCMS2 color management engine, based on Kevin
 Cazabon's PyCMS library.
 
+.. autoclass:: ImageCmsProfile
+    :members:
+    :special-members: __init__
 .. autoclass:: ImageCmsTransform
+    :members:
+    :undoc-members:
+    :show-inheritance:
 .. autoexception:: PyCMSError
 
+Constants
+---------
+
+.. autoclass:: Intent
+    :members:
+    :member-order: bysource
+    :undoc-members:
+    :show-inheritance:
+.. autoclass:: Direction
+    :members:
+    :member-order: bysource
+    :undoc-members:
+    :show-inheritance:
+.. autoclass:: Flags
+    :members:
+    :member-order: bysource
+    :undoc-members:
+    :show-inheritance:
+
 Functions
 ---------
 
@@ -37,16 +62,18 @@ CmsProfile
 ----------
 
 The ICC color profiles are wrapped in an instance of the class
-:py:class:`CmsProfile`.  The specification ICC.1:2010 contains more
+:py:class:`~core.CmsProfile`.  The specification ICC.1:2010 contains more
 information about the meaning of the values in ICC profiles.
 
 For convenience, all XYZ-values are also given as xyY-values (so they
 can be easily displayed in a chromaticity diagram, for example).
 
+.. py:currentmodule:: PIL.ImageCms.core
 .. py:class:: CmsProfile
+    :canonical: PIL._imagingcms.CmsProfile
 
     .. py:attribute:: creation_date
-        :type: Optional[datetime.datetime]
+        :type: datetime.datetime | None
 
         Date and time this profile was first created (see 7.2.1 of ICC.1:2010).
 
@@ -129,58 +156,58 @@ can be easily displayed in a chromaticity diagram, for example).
         not been calculated (see 7.2.18 of ICC.1:2010).
 
     .. py:attribute:: copyright
-        :type: Optional[str]
+        :type: str | None
 
         The text copyright information for the profile (see 9.2.21 of ICC.1:2010).
 
     .. py:attribute:: manufacturer
-        :type: Optional[str]
+        :type: str | None
 
         The (English) display string for the device manufacturer (see
         9.2.22 of ICC.1:2010).
 
     .. py:attribute:: model
-        :type: Optional[str]
+        :type: str | None
 
         The (English) display string for the device model of the device
         for which this profile is created (see 9.2.23 of ICC.1:2010).
 
     .. py:attribute:: profile_description
-        :type: Optional[str]
+        :type: str | None
 
         The (English) display string for the profile description (see
         9.2.41 of ICC.1:2010).
 
     .. py:attribute:: target
-        :type: Optional[str]
+        :type: str | None
 
         The name of the registered characterization data set, or the
         measurement data for a characterization target (see 9.2.14 of
         ICC.1:2010).
 
     .. py:attribute:: red_colorant
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float]] | None
 
         The first column in the matrix used in matrix/TRC transforms (see 9.2.44 of ICC.1:2010).
 
         The value is in the format ``((X, Y, Z), (x, y, Y))``, if available.
 
     .. py:attribute:: green_colorant
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float]] | None
 
         The second column in the matrix used in matrix/TRC transforms (see 9.2.30 of ICC.1:2010).
 
         The value is in the format ``((X, Y, Z), (x, y, Y))``, if available.
 
     .. py:attribute:: blue_colorant
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float]] | None
 
         The third column in the matrix used in matrix/TRC transforms (see 9.2.4 of ICC.1:2010).
 
         The value is in the format ``((X, Y, Z), (x, y, Y))``, if available.
 
     .. py:attribute:: luminance
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float]] | None
 
         The absolute luminance of emissive devices in candelas per square
         metre as described by the Y channel (see 9.2.32 of ICC.1:2010).
@@ -188,7 +215,7 @@ can be easily displayed in a chromaticity diagram, for example).
         The value is in the format ``((X, Y, Z), (x, y, Y))``, if available.
 
     .. py:attribute:: chromaticity
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float], tuple[float, float, float]] | None
 
         The data of the phosphor/colorant chromaticity set used (red,
         green and blue channels, see 9.2.16 of ICC.1:2010).
@@ -196,7 +223,7 @@ can be easily displayed in a chromaticity diagram, for example).
         The value is in the format ``((x, y, Y), (x, y, Y), (x, y, Y))``, if available.
 
     .. py:attribute:: chromatic_adaption
-        :type: tuple[tuple[float]]
+        :type: tuple[tuple[tuple[float, float, float], tuple[float, float, float], tuple[float, float, float]], tuple[tuple[float, float, float], tuple[float, float, float], tuple[float, float, float]]] | None
 
         The chromatic adaption matrix converts a color measured using the
         actual illumination conditions and relative to the actual adopted
@@ -222,34 +249,34 @@ can be easily displayed in a chromaticity diagram, for example).
         9.2.19 of ICC.1:2010).
 
     .. py:attribute:: colorimetric_intent
-        :type: Optional[str]
+        :type: str | None
 
         4-character string (padded with whitespace) identifying the image
         state of PCS colorimetry produced using the colorimetric intent
         transforms (see 9.2.20 of ICC.1:2010 for details).
 
     .. py:attribute:: perceptual_rendering_intent_gamut
-        :type: Optional[str]
+        :type: str | None
 
         4-character string (padded with whitespace) identifying the (one)
         standard reference medium gamut (see 9.2.37 of ICC.1:2010 for
         details).
 
     .. py:attribute:: saturation_rendering_intent_gamut
-        :type: Optional[str]
+        :type: str | None
 
         4-character string (padded with whitespace) identifying the (one)
         standard reference medium gamut (see 9.2.37 of ICC.1:2010 for
         details).
 
     .. py:attribute:: technology
-        :type: Optional[str]
+        :type: str | None
 
         4-character string (padded with whitespace) identifying the device
         technology (see 9.2.47 of ICC.1:2010 for details).
 
     .. py:attribute:: media_black_point
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float]] | None
 
         This tag specifies the media black point and is used for
         generating absolute colorimetry.
@@ -260,19 +287,19 @@ can be easily displayed in a chromaticity diagram, for example).
         The value is in the format ``((X, Y, Z), (x, y, Y))``, if available.
 
     .. py:attribute:: media_white_point_temperature
-        :type: Optional[float]
+        :type: float | None
 
         Calculates the white point temperature (see the LCMS documentation
         for more information).
 
     .. py:attribute:: viewing_condition
-        :type: Optional[str]
+        :type: str | None
 
         The (English) display string for the viewing conditions (see
         9.2.48 of ICC.1:2010).
 
     .. py:attribute:: screening_description
-        :type: Optional[str]
+        :type: str | None
 
         The (English) display string for the screening conditions.
 
@@ -280,21 +307,21 @@ can be easily displayed in a chromaticity diagram, for example).
         version 4.
 
     .. py:attribute:: red_primary
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float]] | None
 
         The XYZ-transformed of the RGB primary color red (1, 0, 0).
 
         The value is in the format ``((X, Y, Z), (x, y, Y))``, if available.
 
     .. py:attribute:: green_primary
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float]] | None
 
         The XYZ-transformed of the RGB primary color green (0, 1, 0).
 
         The value is in the format ``((X, Y, Z), (x, y, Y))``, if available.
 
     .. py:attribute:: blue_primary
-        :type: Optional[tuple[tuple[float]]]
+        :type: tuple[tuple[float, float, float], tuple[float, float, float]] | None
 
         The XYZ-transformed of the RGB primary color blue (0, 0, 1).
 
@@ -307,7 +334,7 @@ can be easily displayed in a chromaticity diagram, for example).
         documentation on LCMS).
 
     .. py:attribute:: clut
-        :type: dict[tuple[bool]]
+        :type: dict[int, tuple[bool, bool, bool]] | None
 
         Returns a dictionary of all supported intents and directions for
         the CLUT model.
@@ -326,7 +353,7 @@ can be easily displayed in a chromaticity diagram, for example).
         that intent is supported for that direction.
 
     .. py:attribute:: intent_supported
-        :type: dict[tuple[bool]]
+        :type: dict[int, tuple[bool, bool, bool]] | None
 
         Returns a dictionary of all supported intents and directions.
 
@@ -345,7 +372,7 @@ can be easily displayed in a chromaticity diagram, for example).
 
     There is one function defined on the class:
 
-    .. py:method:: is_intent_supported(intent, direction)
+    .. py:method:: is_intent_supported(intent: int, direction: int, /)
 
         Returns if the intent is supported for the given direction.
 
diff --git a/docs/reference/ImageDraw.rst b/docs/reference/ImageDraw.rst
index 4ccfacae75e..3e9aa73f8c3 100644
--- a/docs/reference/ImageDraw.rst
+++ b/docs/reference/ImageDraw.rst
@@ -227,6 +227,18 @@ Methods
 
         .. versionadded:: 5.3.0
 
+.. py:method:: ImageDraw.circle(xy, radius, fill=None, outline=None, width=1)
+
+    Draws a circle with a given radius centering on a point.
+
+    .. versionadded:: 10.4.0
+
+    :param xy: The point for the center of the circle, e.g. ``(x, y)``.
+    :param radius: Radius of the circle.
+    :param outline: Color to use for the outline.
+    :param fill: Color to use for the fill.
+    :param width: The line width, in pixels.
+
 .. py:method:: ImageDraw.ellipse(xy, fill=None, outline=None, width=1)
 
     Draws an ellipse inside the given bounding box.
@@ -679,23 +691,7 @@ Methods
     :param hints: An optional list of hints.
     :returns: A (drawing context, drawing resource factory) tuple.
 
-.. py:method:: floodfill(image, xy, value, border=None, thresh=0)
-
-    .. warning:: This method is experimental.
-
-    Fills a bounded region with a given color.
-
-    :param image: Target image.
-    :param xy: Seed position (a 2-item coordinate tuple).
-    :param value: Fill color.
-    :param border: Optional border value.  If given, the region consists of
-        pixels with a color different from the border color.  If not given,
-        the region consists of pixels having the same color as the seed
-        pixel.
-    :param thresh: Optional threshold value which specifies a maximum
-        tolerable difference of a pixel value from the 'background' in
-        order for it to be replaced. Useful for filling regions of non-
-        homogeneous, but similar, colors.
+.. autofunction:: PIL.ImageDraw.floodfill
 
 .. _BCP 47 language code: https://www.w3.org/International/articles/language-tags/
 .. _OpenType docs: https://learn.microsoft.com/en-us/typography/opentype/spec/featurelist
diff --git a/docs/reference/ImageFile.rst b/docs/reference/ImageFile.rst
index 047990f1c2a..fdfeb60f99f 100644
--- a/docs/reference/ImageFile.rst
+++ b/docs/reference/ImageFile.rst
@@ -37,6 +37,11 @@ Example: Parse an image
 Classes
 -------
 
+.. autoclass:: PIL.ImageFile._Tile()
+    :member-order: bysource
+    :members:
+    :show-inheritance:
+
 .. autoclass:: PIL.ImageFile.Parser()
     :members:
 
@@ -57,6 +62,10 @@ Classes
     :undoc-members:
     :show-inheritance:
 
+.. autoclass:: PIL.ImageFile.StubHandler()
+    :members:
+    :show-inheritance:
+
 .. autoclass:: PIL.ImageFile.StubImageFile()
     :members:
     :show-inheritance:
diff --git a/docs/reference/ImageFilter.rst b/docs/reference/ImageFilter.rst
index 044aede6264..5f2b6af7c10 100644
--- a/docs/reference/ImageFilter.rst
+++ b/docs/reference/ImageFilter.rst
@@ -23,8 +23,7 @@ Example: Filter an image
 Filters
 -------
 
-The current version of the library provides the following set of predefined
-image enhancement filters:
+Pillow provides the following set of predefined image enhancement filters:
 
 * **BLUR**
 * **CONTOUR**
diff --git a/docs/reference/ImageFont.rst b/docs/reference/ImageFont.rst
index 6edf4b05c55..d9d9cac6e13 100644
--- a/docs/reference/ImageFont.rst
+++ b/docs/reference/ImageFont.rst
@@ -53,6 +53,7 @@ Functions
 .. autofunction:: PIL.ImageFont.load_path
 .. autofunction:: PIL.ImageFont.truetype
 .. autofunction:: PIL.ImageFont.load_default
+.. autofunction:: PIL.ImageFont.load_default_imagefont
 
 Methods
 -------
@@ -90,3 +91,11 @@ Constants
     Set to 1,000,000, to protect against potential DOS attacks. Pillow will
     raise a :py:exc:`ValueError` if the number of characters is over this limit. The
     check can be disabled by setting ``ImageFont.MAX_STRING_LENGTH = None``.
+
+Dictionaries
+------------
+
+.. autoclass:: Axis
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/reference/ImageGrab.rst b/docs/reference/ImageGrab.rst
index 0b94032d5f8..db2987eb081 100644
--- a/docs/reference/ImageGrab.rst
+++ b/docs/reference/ImageGrab.rst
@@ -11,9 +11,9 @@ or the clipboard to a PIL image memory.
 
 .. py:function:: grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=None)
 
-    Take a snapshot of the screen. The pixels inside the bounding box are
-    returned as an "RGBA" on macOS, or an "RGB" image otherwise.
-    If the bounding box is omitted, the entire screen is copied.
+    Take a snapshot of the screen. The pixels inside the bounding box are returned as
+    an "RGBA" on macOS, or an "RGB" image otherwise. If the bounding box is omitted,
+    the entire screen is copied, and on macOS, it will be at 2x if on a Retina screen.
 
     On Linux, if ``xdisplay`` is ``None`` and the default X11 display does not return
     a snapshot of the screen, ``gnome-screenshot`` will be used as fallback if it is
@@ -22,7 +22,10 @@ or the clipboard to a PIL image memory.
     .. versionadded:: 1.1.3 (Windows), 3.0.0 (macOS), 7.1.0 (Linux)
 
     :param bbox: What region to copy. Default is the entire screen.
-                 Note that on Windows OS, the top-left point may be negative if ``all_screens=True`` is used.
+                 On macOS, this is not increased to 2x for Retina screens, so the full
+                 width of a Retina screen would be 1440, not 2880.
+                 On Windows, the top-left point may be negative if ``all_screens=True``
+                 is used.
     :param include_layered_windows: Includes layered windows. Windows OS only.
 
         .. versionadded:: 6.1.0
diff --git a/docs/reference/ImageMath.rst b/docs/reference/ImageMath.rst
index ee07efa0132..f4e1081e6b7 100644
--- a/docs/reference/ImageMath.rst
+++ b/docs/reference/ImageMath.rst
@@ -4,9 +4,12 @@
 :py:mod:`~PIL.ImageMath` Module
 ===============================
 
-The :py:mod:`~PIL.ImageMath` module can be used to evaluate “image expressions”. The
-module provides a single :py:meth:`~PIL.ImageMath.eval` function, which takes
-an expression string and one or more images.
+The :py:mod:`~PIL.ImageMath` module can be used to evaluate “image expressions”, that
+can take a number of images and generate a result.
+
+:py:mod:`~PIL.ImageMath` only supports single-layer images. To process multi-band
+images, use the :py:meth:`~PIL.Image.Image.split` method or :py:func:`~PIL.Image.merge`
+function.
 
 Example: Using the :py:mod:`~PIL.ImageMath` module
 --------------------------------------------------
@@ -17,35 +20,71 @@ Example: Using the :py:mod:`~PIL.ImageMath` module
 
     with Image.open("image1.jpg") as im1:
         with Image.open("image2.jpg") as im2:
+            out = ImageMath.lambda_eval(
+              lambda args: args["convert"](args["min"](args["a"], args["b"]), 'L'),
+              a=im1,
+              b=im2
+            )
+            out = ImageMath.unsafe_eval(
+              "convert(min(a, b), 'L')",
+              a=im1,
+              b=im2
+            )
+
+.. py:function:: lambda_eval(expression, options, **kw)
+
+    Returns the result of an image function.
+
+    :param expression: A function that receives a dictionary.
+    :param options: Values to add to the function's dictionary. Note that the names
+                    must be valid Python identifiers. Deprecated.
+                    You can instead use one or more keyword arguments, as
+                    shown in the above example.
+    :param \**kw: Values to add to the function's dictionary, mapping image names to
+                 Image instances.
+    :return: An image, an integer value, a floating point value,
+             or a pixel tuple, depending on the expression.
 
-            out = ImageMath.eval("convert(min(a, b), 'L')", a=im1, b=im2)
-            out.save("result.png")
+.. py:function:: unsafe_eval(expression, options, **kw)
 
-.. py:function:: eval(expression, environment)
+    Evaluates an image expression.
 
-    Evaluate expression in the given environment.
+    .. danger::
+        This uses Python's ``eval()`` function to process the expression string,
+        and carries the security risks of doing so. It is not
+        recommended to process expressions without considering this.
+        :py:meth:`lambda_eval` is a more secure alternative.
 
-    In the current version, :py:mod:`~PIL.ImageMath` only supports
-    single-layer images. To process multi-band images, use the
-    :py:meth:`~PIL.Image.Image.split` method or :py:func:`~PIL.Image.merge`
-    function.
+    :py:mod:`~PIL.ImageMath` only supports single-layer images. To process multi-band
+    images, use the :py:meth:`~PIL.Image.Image.split` method or
+    :py:func:`~PIL.Image.merge` function.
 
     :param expression: A string which uses the standard Python expression
                        syntax. In addition to the standard operators, you can
                        also use the functions described below.
-    :param environment: A dictionary that maps image names to Image instances.
-                        You can use one or more keyword arguments instead of a
-                        dictionary, as shown in the above example. Note that
-                        the names must be valid Python identifiers.
+    :param options: Values to add to the evaluation context. Note that the names must
+                    be valid Python identifiers. Deprecated.
+                    You can instead use one or more keyword arguments, as
+                    shown in the above example.
+    :param \**kw: Values to add to the evaluation context, mapping image names to Image
+                 instances.
     :return: An image, an integer value, a floating point value,
              or a pixel tuple, depending on the expression.
 
 Expression syntax
 -----------------
 
-Expressions are standard Python expressions, but they’re evaluated in a
-non-standard environment. You can use PIL methods as usual, plus the following
-set of operators and functions:
+* :py:meth:`lambda_eval` expressions are functions that receive a dictionary
+  containing images and operators.
+
+* :py:meth:`unsafe_eval` expressions are standard Python expressions,
+  but they’re evaluated in a non-standard environment.
+
+.. danger::
+  :py:meth:`unsafe_eval` uses Python's ``eval()`` function to process the
+  expression string, and carries the security risks of doing so.
+  It is not recommended to process expressions without considering this.
+  :py:meth:`lambda_eval` is a more secure alternative.
 
 Standard Operators
 ^^^^^^^^^^^^^^^^^^
diff --git a/docs/reference/ImageOps.rst b/docs/reference/ImageOps.rst
index 47525307873..fcaa3c8f675 100644
--- a/docs/reference/ImageOps.rst
+++ b/docs/reference/ImageOps.rst
@@ -14,6 +14,8 @@ only work on L and RGB images.
 .. autofunction:: colorize
 .. autofunction:: crop
 .. autofunction:: scale
+.. autoclass:: SupportsGetMesh
+    :show-inheritance:
 .. autofunction:: deform
 .. autofunction:: equalize
 .. autofunction:: expand
@@ -34,26 +36,26 @@ Resize relative to a given size
 
     from PIL import Image, ImageOps
     size = (100, 150)
-    with Image.open("Tests/images/hopper.png") as im:
-        ImageOps.contain(im, size).save("imageops_contain.png")
-        ImageOps.cover(im, size).save("imageops_cover.png")
-        ImageOps.fit(im, size).save("imageops_fit.png")
-        ImageOps.pad(im, size, color="#f00").save("imageops_pad.png")
+    with Image.open("Tests/images/hopper.webp") as im:
+        ImageOps.contain(im, size).save("imageops_contain.webp")
+        ImageOps.cover(im, size).save("imageops_cover.webp")
+        ImageOps.fit(im, size).save("imageops_fit.webp")
+        ImageOps.pad(im, size, color="#f00").save("imageops_pad.webp")
 
         # thumbnail() can also be used,
         # but will modify the image object in place
         im.thumbnail(size)
-        im.save("imageops_thumbnail.png")
-
-+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+
-|                | :py:meth:`~PIL.Image.Image.thumbnail`     | :py:meth:`~PIL.ImageOps.contain`           | :py:meth:`~PIL.ImageOps.cover`           | :py:meth:`~PIL.ImageOps.fit`           | :py:meth:`~PIL.ImageOps.pad`           |
-+================+===========================================+============================================+==========================================+========================================+========================================+
-|Given size      | ``(100, 150)``                            | ``(100, 150)``                             | ``(100, 150)``                           | ``(100, 150)``                         | ``(100, 150)``                         |
-+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+
-|Resulting image | .. image:: ../example/image_thumbnail.png | .. image:: ../example/imageops_contain.png | .. image:: ../example/imageops_cover.png | .. image:: ../example/imageops_fit.png | .. image:: ../example/imageops_pad.png |
-+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+
-|Resulting size  | ``100×100``                               | ``100×100``                                | ``150×150``                              | ``100×150``                            | ``100×150``                            |
-+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+
+        im.save("image_thumbnail.webp")
+
++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+
+|                | :py:meth:`~PIL.Image.Image.thumbnail`      | :py:meth:`~PIL.ImageOps.contain`            | :py:meth:`~PIL.ImageOps.cover`            | :py:meth:`~PIL.ImageOps.fit`            | :py:meth:`~PIL.ImageOps.pad`            |
++================+============================================+=============================================+===========================================+=========================================+=========================================+
+|Given size      | ``(100, 150)``                             | ``(100, 150)``                              | ``(100, 150)``                            | ``(100, 150)``                          | ``(100, 150)``                          |
++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+
+|Resulting image | .. image:: ../example/image_thumbnail.webp | .. image:: ../example/imageops_contain.webp | .. image:: ../example/imageops_cover.webp | .. image:: ../example/imageops_fit.webp | .. image:: ../example/imageops_pad.webp |
++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+
+|Resulting size  | ``100×100``                                | ``100×100``                                 | ``150×150``                               | ``100×150``                             | ``100×150``                             |
++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+
 
 .. autofunction:: contain
 .. autofunction:: cover
diff --git a/docs/reference/ImagePath.rst b/docs/reference/ImagePath.rst
index 500096ef7dc..23544b613a0 100644
--- a/docs/reference/ImagePath.rst
+++ b/docs/reference/ImagePath.rst
@@ -21,8 +21,8 @@ vector data. Path objects can be passed to the methods on the
 
     The path object implements most parts of the Python sequence interface, and
     behaves like a list of (x, y) pairs. You can use len(), item access, and
-    slicing as usual. However, the current version does not support slice
-    assignment, or item and slice deletion.
+    slicing as usual. However, this does not support slice assignment, or item
+    and slice deletion.
 
     :param xy: A sequence. The sequence can contain 2-tuples [(x, y), ...]
                or a flat list of numbers [x, y, ...].
diff --git a/docs/reference/ImageStat.rst b/docs/reference/ImageStat.rst
index f61d123131a..f694663828a 100644
--- a/docs/reference/ImageStat.rst
+++ b/docs/reference/ImageStat.rst
@@ -7,67 +7,6 @@
 The :py:mod:`~PIL.ImageStat` module calculates global statistics for an image, or
 for a region of an image.
 
-.. py:class:: Stat(image_or_list, mask=None)
-
-    Calculate statistics for the given image. If a mask is included,
-    only the regions covered by that mask are included in the
-    statistics. You can also pass in a previously calculated histogram.
-
-    :param image: A PIL image, or a precalculated histogram.
-
-        .. note::
-
-            For a PIL image, calculations rely on the
-            :py:meth:`~PIL.Image.Image.histogram` method. The pixel counts are
-            grouped into 256 bins, even if the image has more than 8 bits per
-            channel. So ``I`` and ``F`` mode images have a maximum ``mean``,
-            ``median`` and ``rms`` of 255, and cannot have an ``extrema`` maximum
-            of more than 255.
-
-    :param mask: An optional mask.
-
-    .. py:attribute:: extrema
-
-        Min/max values for each band in the image.
-
-        .. note::
-
-            This relies on the :py:meth:`~PIL.Image.Image.histogram` method, and
-            simply returns the low and high bins used. This is correct for
-            images with 8 bits per channel, but fails for other modes such as
-            ``I`` or ``F``. Instead, use :py:meth:`~PIL.Image.Image.getextrema` to
-            return per-band extrema for the image. This is more correct and
-            efficient because, for non-8-bit modes, the histogram method uses
-            :py:meth:`~PIL.Image.Image.getextrema` to determine the bins used.
-
-    .. py:attribute:: count
-
-        Total number of pixels for each band in the image.
-
-    .. py:attribute:: sum
-
-        Sum of all pixels for each band in the image.
-
-    .. py:attribute:: sum2
-
-        Squared sum of all pixels for each band in the image.
-
-    .. py:attribute:: mean
-
-        Average (arithmetic mean) pixel level for each band in the image.
-
-    .. py:attribute:: median
-
-        Median pixel level for each band in the image.
-
-    .. py:attribute:: rms
-
-        RMS (root-mean-square) for each band in the image.
-
-    .. py:attribute:: var
-
-        Variance for each band in the image.
-
-    .. py:attribute:: stddev
-
-        Standard deviation for each band in the image.
+.. autoclass:: Stat
+    :members:
+    :special-members: __init__
diff --git a/docs/reference/ImageTransform.rst b/docs/reference/ImageTransform.rst
new file mode 100644
index 00000000000..5b0a5ce49dc
--- /dev/null
+++ b/docs/reference/ImageTransform.rst
@@ -0,0 +1,40 @@
+
+.. py:module:: PIL.ImageTransform
+.. py:currentmodule:: PIL.ImageTransform
+
+:py:mod:`~PIL.ImageTransform` Module
+====================================
+
+The :py:mod:`~PIL.ImageTransform` module contains implementations of
+:py:class:`~PIL.Image.ImageTransformHandler` for some of the builtin
+:py:class:`.Image.Transform` methods.
+
+.. autoclass:: Transform
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. autoclass:: AffineTransform
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. autoclass:: PerspectiveTransform
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. autoclass:: ExtentTransform
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. autoclass:: QuadTransform
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. autoclass:: MeshTransform
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/reference/PixelAccess.rst b/docs/reference/PixelAccess.rst
index 04d6f5dcd58..1ac3d034b49 100644
--- a/docs/reference/PixelAccess.rst
+++ b/docs/reference/PixelAccess.rst
@@ -44,42 +44,23 @@ Access using negative indexes is also possible. ::
 -----------------------------
 
 .. class:: PixelAccess
+  :canonical: PIL.Image.core.PixelAccess
 
-  .. method:: __setitem__(self, xy, color):
+  .. method:: __getitem__(self, xy: tuple[int, int]) -> float | tuple[int, ...]
 
-        Modifies the pixel at x,y. The color is given as a single
-        numerical value for single band images, and a tuple for
-        multi-band images
-
-        :param xy: The pixel coordinate, given as (x, y).
-        :param color: The pixel value according to its mode. e.g. tuple (r, g, b) for RGB mode)
-
-  .. method:: __getitem__(self, xy):
-
-       Returns the pixel at x,y. The pixel is returned as a single
-        value for single band images or a tuple for multiple band
-        images
+        Returns the pixel at x,y. The pixel is returned as a single
+        value for single band images or a tuple for multi-band images.
 
         :param xy: The pixel coordinate, given as (x, y).
         :returns: a pixel value for single band images, a tuple of
-          pixel values for multiband images.
+                  pixel values for multiband images.
 
-  .. method:: putpixel(self, xy, color):
+  .. method:: __setitem__(self, xy: tuple[int, int], color: float | tuple[int, ...]) -> None
 
         Modifies the pixel at x,y. The color is given as a single
         numerical value for single band images, and a tuple for
-        multi-band images. In addition to this, RGB and RGBA tuples
-        are accepted for P and PA images.
+        multi-band images.
 
         :param xy: The pixel coordinate, given as (x, y).
-        :param color: The pixel value according to its mode. e.g. tuple (r, g, b) for RGB mode)
-
-  .. method:: getpixel(self, xy):
-
-       Returns the pixel at x,y. The pixel is returned as a single
-        value for single band images or a tuple for multiple band
-        images
-
-        :param xy: The pixel coordinate, given as (x, y).
-        :returns: a pixel value for single band images, a tuple of
-          pixel values for multiband images.
+        :param color: The pixel value according to its mode,
+                      e.g. tuple (r, g, b) for RGB mode.
diff --git a/docs/reference/PyAccess.rst b/docs/reference/PyAccess.rst
deleted file mode 100644
index ed58ca3a591..00000000000
--- a/docs/reference/PyAccess.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. py:module:: PIL.PyAccess
-.. py:currentmodule:: PIL.PyAccess
-
-:py:mod:`~PIL.PyAccess` Module
-==============================
-
-The :py:mod:`~PIL.PyAccess` module provides a CFFI/Python implementation of the :ref:`PixelAccess`. This implementation is far faster on PyPy than the PixelAccess version.
-
-.. note:: Accessing individual pixels is fairly slow. If you are
-          looping over all of the pixels in an image, there is likely
-          a faster way using other parts of the Pillow API.
-
-          :mod:`~PIL.Image`, :mod:`~PIL.ImageChops` and :mod:`~PIL.ImageOps`
-          have methods for many standard operations. If you wish to perform
-          a custom mapping, check out :py:meth:`~PIL.Image.Image.point`.
-
-Example
--------
-
-The following script loads an image, accesses one pixel from it, then changes it. ::
-
-    from PIL import Image
-
-    with Image.open("hopper.jpg") as im:
-        px = im.load()
-    print(px[4, 4])
-    px[4, 4] = (0, 0, 0)
-    print(px[4, 4])
-
-Results in the following::
-
-    (23, 24, 68)
-    (0, 0, 0)
-
-Access using negative indexes is also possible. ::
-
-    px[-1, -1] = (0, 0, 0)
-    print(px[-1, -1])
-
-
-
-:py:class:`PyAccess` Class
---------------------------
-
-.. autoclass:: PIL.PyAccess.PyAccess()
-    :members:
diff --git a/docs/reference/features.rst b/docs/reference/features.rst
index c6619306186..fcff9673567 100644
--- a/docs/reference/features.rst
+++ b/docs/reference/features.rst
@@ -54,12 +54,12 @@ Feature version numbers are available only where stated.
 Support for the following features can be checked:
 
 * ``libjpeg_turbo``: (compile time) Whether Pillow was compiled against the libjpeg-turbo version of libjpeg. Compile-time version number is available.
-* ``transp_webp``: Support for transparency in WebP images.
-* ``webp_mux``: (compile time) Support for EXIF data in WebP images.
-* ``webp_anim``: (compile time) Support for animated WebP images.
 * ``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.
 * ``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.version_feature
diff --git a/docs/reference/index.rst b/docs/reference/index.rst
index 5d6affa94ad..effcd3c46a1 100644
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@@ -25,13 +25,13 @@ Reference
    ImageShow
    ImageStat
    ImageTk
+   ImageTransform
    ImageWin
    ExifTags
    TiffTags
    JpegPresets
    PSDraw
    PixelAccess
-   PyAccess
    features
    ../PIL
    plugins
diff --git a/docs/reference/internal_design.rst b/docs/reference/internal_design.rst
index 2e2d3322f75..99a18e9ea99 100644
--- a/docs/reference/internal_design.rst
+++ b/docs/reference/internal_design.rst
@@ -1,5 +1,5 @@
-Internal Reference Docs
-=======================
+Internal Reference
+==================
 
 .. toctree::
   :maxdepth: 2
diff --git a/docs/reference/internal_modules.rst b/docs/reference/internal_modules.rst
index f2932c32200..93fd82cf9df 100644
--- a/docs/reference/internal_modules.rst
+++ b/docs/reference/internal_modules.rst
@@ -33,6 +33,26 @@ Internal Modules
 Provides a convenient way to import type hints that are not available
 on some Python versions.
 
+.. py:class:: Buffer
+
+    Typing alias.
+
+.. py:class:: IntegralLike
+
+    Typing alias.
+
+.. py:class:: NumpyArray
+
+    Typing alias.
+
+.. py:class:: StrOrBytesPath
+
+    Typing alias.
+
+.. py:class:: SupportsRead
+
+    An object that supports the read method.
+
 .. py:data:: TypeGuard
     :value: typing.TypeGuard
 
@@ -66,3 +86,7 @@ on some Python versions.
 
 An internal interface module previously known as :mod:`~PIL._imaging`,
 implemented in :file:`_imaging.c`.
+
+.. py:class:: ImagingCore
+
+    A representation of the image data.
diff --git a/docs/reference/open_files.rst b/docs/reference/open_files.rst
index f31941c9abb..730c8da5b80 100644
--- a/docs/reference/open_files.rst
+++ b/docs/reference/open_files.rst
@@ -3,7 +3,7 @@
 File Handling in Pillow
 =======================
 
-When opening a file as an image, Pillow requires a filename, ``pathlib.Path``
+When opening a file as an image, Pillow requires a filename, ``os.PathLike``
 object, or a file-like object. Pillow uses the filename or ``Path`` to open a
 file, so for the rest of this article, they will all be treated as a file-like
 object.
diff --git a/docs/reference/plugins.rst b/docs/reference/plugins.rst
index 18cd99cf3a2..454b94d8ce7 100644
--- a/docs/reference/plugins.rst
+++ b/docs/reference/plugins.rst
@@ -185,6 +185,14 @@ Plugin reference
     :undoc-members:
     :show-inheritance:
 
+:mod:`~PIL.MpoImagePlugin` Module
+----------------------------------
+
+.. automodule:: PIL.MpoImagePlugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 :mod:`~PIL.MspImagePlugin` Module
 ---------------------------------
 
diff --git a/docs/releasenotes/10.0.0.rst b/docs/releasenotes/10.0.0.rst
index a3f238119f0..2ea973c5c76 100644
--- a/docs/releasenotes/10.0.0.rst
+++ b/docs/releasenotes/10.0.0.rst
@@ -1,6 +1,33 @@
 10.0.0
 ------
 
+Security
+========
+
+Limit size even if one dimension is zero
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When performing decompression bomb checks, Pillow did not reject images with
+excessive width and zero height, or zero width and excessive height. That has
+now been fixed.
+
+This effectively dates to the PIL fork, since problem images would still have
+been processed before Pillow started checking for decompression bombs.
+
+.. _Added ImageFont.MAX_STRING_LENGTH:
+
+:cve:`2023-44271`: Added ImageFont.MAX_STRING_LENGTH
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To protect against potential DOS attacks when using arbitrary strings as text
+input, Pillow will now raise a :py:exc:`ValueError` if the number of characters
+passed into ImageFont methods is over a certain limit,
+:py:data:`PIL.ImageFont.MAX_STRING_LENGTH`.
+
+This threshold can be changed by setting
+:py:data:`PIL.ImageFont.MAX_STRING_LENGTH`. It can be disabled by setting
+``ImageFont.MAX_STRING_LENGTH = None``.
+
 Backwards Incompatible Changes
 ==============================
 
@@ -43,7 +70,7 @@ Constants
 ^^^^^^^^^
 
 A number of constants have been removed.
-Instead, ``enum.IntEnum`` classes have been added.
+Instead, :py:class:`enum.IntEnum` classes have been added.
 
 =====================================================  ============================================================
 Removed                                                Use instead
@@ -131,7 +158,7 @@ PyAccess and Image.USE_CFFI_ACCESS
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Since Pillow's C API is now faster than PyAccess on PyPy,
-:py:mod:`~PIL.PyAccess` has been deprecated and will be removed in Pillow
+:py:mod:`!PyAccess` has been deprecated and will be removed in Pillow
 11.0.0 (2024-10-15). Pillow's C API will now be used by default on PyPy instead.
 
 ``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, is
@@ -157,31 +184,6 @@ Added ``alpha_only`` argument to ``getbbox()``
 and the image has an alpha channel, trim transparent pixels. Otherwise, trim
 pixels when all channels are zero.
 
-Security
-========
-
-Limit size even if one dimension is zero
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-When performing decompression bomb checks, Pillow did not reject images with
-excessive width and zero height, or zero width and excessive height. That has
-now been fixed.
-
-This effectively dates to the PIL fork, since problem images would still have
-been processed before Pillow started checking for decompression bombs.
-
-Added ImageFont.MAX_STRING_LENGTH
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-:cve:`2023-44271`: To protect against potential DOS attacks when using arbitrary strings as text
-input, Pillow will now raise a :py:exc:`ValueError` if the number of characters
-passed into ImageFont methods is over a certain limit,
-:py:data:`PIL.ImageFont.MAX_STRING_LENGTH`.
-
-This threshold can be changed by setting
-:py:data:`PIL.ImageFont.MAX_STRING_LENGTH`. It can be disabled by setting
-``ImageFont.MAX_STRING_LENGTH = None``.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/10.0.1.rst b/docs/releasenotes/10.0.1.rst
index 6ac30e7fce1..02189d51405 100644
--- a/docs/releasenotes/10.0.1.rst
+++ b/docs/releasenotes/10.0.1.rst
@@ -4,11 +4,17 @@
 Security
 ========
 
-This release addresses :cve:`2023-4863`, by providing an updated install script and
-updated wheels to include libwebp 1.3.2, preventing a potential heap buffer overflow
-in WebP.
+:cve:`2023-4863`: Updated install script and updated wheels
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This release provides an updated install script and updated wheels to
+include libwebp 1.3.2, preventing a potential heap buffer overflow in
+WebP.
+
+Other Changes
+=============
 
 Updated tests to pass with latest zlib version
-==============================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The release of zlib 1.3 caused one of the tests in the Pillow test suite to fail.
diff --git a/docs/releasenotes/10.2.0.rst b/docs/releasenotes/10.2.0.rst
index c3947f64c2e..1c6b78b0841 100644
--- a/docs/releasenotes/10.2.0.rst
+++ b/docs/releasenotes/10.2.0.rst
@@ -1,6 +1,38 @@
 10.2.0
 ------
 
+Security
+========
+
+ImageFont.getmask: Applied ImageFont.MAX_STRING_LENGTH
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To protect against potential DOS attacks when using arbitrary strings as text input,
+Pillow will now raise a :py:exc:`ValueError` if the number of characters passed into
+:py:meth:`PIL.ImageFont.ImageFont.getmask` is over a certain limit,
+:py:data:`PIL.ImageFont.MAX_STRING_LENGTH`.
+
+This threshold can be changed by setting :py:data:`PIL.ImageFont.MAX_STRING_LENGTH`. It
+can be disabled by setting ``ImageFont.MAX_STRING_LENGTH = None``.
+
+A decompression bomb check has also been added to
+:py:meth:`PIL.ImageFont.ImageFont.getmask`.
+
+ImageFont.getmask: Trim glyph size
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To protect against potential DOS attacks when using PIL fonts,
+:py:class:`PIL.ImageFont.ImageFont` now trims the size of individual glyphs so that
+they do not extend beyond the bitmap image.
+
+:cve:`2023-50447`: ImageMath.eval: Restricted environment keys
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If an attacker has control over the keys passed to the
+``environment`` argument of :py:meth:`!PIL.ImageMath.eval`, they may be able to execute
+arbitrary code. To prevent this, keys matching the names of builtins and keys
+containing double underscores will now raise a :py:exc:`ValueError`.
+
 Deprecations
 ============
 
@@ -63,38 +95,6 @@ JPEG tables-only streamtype
 When saving JPEG files, ``streamtype`` can now be set to 1, for tables-only. This will
 output only the quantization and Huffman tables for the image.
 
-Security
-========
-
-ImageFont.getmask: Applied ImageFont.MAX_STRING_LENGTH
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-To protect against potential DOS attacks when using arbitrary strings as text input,
-Pillow will now raise a :py:exc:`ValueError` if the number of characters passed into
-:py:meth:`PIL.ImageFont.ImageFont.getmask` is over a certain limit,
-:py:data:`PIL.ImageFont.MAX_STRING_LENGTH`.
-
-This threshold can be changed by setting :py:data:`PIL.ImageFont.MAX_STRING_LENGTH`. It
-can be disabled by setting ``ImageFont.MAX_STRING_LENGTH = None``.
-
-A decompression bomb check has also been added to
-:py:meth:`PIL.ImageFont.ImageFont.getmask`.
-
-ImageFont.getmask: Trim glyph size
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-To protect against potential DOS attacks when using PIL fonts,
-:py:class:`PIL.ImageFont.ImageFont` now trims the size of individual glyphs so that
-they do not extend beyond the bitmap image.
-
-ImageMath.eval: Restricted environment keys
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-:cve:`2023-50447`: If an attacker has control over the keys passed to the
-``environment`` argument of :py:meth:`PIL.ImageMath.eval`, they may be able to execute
-arbitrary code. To prevent this, keys matching the names of builtins and keys
-containing double underscores will now raise a :py:exc:`ValueError`.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/10.3.0.rst b/docs/releasenotes/10.3.0.rst
new file mode 100644
index 00000000000..2f0437d94f9
--- /dev/null
+++ b/docs/releasenotes/10.3.0.rst
@@ -0,0 +1,119 @@
+10.3.0
+------
+
+Security
+========
+
+ImageMath eval()
+^^^^^^^^^^^^^^^^
+
+.. danger::
+  ``ImageMath.eval()`` uses Python's ``eval()`` function to process the expression
+  string, and carries the security risks of doing so. A direct replacement for this is
+  the new :py:meth:`~PIL.ImageMath.unsafe_eval`, but that carries the same risks. It is
+  not recommended to process expressions without considering this.
+  :py:meth:`~PIL.ImageMath.lambda_eval` is a more secure alternative.
+
+:cve:`2024-28219`: Fix buffer overflow in ``_imagingcms.c``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In ``_imagingcms.c``, two ``strcpy`` calls were able to copy too much data into fixed
+length strings. This has been fixed by using ``strncpy`` instead.
+
+Deprecations
+============
+
+ImageCms constants and versions() function
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+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()
+^^^^^^^^^^^^^^^^
+
+``ImageMath.eval()`` has been deprecated. Use :py:meth:`~PIL.ImageMath.lambda_eval` or
+:py:meth:`~PIL.ImageMath.unsafe_eval` instead. See earlier security notes for more
+information.
+
+API Changes
+===========
+
+Added alpha_quality argument when saving WebP images
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When saving WebP images, an ``alpha_quality`` argument can be passed to the encoder. It
+is an integer value between 0 to 100, where values other than 100 will provide lossy
+compression.
+
+Negative kmeans error
+^^^^^^^^^^^^^^^^^^^^^
+
+When calling :py:meth:`~PIL.Image.Image.quantize`, a negative ``kmeans`` will now
+raise a :py:exc:`ValueError`, unless a palette is supplied to make the value redundant.
+
+Negative P1-P3 PPM value error
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If a P1-P3 PPM image contains a negative value, a :py:exc:`ValueError` will now be
+raised.
+
+API Additions
+=============
+
+Added PerspectiveTransform
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+:py:class:`~PIL.ImageTransform.PerspectiveTransform` has been added, meaning
+that all of the :py:data:`~PIL.Image.Transform` values now have a corresponding
+subclass of :py:class:`~PIL.ImageTransform.Transform`.
+
+Other Changes
+=============
+
+Portable FloatMap (PFM) images
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Support has been added for reading and writing grayscale (Pf format)
+Portable FloatMap (PFM) files containing ``F`` data.
+
+Release GIL when fetching WebP frames
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Python's Global Interpreter Lock is now released when fetching WebP frames from
+the libwebp decoder.
+
+Type hints
+^^^^^^^^^^
+
+Pillow now has type hints for a large part of its modules, and the package
+includes a ``py.typed`` file and the ``Typing :: Typed`` Trove classifier.
diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst
new file mode 100644
index 00000000000..8d3706be617
--- /dev/null
+++ b/docs/releasenotes/10.4.0.rst
@@ -0,0 +1,62 @@
+10.4.0
+------
+
+Security
+========
+
+ImageShow.WindowsViewer.show_file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If an attacker has control over the ``path`` passed to
+``ImageShow.WindowsViewer.show_file()``, they may be able to
+execute arbitrary shell commands.
+
+To prevent this, a :py:exc:`FileNotFoundError` will be raised if the ``path``
+does not exist as a file. To provide a consistent experience, the error has
+been added to all :py:class:`~PIL.ImageShow` viewers.
+
+Deprecations
+============
+
+BGR;15, BGR 16 and BGR;24
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The experimental BGR;15, BGR;16 and BGR;24 modes have been deprecated.
+
+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 deprecated. Defaulting to "L" or "1" if the mode cannot be mapped
+is also deprecated.
+
+Support for LibTIFF earlier than 4
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Support for LibTIFF earlier than version 4 has been deprecated.
+Upgrade to a newer version of LibTIFF instead.
+
+ImageDraw.getdraw hints parameter
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated.
+
+API Additions
+=============
+
+ImageDraw.circle
+^^^^^^^^^^^^^^^^
+
+Added :py:meth:`~PIL.ImageDraw.ImageDraw.circle`. It provides the same functionality as
+:py:meth:`~PIL.ImageDraw.ImageDraw.ellipse`, but instead of taking a bounding box, it
+takes a center point and radius.
+
+Other Changes
+=============
+
+Python 3.13 beta
+^^^^^^^^^^^^^^^^
+
+To help others prepare for Python 3.13, wheels have been built against the 3.13 beta as
+a preview. This is not official support for Python 3.13, but simply an opportunity for
+users to test how Pillow works with the beta and report any problems.
diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst
new file mode 100644
index 00000000000..c3f18140f42
--- /dev/null
+++ b/docs/releasenotes/11.0.0.rst
@@ -0,0 +1,162 @@
+11.0.0
+------
+
+Backwards Incompatible Changes
+==============================
+
+Python 3.8
+^^^^^^^^^^
+
+Pillow has dropped support for Python 3.8,
+which reached end-of-life in October 2024.
+
+Python 3.12 on macOS <= 10.12
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The latest version of Python 3.12 only supports macOS versions 10.13 and later,
+and so Pillow has also updated the deployment target for its prebuilt Python 3.12
+wheels.
+
+PSFile
+^^^^^^
+
+The :py:class:`!PSFile` class was removed in Pillow 11 (2024-10-15).
+This class was only made as a helper to be used internally,
+so there is no replacement. If you need this functionality though,
+it is a very short class that can easily be recreated in your own code.
+
+PyAccess and Image.USE_CFFI_ACCESS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Since Pillow's C API is now faster than PyAccess on PyPy, ``PyAccess`` has been
+removed. Pillow's C API will now be used on PyPy instead.
+
+``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, was
+similarly removed.
+
+TiffImagePlugin IFD_LEGACY_API
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+An unused setting, ``TiffImagePlugin.IFD_LEGACY_API``, has been removed.
+
+WebP 0.4
+^^^^^^^^
+
+Support for WebP 0.4 and earlier has been removed; WebP 0.5 is the minimum supported.
+
+Deprecations
+============
+
+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/
+
+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.
+
+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).
+
+API Changes
+===========
+
+Default resampling filter for I;16* image modes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The default resampling filter for I;16, I;16L, I;16B and I;16N has been changed from
+``Image.NEAREST`` to ``Image.BICUBIC``, to match the majority of modes.
+
+API Additions
+=============
+
+Writing XMP bytes to JPEG and MPO
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+XMP data can now be saved to JPEG files using an ``xmp`` argument::
+
+    im.save("out.jpg", xmp=b"test")
+
+The data can also be set  through :py:attr:`~PIL.Image.Image.info`, for use when saving
+either JPEG or MPO images::
+
+    im.info["xmp"] = b"test"
+    im.save("out.jpg")
+
+Other Changes
+=============
+
+Python 3.13
+^^^^^^^^^^^
+
+Pillow 10.4.0 had wheels built against Python 3.13 beta, available as a preview to help
+others prepare for 3.13, and to ensure Pillow could be used immediately at the release
+of 3.13.0 final (2024-10-07, :pep:`719`).
+
+Pillow 11.0.0 now officially supports Python 3.13.
+
+Support has also been added for the experimental free-threaded mode of :pep:`703`.
+
+Python 3.13 only supports macOS versions 10.13 and later.
+
+C-level Flags
+^^^^^^^^^^^^^
+
+Some compiling flags like ``WITH_THREADING``, ``WITH_IMAGECHOPS``, and other
+``WITH_*`` were removed. These flags were not available through the build system,
+but they could be edited in the C source.
diff --git a/docs/releasenotes/2.3.1.rst b/docs/releasenotes/2.3.1.rst
new file mode 100644
index 00000000000..e54065a0b6e
--- /dev/null
+++ b/docs/releasenotes/2.3.1.rst
@@ -0,0 +1,26 @@
+2.3.1
+-----
+
+Security
+========
+
+These issues were reported in
+`Debian bug #737059 <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=737059>`_.
+
+:cve:`2014-1932`: Fix insecure use of :py:func:`tempfile.mktemp`
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The (1) ``load_djpeg`` function in ``JpegImagePlugin.py``, (2) Ghostscript function
+in ``EpsImagePlugin.py``, (3) ``load`` function in ``IptcImagePlugin.py``, and (4)
+``_copy`` function in ``Image.py`` in
+Pillow before 2.3.1 do not properly create temporary files, which allow
+local users to overwrite arbitrary files and obtain sensitive information via a
+symlink attack on the temporary file.
+
+:cve:`2014-1933`: Fix insecure use of :py:func:`tempfile.mktemp`
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The (1) ``JpegImagePlugin.py`` and (2) ``EpsImagePlugin.py`` scripts in
+Pillow before 2.3.1 uses the names of
+temporary files on the command line, which makes it easier for local users to
+conduct symlink attacks by listing the processes.
diff --git a/docs/releasenotes/2.3.2.rst b/docs/releasenotes/2.3.2.rst
new file mode 100644
index 00000000000..c4504ee332c
--- /dev/null
+++ b/docs/releasenotes/2.3.2.rst
@@ -0,0 +1,14 @@
+2.3.2
+-----
+
+Security
+========
+
+:cve:`2014-3589`: Fix DOS attack
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``PIL/IcnsImagePlugin.py`` in Pillow before 2.3.2 and
+2.5.x before 2.5.2 allows remote attackers to cause a denial of service via a crafted
+block size.
+
+Found and reported by Andrew Drake of `Dropbox <https://www.dropbox.com/>`__.
diff --git a/docs/releasenotes/2.5.2.rst b/docs/releasenotes/2.5.2.rst
new file mode 100644
index 00000000000..a80b460a894
--- /dev/null
+++ b/docs/releasenotes/2.5.2.rst
@@ -0,0 +1,14 @@
+2.5.2
+-----
+
+Security
+========
+
+:cve:`2014-3589`: Fix DOS attack
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``PIL/IcnsImagePlugin.py`` in Pillow before 2.3.2 and
+2.5.x before 2.5.2 allows remote attackers to cause a denial of service via a crafted
+block size.
+
+Found and reported by Andrew Drake of `Dropbox <https://www.dropbox.com/>`__.
diff --git a/docs/releasenotes/2.6.0.rst b/docs/releasenotes/2.6.0.rst
new file mode 100644
index 00000000000..84b0016d27d
--- /dev/null
+++ b/docs/releasenotes/2.6.0.rst
@@ -0,0 +1,14 @@
+2.6.0
+-----
+
+Security
+========
+
+:cve:`2014-3589`: Fix DOS attack
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``PIL/IcnsImagePlugin.py`` in Pillow before 2.3.2 and
+2.5.x before 2.5.2 allows remote attackers to cause a denial of service via a crafted
+block size.
+
+Found and reported by Andrew Drake of `Dropbox <https://www.dropbox.com/>`__.
diff --git a/docs/releasenotes/2.7.0.rst b/docs/releasenotes/2.7.0.rst
index 0b3eeeb49d5..e9b0995bb9f 100644
--- a/docs/releasenotes/2.7.0.rst
+++ b/docs/releasenotes/2.7.0.rst
@@ -1,15 +1,14 @@
 2.7.0
-=====
+-----
 
 Sane Plugin
------------
+^^^^^^^^^^^
 
 The Sane plugin has now been split into its own repo:
 https://github.com/python-pillow/Sane .
 
-
 Png text chunk size limits
---------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 To prevent potential denial of service attacks using compressed text
 chunks, there are now limits to the decompressed size of text chunks
@@ -24,7 +23,7 @@ default. The total decompressed size of all text chunks is limited to
 know that there are large text blocks that are desired.
 
 Image resizing filters
-----------------------
+^^^^^^^^^^^^^^^^^^^^^^
 
 Image resizing methods :py:meth:`~PIL.Image.Image.resize` and
 :py:meth:`~PIL.Image.Image.thumbnail` take a ``resample`` argument, which tells
@@ -33,7 +32,7 @@ which filter should be used for resampling. Possible values are:
 were changed in this version.
 
 Bicubic and bilinear downscaling
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+++++++++++++++++++++++++++++++++
 
 From the beginning ``BILINEAR`` and ``BICUBIC`` filters were based on affine
 transformations and used a fixed number of pixels from the source image for
@@ -50,7 +49,7 @@ If you have previously used any tricks to maintain quality when downscaling with
 steps), they are unnecessary now.
 
 Antialias renamed to Lanczos
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+++++++++++++++++++++++++++++
 
 A new ``LANCZOS`` constant was added instead of ``ANTIALIAS``.
 
@@ -64,19 +63,19 @@ The ``ANTIALIAS`` constant is left for backward compatibility and is an alias
 for ``LANCZOS``.
 
 Lanczos upscaling quality
-^^^^^^^^^^^^^^^^^^^^^^^^^
++++++++++++++++++++++++++
 
 The image upscaling quality with ``LANCZOS`` filter was almost the same as
 ``BILINEAR`` due to a bug. This has been fixed.
 
 Bicubic upscaling quality
-^^^^^^^^^^^^^^^^^^^^^^^^^
++++++++++++++++++++++++++
 
 The ``BICUBIC`` filter for affine transformations produced sharp, slightly
 pixelated image for upscaling. Bicubic for convolutions is more soft.
 
 Resize performance
-^^^^^^^^^^^^^^^^^^
+++++++++++++++++++
 
 In most cases, convolution is more a expensive algorithm for downscaling
 because it takes into account all the pixels of source image. Therefore
@@ -93,7 +92,7 @@ The upscaling performance of the ``LANCZOS`` filter has remained the same. For
 times.
 
 Default filter for thumbnails
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++++++++++++++++++++++++++++++
 
 In Pillow 2.5 the default filter for :py:meth:`~PIL.Image.Image.thumbnail` was
 changed from ``NEAREST`` to ``ANTIALIAS``. Antialias was chosen because all the
@@ -103,7 +102,7 @@ other filters gave poor quality for reduction. Starting from Pillow 2.7.0,
 uses supersampling internally, not convolutions.
 
 Image transposition
--------------------
++++++++++++++++++++
 
 A new method ``TRANSPOSE`` has been added for the
 :py:meth:`~PIL.Image.Image.transpose` operation in addition to
@@ -115,7 +114,7 @@ The speed of ``ROTATE_90``, ``ROTATE_270`` and ``TRANSPOSE`` has been significan
 improved for large images which don't fit in the processor cache.
 
 Gaussian blur and unsharp mask
-------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The :py:meth:`~PIL.ImageFilter.GaussianBlur` implementation has been replaced
 with a sequential application of box filters. The new implementation is based on
@@ -125,7 +124,7 @@ implementations use Gaussian blur internally, all changes from this chapter
 are also applicable to it.
 
 Blur radius
-^^^^^^^^^^^
++++++++++++
 
 There was an error in the previous version of Pillow, where blur radius (the
 standard deviation of Gaussian) actually meant blur diameter. For example, to
@@ -136,7 +135,7 @@ If you used a Gaussian blur with some radius value, you need to divide this
 value by two.
 
 Blur performance
-^^^^^^^^^^^^^^^^
+++++++++++++++++
 
 Box filter computation time is constant relative to the radius and depends
 on source image size only. Because the new Gaussian blur implementation
@@ -148,7 +147,7 @@ second for radius 1, 3.6 seconds for radius 10 and 17 seconds for 50, now blur
 with any radius on same image is executed for 0.2 seconds.
 
 Blur quality
-^^^^^^^^^^^^
+++++++++++++
 
 The previous implementation takes into account only source pixels within
 2 * standard deviation radius for every destination pixel. This was not enough,
@@ -157,7 +156,7 @@ so the quality was worse compared to other Gaussian blur software.
 The new implementation does not have this drawback.
 
 TIFF Parameter Changes
-----------------------
+^^^^^^^^^^^^^^^^^^^^^^
 
 Several kwarg parameters for saving TIFF images were previously
 specified as strings with included spaces (e.g. 'x resolution'). This
diff --git a/docs/releasenotes/2.8.0.rst b/docs/releasenotes/2.8.0.rst
index 4dbbc0bdd29..2b9eed524d9 100644
--- a/docs/releasenotes/2.8.0.rst
+++ b/docs/releasenotes/2.8.0.rst
@@ -1,8 +1,8 @@
 2.8.0
-=====
+-----
 
 Open HTTP response objects with Image.open
-------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 HTTP response objects returned from ``urllib2.urlopen(url)`` or
 ``requests.get(url, stream=True).raw`` are 'file-like' but do not support ``.seek()``
diff --git a/docs/releasenotes/3.0.0.rst b/docs/releasenotes/3.0.0.rst
index e8eada73c54..8bc477f7020 100644
--- a/docs/releasenotes/3.0.0.rst
+++ b/docs/releasenotes/3.0.0.rst
@@ -1,9 +1,28 @@
-
 3.0.0
-=====
+-----
+
+Backwards Incompatible Changes
+==============================
+
+Several methods that have been marked as deprecated for many releases
+have been removed in this release:
+
+* ``Image.tostring()``
+* ``Image.fromstring()``
+* ``Image.offset()``
+* ``ImageDraw.setink()``
+* ``ImageDraw.setfill()``
+* The ``ImageFileIO`` module
+* The ``ImageFont.FreeTypeFont`` and ``ImageFont.truetype`` ``file`` keyword arg
+* The ``ImagePalette`` private ``_make`` functions
+* ``ImageWin.fromstring()``
+* ``ImageWin.tostring()``
+
+Other Changes
+=============
 
 Saving Multipage Images
------------------------
+^^^^^^^^^^^^^^^^^^^^^^^
 
 There is now support for saving multipage images in the ``GIF`` and
 ``PDF`` formats. To enable this functionality, pass in ``save_all=True``
@@ -12,7 +31,7 @@ as a keyword argument to the save::
     im.save('test.pdf', save_all=True)
 
 Tiff ImageFileDirectory Rewrite
--------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The Tiff ImageFileDirectory metadata code has been rewritten. Where
 previously it returned a somewhat arbitrary set of values and tuples,
@@ -25,25 +44,8 @@ structures will be deprecated at some point in the future.  When
 saving Tiff metadata, new code should use the
 TiffImagePlugin.ImageFileDirectory_v2 class.
 
-Deprecated Methods
-------------------
-
-Several methods that have been marked as deprecated for many releases
-have been removed in this release::
-
-    Image.tostring()
-    Image.fromstring()
-    Image.offset()
-    ImageDraw.setink()
-    ImageDraw.setfill()
-    The ImageFileIO module
-    The ImageFont.FreeTypeFont and ImageFont.truetype ``file`` keyword arg
-    The ImagePalette private _make functions
-    ImageWin.fromstring()
-    ImageWin.tostring()
-
-LibJpeg and Zlib are Required by Default
-----------------------------------------
+LibJpeg and Zlib are required by default
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The external dependencies on libjpeg and zlib are now required by default.
 If the headers or libraries are not found, then installation will abort
diff --git a/docs/releasenotes/3.1.0.rst b/docs/releasenotes/3.1.0.rst
index 3cdb6939d49..951819f1956 100644
--- a/docs/releasenotes/3.1.0.rst
+++ b/docs/releasenotes/3.1.0.rst
@@ -1,9 +1,8 @@
-
 3.1.0
-=====
+-----
 
 ImageDraw arc, chord and pieslice can now use floats
-----------------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 There is no longer a need to ensure that the start and end arguments for ``arc``,
 ``chord`` and ``pieslice`` are integers.
@@ -12,7 +11,7 @@ Note that these numbers are not simply rounded internally, but are actually
 utilised in the drawing process.
 
 Consistent multiline text spacing
----------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 When using the ``ImageDraw`` multiline methods, the spacing between
 lines was inconsistent, based on the combination on ascenders and
@@ -24,7 +23,7 @@ not the absolute height of each line.
 There is also now a default spacing of 4px between lines.
 
 Exif, Jpeg and Tiff Metadata
-----------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 There were major changes in the TIFF ImageFileDirectory support in
 Pillow 3.0 that led to a number of regressions. Some of them have been
diff --git a/docs/releasenotes/3.1.1.rst b/docs/releasenotes/3.1.1.rst
index 5d60e116cc1..4eabd194490 100644
--- a/docs/releasenotes/3.1.1.rst
+++ b/docs/releasenotes/3.1.1.rst
@@ -1,12 +1,14 @@
-
 3.1.1
-=====
+-----
+
+Security
+========
 
-CVE-2016-0740 -- Buffer overflow in TiffDecode.c
-------------------------------------------------
+:cve:`2016-0740`: Buffer overflow in ``TiffDecode.c``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Pillow 3.1.0 and earlier when linked against libtiff >= 4.0.0 on x64
-may overflow a buffer when reading a specially crafted tiff file (:cve:`2016-0740`).
+may overflow a buffer when reading a specially crafted tiff file.
 
 Specifically, libtiff >= 4.0.0 changed the return type of
 ``TIFFScanlineSize`` from ``int32`` to machine dependent
@@ -19,9 +21,8 @@ image data over 64k is written over the heap, causing a segfault.
 
 This issue was found by security researcher FourOne.
 
-
-CVE-2016-0775 -- Buffer overflow in FliDecode.c
------------------------------------------------
+:cve:`2016-0775`: Buffer overflow in ``FliDecode.c``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In all versions of Pillow, dating back at least to the last PIL 1.1.7
 release, FliDecode.c has a buffer overflow error (:cve:`2016-0775`).
@@ -49,8 +50,8 @@ off the end of the memory buffer, causing a segfault.
 
 This issue was found by Alyssa Besseling at Atlassian.
 
-CVE-2016-2533 -- Buffer overflow in PcdDecode.c
------------------------------------------------
+:cve:`2016-2533`: Buffer overflow in ``PcdDecode.c``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In all versions of Pillow, dating back at least to the last PIL 1.1.7
 release, ``PcdDecode.c`` has a buffer overflow error (:cve:`2016-2533`).
@@ -61,8 +62,8 @@ assuming 4 bytes per pixel. This writes 768 bytes beyond the end of
 the buffer into other Python object storage. In some cases, this
 causes a segfault, in others an internal Python malloc error.
 
-Integer overflow in Resample.c
-------------------------------
+Integer overflow in ``Resample.c``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If a large value was passed into the new size for an image, it is
 possible to overflow an ``int32`` value passed into malloc.
diff --git a/docs/releasenotes/3.1.2.rst b/docs/releasenotes/3.1.2.rst
index 04325ad868f..a9615497795 100644
--- a/docs/releasenotes/3.1.2.rst
+++ b/docs/releasenotes/3.1.2.rst
@@ -1,13 +1,15 @@
-
 3.1.2
-=====
+-----
+
+Security
+========
 
-CVE-2016-3076 -- Buffer overflow in Jpeg2KEncode.c
---------------------------------------------------
+:cve:`2016-3076`: Buffer overflow in Jpeg2KEncode.c
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Pillow between 2.5.0 and 3.1.1 may overflow a buffer when writing
-large Jpeg2000 files, allowing for code execution or other memory
-corruption (:cve:`2016-3076`).
+Pillow between 2.5.0 and 3.1.1 may overflow a buffer
+when writing large Jpeg2000 files, allowing for code execution or other
+memory corruption.
 
 This occurs specifically in the function ``j2k_encode_entry``, at the line:
 
diff --git a/docs/releasenotes/3.2.0.rst b/docs/releasenotes/3.2.0.rst
index c6177428814..3ed8fae574b 100644
--- a/docs/releasenotes/3.2.0.rst
+++ b/docs/releasenotes/3.2.0.rst
@@ -1,9 +1,8 @@
-
 3.2.0
 -----
 
 New DDS and FTEX Image Plugins
-==============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The ``DdsImagePlugin`` reading DXT1 and DXT5 encoded ``.dds`` images was
 added. DXT3 images are not currently supported.
@@ -14,13 +13,13 @@ per file, in the ``.ftc`` (compressed) and ``.ftu`` (uncompressed)
 formats.
 
 Updates to the GbrImagePlugin
-=============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The ``GbrImagePlugin`` (GIMP brush format) has been updated to fix
 support for version 1 files and add support for version 2 files.
 
 Passthrough Parameters for ImageDraw.text
-=========================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ``ImageDraw.multiline_text`` and ``ImageDraw.multiline_size`` take extra
 spacing parameters above what are used in ``ImageDraw.text`` and
@@ -29,7 +28,7 @@ spacing parameters above what are used in ``ImageDraw.text`` and
 to the corresponding multiline functions.
 
 ImageSequence.Iterator changes
-==============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ``ImageSequence.Iterator`` is now an actual iterator implementing the
 Iterator protocol.  It is also now possible to seek to the first image
diff --git a/docs/releasenotes/3.3.0.rst b/docs/releasenotes/3.3.0.rst
index 39ffdbb2ef0..cd6f7e2f93c 100644
--- a/docs/releasenotes/3.3.0.rst
+++ b/docs/releasenotes/3.3.0.rst
@@ -2,7 +2,7 @@
 -----
 
 Libimagequant support
-=====================
+^^^^^^^^^^^^^^^^^^^^^
 
 There is now support for using libimagequant as a higher quality
 quantization option in ``Image.quantize()`` on Unix-like
@@ -12,21 +12,20 @@ differences.
 
 
 New Setup.py options
-====================
+^^^^^^^^^^^^^^^^^^^^
 
 There are two new options to control the ``build_ext`` task in ``setup.py``:
 
-  * ``--debug`` dumps all of the directories and files that are
-    checked when searching for libraries or headers when building the
-    extensions.
-  * ``--disable-platform-guessing`` removes many of the directories
-    that are checked for libraries and headers for build systems or
-    cross compilers that specify that information in via environment
-    variables.
-
+* ``--debug`` dumps all of the directories and files that are
+  checked when searching for libraries or headers when building the
+  extensions.
+* ``--disable-platform-guessing`` removes many of the directories
+  that are checked for libraries and headers for build systems or
+  cross compilers that specify that information in via environment
+  variables.
 
 Resizing
-========
+^^^^^^^^
 
 Image resampling for 8-bit per channel images was rewritten using only integer
 computings. This is faster on most platforms and doesn't introduce precision
@@ -36,19 +35,17 @@ makes resampling 60% faster on average.
 Color calculation for images in the ``LA`` mode on semitransparent pixels
 was fixed.
 
-
 Rotation
-========
+^^^^^^^^
 
 Rotation for angles divisible by 90 degrees now always uses transposition.
 This greatly improves both quality and performance in this case.
 Also, the bug with wrong image size calculation when rotating by 90 degrees
 was fixed.
 
-
 Image Metadata
-==============
+^^^^^^^^^^^^^^
 
 The return type for binary data in version 2 Exif and Tiff metadata
 has been changed from a tuple of integers to bytes. This is a change
-from the behavior since ``3.0.0``.
+from the behavior since 3.0.0.
diff --git a/docs/releasenotes/3.3.2.rst b/docs/releasenotes/3.3.2.rst
index 8845b976a8b..73156a65dbb 100644
--- a/docs/releasenotes/3.3.2.rst
+++ b/docs/releasenotes/3.3.2.rst
@@ -1,9 +1,11 @@
-
 3.3.2
-=====
+-----
+
+Security
+========
 
 Integer overflow in Map.c
--------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Pillow prior to 3.3.2 may experience integer overflow errors in map.c
 when reading specially crafted image files. This may lead to memory
@@ -26,7 +28,7 @@ memory without duplicating the image first.
 This issue was found by Cris Neckar at Divergent Security.
 
 Sign Extension in Storage.c
----------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Pillow prior to 3.3.2 and PIL 1.1.7 (at least) do not check for
 negative image sizes in ``ImagingNew`` in ``Storage.c``. A negative
diff --git a/docs/releasenotes/3.4.0.rst b/docs/releasenotes/3.4.0.rst
index 2bbafe741d2..8a5a7efe350 100644
--- a/docs/releasenotes/3.4.0.rst
+++ b/docs/releasenotes/3.4.0.rst
@@ -1,9 +1,32 @@
-
 3.4.0
 -----
 
+Backwards Incompatible Changes
+==============================
+
+Image.core.open_ppm removed
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The nominally private/debugging function ``Image.core.open_ppm`` has
+been removed. If you were using this function, please use
+``Image.open`` instead.
+
+Deprecations
+============
+
+Deprecation Warning when Saving JPEGs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+JPEG images cannot contain an alpha channel. Pillow prior to 3.4.0
+silently drops the alpha channel. With this release Pillow will now
+issue a :py:exc:`DeprecationWarning` when attempting to save a ``RGBA`` mode
+image as a JPEG. This will become an error in Pillow 4.2.
+
+API Additions
+=============
+
 New resizing filters
-====================
+^^^^^^^^^^^^^^^^^^^^
 
 Two new filters available for ``Image.resize()`` and ``Image.thumbnail()``
 functions: ``BOX`` and ``HAMMING``. ``BOX`` is the high-performance filter with
@@ -14,23 +37,15 @@ two times shorter window than ``BILINEAR``. It can be used for image reduction
 providing the image downscaling quality comparable to ``BICUBIC``.
 Both new filters don't show good quality for the image upscaling.
 
-Deprecation Warning when Saving JPEGs
-=====================================
-
-JPEG images cannot contain an alpha channel. Pillow prior to 3.4.0
-silently drops the alpha channel. With this release Pillow will now
-issue a :py:exc:`DeprecationWarning` when attempting to save a ``RGBA`` mode
-image as a JPEG. This will become an error in Pillow 4.2.
-
 New DDS Decoders
-================
+^^^^^^^^^^^^^^^^
 
 Pillow can now decode DXT3 images, as well as the previously supported
 DXT1 and DXT5 formats. All three formats are now decoded in C code for
 better performance.
 
 Append images to GIF
-====================
+^^^^^^^^^^^^^^^^^^^^
 
 Additional frames can now be appended when saving a GIF file, through the
 ``append_images`` argument. The new frames are passed in as a list of images,
@@ -42,16 +57,9 @@ in effect, e.g.::
     im.save(out, save_all=True, append_images=[im1, im2, ...])
 
 Save multiple frame TIFF
-========================
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 Multiple frames can now be saved in a TIFF file by using the ``save_all`` option.
 e.g.::
 
     im.save("filename.tiff", format="TIFF", save_all=True)
-
-Image.core.open_ppm removed
-===========================
-
-The nominally private/debugging function ``Image.core.open_ppm`` has
-been removed. If you were using this function, please use
-``Image.open`` instead.
diff --git a/docs/releasenotes/4.0.0.rst b/docs/releasenotes/4.0.0.rst
index 5778de26a82..625f237e841 100644
--- a/docs/releasenotes/4.0.0.rst
+++ b/docs/releasenotes/4.0.0.rst
@@ -2,7 +2,7 @@
 -----
 
 Python 2.6 and 3.2 Dropped
-==========================
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Pillow 4.0 no longer supports Python 2.6 and 3.2. We will not be
 creating binaries, testing, or retaining compatibility with these
@@ -10,12 +10,12 @@ releases. This release removes some workarounds for those Python
 releases, so the final working version of Pillow on 2.6 or 3.2 is 3.4.2.
 
 Support added for Python 3.6
-============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Pillow 4.0 supports Python 3.6.
 
 OleFileIO.py
-============
+^^^^^^^^^^^^
 
 ``OleFileIO.py`` has been removed as a vendored file and is now installed
 from the upstream :pypi:`olefile` PyPI package. All internal dependencies are
@@ -24,19 +24,19 @@ redirected to the olefile package. Direct accesses to
 upstream olefile into ``sys.modules`` in its place.
 
 SGI image save
-==============
+^^^^^^^^^^^^^^
 
 It is now possible to save images in modes ``L``, ``RGB``, and
 ``RGBA`` to the uncompressed SGI image format.
 
 Zero sized images
-=================
+^^^^^^^^^^^^^^^^^
 
 Pillow 3.4.0 removed support for creating images with (0,0) size. This
 has been reenabled, restoring pre 3.4 behavior.
 
 Internal handles_eof flag
-=========================
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The ``handles_eof flag`` for decoding images has been removed, as there
 were no internal users of the flag. Anyone maintaining image decoders
@@ -44,7 +44,7 @@ outside of the Pillow source tree should consider using the cleanup
 function pointers instead.
 
 Image.core.stretch removed
-==========================
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The stretch function on the core image object has been removed. This
 used to be for enlarging the image, but has been aliased to resize
diff --git a/docs/releasenotes/4.1.0.rst b/docs/releasenotes/4.1.0.rst
index 4d6598d8efa..80ad9b9fb63 100644
--- a/docs/releasenotes/4.1.0.rst
+++ b/docs/releasenotes/4.1.0.rst
@@ -1,8 +1,8 @@
 4.1.0
 -----
 
-Removed Deprecated Items
-========================
+Deprecations
+============
 
 Several deprecated items have been removed.
 
@@ -15,8 +15,11 @@ Several deprecated items have been removed.
   ``PIL.ImageDraw.ImageDraw.setfont`` have been removed.
 
 
+Other Changes
+=============
+
 Closing Files When Opening Images
-=================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The file handling when opening images has been overhauled. Previously,
 Pillow would attempt to close some, but not all image formats
@@ -38,9 +41,8 @@ is specified:
   the underlying file until we are done with the image. The mapping
   will be closed in the ``close`` or ``__del__`` method.
 
-
 Changes to GIF Handling When Saving
-===================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The :py:class:`PIL.GifImagePlugin` code has been refactored to fix the flow when
 saving images. There are two external changes that arise from this:
@@ -56,14 +58,14 @@ This refactor fixed some bugs with palette handling when saving
 multiple frame GIFs.
 
 New Method: Image.remap_palette
-===============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The method :py:meth:`PIL.Image.Image.remap_palette()` has been
 added. This method was hoisted from the GifImagePlugin code used to
 optimize the palette.
 
 Added Decoder Registry and Support for Python Based Decoders
-============================================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 There is now a decoder registry similar to the image plugin
 registries. Image plugins can register a decoder, and it will be
@@ -73,7 +75,7 @@ their C based counterparts, they may be easier and quicker to develop
 or safer to run.
 
 Tests
-=====
+^^^^^
 
 Many tests have been added, including correctness tests for image
 formats that have been previously untested.
diff --git a/docs/releasenotes/4.1.1.rst b/docs/releasenotes/4.1.1.rst
index 1b5757015f8..8c8055bfad8 100644
--- a/docs/releasenotes/4.1.1.rst
+++ b/docs/releasenotes/4.1.1.rst
@@ -2,7 +2,7 @@
 -----
 
 Fix Regression with reading DPI from EXIF data
-==============================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Some JPEG images don't contain DPI information in the image metadata,
 but do contain it in the EXIF data. A patch was added in 4.1.0 to read
@@ -10,9 +10,8 @@ from the EXIF data, but it did not accept all possible types that
 could be included there.  This fix adds the ability to read ints as
 well as rational values.
 
-
 Incompatibility between 3.6.0 and 3.6.1
-=======================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 CPython 3.6.1 added a new symbol, PySlice_GetIndicesEx, which was not
 present in 3.6.0. This had the effect of causing binaries compiled on
diff --git a/docs/releasenotes/4.2.0.rst b/docs/releasenotes/4.2.0.rst
index 1e9637f1e32..bc2a45f025f 100644
--- a/docs/releasenotes/4.2.0.rst
+++ b/docs/releasenotes/4.2.0.rst
@@ -1,8 +1,34 @@
 4.2.0
 -----
 
+Backwards Incompatible Changes
+==============================
+
+Several deprecated items have been removed
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* The methods ``PIL.ImageWin.Dib.fromstring``,
+  ``PIL.ImageWin.Dib.tostring`` and
+  ``PIL.TiffImagePlugin.ImageFileDirectory_v2.as_dict`` have
+  been removed.
+
+* Before Pillow 4.2.0, attempting to save an RGBA image as JPEG would
+  discard the alpha channel. From Pillow 3.4.0, a deprecation warning
+  was shown. From Pillow 4.2.0, the deprecation warning is removed and
+  an :py:exc:`IOError` is raised.
+
+Removed Core Image Function
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The unused function ``Image.core.new_array`` was removed. This is an
+internal function that should not have been used by user code, but it
+was accessible from the python layer.
+
+Other Changes
+=============
+
 Added Complex Text Rendering
-============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Pillow now supports complex text rendering for scripts requiring glyph
 composition and bidirectional flow. This optional feature adds three
@@ -11,7 +37,7 @@ dependencies: harfbuzz, fribidi, and raqm. See the :doc:`install documentation
 Unix and Mac, but has not yet been built on Windows platforms.
 
 New Optional Parameters
-=======================
+^^^^^^^^^^^^^^^^^^^^^^^
 
 * :py:meth:`PIL.ImageDraw.floodfill` has a new optional parameter:
   threshold. This specifies a tolerance for the color to replace with
@@ -22,30 +48,8 @@ New Optional Parameters
   multipage outputs.
 
 New DecompressionBomb Warning
-=============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 :py:meth:`PIL.Image.Image.crop` now may raise a DecompressionBomb
 warning if the crop region enlarges the image over the threshold
 specified by :py:data:`PIL.Image.MAX_IMAGE_PIXELS`.
-
-Removed Deprecated Items
-========================
-
-Several deprecated items have been removed.
-
-* The methods ``PIL.ImageWin.Dib.fromstring``,
-  ``PIL.ImageWin.Dib.tostring`` and
-  ``PIL.TiffImagePlugin.ImageFileDirectory_v2.as_dict`` have
-  been removed.
-
-* Before Pillow 4.2.0, attempting to save an RGBA image as JPEG would
-  discard the alpha channel. From Pillow 3.4.0, a deprecation warning
-  was shown. From Pillow 4.2.0, the deprecation warning is removed and
-  an :py:exc:`IOError` is raised.
-
-Removed Core Image Function
-===========================
-
-The unused function ``Image.core.new_array`` was removed. This is an
-internal function that should not have been used by user code, but it
-was accessible from the python layer.
diff --git a/docs/releasenotes/4.2.1.rst b/docs/releasenotes/4.2.1.rst
index 0730936feb0..2061f646746 100644
--- a/docs/releasenotes/4.2.1.rst
+++ b/docs/releasenotes/4.2.1.rst
@@ -4,7 +4,7 @@
 There are no functional changes in this release.
 
 Fixed Windows PyPy Build
-========================
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 A change in the 4.2.0 cycle broke the Windows PyPy build. This has
 been fixed, and PyPy is now part of the Windows CI matrix.
diff --git a/docs/releasenotes/5.1.0.rst b/docs/releasenotes/5.1.0.rst
index 2a4c64ac52e..4e3d10ac596 100644
--- a/docs/releasenotes/5.1.0.rst
+++ b/docs/releasenotes/5.1.0.rst
@@ -1,15 +1,6 @@
 5.1.0
 -----
 
-New File Format
-===============
-
-BLP File Format
-^^^^^^^^^^^^^^^
-
-Pillow now supports reading the BLP "Blizzard Mipmap" file format used
-for tiles in Blizzard's engine.
-
 API Changes
 ===========
 
@@ -21,12 +12,21 @@ and ``CMYK`` with up to 6 8-bit channels, discarding any extra
 channels if the content is tagged as UNSPECIFIED.  Pillow still does
 not store more than 4 8-bit channels of image data.
 
+API Additions
+=============
+
 Append to PDF Files
 ^^^^^^^^^^^^^^^^^^^
 
 Images can now be appended to PDF files in place by passing in
 ``append=True`` when saving the image.
 
+New BLP File Format
+^^^^^^^^^^^^^^^^^^^
+
+Pillow now supports reading the BLP "Blizzard Mipmap" file format used
+for tiles in Blizzard's engine.
+
 Other Changes
 =============
 
diff --git a/docs/releasenotes/6.2.0.rst b/docs/releasenotes/6.2.0.rst
index 7daac1b1902..b851c56fc0e 100644
--- a/docs/releasenotes/6.2.0.rst
+++ b/docs/releasenotes/6.2.0.rst
@@ -1,6 +1,53 @@
 6.2.0
 -----
 
+Security
+========
+
+This release catches several buffer overruns and fixes :cve:`2019-16865`.
+
+Buffer overruns
+^^^^^^^^^^^^^^^
+
+In ``RawDecode.c``, an error is now thrown if skip is calculated to be less than
+zero. It is intended to skip padding between lines, not to go backwards.
+
+In ``PsdImagePlugin``, if the combined sizes of the individual parts is larger than
+the declared size of the extra data field, then it looked for the next layer by
+seeking backwards. This is now corrected by seeking to (the start of the layer
++ the size of the extra data field) instead of (the read parts of the layer +
+the rest of the layer).
+
+Decompression bomb checks have been added to GIF and ICO formats.
+
+An error is now raised if a TIFF dimension is a string, rather than trying to
+perform operations on it.
+
+:cve:`2019-16865`: Fix DOS attack
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The CVE is regarding DOS problems, such as consuming large amounts of memory,
+or taking a large amount of time to process an image.
+
+API Changes
+===========
+
+Image.getexif
+^^^^^^^^^^^^^
+
+To allow for lazy loading of Exif data, ``Image.getexif()`` now returns a
+shared instance of ``Image.Exif``.
+
+Deprecations
+^^^^^^^^^^^^
+
+Image.frombuffer
+~~~~~~~~~~~~~~~~
+
+There has been a longstanding warning that the defaults of ``Image.frombuffer``
+may change in the future for the "raw" decoder. The change will now take place
+in Pillow 7.0.
+
 API Additions
 =============
 
@@ -46,46 +93,6 @@ ImageGrab on multi-monitor Windows
 An ``all_screens`` argument has been added to ``ImageGrab.grab``. If ``True``,
 all monitors will be included in the created image.
 
-API Changes
-===========
-
-Image.getexif
-^^^^^^^^^^^^^
-
-To allow for lazy loading of Exif data, ``Image.getexif()`` now returns a
-shared instance of ``Image.Exif``.
-
-Deprecations
-^^^^^^^^^^^^
-
-Image.frombuffer
-~~~~~~~~~~~~~~~~
-
-There has been a longstanding warning that the defaults of ``Image.frombuffer``
-may change in the future for the "raw" decoder. The change will now take place
-in Pillow 7.0.
-
-Security
-========
-
-This release catches several buffer overruns, as well as addressing
-:cve:`2019-16865`. The CVE is regarding DOS problems, such as consuming large
-amounts of memory, or taking a large amount of time to process an image.
-
-In RawDecode.c, an error is now thrown if skip is calculated to be less than
-zero. It is intended to skip padding between lines, not to go backwards.
-
-In PsdImagePlugin, if the combined sizes of the individual parts is larger than
-the declared size of the extra data field, then it looked for the next layer by
-seeking backwards. This is now corrected by seeking to (the start of the layer
-+ the size of the extra data field) instead of (the read parts of the layer +
-the rest of the layer).
-
-Decompression bomb checks have been added to GIF and ICO formats.
-
-An error is now raised if a TIFF dimension is a string, rather than trying to
-perform operations on it.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/6.2.1.rst b/docs/releasenotes/6.2.1.rst
index ca298fa702c..372298fbc2a 100644
--- a/docs/releasenotes/6.2.1.rst
+++ b/docs/releasenotes/6.2.1.rst
@@ -18,8 +18,6 @@ Pillow 7.0.0 will be released on 2020-01-01 and will drop support for Python
 Other Changes
 =============
 
-
-
 Support added for Python 3.8
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/releasenotes/6.2.2.rst b/docs/releasenotes/6.2.2.rst
index 47692a3de6a..85b0d0ba96a 100644
--- a/docs/releasenotes/6.2.2.rst
+++ b/docs/releasenotes/6.2.2.rst
@@ -4,15 +4,17 @@
 Security
 ========
 
-This release addresses several security problems.
+This release fixes several buffer overflow issues and a DOS attack vulnerability.
 
-:cve:`2019-19911` is regarding FPX images. If an image reports that it has a large
-number of bands, a large amount of resources will be used when trying to process the
-image. This is fixed by limiting the number of bands to those usable by Pillow.
+:cve:`2020-5310`, :cve:`2020-5311`, :cve:`2020-5312`, :cve:`2020-5313`: Overflow checks added
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Buffer overruns were found when processing an SGI (:cve:`2020-5311`),
-PCX (:cve:`2020-5312`) or FLI image (:cve:`2020-5313`). Checks have been added
-to prevent this.
+Overflow checks have been added when calculating the size of a memory block to be reallocated
+in the processing of TIFF, SGI, PCX and FLI images.
 
-:cve:`2020-5310`: Overflow checks have been added when calculating the size of a
-memory block to be reallocated in the processing of a TIFF image.
+:cve:`2019-19911`: DOS attack vulnerability
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If an FPX image reports that it has a large number of bands, a large amount of
+resources will be used when trying to process the image. This is fixed by
+limiting the number of bands to those usable by Pillow.
diff --git a/docs/releasenotes/7.1.0.rst b/docs/releasenotes/7.1.0.rst
index 6e231464e93..0dd8669a5b8 100644
--- a/docs/releasenotes/7.1.0.rst
+++ b/docs/releasenotes/7.1.0.rst
@@ -1,6 +1,40 @@
 7.1.0
 -----
 
+Security
+========
+
+This release includes many security fixes.
+
+:cve:`2020-10177`: Multiple out-of-bounds reads in FLI decoding
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Pillow before 7.1.0 has multiple out-of-bounds reads in ``libImaging/FliDecode.c``.
+
+:cve:`2020-10378`: Bounds overflow in PCX decoding
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In ``libImaging/PcxDecode.c`` in Pillow before 7.1.0, an out-of-bounds read can occur
+when reading PCX files where ``state->shuffle`` is instructed to read beyond
+``state->buffer``.
+
+:cve:`2020-10379`: Two buffer overflows in TIFF decoding
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In Pillow before 7.1.0, there are two buffer overflows in ``libImaging/TiffDecode.c``.
+
+:cve:`2020-10994`: Bounds overflow in JPEG 2000 decoding
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In ``libImaging/Jpeg2KDecode.c`` in Pillow before 7.1.0, there are multiple
+out-of-bounds reads via a crafted JP2 file.
+
+:cve:`2020-11538`: Buffer overflow in SGI-RLE decoding
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In ``libImaging/SgiRleDecode.c`` in Pillow through 7.0.0, a number of out-of-bounds
+reads exist in the parsing of SGI image files, a different issue than :cve:`2020-5311`.
+
 API Changes
 ===========
 
@@ -67,17 +101,6 @@ Passing a different value on Windows or macOS will force taking a snapshot
 using the selected X server; pass an empty string to use the default X server.
 XCB support is not included in pre-compiled wheels for Windows and macOS.
 
-Security
-========
-
-This release includes security fixes.
-
-* :cve:`2020-10177` Fix multiple out-of-bounds reads in FLI decoding
-* :cve:`2020-10378` Fix bounds overflow in PCX decoding
-* :cve:`2020-10379` Fix two buffer overflows in TIFF decoding
-* :cve:`2020-10994` Fix bounds overflow in JPEG 2000 decoding
-* :cve:`2020-11538` Fix buffer overflow in SGI-RLE decoding
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/7.1.1.rst b/docs/releasenotes/7.1.1.rst
index 2169e6a05b8..4afdb664588 100644
--- a/docs/releasenotes/7.1.1.rst
+++ b/docs/releasenotes/7.1.1.rst
@@ -2,7 +2,7 @@
 -----
 
 Fix regression seeking PNG files
-================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This fixes a regression introduced in 7.1.0 when adding support for APNG files when calling
 ``seek`` and ``tell``:
diff --git a/docs/releasenotes/7.1.2.rst b/docs/releasenotes/7.1.2.rst
index ec0063e7953..63a4b7aadbf 100644
--- a/docs/releasenotes/7.1.2.rst
+++ b/docs/releasenotes/7.1.2.rst
@@ -2,7 +2,7 @@
 -----
 
 Fix another regression seeking PNG files
-========================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This fixes a regression introduced in 7.1.0 when adding support for APNG files.
 
diff --git a/docs/releasenotes/8.0.0.rst b/docs/releasenotes/8.0.0.rst
index 2bf299dd3d8..1fc245c9a3c 100644
--- a/docs/releasenotes/8.0.0.rst
+++ b/docs/releasenotes/8.0.0.rst
@@ -30,7 +30,7 @@ Image.fromstring, im.fromstring and im.tostring
 ImageCms.CmsProfile attributes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Some attributes in :py:class:`PIL.ImageCms.CmsProfile` have been removed:
+Some attributes in :py:class:`PIL.ImageCms.core.CmsProfile` have been removed:
 
 ========================  ===================================================
 Removed                   Use instead
diff --git a/docs/releasenotes/8.0.1.rst b/docs/releasenotes/8.0.1.rst
index f7a1cea65da..29a28443f5e 100644
--- a/docs/releasenotes/8.0.1.rst
+++ b/docs/releasenotes/8.0.1.rst
@@ -4,12 +4,13 @@
 Security
 ========
 
-Update FreeType used in binary wheels to `2.10.4`_ to fix :cve:`2020-15999`:
+:cve:`2020-15999`: Update FreeType in wheels to `2.10.4`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-  - A heap buffer overflow has been found  in the handling of embedded PNG bitmaps,
-    introduced in FreeType version 2.6.
+* A heap buffer overflow has been found  in the handling of embedded PNG bitmaps,
+  introduced in FreeType version 2.6.
 
-    If you use option ``FT_CONFIG_OPTION_USE_PNG`` you should upgrade immediately.
+* If you use option ``FT_CONFIG_OPTION_USE_PNG`` you should upgrade immediately.
 
 We strongly recommend updating to Pillow 8.0.1 if you are using Pillow 8.0.0, which improved support for bitmap fonts.
 
diff --git a/docs/releasenotes/8.1.0.rst b/docs/releasenotes/8.1.0.rst
index 69726e628b7..5c399331846 100644
--- a/docs/releasenotes/8.1.0.rst
+++ b/docs/releasenotes/8.1.0.rst
@@ -1,6 +1,50 @@
 8.1.0
 -----
 
+Security
+========
+
+This release includes security fixes.
+
+* An out-of-bounds read when saving TIFFs with custom metadata through LibTIFF
+* An out-of-bounds read when saving a GIF of 1px width
+
+:cve:`2020-35653`: Buffer read overrun in PCX decoding
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The PCX image decoder used the reported image stride to calculate
+the row buffer, rather than calculating it from the image size. This issue dates back
+to the PIL fork. Thanks to Google's `OSS-Fuzz`_ project for finding this.
+
+:cve:`2020-35654`: TIFF out-of-bounds write error
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Out-of-bounds write in ``TiffDecode.c`` when reading corrupt YCbCr
+files in some LibTIFF versions (4.1.0/Ubuntu 20.04, but not 4.0.9/Ubuntu 18.04).
+In some cases LibTIFF's interpretation of the file is different when reading in RGBA mode,
+leading to an out-of-bounds write in ``TiffDecode.c``. This potentially affects Pillow
+versions from 6.0.0 to 8.0.1, depending on the version of LibTIFF. This was reported through
+`Tidelift`_.
+
+:cve:`2020-35655`: SGI Decode buffer overrun
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+4 byte read overflow in ``SgiRleDecode.c``, where the code was not correctly
+checking the offsets and length tables. Independently reported through `Tidelift`_ and Google's
+`OSS-Fuzz`_. This vulnerability covers Pillow versions 4.3.0->8.0.1.
+
+.. _Tidelift: https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pillow&utm_medium=referral&utm_campaign=docs
+.. _OSS-Fuzz: https://github.com/google/oss-fuzz
+
+Dependencies
+^^^^^^^^^^^^
+
+OpenJPEG in the macOS and Linux wheels has been updated from 2.3.1 to 2.4.0, including
+security fixes.
+
+LibTIFF in the macOS and Linux wheels has been updated from 4.1.0 to 4.2.0, including
+security fixes discovered by fuzzers.
+
 Deprecations
 ============
 
@@ -33,46 +77,6 @@ With this release, a list of images can be provided to the ``append_images`` par
 when saving, to replace the scaled down versions. This is the same functionality that
 already exists for the ICNS format.
 
-Security
-========
-
-This release includes security fixes.
-
-* An out-of-bounds read when saving TIFFs with custom metadata through LibTIFF
-* An out-of-bounds read when saving a GIF of 1px width
-* :cve:`2020-35653` Buffer read overrun in PCX decoding
-
-The PCX image decoder used the reported image stride to calculate the row buffer,
-rather than calculating it from the image size. This issue dates back to the PIL fork.
-Thanks to Google's `OSS-Fuzz`_ project for finding this.
-
-* :cve:`2020-35654` Fix TIFF out-of-bounds write error
-
-Out-of-bounds write in ``TiffDecode.c`` when reading corrupt YCbCr files in some
-LibTIFF versions (4.1.0/Ubuntu 20.04, but not 4.0.9/Ubuntu 18.04). In some cases
-LibTIFF's interpretation of the file is different when reading in RGBA mode, leading to
-an out-of-bounds write in ``TiffDecode.c``. This potentially affects Pillow versions
-from 6.0.0 to 8.0.1, depending on the version of LibTIFF. This was reported through
-`Tidelift`_.
-
-* :cve:`2020-35655` Fix for SGI Decode buffer overrun
-
-4 byte read overflow in ``SgiRleDecode.c``, where the code was not correctly checking the
-offsets and length tables. Independently reported through `Tidelift`_ and Google's
-`OSS-Fuzz`_. This vulnerability covers Pillow versions 4.3.0->8.0.1.
-
-.. _Tidelift: https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pillow&utm_medium=referral&utm_campaign=docs
-.. _OSS-Fuzz: https://github.com/google/oss-fuzz
-
-Dependencies
-^^^^^^^^^^^^
-
-OpenJPEG in the macOS and Linux wheels has been updated from 2.3.1 to 2.4.0, including
-security fixes.
-
-LibTIFF in the macOS and Linux wheels has been updated from 4.1.0 to 4.2.0, including
-security fixes discovered by fuzzers.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/8.1.1.rst b/docs/releasenotes/8.1.1.rst
index 18d0a33f1cd..690421c2a56 100644
--- a/docs/releasenotes/8.1.1.rst
+++ b/docs/releasenotes/8.1.1.rst
@@ -4,21 +4,33 @@
 Security
 ========
 
-:cve:`2021-25289`: The previous fix for :cve:`2020-35654` was insufficient
-due to incorrect error checking in ``TiffDecode.c``.
+:cve:`2021-25289`: Correct the fix for :cve:`2020-35654`
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-:cve:`2021-25290`: In ``TiffDecode.c``, there is a negative-offset ``memcpy``
-with an invalid size.
+The previous fix for :cve:`2020-35654` was insufficient due to incorrect
+error checking in ``TiffDecode.c``.
 
-:cve:`2021-25291`: In ``TiffDecode.c``, invalid tile boundaries could lead to
-an out-of-bounds read in ``TIFFReadRGBATile``.
+:cve:`2021-25290`: Fix buffer overflow in ``TiffDecode.c``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-:cve:`2021-25292`: The PDF parser has a catastrophic backtracking regex
-that could be used as a DOS attack.
+In ``TiffDecode.c``, there is a negative-offset ``memcpy`` with an invalid size.
 
-:cve:`2021-25293`: There is an out-of-bounds read in ``SgiRleDecode.c``,
-since Pillow 4.3.0.
+:cve:`2021-25291`: Fix buffer overflow in ``TIFFReadRGBATile``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+In ``TiffDecode.c``, invalid tile boundaries could lead to an out-of-bounds
+read in ``TIFFReadRGBATile``.
+
+:cve:`2021-25292`: Fix DOS attack
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The PDF parser has a catastrophic backtracking regex that could be used as a
+DOS attack.
+
+:cve:`2021-25293`: Fix buffer overflow in ``SgiRleDecode.c``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There is an out-of-bounds read in ``SgiRleDecode.c`` since Pillow 4.3.0.
 
 Other Changes
 =============
diff --git a/docs/releasenotes/8.1.2.rst b/docs/releasenotes/8.1.2.rst
index de50a3f1dad..de6ba605e6b 100644
--- a/docs/releasenotes/8.1.2.rst
+++ b/docs/releasenotes/8.1.2.rst
@@ -4,9 +4,12 @@
 Security
 ========
 
-There is an exhaustion of memory DOS in the BLP (:cve:`2021-27921`),
-ICNS (:cve:`2021-27922`) and ICO (:cve:`2021-27923`) container formats
+:cve:`2021-27921`, :cve:`2021-27922`, :cve:`2021-27923`: Fix DOS attacks
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There is an exhaustion of memory DOS attack in BLP, ICNS, ICO images
 where Pillow did not properly check the reported size of the contained image.
-These images could cause arbitrarily large memory allocations. This was reported
-by Jiayi Lin, Luke Shaffer, Xinran Xie, and Akshay Ajayan of
-`Arizona State University <https://www.asu.edu/>`_.
+These images could cause arbitrarily large memory allocations.
+
+These issues were reported by Jiayi Lin, Luke Shaffer, Xinran Xie and
+Akshay Ajayan of `Arizona State University <https://www.asu.edu/>`_.
diff --git a/docs/releasenotes/8.2.0.rst b/docs/releasenotes/8.2.0.rst
index 452077f1a64..50fe9aa1988 100644
--- a/docs/releasenotes/8.2.0.rst
+++ b/docs/releasenotes/8.2.0.rst
@@ -1,6 +1,60 @@
 8.2.0
 -----
 
+Security
+========
+
+These issues were all found with `OSS-Fuzz`_.
+
+:cve:`2021-25287`, :cve:`2021-25288`: OOB read in Jpeg2KDecode
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* For J2k images with multiple bands, it's legal to have different widths for each band,
+  e.g. 1 byte for ``L``, 4 bytes for ``A``.
+* This dates to Pillow 2.4.0.
+
+:cve:`2021-28675`: DOS attack in PsdImagePlugin
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* :py:class:`.PsdImagePlugin.PsdImageFile` did not sanity check the number of input
+  layers with regard to the size of the data block, this could lead to a
+  denial-of-service on :py:meth:`~PIL.Image.open` prior to
+  :py:meth:`~PIL.Image.Image.load`.
+* This dates to the PIL fork.
+
+:cve:`2021-28676`: FLI image DOS attack
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* ``FliDecode.c`` did not properly check that the block advance was non-zero,
+  potentially leading to an infinite loop on load.
+* This dates to the PIL fork.
+
+:cve:`2021-28677`: EPS DOS on _open
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* The readline used in EPS has to deal with any combination of ``\r`` and ``\n`` as line
+  endings. It accidentally used a quadratic method of accumulating lines while looking
+  for a line ending.
+* A malicious EPS file could use this to perform a denial-of-service of Pillow in the
+  open phase, before an image was accepted for opening.
+* This dates to the PIL fork.
+
+:cve:`2021-28678`: BLP DOS attack
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* ``BlpImagePlugin`` did not properly check that reads after jumping to file offsets
+  returned data. This could lead to a denial-of-service where the decoder could be run a
+  large number of times on empty data.
+* This dates to Pillow 5.1.0.
+
+Fix memory DOS in ImageFont
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* A corrupt or specially crafted TTF font could have font metrics that lead to
+  unreasonably large sizes when rendering text in font. ``ImageFont.py`` did not check
+  the image size before allocating memory for it.
+* This dates to the PIL fork.
+
 Deprecations
 ============
 
@@ -123,61 +177,6 @@ be specified through a keyword argument::
 
     im.save("out.tif", icc_profile=...)
 
-
-Security
-========
-
-These were all found with `OSS-Fuzz`_.
-
-:cve:`2021-25287`, :cve:`2021-25288`: Fix OOB read in Jpeg2KDecode
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* For J2k images with multiple bands, it's legal to have different widths for each band,
-  e.g. 1 byte for ``L``, 4 bytes for ``A``.
-* This dates to Pillow 2.4.0.
-
-:cve:`2021-28675`: Fix DOS in PsdImagePlugin
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* :py:class:`.PsdImagePlugin.PsdImageFile` did not sanity check the number of input
-  layers with regard to the size of the data block, this could lead to a
-  denial-of-service on :py:meth:`~PIL.Image.open` prior to
-  :py:meth:`~PIL.Image.Image.load`.
-* This dates to the PIL fork.
-
-:cve:`2021-28676`: Fix FLI DOS
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* ``FliDecode.c`` did not properly check that the block advance was non-zero,
-  potentially leading to an infinite loop on load.
-* This dates to the PIL fork.
-
-:cve:`2021-28677`: Fix EPS DOS on _open
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* The readline used in EPS has to deal with any combination of ``\r`` and ``\n`` as line
-  endings. It accidentally used a quadratic method of accumulating lines while looking
-  for a line ending.
-* A malicious EPS file could use this to perform a denial-of-service of Pillow in the
-  open phase, before an image was accepted for opening.
-* This dates to the PIL fork.
-
-:cve:`2021-28678`: Fix BLP DOS
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* ``BlpImagePlugin`` did not properly check that reads after jumping to file offsets
-  returned data. This could lead to a denial-of-service where the decoder could be run a
-  large number of times on empty data.
-* This dates to Pillow 5.1.0.
-
-Fix memory DOS in ImageFont
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* A corrupt or specially crafted TTF font could have font metrics that lead to
-  unreasonably large sizes when rendering text in font. ``ImageFont.py`` did not check
-  the image size before allocating memory for it.
-* This dates to the PIL fork.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/8.3.0.rst b/docs/releasenotes/8.3.0.rst
index e74880f6f40..4ef914f6471 100644
--- a/docs/releasenotes/8.3.0.rst
+++ b/docs/releasenotes/8.3.0.rst
@@ -1,6 +1,27 @@
 8.3.0
 -----
 
+Security
+========
+
+:cve:`2021-34552`: Fix buffer overflow
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+PIL since 1.1.4 and Pillow since 1.0 allowed parameters passed into a convert
+function to trigger buffer overflow in ``Convert.c``.
+
+Parsing XML
+^^^^^^^^^^^
+
+Pillow previously parsed XMP data using Python's ``xml`` module. However, this module
+is not secure.
+
+- :py:meth:`~PIL.Image.Image.getexif` has used ``xml`` to potentially retrieve
+  orientation data since Pillow 7.2.0. It has been refactored to use ``re`` instead.
+- ``getxmp()`` was added to :py:class:`~PIL.JpegImagePlugin.JpegImageFile` in Pillow
+  8.2.0. It will now use ``defusedxml`` instead. If the dependency is not present, an
+  empty dictionary will be returned and a warning raised.
+
 Deprecations
 ============
 
@@ -79,28 +100,6 @@ format, through the new ``bitmap_format`` argument::
 
     im.save("out.ico", bitmap_format="bmp")
 
-Security
-========
-
-Buffer overflow
-^^^^^^^^^^^^^^^
-
-This release addresses :cve:`2021-34552`. PIL since 1.1.4 and Pillow since 1.0
-allowed parameters passed into a convert function to trigger buffer overflow in
-Convert.c.
-
-Parsing XML
-^^^^^^^^^^^
-
-Pillow previously parsed XMP data using Python's ``xml`` module. However, this module
-is not secure.
-
-- :py:meth:`~PIL.Image.Image.getexif` has used ``xml`` to potentially retrieve
-  orientation data since Pillow 7.2.0. It has been refactored to use ``re`` instead.
-- :py:meth:`~PIL.JpegImagePlugin.JpegImageFile.getxmp` was added in Pillow 8.2.0. It
-  will now use ``defusedxml`` instead. If the dependency is not present, an empty
-  dictionary will be returned and a warning raised.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/8.3.1.rst b/docs/releasenotes/8.3.1.rst
index 6af2b37bfe1..edcda3d614f 100644
--- a/docs/releasenotes/8.3.1.rst
+++ b/docs/releasenotes/8.3.1.rst
@@ -2,7 +2,7 @@
 -----
 
 Fixed regression converting to NumPy arrays
-===========================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This fixes a regression introduced in 8.3.0 when converting an image to a NumPy array
 with a ``dtype`` argument.
@@ -19,7 +19,7 @@ with a ``dtype`` argument.
     >>>
 
 Catch OSError when checking if destination is sys.stdout
-========================================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In 8.3.0, a check to see if the destination was ``sys.stdout`` when saving an image was
 updated. This lead to an :py:exc:`OSError` being raised if the environment restricted
@@ -28,7 +28,7 @@ access.
 The :py:exc:`OSError` is now silently caught.
 
 Fixed removing orientation in ImageOps.exif_transpose
-=====================================================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In 8.3.0, :py:meth:`~PIL.ImageOps.exif_transpose` was changed to ensure that the
 original image EXIF data was not modified, and the orientation was only removed from
diff --git a/docs/releasenotes/8.3.2.rst b/docs/releasenotes/8.3.2.rst
index 3333d63a1e8..34ba703f70a 100644
--- a/docs/releasenotes/8.3.2.rst
+++ b/docs/releasenotes/8.3.2.rst
@@ -4,14 +4,21 @@
 Security
 ========
 
-* :cve:`2021-23437`: Avoid a potential ReDoS (regular expression denial of service)
-  in :py:class:`~PIL.ImageColor`'s :py:meth:`~PIL.ImageColor.getrgb` by raising
-  :py:exc:`ValueError` if the color specifier is too long. Present since Pillow 5.2.0.
-
-* Fix 6-byte out-of-bounds (OOB) read. The previous bounds check in ``FliDecode.c``
-  incorrectly calculated the required read buffer size when copying a chunk, potentially
-  reading six extra bytes off the end of the allocated buffer from the heap. Present
-  since Pillow 7.1.0. This bug was found by Google's `OSS-Fuzz`_ `CIFuzz`_ runs.
+:cve:`2021-23437`: Avoid potential ReDoS (regular expression denial of service)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Avoid a potential ReDoS (regular expression denial of service) in :py:class:`~PIL.ImageColor`'s
+:py:meth:`~PIL.ImageColor.getrgb` by raising :py:exc:`ValueError` if the color specifier is
+too long. Present since Pillow 5.2.0.
+
+Fix 6-byte out-of-bounds (OOB) read
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Fix 6-byte out-of-bounds (OOB) read. The previous bounds check in ``FliDecode.c`` incorrectly
+calculated the required read buffer size when copying a chunk, potentially reading six extra
+bytes off the end of the allocated buffer from the heap. Present since Pillow 7.1.0.
+
+This bug was found by Google's `OSS-Fuzz`_ `CIFuzz`_ runs.
 
 Other Changes
 =============
diff --git a/docs/releasenotes/8.4.0.rst b/docs/releasenotes/8.4.0.rst
index e61471e726f..bdc8e802082 100644
--- a/docs/releasenotes/8.4.0.rst
+++ b/docs/releasenotes/8.4.0.rst
@@ -1,14 +1,11 @@
 8.4.0
 -----
 
-API Changes
-===========
-
 Deprecations
-^^^^^^^^^^^^
+============
 
 ImagePalette size parameter
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The ``size`` parameter will be removed in Pillow 10.0.0 (2023-07-01).
 
diff --git a/docs/releasenotes/9.0.0.rst b/docs/releasenotes/9.0.0.rst
index 090ec802467..fee66b6d0b5 100644
--- a/docs/releasenotes/9.0.0.rst
+++ b/docs/releasenotes/9.0.0.rst
@@ -24,6 +24,41 @@ success of Python.
 
 Thank you, Fredrik.
 
+Security
+========
+
+Ensure JpegImagePlugin stops at the end of a truncated file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``JpegImagePlugin`` may append an EOF marker to the end of a truncated file, so that
+the last segment of the data will still be processed by the decoder.
+
+If the EOF marker is not detected as such however, this could lead to an infinite
+loop where ``JpegImagePlugin`` keeps trying to end the file.
+
+Remove consecutive duplicate tiles that only differ by their offset
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To prevent attempts to slow down loading times for images, if an image has consecutive
+duplicate tiles that only differ by their offset, only load the last tile. Credit to
+Google's `OSS-Fuzz`_ project for finding this issue.
+
+:cve:`2022-22817`: Restrict builtins available to ImageMath.eval
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To limit :py:class:`PIL.ImageMath` to working with images, Pillow
+will now restrict the builtins available to :py:meth:`!PIL.ImageMath.eval`. This will
+help prevent problems arising if users evaluate arbitrary expressions, such as
+``ImageMath.eval("exec(exit())")``.
+
+:cve:`2022-22815`, :cve:`2022-22816`: ImagePath.Path array handling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+:cve:`2022-22815` (:cwe:`126`) and :cve:`2022-22816` (:cwe:`665`) were found when
+initializing ``ImagePath.Path``.
+
+.. _OSS-Fuzz: https://github.com/google/oss-fuzz
+
 Backwards Incompatible Changes
 ==============================
 
@@ -97,41 +132,6 @@ Support has been added for the "title" argument in
 argument will also now be supported, e.g. ``im.show(title="My Image")`` and
 ``ImageShow.show(im, title="My Image")``.
 
-Security
-========
-
-Ensure JpegImagePlugin stops at the end of a truncated file
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-``JpegImagePlugin`` may append an EOF marker to the end of a truncated file, so that
-the last segment of the data will still be processed by the decoder.
-
-If the EOF marker is not detected as such however, this could lead to an infinite
-loop where ``JpegImagePlugin`` keeps trying to end the file.
-
-Remove consecutive duplicate tiles that only differ by their offset
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-To prevent attempts to slow down loading times for images, if an image has consecutive
-duplicate tiles that only differ by their offset, only load the last tile. Credit to
-Google's `OSS-Fuzz`_ project for finding this issue.
-
-Restrict builtins available to ImageMath.eval
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-:cve:`2022-22817`: To limit :py:class:`PIL.ImageMath` to working with images, Pillow
-will now restrict the builtins available to :py:meth:`PIL.ImageMath.eval`. This will
-help prevent problems arising if users evaluate arbitrary expressions, such as
-``ImageMath.eval("exec(exit())")``.
-
-Fixed ImagePath.Path array handling
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-:cve:`2022-22815` (:cwe:`126`) and :cve:`2022-22816` (:cwe:`665`) were
-found when initializing ``ImagePath.Path``.
-
-.. _OSS-Fuzz: https://github.com/google/oss-fuzz
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/9.0.1.rst b/docs/releasenotes/9.0.1.rst
index acb92dc4151..f65e3bcc2ec 100644
--- a/docs/releasenotes/9.0.1.rst
+++ b/docs/releasenotes/9.0.1.rst
@@ -6,14 +6,20 @@ Security
 
 This release addresses several security problems.
 
-:cve:`2022-24303`: If the path to the temporary directory on Linux or macOS
+:cve:`2022-24303`: Temp image removal
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If the path to the temporary directory on Linux or macOS
 contained a space, this would break removal of the temporary image file after
 ``im.show()`` (and related actions), and potentially remove an unrelated file. This
 has been present since PIL.
 
-:cve:`2022-22817`: While Pillow 9.0 restricted top-level builtins available to
-:py:meth:`PIL.ImageMath.eval`, it did not prevent builtins available to lambda
-expressions. These are now also restricted.
+:cve:`2022-22817`: Restrict lambda expressions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+While Pillow 9.0 restricted top-level builtins available to
+:py:meth:`!PIL.ImageMath.eval`, it did not prevent builtins
+available to lambda expressions. These are now also restricted.
 
 Other Changes
 =============
diff --git a/docs/releasenotes/9.1.0.rst b/docs/releasenotes/9.1.0.rst
index 02da702a799..5b83d1e9c56 100644
--- a/docs/releasenotes/9.1.0.rst
+++ b/docs/releasenotes/9.1.0.rst
@@ -1,49 +1,6 @@
 9.1.0
 -----
 
-API Changes
-===========
-
-Raise an error when performing a negative crop
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Performing a negative crop on an image previously just returned a ``(0, 0)`` image. Now
-it will raise a :py:exc:`ValueError`, to help reduce confusion if a user has unintentionally
-provided the wrong arguments.
-
-Added specific error if path coordinate type is incorrect
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Rather than returning a :py:exc:`SystemError`, passing the incorrect types of coordinates into
-a path will now raise a more specific :py:exc:`ValueError`, with the message "incorrect
-coordinate type".
-
-Replace requirements.txt with extras
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Rather than installing all dependencies for docs and tests via ``requirements.txt``,
-``extras_require`` is used instead. This installs only those needed and at the same
-time as installing Pillow.
-
-For example:
-
-.. code-block:: bash
-
-    # Install with dependencies for tests:
-    python3 -m pip install .[tests]
-
-    # Or for building docs:
-    python3 -m pip install .[docs]
-
-    # Or for all:
-    python3 -m pip install .[docs,tests]
-
-On macOS, the last argument may need to be wrapped in quotes, e.g.
-``python3 -m pip install ".[tests]"``
-
-Therefore ``requirements.txt`` has been removed along with the ``make install-req``
-command for installing its contents.
-
 Deprecations
 ============
 
@@ -51,7 +8,7 @@ Constants
 ^^^^^^^^^
 
 A number of constants have been deprecated and will be removed in Pillow 10.0.0
-(2023-07-01). Instead, ``enum.IntEnum`` classes have been added.
+(2023-07-01). Instead, :py:class:`enum.IntEnum` classes have been added.
 
 .. note::
 
@@ -137,6 +94,49 @@ The stub image plugin ``FitsStubImagePlugin`` has been deprecated and will be re
 Pillow 10.0.0 (2023-07-01). FITS images can be read without a handler through
 :mod:`~PIL.FitsImagePlugin` instead.
 
+API Changes
+===========
+
+Raise an error when performing a negative crop
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Performing a negative crop on an image previously just returned a ``(0, 0)`` image. Now
+it will raise a :py:exc:`ValueError`, to help reduce confusion if a user has unintentionally
+provided the wrong arguments.
+
+Added specific error if path coordinate type is incorrect
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Rather than returning a :py:exc:`SystemError`, passing the incorrect types of coordinates into
+a path will now raise a more specific :py:exc:`ValueError`, with the message "incorrect
+coordinate type".
+
+Replace requirements.txt with extras
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Rather than installing all dependencies for docs and tests via ``requirements.txt``,
+``extras_require`` is used instead. This installs only those needed and at the same
+time as installing Pillow.
+
+For example:
+
+.. code-block:: bash
+
+    # Install with dependencies for tests:
+    python3 -m pip install .[tests]
+
+    # Or for building docs:
+    python3 -m pip install .[docs]
+
+    # Or for all:
+    python3 -m pip install .[docs,tests]
+
+On macOS, the last argument may need to be wrapped in quotes, e.g.
+``python3 -m pip install ".[tests]"``
+
+Therefore ``requirements.txt`` has been removed along with the ``make install-req``
+command for installing its contents.
+
 API Additions
 =============
 
diff --git a/docs/releasenotes/9.1.1.rst b/docs/releasenotes/9.1.1.rst
index bab70f8f984..746bec4d4d6 100644
--- a/docs/releasenotes/9.1.1.rst
+++ b/docs/releasenotes/9.1.1.rst
@@ -4,13 +4,19 @@
 Security
 ========
 
-This release addresses several security problems.
+This release addresses several security issues.
 
-:cve:`2022-30595`: When reading a TGA file with RLE packets that cross scan lines,
+:cve:`2022-30595`: Heap buffer overflow
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When reading a TGA file with RLE packets that cross scan lines,
 Pillow reads the information past the end of the first line without deducting that
 from the length of the remaining file data. This vulnerability was introduced in Pillow
 9.1.0, and can cause a heap buffer overflow.
 
+Decompression bomb check fix
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 Opening an image with a zero or negative height has been found to bypass a
 decompression bomb check. This will now raise a :py:exc:`SyntaxError` instead, in turn
 raising a ``PIL.UnidentifiedImageError``.
diff --git a/docs/releasenotes/9.2.0.rst b/docs/releasenotes/9.2.0.rst
index b875edf8e5c..6e064734391 100644
--- a/docs/releasenotes/9.2.0.rst
+++ b/docs/releasenotes/9.2.0.rst
@@ -1,6 +1,11 @@
 9.2.0
 -----
 
+Security
+========
+
+An additional decompression bomb check has been added for the GIF format.
+
 Deprecations
 ============
 
@@ -69,10 +74,10 @@ Previous code::
 
     im = Image.new("RGB", (100, 100))
     draw = ImageDraw.Draw(im)
-    width, height = draw.textsize("Hello world")
+    width, height = draw.textsize("Hello world", font)
 
     width, height = font.getsize_multiline("Hello\nworld")
-    width, height = draw.multiline_textsize("Hello\nworld")
+    width, height = draw.multiline_textsize("Hello\nworld", font)
 
 Use instead::
 
@@ -84,11 +89,43 @@ Use instead::
 
     im = Image.new("RGB", (100, 100))
     draw = ImageDraw.Draw(im)
-    width = draw.textlength("Hello world")
+    width = draw.textlength("Hello world", font)
 
-    left, top, right, bottom = draw.multiline_textbbox((0, 0), "Hello\nworld")
+    left, top, right, bottom = draw.multiline_textbbox((0, 0), "Hello\nworld", font)
     width, height = right - left, bottom - top
 
+Previously, the ``size`` methods returned a ``height`` that included the vertical
+offset of the text, while the new ``bbox`` methods distinguish this as a ``top``
+offset.
+
+.. image:: ../example/size_vs_bbox.webp
+    :alt: In bbox methods, top measures the vertical distance above the text, while bottom measures that plus the vertical distance of the text itself. In size methods, height also measures the vertical distance above the text plus the vertical distance of the text itself.
+    :align: center
+
+If you are using these methods for aligning text, consider using :ref:`text-anchors` instead
+which avoid issues that can occur with non-English text or unusual fonts.
+For example, instead of the following code::
+
+    from PIL import Image, ImageDraw, ImageFont
+
+    font = ImageFont.truetype("Tests/fonts/FreeMono.ttf")
+
+    im = Image.new("RGB", (100, 100))
+    draw = ImageDraw.Draw(im)
+    width, height = draw.textsize("Hello world", font)
+    x, y = (100 - width) / 2, (100 - height) / 2
+    draw.text((x, y), "Hello world", font=font)
+
+Use instead::
+
+    from PIL import Image, ImageDraw, ImageFont
+
+    font = ImageFont.truetype("Tests/fonts/FreeMono.ttf")
+
+    im = Image.new("RGB", (100, 100))
+    draw = ImageDraw.Draw(im)
+    draw.text((100 / 2, 100 / 2), "Hello world", font=font, anchor="mm")
+
 API Additions
 =============
 
@@ -100,11 +137,6 @@ with "transparency" in ``im.info``, and apply the transparency to the palette in
 The image's palette mode will become "RGBA", and "transparency" will be removed from
 ``im.info``.
 
-Security
-========
-
-An additional decompression bomb check has been added for the GIF format.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/9.3.0.rst b/docs/releasenotes/9.3.0.rst
index fde2faae3a7..e5987ce086c 100644
--- a/docs/releasenotes/9.3.0.rst
+++ b/docs/releasenotes/9.3.0.rst
@@ -1,6 +1,33 @@
 9.3.0
 -----
 
+Security
+========
+
+Initialize libtiff buffer when saving
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When saving a TIFF image to a file object using libtiff, the buffer was not
+initialized. This behaviour introduced in Pillow 2.0.0, and has now been fixed.
+
+Decode JPEG compressed BLP1 data in original mode
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Within the BLP image format, BLP1 data may use JPEG compression. Instead of
+telling the JPEG library that this data is in BGRX mode, Pillow will now
+decode the data in its natural CMYK mode, then convert it to RGB and rearrange
+the channels afterwards. Trying to load the data in an incorrect mode could
+result in a segmentation fault. This issue was introduced in Pillow 9.1.0.
+
+Limit SAMPLESPERPIXEL to avoid runtime DOS
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A large value in the ``SAMPLESPERPIXEL`` tag could lead to a memory and runtime DOS in
+``TiffImagePlugin.py`` when setting up the context for image decoding.
+This was introduced in Pillow 9.2.0, found with `OSS-Fuzz`_ and fixed by limiting
+``SAMPLESPERPIXEL`` to the number of planes that we can decode.
+
+
 API Additions
 =============
 
@@ -33,35 +60,9 @@ Added ExifTags enums
 ^^^^^^^^^^^^^^^^^^^^
 
 The data from :py:data:`~PIL.ExifTags.TAGS` and
-:py:data:`~PIL.ExifTags.GPSTAGS` is now also exposed as ``enum.IntEnum``
-classes: :py:data:`~PIL.ExifTags.Base` and :py:data:`~PIL.ExifTags.GPS`.
-
-
-Security
-========
-
-Initialize libtiff buffer when saving
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-When saving a TIFF image to a file object using libtiff, the buffer was not
-initialized. This behaviour introduced in Pillow 2.0.0, and has now been fixed.
-
-Decode JPEG compressed BLP1 data in original mode
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Within the BLP image format, BLP1 data may use JPEG compression. Instead of
-telling the JPEG library that this data is in BGRX mode, Pillow will now
-decode the data in its natural CMYK mode, then convert it to RGB and rearrange
-the channels afterwards. Trying to load the data in an incorrect mode could
-result in a segmentation fault. This issue was introduced in Pillow 9.1.0.
-
-Limit SAMPLESPERPIXEL to avoid runtime DOS
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-A large value in the ``SAMPLESPERPIXEL`` tag could lead to a memory and runtime DOS in
-``TiffImagePlugin.py`` when setting up the context for image decoding.
-This was introduced in Pillow 9.2.0, found with `OSS-Fuzz`_ and fixed by limiting
-``SAMPLESPERPIXEL`` to the number of planes that we can decode.
+:py:data:`~PIL.ExifTags.GPSTAGS` is now also exposed as
+:py:class:`enum.IntEnum` classes: :py:data:`~PIL.ExifTags.Base` and
+:py:data:`~PIL.ExifTags.GPS`.
 
 
 Other Changes
diff --git a/docs/releasenotes/9.4.0.rst b/docs/releasenotes/9.4.0.rst
index 0af5bc8ca11..37f26a22c05 100644
--- a/docs/releasenotes/9.4.0.rst
+++ b/docs/releasenotes/9.4.0.rst
@@ -1,6 +1,25 @@
 9.4.0
 -----
 
+Security
+========
+
+Fix memory DOS in ImageFont
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A corrupt or specially crafted TTF font could have font metrics that lead to
+unreasonably large sizes when rendering text in font. ``ImageFont.py`` did not
+check the image size before allocating memory for it. This dates to the PIL
+fork. Pillow 8.2.0 added a check for large sizes, but did not consider the
+case where one dimension is zero.
+
+Null pointer dereference crash in ImageFont
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Pillow attempted to dereference a null pointer in ``ImageFont``, leading to a
+crash. An error is now raised instead. This has been present since
+Pillow 8.0.0.
+
 API Additions
 =============
 
@@ -69,25 +88,6 @@ When saving a JPEG image, a comment can now be written from
 
     im.save(out, comment="Test comment")
 
-Security
-========
-
-Fix memory DOS in ImageFont
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-A corrupt or specially crafted TTF font could have font metrics that lead to
-unreasonably large sizes when rendering text in font. ``ImageFont.py`` did not
-check the image size before allocating memory for it. This dates to the PIL
-fork. Pillow 8.2.0 added a check for large sizes, but did not consider the
-case where one dimension is zero.
-
-Null pointer dereference crash in ImageFont
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Pillow attempted to dereference a null pointer in ``ImageFont``, leading to a
-crash. An error is now raised instead. This has been present since
-Pillow 8.0.0.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/9.5.0.rst b/docs/releasenotes/9.5.0.rst
index b1e982fccff..501479bb6df 100644
--- a/docs/releasenotes/9.5.0.rst
+++ b/docs/releasenotes/9.5.0.rst
@@ -1,13 +1,38 @@
 9.5.0
 -----
 
+Security
+========
+
+Clear PPM half token after use
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Image files that are small on disk are often prevented from expanding to be
+big images consuming a large amount of resources simply because they lack the
+data to populate those resources.
+
+PpmImagePlugin might hold onto the last data read for a pixel value in case the
+pixel value has not been finished yet. However, that data was not being cleared
+afterwards, meaning that infinite data could be available to fill any image
+size. This has been present since Pillow 9.2.0.
+
+That data is now cleared after use.
+
+Saving TIFF tag ImageSourceData
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If Pillow incorrectly saved the TIFF tag ImageSourceData as ASCII instead of
+UNDEFINED, a segmentation fault was triggered.
+
+The correct tag type will now be used by default instead.
+
 Deprecations
 ============
 
 PSFile
 ^^^^^^
 
-The :py:class:`~PIL.EpsImagePlugin.PSFile` class has been deprecated and will
+The :py:class:`!PSFile` class has been deprecated and will
 be removed in Pillow 11 (2024-10-15). This class was only made as a helper to
 be used internally, so there is no replacement. If you need this functionality
 though, it is a very short class that can easily be recreated in your own code.
@@ -46,31 +71,6 @@ If OpenJPEG 2.4.0 or later is available and the ``plt`` keyword argument
 is present and true when saving JPEG2000 images, tell the encoder to generate
 PLT markers.
 
-Security
-========
-
-Clear PPM half token after use
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Image files that are small on disk are often prevented from expanding to be
-big images consuming a large amount of resources simply because they lack the
-data to populate those resources.
-
-PpmImagePlugin might hold onto the last data read for a pixel value in case the
-pixel value has not been finished yet. However, that data was not being cleared
-afterwards, meaning that infinite data could be available to fill any image
-size. This has been present since Pillow 9.2.0.
-
-That data is now cleared after use.
-
-Saving TIFF tag ImageSourceData
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If Pillow incorrectly saved the TIFF tag ImageSourceData as ASCII instead of
-UNDEFINED, a segmentation fault was triggered.
-
-The correct tag type will now be used by default instead.
-
 Other Changes
 =============
 
diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
index d8034853cc2..641cda4efb5 100644
--- a/docs/releasenotes/index.rst
+++ b/docs/releasenotes/index.rst
@@ -14,6 +14,9 @@ expected to be backported to earlier versions.
 .. toctree::
   :maxdepth: 2
 
+  11.0.0
+  10.4.0
+  10.3.0
   10.2.0
   10.1.0
   10.0.1
@@ -68,4 +71,8 @@ expected to be backported to earlier versions.
   3.0.0
   2.8.0
   2.7.0
+  2.6.0
+  2.5.2
+  2.3.2
+  2.3.1
   versioning
diff --git a/docs/releasenotes/template.rst b/docs/releasenotes/template.rst
index 440d04b1cc4..cfc7221a3cc 100644
--- a/docs/releasenotes/template.rst
+++ b/docs/releasenotes/template.rst
@@ -1,6 +1,19 @@
 xx.y.z
 ------
 
+Security
+========
+
+TODO
+^^^^
+
+TODO
+
+:cve:`YYYY-XXXXX`: TODO
+^^^^^^^^^^^^^^^^^^^^^^^
+
+TODO
+
 Backwards Incompatible Changes
 ==============================
 
@@ -31,14 +44,6 @@ TODO
 
 TODO
 
-Security
-========
-
-TODO
-^^^^
-
-TODO
-
 Other Changes
 =============
 
diff --git a/pyproject.toml b/pyproject.toml
index da2537b2137..c55be769341 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,18 +14,20 @@ readme = "README.md"
 keywords = [
   "Imaging",
 ]
-license = {text = "HPND"}
-authors = [{name = "Jeffrey A. Clark (Alex)", email = "aclark@aclark.net"}]
-requires-python = ">=3.8"
+license = { text = "MIT-CMU" }
+authors = [
+  { name = "Jeffrey A. Clark", email = "aclark@aclark.net" },
+]
+requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 6 - Mature",
-  "License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND)",
+  "License :: OSI Approved :: CMU License (MIT-CMU)",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
   "Topic :: Multimedia :: Graphics",
@@ -33,27 +35,26 @@ classifiers = [
   "Topic :: Multimedia :: Graphics :: Capture :: Screen Capture",
   "Topic :: Multimedia :: Graphics :: Graphics Conversion",
   "Topic :: Multimedia :: Graphics :: Viewers",
+  "Typing :: Typed",
 ]
 dynamic = [
   "version",
 ]
-[project.optional-dependencies]
-docs = [
+optional-dependencies.docs = [
   "furo",
   "olefile",
-  "sphinx>=2.4",
+  "sphinx>=8.1",
   "sphinx-copybutton",
   "sphinx-inline-tabs",
-  "sphinx-removed-in",
   "sphinxext-opengraph",
 ]
-fpx = [
+optional-dependencies.fpx = [
   "olefile",
 ]
-mic = [
+optional-dependencies.mic = [
   "olefile",
 ]
-tests = [
+optional-dependencies.tests = [
   "check-manifest",
   "coverage",
   "defusedxml",
@@ -65,29 +66,29 @@ tests = [
   "pytest-cov",
   "pytest-timeout",
 ]
-typing = [
-  'typing-extensions; python_version < "3.10"',
+optional-dependencies.typing = [
+  "typing-extensions; python_version<'3.10'",
 ]
-xmp = [
+optional-dependencies.xmp = [
   "defusedxml",
 ]
-[project.urls]
-Changelog = "https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst"
-Documentation = "https://pillow.readthedocs.io"
-Funding = "https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi"
-Homepage = "https://python-pillow.org"
-Mastodon = "https://fosstodon.org/@pillow"
-"Release notes" = "https://pillow.readthedocs.io/en/stable/releasenotes/index.html"
-Source = "https://github.com/python-pillow/Pillow"
-Twitter = "https://twitter.com/PythonPillow"
+urls.Changelog = "https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst"
+urls.Documentation = "https://pillow.readthedocs.io"
+urls.Funding = "https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi"
+urls.Homepage = "https://python-pillow.org"
+urls.Mastodon = "https://fosstodon.org/@pillow"
+urls."Release notes" = "https://pillow.readthedocs.io/en/stable/releasenotes/index.html"
+urls.Source = "https://github.com/python-pillow/Pillow"
 
 [tool.setuptools]
-packages = ["PIL"]
+packages = [
+  "PIL",
+]
 include-package-data = true
-package-dir = {"" = "src"}
+package-dir = { "" = "src" }
 
 [tool.setuptools.dynamic]
-version = {attr = "PIL.__version__"}
+version = { attr = "PIL.__version__" }
 
 [tool.cibuildwheel]
 before-all = ".github/workflows/wheels-dependencies.sh"
@@ -96,43 +97,67 @@ config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable"
 test-command = "cd {project} && .github/workflows/wheels-test.sh"
 test-extras = "tests"
 
+[tool.black]
+exclude = "wheels/multibuild"
+
 [tool.ruff]
-select = [
-  "C4", # flake8-comprehensions
-  "E", # pycodestyle errors
-  "EM", # flake8-errmsg
-  "F", # pyflakes errors
-  "I", # isort
-  "ISC", # flake8-implicit-str-concat
-  "PGH", # pygrep-hooks
+exclude = [ "wheels/multibuild" ]
+
+fix = true
+lint.select = [
+  "C4",     # flake8-comprehensions
+  "E",      # pycodestyle errors
+  "EM",     # flake8-errmsg
+  "F",      # pyflakes errors
+  "I",      # isort
+  "ISC",    # flake8-implicit-str-concat
+  "LOG",    # flake8-logging
+  "PGH",    # pygrep-hooks
+  "PT",     # flake8-pytest-style
+  "PYI",    # flake8-pyi
   "RUF100", # unused noqa (yesqa)
-  "UP", # pyupgrade
-  "W", # pycodestyle warnings
-  "YTT", # flake8-2020
-  # "LOG", # TODO: enable flake8-logging when it's not in preview anymore
+  "UP",     # pyupgrade
+  "W",      # pycodestyle warnings
+  "YTT",    # flake8-2020
 ]
-extend-ignore = [
-  "E203", # Whitespace before ':'
-  "E221", # Multiple spaces before operator
-  "E226", # Missing whitespace around arithmetic operator
-  "E241", # Multiple spaces after ','
+lint.ignore = [
+  "E203",   # Whitespace before ':'
+  "E221",   # Multiple spaces before operator
+  "E226",   # Missing whitespace around arithmetic operator
+  "E241",   # Multiple spaces after ','
+  "PT001",  # pytest-fixture-incorrect-parentheses-style
+  "PT007",  # pytest-parametrize-values-wrong-type
+  "PT011",  # pytest-raises-too-broad
+  "PT012",  # pytest-raises-with-multiple-statements
+  "PT017",  # pytest-assert-in-except
+  "PYI026", # flake8-pyi: typing.TypeAlias added in Python 3.10
+  "PYI034", # flake8-pyi: typing.Self added in Python 3.11
+]
+lint.per-file-ignores."Tests/oss-fuzz/fuzz_font.py" = [
+  "I002",
+]
+lint.per-file-ignores."Tests/oss-fuzz/fuzz_pillow.py" = [
+  "I002",
+]
+lint.flake8-pytest-style.parametrize-names-type = "csv"
+lint.isort.known-first-party = [
+  "PIL",
+]
+lint.isort.required-imports = [
+  "from __future__ import annotations",
 ]
 
-[tool.ruff.per-file-ignores]
-"Tests/*.py" = ["I001"]
-"Tests/oss-fuzz/fuzz_font.py" = ["I002"]
-"Tests/oss-fuzz/fuzz_pillow.py" = ["I002"]
-
-[tool.ruff.isort]
-known-first-party = ["PIL"]
-required-imports = ["from __future__ import annotations"]
+[tool.pyproject-fmt]
+max_supported_python = "3.13"
 
 [tool.pytest.ini_options]
 addopts = "-ra --color=yes"
-testpaths = ["Tests"]
+testpaths = [
+  "Tests",
+]
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 pretty = true
 disallow_any_generics = true
 enable_error_code = "ignore-without-code"
@@ -141,20 +166,3 @@ follow_imports = "silent"
 warn_redundant_casts = true
 warn_unreachable = true
 warn_unused_ignores = true
-exclude = [
-  '^src/PIL/_tkinter_finder.py$',
-  '^src/PIL/DdsImagePlugin.py$',
-  '^src/PIL/FpxImagePlugin.py$',
-  '^src/PIL/Image.py$',
-  '^src/PIL/ImageMath.py$',
-  '^src/PIL/ImageMorph.py$',
-  '^src/PIL/ImageQt.py$',
-  '^src/PIL/ImageShow.py$',
-  '^src/PIL/ImImagePlugin.py$',
-  '^src/PIL/MicImagePlugin.py$',
-  '^src/PIL/PdfParser.py$',
-  '^src/PIL/PyAccess.py$',
-  '^src/PIL/TiffImagePlugin.py$',
-  '^src/PIL/TiffTags.py$',
-  '^src/PIL/WebPImagePlugin.py$',
-]
diff --git a/selftest.py b/selftest.py
index ed5252c4464..e9b5689a0d4 100755
--- a/selftest.py
+++ b/selftest.py
@@ -52,7 +52,7 @@ def testimage() -> None:
     or you call the "load" method:
 
     >>> im = Image.open("Tests/images/hopper.ppm")
-    >>> print(im.im) # internal image attribute
+    >>> print(im._im) # internal image attribute
     None
     >>> a = im.load()
     >>> type(im.im) # doctest: +ELLIPSIS
@@ -139,7 +139,9 @@ def testimage() -> None:
     In 1.1.6, you can use the ImageMath module to do image
     calculations.
 
-    >>> im = ImageMath.eval("float(im + 20)", im=im.convert("L"))
+    >>> im = ImageMath.lambda_eval( \
+      lambda args: args["float"](args["im"] + 20), im=im.convert("L") \
+    )
     >>> im.mode, im.size
     ('F', (128, 128))
 
@@ -163,9 +165,9 @@ def testimage() -> None:
     print("Running selftest:")
     status = doctest.testmod(sys.modules[__name__])
     if status[0]:
-        print("*** %s tests of %d failed." % status)
+        print(f"*** {status[0]} tests of {status[1]} failed.")
         exit_status = 1
     else:
-        print("--- %s tests passed." % status[1])
+        print(f"--- {status[1]} tests passed.")
 
     sys.exit(exit_status)
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index 1bf0bcff558..60707083f6e
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # > pyroma .
 # ------------------------------
 # Checking .
@@ -16,16 +15,20 @@
 import subprocess
 import sys
 import warnings
+from collections.abc import Iterator
+from typing import Any
 
 from setuptools import Extension, setup
 from setuptools.command.build_ext import build_ext
 
 
-def get_version():
+def get_version() -> str:
     version_file = "src/PIL/_version.py"
     with open(version_file, encoding="utf-8") as f:
-        exec(compile(f.read(), version_file, "exec"))
-    return locals()["__version__"]
+        return f.read().split('"')[1]
+
+
+configuration: dict[str, list[str]] = {}
 
 
 PILLOW_VERSION = get_version()
@@ -36,11 +39,13 @@ def get_version():
 JPEG2K_ROOT = None
 JPEG_ROOT = None
 LCMS_ROOT = None
+RAQM_ROOT = None
 TIFF_ROOT = None
+WEBP_ROOT = None
 ZLIB_ROOT = None
 FUZZING_BUILD = "LIB_FUZZING_ENGINE" in os.environ
 
-if sys.platform == "win32" and sys.version_info >= (3, 13):
+if sys.platform == "win32" and sys.version_info >= (3, 14):
     import atexit
 
     atexit.register(
@@ -140,7 +145,7 @@ class RequiredDependencyException(Exception):
 PLATFORM_MINGW = os.name == "nt" and "GCC" in sys.version
 
 
-def _dbg(s, tp=None):
+def _dbg(s: str, tp: Any = None) -> None:
     if DEBUG:
         if tp:
             print(s % tp)
@@ -148,10 +153,13 @@ def _dbg(s, tp=None):
         print(s)
 
 
-def _find_library_dirs_ldconfig():
+def _find_library_dirs_ldconfig() -> list[str]:
     # Based on ctypes.util from Python 2
 
     ldconfig = "ldconfig" if shutil.which("ldconfig") else "/sbin/ldconfig"
+    args: list[str]
+    env: dict[str, str]
+    expr: str
     if sys.platform.startswith("linux") or sys.platform.startswith("gnu"):
         if struct.calcsize("l") == 4:
             machine = os.uname()[4] + "-32"
@@ -181,13 +189,11 @@ def _find_library_dirs_ldconfig():
 
     try:
         p = subprocess.Popen(
-            args, stderr=subprocess.DEVNULL, stdout=subprocess.PIPE, env=env
+            args, stderr=subprocess.DEVNULL, stdout=subprocess.PIPE, env=env, text=True
         )
     except OSError:  # E.g. command not found
         return []
-    [data, _] = p.communicate()
-    if isinstance(data, bytes):
-        data = data.decode("latin1")
+    data = p.communicate()[0]
 
     dirs = []
     for dll in re.findall(expr, data):
@@ -197,7 +203,9 @@ def _find_library_dirs_ldconfig():
     return dirs
 
 
-def _add_directory(path, subdir, where=None):
+def _add_directory(
+    path: list[str], subdir: str | None, where: int | None = None
+) -> None:
     if subdir is None:
         return
     subdir = os.path.realpath(subdir)
@@ -213,7 +221,7 @@ def _add_directory(path, subdir, where=None):
         path.insert(where, subdir)
 
 
-def _find_include_file(self, include):
+def _find_include_file(self: pil_build_ext, include: str) -> int:
     for directory in self.compiler.include_dirs:
         _dbg("Checking for include file %s in %s", (include, directory))
         if os.path.isfile(os.path.join(directory, include)):
@@ -222,7 +230,7 @@ def _find_include_file(self, include):
     return 0
 
 
-def _find_library_file(self, library):
+def _find_library_file(self: pil_build_ext, library: str) -> str | None:
     ret = self.compiler.find_library_file(self.compiler.library_dirs, library)
     if ret:
         _dbg("Found library %s at %s", (library, ret))
@@ -231,7 +239,7 @@ def _find_library_file(self, library):
     return ret
 
 
-def _find_include_dir(self, dirname, include):
+def _find_include_dir(self: pil_build_ext, dirname: str, include: str) -> bool | str:
     for directory in self.compiler.include_dirs:
         _dbg("Checking for include file %s in %s", (include, directory))
         if os.path.isfile(os.path.join(directory, include)):
@@ -242,6 +250,7 @@ def _find_include_dir(self, dirname, include):
         if os.path.isfile(os.path.join(subdir, include)):
             _dbg("Found %s in %s", (include, subdir))
             return subdir
+    return False
 
 
 def _cmd_exists(cmd: str) -> bool:
@@ -253,7 +262,7 @@ def _cmd_exists(cmd: str) -> bool:
     )
 
 
-def _pkg_config(name):
+def _pkg_config(name: str) -> tuple[list[str], list[str]] | None:
     command = os.environ.get("PKG_CONFIG", "pkg-config")
     for keep_system in (True, False):
         try:
@@ -280,10 +289,11 @@ def _pkg_config(name):
             return libs, cflags
         except Exception:
             pass
+    return None
 
 
 class pil_build_ext(build_ext):
-    class feature:
+    class ext_feature:
         features = [
             "zlib",
             "jpeg",
@@ -292,32 +302,38 @@ class feature:
             "raqm",
             "lcms",
             "webp",
-            "webpmux",
             "jpeg2000",
             "imagequant",
             "xcb",
         ]
 
         required = {"jpeg", "zlib"}
-        vendor = set()
+        vendor: set[str] = set()
 
-        def __init__(self):
+        def __init__(self) -> None:
+            self._settings: dict[str, str | bool | None] = {}
             for f in self.features:
-                setattr(self, f, None)
+                self.set(f, None)
 
-        def require(self, feat):
+        def require(self, feat: str) -> bool:
             return feat in self.required
 
-        def want(self, feat):
-            return getattr(self, feat) is None
+        def get(self, feat: str) -> str | bool | None:
+            return self._settings[feat]
+
+        def set(self, feat: str, value: str | bool | None) -> None:
+            self._settings[feat] = value
+
+        def want(self, feat: str) -> bool:
+            return self._settings[feat] is None
 
-        def want_vendor(self, feat):
+        def want_vendor(self, feat: str) -> bool:
             return feat in self.vendor
 
-        def __iter__(self):
+        def __iter__(self) -> Iterator[str]:
             yield from self.features
 
-    feature = feature()
+    feature = ext_feature()
 
     user_options = (
         build_ext.user_options
@@ -334,17 +350,26 @@ def __iter__(self):
         + [("add-imaging-libs=", None, "Add libs to _imaging build")]
     )
 
-    def initialize_options(self):
-        self.disable_platform_guessing = None
+    @staticmethod
+    def check_configuration(option: str, value: str) -> bool | None:
+        return True if value in configuration.get(option, []) else None
+
+    def initialize_options(self) -> None:
+        self.disable_platform_guessing = self.check_configuration(
+            "platform-guessing", "disable"
+        )
         self.add_imaging_libs = ""
         build_ext.initialize_options(self)
         for x in self.feature:
-            setattr(self, f"disable_{x}", None)
-            setattr(self, f"enable_{x}", None)
+            setattr(self, f"disable_{x}", self.check_configuration(x, "disable"))
+            setattr(self, f"enable_{x}", self.check_configuration(x, "enable"))
         for x in ("raqm", "fribidi"):
-            setattr(self, f"vendor_{x}", None)
+            setattr(self, f"vendor_{x}", self.check_configuration(x, "vendor"))
+        if self.check_configuration("debug", "true"):
+            self.debug = True
+        self.parallel = configuration.get("parallel", [None])[-1]
 
-    def finalize_options(self):
+    def finalize_options(self) -> None:
         build_ext.finalize_options(self)
         if self.debug:
             global DEBUG
@@ -352,12 +377,16 @@ def finalize_options(self):
         if not self.parallel:
             # If --parallel (or -j) wasn't specified, we want to reproduce the same
             # behavior as before, that is, auto-detect the number of jobs.
-            try:
-                self.parallel = int(
-                    os.environ.get("MAX_CONCURRENCY", min(4, os.cpu_count()))
-                )
-            except TypeError:
-                self.parallel = None
+            self.parallel = None
+
+            cpu_count = os.cpu_count()
+            if cpu_count is not None:
+                try:
+                    self.parallel = int(
+                        os.environ.get("MAX_CONCURRENCY", min(4, cpu_count))
+                    )
+                except TypeError:
+                    pass
         for x in self.feature:
             if getattr(self, f"disable_{x}"):
                 setattr(self.feature, x, False)
@@ -391,7 +420,13 @@ def finalize_options(self):
                 _dbg("Using vendored version of %s", x)
                 self.feature.vendor.add(x)
 
-    def _update_extension(self, name, libraries, define_macros=None, sources=None):
+    def _update_extension(
+        self,
+        name: str,
+        libraries: list[str] | list[str | bool | None],
+        define_macros: list[tuple[str, str | None]] | None = None,
+        sources: list[str] | None = None,
+    ) -> None:
         for extension in self.extensions:
             if extension.name == name:
                 extension.libraries += libraries
@@ -404,13 +439,13 @@ def _update_extension(self, name, libraries, define_macros=None, sources=None):
                     extension.extra_link_args = ["--stdlib=libc++"]
                 break
 
-    def _remove_extension(self, name):
+    def _remove_extension(self, name: str) -> None:
         for extension in self.extensions:
             if extension.name == name:
                 self.extensions.remove(extension)
                 break
 
-    def get_macos_sdk_path(self):
+    def get_macos_sdk_path(self) -> str | None:
         try:
             sdk_path = (
                 subprocess.check_output(["xcrun", "--show-sdk-path"])
@@ -431,9 +466,9 @@ def get_macos_sdk_path(self):
                 sdk_path = commandlinetools_sdk_path
         return sdk_path
 
-    def build_extensions(self):
-        library_dirs = []
-        include_dirs = []
+    def build_extensions(self) -> None:
+        library_dirs: list[str] = []
+        include_dirs: list[str] = []
 
         pkg_config = None
         if _cmd_exists(os.environ.get("PKG_CONFIG", "pkg-config")):
@@ -449,25 +484,30 @@ def build_extensions(self):
             "FREETYPE_ROOT": "freetype2",
             "HARFBUZZ_ROOT": "harfbuzz",
             "FRIBIDI_ROOT": "fribidi",
+            "RAQM_ROOT": "raqm",
+            "WEBP_ROOT": "libwebp",
             "LCMS_ROOT": "lcms2",
             "IMAGEQUANT_ROOT": "libimagequant",
         }.items():
             root = globals()[root_name]
 
             if root is None and root_name in os.environ:
-                prefix = os.environ[root_name]
-                root = (os.path.join(prefix, "lib"), os.path.join(prefix, "include"))
+                root_prefix = os.environ[root_name]
+                root = (
+                    os.path.join(root_prefix, "lib"),
+                    os.path.join(root_prefix, "include"),
+                )
 
             if root is None and pkg_config:
-                if isinstance(lib_name, tuple):
+                if isinstance(lib_name, str):
+                    _dbg(f"Looking for `{lib_name}` using pkg-config.")
+                    root = pkg_config(lib_name)
+                else:
                     for lib_name2 in lib_name:
                         _dbg(f"Looking for `{lib_name2}` using pkg-config.")
                         root = pkg_config(lib_name2)
                         if root:
                             break
-                else:
-                    _dbg(f"Looking for `{lib_name}` using pkg-config.")
-                    root = pkg_config(lib_name)
 
             if isinstance(root, tuple):
                 lib_root, include_root = root
@@ -570,6 +610,9 @@ def build_extensions(self):
             if sdk_path:
                 _add_directory(library_dirs, os.path.join(sdk_path, "usr", "lib"))
                 _add_directory(include_dirs, os.path.join(sdk_path, "usr", "include"))
+
+                for extension in self.extensions:
+                    extension.extra_compile_args = ["-Wno-nullability-completeness"]
         elif (
             sys.platform.startswith("linux")
             or sys.platform.startswith("gnu")
@@ -644,22 +687,22 @@ def build_extensions(self):
             _dbg("Looking for zlib")
             if _find_include_file(self, "zlib.h"):
                 if _find_library_file(self, "z"):
-                    feature.zlib = "z"
+                    feature.set("zlib", "z")
                 elif sys.platform == "win32" and _find_library_file(self, "zlib"):
-                    feature.zlib = "zlib"  # alternative name
+                    feature.set("zlib", "zlib")  # alternative name
 
         if feature.want("jpeg"):
             _dbg("Looking for jpeg")
             if _find_include_file(self, "jpeglib.h"):
                 if _find_library_file(self, "jpeg"):
-                    feature.jpeg = "jpeg"
+                    feature.set("jpeg", "jpeg")
                 elif sys.platform == "win32" and _find_library_file(self, "libjpeg"):
-                    feature.jpeg = "libjpeg"  # alternative name
+                    feature.set("jpeg", "libjpeg")  # alternative name
 
-        feature.openjpeg_version = None
+        feature.set("openjpeg_version", None)
         if feature.want("jpeg2000"):
             _dbg("Looking for jpeg2000")
-            best_version = None
+            best_version: tuple[int, ...] | None = None
             best_path = None
 
             # Find the best version
@@ -689,26 +732,26 @@ def build_extensions(self):
                 # <openjpeg.h> rather than having to cope with the versioned
                 # include path
                 _add_directory(self.compiler.include_dirs, best_path, 0)
-                feature.jpeg2000 = "openjp2"
-                feature.openjpeg_version = ".".join(str(x) for x in best_version)
+                feature.set("jpeg2000", "openjp2")
+                feature.set("openjpeg_version", ".".join(str(x) for x in best_version))
 
         if feature.want("imagequant"):
             _dbg("Looking for imagequant")
             if _find_include_file(self, "libimagequant.h"):
                 if _find_library_file(self, "imagequant"):
-                    feature.imagequant = "imagequant"
+                    feature.set("imagequant", "imagequant")
                 elif _find_library_file(self, "libimagequant"):
-                    feature.imagequant = "libimagequant"
+                    feature.set("imagequant", "libimagequant")
 
         if feature.want("tiff"):
             _dbg("Looking for tiff")
             if _find_include_file(self, "tiff.h"):
                 if _find_library_file(self, "tiff"):
-                    feature.tiff = "tiff"
+                    feature.set("tiff", "tiff")
                 if sys.platform in ["win32", "darwin"] and _find_library_file(
                     self, "libtiff"
                 ):
-                    feature.tiff = "libtiff"
+                    feature.set("tiff", "libtiff")
 
         if feature.want("freetype"):
             _dbg("Looking for freetype")
@@ -729,31 +772,31 @@ def build_extensions(self):
                         freetype_version = 21
                         break
                 if freetype_version:
-                    feature.freetype = "freetype"
+                    feature.set("freetype", "freetype")
                     if subdir:
                         _add_directory(self.compiler.include_dirs, subdir, 0)
 
-        if feature.freetype and feature.want("raqm"):
+        if feature.get("freetype") and feature.want("raqm"):
             if not feature.want_vendor("raqm"):  # want system Raqm
                 _dbg("Looking for Raqm")
                 if _find_include_file(self, "raqm.h"):
                     if _find_library_file(self, "raqm"):
-                        feature.raqm = "raqm"
+                        feature.set("raqm", "raqm")
                     elif _find_library_file(self, "libraqm"):
-                        feature.raqm = "libraqm"
+                        feature.set("raqm", "libraqm")
             else:  # want to build Raqm from src/thirdparty
                 _dbg("Looking for HarfBuzz")
-                feature.harfbuzz = None
+                feature.set("harfbuzz", None)
                 hb_dir = _find_include_dir(self, "harfbuzz", "hb.h")
                 if hb_dir:
                     if isinstance(hb_dir, str):
                         _add_directory(self.compiler.include_dirs, hb_dir, 0)
                     if _find_library_file(self, "harfbuzz"):
-                        feature.harfbuzz = "harfbuzz"
-                if feature.harfbuzz:
+                        feature.set("harfbuzz", "harfbuzz")
+                if feature.get("harfbuzz"):
                     if not feature.want_vendor("fribidi"):  # want system FriBiDi
                         _dbg("Looking for FriBiDi")
-                        feature.fribidi = None
+                        feature.set("fribidi", None)
                         fribidi_dir = _find_include_dir(self, "fribidi", "fribidi.h")
                         if fribidi_dir:
                             if isinstance(fribidi_dir, str):
@@ -761,53 +804,43 @@ def build_extensions(self):
                                     self.compiler.include_dirs, fribidi_dir, 0
                                 )
                             if _find_library_file(self, "fribidi"):
-                                feature.fribidi = "fribidi"
-                                feature.raqm = True
+                                feature.set("fribidi", "fribidi")
+                                feature.set("raqm", True)
                     else:  # want to build FriBiDi shim from src/thirdparty
-                        feature.raqm = True
+                        feature.set("raqm", True)
 
         if feature.want("lcms"):
             _dbg("Looking for lcms")
             if _find_include_file(self, "lcms2.h"):
                 if _find_library_file(self, "lcms2"):
-                    feature.lcms = "lcms2"
+                    feature.set("lcms", "lcms2")
                 elif _find_library_file(self, "lcms2_static"):
                     # alternate Windows name.
-                    feature.lcms = "lcms2_static"
+                    feature.set("lcms", "lcms2_static")
 
         if feature.want("webp"):
             _dbg("Looking for webp")
-            if _find_include_file(self, "webp/encode.h") and _find_include_file(
-                self, "webp/decode.h"
+            if all(
+                _find_include_file(self, "webp/" + include)
+                for include in ("encode.h", "decode.h", "mux.h", "demux.h")
             ):
-                # In Google's precompiled zip it is call "libwebp":
-                if _find_library_file(self, "webp"):
-                    feature.webp = "webp"
-                elif _find_library_file(self, "libwebp"):
-                    feature.webp = "libwebp"
-
-        if feature.want("webpmux"):
-            _dbg("Looking for webpmux")
-            if _find_include_file(self, "webp/mux.h") and _find_include_file(
-                self, "webp/demux.h"
-            ):
-                if _find_library_file(self, "webpmux") and _find_library_file(
-                    self, "webpdemux"
-                ):
-                    feature.webpmux = "webpmux"
-                if _find_library_file(self, "libwebpmux") and _find_library_file(
-                    self, "libwebpdemux"
-                ):
-                    feature.webpmux = "libwebpmux"
+                # In Google's precompiled zip it is called "libwebp"
+                for prefix in ("", "lib"):
+                    if all(
+                        _find_library_file(self, prefix + library)
+                        for library in ("webp", "webpmux", "webpdemux")
+                    ):
+                        feature.set("webp", prefix + "webp")
+                        break
 
         if feature.want("xcb"):
             _dbg("Looking for xcb")
             if _find_include_file(self, "xcb/xcb.h"):
                 if _find_library_file(self, "xcb"):
-                    feature.xcb = "xcb"
+                    feature.set("xcb", "xcb")
 
         for f in feature:
-            if not getattr(feature, f) and feature.require(f):
+            if not feature.get(f) and feature.require(f):
                 if f in ("jpeg", "zlib"):
                     raise RequiredDependencyException(f)
                 raise DependencyException(f)
@@ -815,10 +848,11 @@ def build_extensions(self):
         #
         # core library
 
-        libs = self.add_imaging_libs.split()
-        defs = []
-        if feature.tiff:
-            libs.append(feature.tiff)
+        libs: list[str | bool | None] = []
+        libs.extend(self.add_imaging_libs.split())
+        defs: list[tuple[str, str | None]] = []
+        if feature.get("tiff"):
+            libs.append(feature.get("tiff"))
             defs.append(("HAVE_LIBTIFF", None))
             if sys.platform == "win32":
                 # This define needs to be defined if-and-only-if it was defined
@@ -826,22 +860,22 @@ def build_extensions(self):
                 # so we have to guess; by default it is defined in all Windows builds.
                 # See #4237, #5243, #5359 for more information.
                 defs.append(("USE_WIN32_FILEIO", None))
-        if feature.jpeg:
-            libs.append(feature.jpeg)
+        if feature.get("jpeg"):
+            libs.append(feature.get("jpeg"))
             defs.append(("HAVE_LIBJPEG", None))
-        if feature.jpeg2000:
-            libs.append(feature.jpeg2000)
+        if feature.get("jpeg2000"):
+            libs.append(feature.get("jpeg2000"))
             defs.append(("HAVE_OPENJPEG", None))
             if sys.platform == "win32" and not PLATFORM_MINGW:
                 defs.append(("OPJ_STATIC", None))
-        if feature.zlib:
-            libs.append(feature.zlib)
+        if feature.get("zlib"):
+            libs.append(feature.get("zlib"))
             defs.append(("HAVE_LIBZ", None))
-        if feature.imagequant:
-            libs.append(feature.imagequant)
+        if feature.get("imagequant"):
+            libs.append(feature.get("imagequant"))
             defs.append(("HAVE_LIBIMAGEQUANT", None))
-        if feature.xcb:
-            libs.append(feature.xcb)
+        if feature.get("xcb"):
+            libs.append(feature.get("xcb"))
             defs.append(("HAVE_XCB", None))
         if sys.platform == "win32":
             libs.extend(["kernel32", "user32", "gdi32"])
@@ -855,22 +889,22 @@ def build_extensions(self):
         #
         # additional libraries
 
-        if feature.freetype:
+        if feature.get("freetype"):
             srcs = []
             libs = ["freetype"]
             defs = []
-            if feature.raqm:
+            if feature.get("raqm"):
                 if not feature.want_vendor("raqm"):  # using system Raqm
                     defs.append(("HAVE_RAQM", None))
                     defs.append(("HAVE_RAQM_SYSTEM", None))
-                    libs.append(feature.raqm)
+                    libs.append(feature.get("raqm"))
                 else:  # building Raqm from src/thirdparty
                     defs.append(("HAVE_RAQM", None))
                     srcs.append("src/thirdparty/raqm/raqm.c")
-                    libs.append(feature.harfbuzz)
+                    libs.append(feature.get("harfbuzz"))
                     if not feature.want_vendor("fribidi"):  # using system FriBiDi
                         defs.append(("HAVE_FRIBIDI_SYSTEM", None))
-                        libs.append(feature.fribidi)
+                        libs.append(feature.get("fribidi"))
                     else:  # building FriBiDi shim from src/thirdparty
                         srcs.append("src/thirdparty/fribidi-shim/fribidi.c")
             self._update_extension("PIL._imagingft", libs, defs, srcs)
@@ -878,24 +912,18 @@ def build_extensions(self):
         else:
             self._remove_extension("PIL._imagingft")
 
-        if feature.lcms:
-            extra = []
+        if feature.get("lcms"):
+            libs = [feature.get("lcms")]
             if sys.platform == "win32":
-                extra.extend(["user32", "gdi32"])
-            self._update_extension("PIL._imagingcms", [feature.lcms] + extra)
+                libs.extend(["user32", "gdi32"])
+            self._update_extension("PIL._imagingcms", libs)
         else:
             self._remove_extension("PIL._imagingcms")
 
-        if feature.webp:
-            libs = [feature.webp]
-            defs = []
-
-            if feature.webpmux:
-                defs.append(("HAVE_WEBPMUX", None))
-                libs.append(feature.webpmux)
-                libs.append(feature.webpmux.replace("pmux", "pdemux"))
-
-            self._update_extension("PIL._webp", libs, defs)
+        webp = feature.get("webp")
+        if isinstance(webp, str):
+            libs = [webp, webp + "mux", webp + "demux"]
+            self._update_extension("PIL._webp", libs)
         else:
             self._remove_extension("PIL._webp")
 
@@ -909,14 +937,14 @@ def build_extensions(self):
 
         self.summary_report(feature)
 
-    def summary_report(self, feature):
+    def summary_report(self, feature: ext_feature) -> None:
         print("-" * 68)
         print("PIL SETUP SUMMARY")
         print("-" * 68)
         print(f"version      Pillow {PILLOW_VERSION}")
-        v = sys.version.split("[")
-        print(f"platform     {sys.platform} {v[0].strip()}")
-        for v in v[1:]:
+        version = sys.version.split("[")
+        print(f"platform     {sys.platform} {version[0].strip()}")
+        for v in version[1:]:
             print(f"             [{v.strip()}")
         print("-" * 68)
 
@@ -927,17 +955,20 @@ def summary_report(self, feature):
                 raqm_extra_info += ", FriBiDi shim"
 
         options = [
-            (feature.jpeg, "JPEG"),
-            (feature.jpeg2000, "OPENJPEG (JPEG2000)", feature.openjpeg_version),
-            (feature.zlib, "ZLIB (PNG/ZIP)"),
-            (feature.imagequant, "LIBIMAGEQUANT"),
-            (feature.tiff, "LIBTIFF"),
-            (feature.freetype, "FREETYPE2"),
-            (feature.raqm, "RAQM (Text shaping)", raqm_extra_info),
-            (feature.lcms, "LITTLECMS2"),
-            (feature.webp, "WEBP"),
-            (feature.webpmux, "WEBPMUX"),
-            (feature.xcb, "XCB (X protocol)"),
+            (feature.get("jpeg"), "JPEG"),
+            (
+                feature.get("jpeg2000"),
+                "OPENJPEG (JPEG2000)",
+                feature.get("openjpeg_version"),
+            ),
+            (feature.get("zlib"), "ZLIB (PNG/ZIP)"),
+            (feature.get("imagequant"), "LIBIMAGEQUANT"),
+            (feature.get("tiff"), "LIBTIFF"),
+            (feature.get("freetype"), "FREETYPE2"),
+            (feature.get("raqm"), "RAQM (Text shaping)", raqm_extra_info),
+            (feature.get("lcms"), "LITTLECMS2"),
+            (feature.get("webp"), "WEBP"),
+            (feature.get("xcb"), "XCB (X protocol)"),
         ]
 
         all = 1
@@ -966,7 +997,7 @@ def summary_report(self, feature):
         print("")
 
 
-def debug_build():
+def debug_build() -> bool:
     return hasattr(sys, "gettotalrefcount") or FUZZING_BUILD
 
 
@@ -985,6 +1016,12 @@ def debug_build():
     Extension("PIL._imagingmorph", ["src/_imagingmorph.c"]),
 ]
 
+
+# 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:
     setup(
         cmdclass={"build_ext": pil_build_ext},
@@ -998,7 +1035,7 @@ def debug_build():
 a required dependency when compiling Pillow from source.
 
 Please see the install instructions at:
-   https://pillow.readthedocs.io/en/latest/installation.html
+   https://pillow.readthedocs.io/en/latest/installation/basic-installation.html
 
 """
     sys.stderr.write(msg)
diff --git a/src/PIL/BdfFontFile.py b/src/PIL/BdfFontFile.py
index e3eda4fe98c..bc1416c74c6 100644
--- a/src/PIL/BdfFontFile.py
+++ b/src/PIL/BdfFontFile.py
@@ -103,7 +103,7 @@ def bdf_char(
 class BdfFontFile(FontFile.FontFile):
     """Font file plugin for the X11 BDF format."""
 
-    def __init__(self, fp: BinaryIO):
+    def __init__(self, fp: BinaryIO) -> None:
         super().__init__()
 
         s = fp.readline()
diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py
index b8f38b78a2e..e5605635e55 100644
--- a/src/PIL/BlpImagePlugin.py
+++ b/src/PIL/BlpImagePlugin.py
@@ -28,12 +28,15 @@
   - DXT3 compression is used if alpha_encoding == 1.
   - DXT5 compression is used if alpha_encoding == 7.
 """
+
 from __future__ import annotations
 
+import abc
 import os
 import struct
 from enum import IntEnum
 from io import BytesIO
+from typing import IO
 
 from . import Image, ImageFile
 
@@ -54,11 +57,13 @@ class AlphaEncoding(IntEnum):
     DXT5 = 7
 
 
-def unpack_565(i):
+def unpack_565(i: int) -> tuple[int, int, int]:
     return ((i >> 11) & 0x1F) << 3, ((i >> 5) & 0x3F) << 2, (i & 0x1F) << 3
 
 
-def decode_dxt1(data, alpha=False):
+def decode_dxt1(
+    data: bytes, alpha: bool = False
+) -> tuple[bytearray, bytearray, bytearray, bytearray]:
     """
     input: one "row" of data (i.e. will produce 4*width pixels)
     """
@@ -66,9 +71,9 @@ def decode_dxt1(data, alpha=False):
     blocks = len(data) // 8  # number of blocks in row
     ret = (bytearray(), bytearray(), bytearray(), bytearray())
 
-    for block in range(blocks):
+    for block_index in range(blocks):
         # Decode next 8-byte block.
-        idx = block * 8
+        idx = block_index * 8
         color0, color1, bits = struct.unpack_from("<HHI", data, idx)
 
         r0, g0, b0 = unpack_565(color0)
@@ -113,7 +118,7 @@ def decode_dxt1(data, alpha=False):
     return ret
 
 
-def decode_dxt3(data):
+def decode_dxt3(data: bytes) -> tuple[bytearray, bytearray, bytearray, bytearray]:
     """
     input: one "row" of data (i.e. will produce 4*width pixels)
     """
@@ -121,8 +126,8 @@ def decode_dxt3(data):
     blocks = len(data) // 16  # number of blocks in row
     ret = (bytearray(), bytearray(), bytearray(), bytearray())
 
-    for block in range(blocks):
-        idx = block * 16
+    for block_index in range(blocks):
+        idx = block_index * 16
         block = data[idx : idx + 16]
         # Decode next 16-byte block.
         bits = struct.unpack_from("<8B", block)
@@ -166,7 +171,7 @@ def decode_dxt3(data):
     return ret
 
 
-def decode_dxt5(data):
+def decode_dxt5(data: bytes) -> tuple[bytearray, bytearray, bytearray, bytearray]:
     """
     input: one "row" of data (i.e. will produce 4 * width pixels)
     """
@@ -174,8 +179,8 @@ def decode_dxt5(data):
     blocks = len(data) // 16  # number of blocks in row
     ret = (bytearray(), bytearray(), bytearray(), bytearray())
 
-    for block in range(blocks):
-        idx = block * 16
+    for block_index in range(blocks):
+        idx = block_index * 16
         block = data[idx : idx + 16]
         # Decode next 16-byte block.
         a0, a1 = struct.unpack_from("<BB", block)
@@ -240,7 +245,7 @@ class BLPFormatError(NotImplementedError):
     pass
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] in (b"BLP1", b"BLP2")
 
 
@@ -252,7 +257,7 @@ class BlpImageFile(ImageFile.ImageFile):
     format = "BLP"
     format_description = "Blizzard Mipmap Format"
 
-    def _open(self):
+    def _open(self) -> None:
         self.magic = self.fp.read(4)
 
         self.fp.seek(5, os.SEEK_CUR)
@@ -268,13 +273,13 @@ def _open(self):
             raise BLPFormatError(msg)
 
         self._mode = "RGBA" if self._blp_alpha_depth else "RGB"
-        self.tile = [(decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))]
+        self.tile = [ImageFile._Tile(decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))]
 
 
 class _BLPBaseDecoder(ImageFile.PyDecoder):
     _pulls_fd = True
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
         try:
             self._read_blp_header()
             self._load()
@@ -283,7 +288,12 @@ def decode(self, buffer):
             raise OSError(msg) from e
         return -1, 0
 
-    def _read_blp_header(self):
+    @abc.abstractmethod
+    def _load(self) -> None:
+        pass
+
+    def _read_blp_header(self) -> None:
+        assert self.fd is not None
         self.fd.seek(4)
         (self._blp_compression,) = struct.unpack("<i", self._safe_read(4))
 
@@ -302,10 +312,11 @@ def _read_blp_header(self):
         self._blp_offsets = struct.unpack("<16I", self._safe_read(16 * 4))
         self._blp_lengths = struct.unpack("<16I", self._safe_read(16 * 4))
 
-    def _safe_read(self, length):
+    def _safe_read(self, length: int) -> bytes:
+        assert self.fd is not None
         return ImageFile._safe_read(self.fd, length)
 
-    def _read_palette(self):
+    def _read_palette(self) -> list[tuple[int, int, int, int]]:
         ret = []
         for i in range(256):
             try:
@@ -315,7 +326,7 @@ def _read_palette(self):
             ret.append((b, g, r, a))
         return ret
 
-    def _read_bgra(self, palette):
+    def _read_bgra(self, palette: list[tuple[int, int, int, int]]) -> bytearray:
         data = bytearray()
         _data = BytesIO(self._safe_read(self._blp_lengths[0]))
         while True:
@@ -324,7 +335,7 @@ def _read_bgra(self, palette):
             except struct.error:
                 break
             b, g, r, a = palette[offset]
-            d = (r, g, b)
+            d: tuple[int, ...] = (r, g, b)
             if self._blp_alpha_depth:
                 d += (a,)
             data.extend(d)
@@ -332,7 +343,7 @@ def _read_bgra(self, palette):
 
 
 class BLP1Decoder(_BLPBaseDecoder):
-    def _load(self):
+    def _load(self) -> None:
         if self._blp_compression == Format.JPEG:
             self._decode_jpeg_stream()
 
@@ -340,7 +351,7 @@ def _load(self):
             if self._blp_encoding in (4, 5):
                 palette = self._read_palette()
                 data = self._read_bgra(palette)
-                self.set_as_raw(bytes(data))
+                self.set_as_raw(data)
             else:
                 msg = f"Unsupported BLP encoding {repr(self._blp_encoding)}"
                 raise BLPFormatError(msg)
@@ -348,29 +359,33 @@ def _load(self):
             msg = f"Unsupported BLP compression {repr(self._blp_encoding)}"
             raise BLPFormatError(msg)
 
-    def _decode_jpeg_stream(self):
+    def _decode_jpeg_stream(self) -> None:
         from .JpegImagePlugin import JpegImageFile
 
         (jpeg_header_size,) = struct.unpack("<I", self._safe_read(4))
         jpeg_header = self._safe_read(jpeg_header_size)
+        assert self.fd is not None
         self._safe_read(self._blp_offsets[0] - self.fd.tell())  # What IS this?
         data = self._safe_read(self._blp_lengths[0])
         data = jpeg_header + data
-        data = BytesIO(data)
-        image = JpegImageFile(data)
+        image = JpegImageFile(BytesIO(data))
         Image._decompression_bomb_check(image.size)
         if image.mode == "CMYK":
             decoder_name, extents, offset, args = image.tile[0]
-            image.tile = [(decoder_name, extents, offset, (args[0], "CMYK"))]
+            assert isinstance(args, tuple)
+            image.tile = [
+                ImageFile._Tile(decoder_name, extents, offset, (args[0], "CMYK"))
+            ]
         r, g, b = image.convert("RGB").split()
-        image = Image.merge("RGB", (b, g, r))
-        self.set_as_raw(image.tobytes())
+        reversed_image = Image.merge("RGB", (b, g, r))
+        self.set_as_raw(reversed_image.tobytes())
 
 
 class BLP2Decoder(_BLPBaseDecoder):
-    def _load(self):
+    def _load(self) -> None:
         palette = self._read_palette()
 
+        assert self.fd is not None
         self.fd.seek(self._blp_offsets[0])
 
         if self._blp_compression == 1:
@@ -411,14 +426,15 @@ def _load(self):
             msg = f"Unknown BLP compression {repr(self._blp_compression)}"
             raise BLPFormatError(msg)
 
-        self.set_as_raw(bytes(data))
+        self.set_as_raw(data)
 
 
 class BLPEncoder(ImageFile.PyEncoder):
     _pushes_fd = True
 
-    def _write_palette(self):
+    def _write_palette(self) -> bytes:
         data = b""
+        assert self.im is not None
         palette = self.im.getpalette("RGBA", "RGBA")
         for i in range(len(palette) // 4):
             r, g, b, a = palette[i * 4 : (i + 1) * 4]
@@ -427,12 +443,13 @@ def _write_palette(self):
             data += b"\x00" * 4
         return data
 
-    def encode(self, bufsize):
+    def encode(self, bufsize: int) -> tuple[int, int, bytes]:
         palette_data = self._write_palette()
 
         offset = 20 + 16 * 4 * 2 + len(palette_data)
         data = struct.pack("<16I", offset, *((0,) * 15))
 
+        assert self.im is not None
         w, h = self.im.size
         data += struct.pack("<16I", w * h, *((0,) * 15))
 
@@ -445,7 +462,7 @@ def encode(self, bufsize):
         return len(data), 0, data
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.mode != "P":
         msg = "Unsupported BLP image mode"
         raise ValueError(msg)
@@ -453,6 +470,7 @@ def _save(im, fp, filename):
     magic = b"BLP1" if im.encoderinfo.get("blp_version") == "BLP1" else b"BLP2"
     fp.write(magic)
 
+    assert im.palette is not None
     fp.write(struct.pack("<i", 1))  # Uncompressed or DirectX compression
     fp.write(struct.pack("<b", Encoding.UNCOMPRESSED))
     fp.write(struct.pack("<b", 1 if im.palette.mode == "RGBA" else 0))
@@ -463,7 +481,7 @@ def _save(im, fp, filename):
         fp.write(struct.pack("<i", 5))
         fp.write(struct.pack("<i", 0))
 
-    ImageFile._save(im, fp, [("BLP", (0, 0) + im.size, 0, im.mode)])
+    ImageFile._save(im, fp, [ImageFile._Tile("BLP", (0, 0) + im.size, 0, im.mode)])
 
 
 Image.register_open(BlpImageFile.format, BlpImageFile, _accept)
diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py
index 6f730cfef16..bf8f29577ae 100644
--- a/src/PIL/BmpImagePlugin.py
+++ b/src/PIL/BmpImagePlugin.py
@@ -25,6 +25,7 @@
 from __future__ import annotations
 
 import os
+from typing import IO, Any
 
 from . import Image, ImageFile, ImagePalette
 from ._binary import i16le as i16
@@ -48,12 +49,12 @@
 }
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:2] == b"BM"
 
 
-def _dib_accept(prefix):
-    return i32(prefix) in [12, 40, 64, 108, 124]
+def _dib_accept(prefix: bytes) -> bool:
+    return i32(prefix) in [12, 40, 52, 56, 64, 108, 124]
 
 
 # =============================================================================
@@ -71,31 +72,41 @@ class BmpImageFile(ImageFile.ImageFile):
     for k, v in COMPRESSIONS.items():
         vars()[k] = v
 
-    def _bitmap(self, header=0, offset=0):
+    def _bitmap(self, header: int = 0, offset: int = 0) -> None:
         """Read relevant info about the BMP"""
         read, seek = self.fp.read, self.fp.seek
         if header:
             seek(header)
         # read bmp header size @offset 14 (this is part of the header size)
-        file_info = {"header_size": i32(read(4)), "direction": -1}
+        file_info: dict[str, bool | int | tuple[int, ...]] = {
+            "header_size": i32(read(4)),
+            "direction": -1,
+        }
 
         # -------------------- If requested, read header at a specific position
         # read the rest of the bmp header, without its size
+        assert isinstance(file_info["header_size"], int)
         header_data = ImageFile._safe_read(self.fp, file_info["header_size"] - 4)
 
-        # -------------------------------------------------- IBM OS/2 Bitmap v1
+        # ------------------------------- Windows Bitmap v2, IBM OS/2 Bitmap v1
         # ----- This format has different offsets because of width/height types
+        # 12: BITMAPCOREHEADER/OS21XBITMAPHEADER
         if file_info["header_size"] == 12:
             file_info["width"] = i16(header_data, 0)
             file_info["height"] = i16(header_data, 2)
             file_info["planes"] = i16(header_data, 4)
             file_info["bits"] = i16(header_data, 6)
-            file_info["compression"] = self.RAW
+            file_info["compression"] = self.COMPRESSIONS["RAW"]
             file_info["palette_padding"] = 3
 
-        # --------------------------------------------- Windows Bitmap v2 to v5
-        # v3, OS/2 v2, v4, v5
-        elif file_info["header_size"] in (40, 64, 108, 124):
+        # --------------------------------------------- Windows Bitmap v3 to v5
+        #  40: BITMAPINFOHEADER
+        #  52: BITMAPV2HEADER
+        #  56: BITMAPV3HEADER
+        #  64: BITMAPCOREHEADER2/OS22XBITMAPHEADER
+        # 108: BITMAPV4HEADER
+        # 124: BITMAPV5HEADER
+        elif file_info["header_size"] in (40, 52, 56, 64, 108, 124):
             file_info["y_flip"] = header_data[7] == 0xFF
             file_info["direction"] = 1 if file_info["y_flip"] else -1
             file_info["width"] = i32(header_data, 0)
@@ -115,12 +126,16 @@ def _bitmap(self, header=0, offset=0):
             )
             file_info["colors"] = i32(header_data, 28)
             file_info["palette_padding"] = 4
+            assert isinstance(file_info["pixels_per_meter"], tuple)
             self.info["dpi"] = tuple(x / 39.3701 for x in file_info["pixels_per_meter"])
-            if file_info["compression"] == self.BITFIELDS:
-                if len(header_data) >= 52:
-                    for idx, mask in enumerate(
-                        ["r_mask", "g_mask", "b_mask", "a_mask"]
-                    ):
+            if file_info["compression"] == self.COMPRESSIONS["BITFIELDS"]:
+                masks = ["r_mask", "g_mask", "b_mask"]
+                if len(header_data) >= 48:
+                    if len(header_data) >= 52:
+                        masks.append("a_mask")
+                    else:
+                        file_info["a_mask"] = 0x0
+                    for idx, mask in enumerate(masks):
                         file_info[mask] = i32(header_data, 36 + idx * 4)
                 else:
                     # 40 byte headers only have the three components in the
@@ -132,8 +147,12 @@ def _bitmap(self, header=0, offset=0):
                     # location, but it is listed as a reserved component,
                     # and it is not generally an alpha channel
                     file_info["a_mask"] = 0x0
-                    for mask in ["r_mask", "g_mask", "b_mask"]:
+                    for mask in masks:
                         file_info[mask] = i32(read(4))
+                assert isinstance(file_info["r_mask"], int)
+                assert isinstance(file_info["g_mask"], int)
+                assert isinstance(file_info["b_mask"], int)
+                assert isinstance(file_info["a_mask"], int)
                 file_info["rgb_mask"] = (
                     file_info["r_mask"],
                     file_info["g_mask"],
@@ -151,33 +170,39 @@ def _bitmap(self, header=0, offset=0):
 
         # ------------------ Special case : header is reported 40, which
         # ---------------------- is shorter than real size for bpp >= 16
+        assert isinstance(file_info["width"], int)
+        assert isinstance(file_info["height"], int)
         self._size = file_info["width"], file_info["height"]
 
         # ------- If color count was not found in the header, compute from bits
+        assert isinstance(file_info["bits"], int)
         file_info["colors"] = (
             file_info["colors"]
             if file_info.get("colors", 0)
             else (1 << file_info["bits"])
         )
+        assert isinstance(file_info["colors"], int)
         if offset == 14 + file_info["header_size"] and file_info["bits"] <= 8:
             offset += 4 * file_info["colors"]
 
         # ---------------------- Check bit depth for unusual unsupported values
-        self._mode, raw_mode = BIT2MODE.get(file_info["bits"], (None, None))
-        if self.mode is None:
+        self._mode, raw_mode = BIT2MODE.get(file_info["bits"], ("", ""))
+        if not self.mode:
             msg = f"Unsupported BMP pixel depth ({file_info['bits']})"
             raise OSError(msg)
 
         # ---------------- Process BMP with Bitfields compression (not palette)
         decoder_name = "raw"
-        if file_info["compression"] == self.BITFIELDS:
-            SUPPORTED = {
+        if file_info["compression"] == self.COMPRESSIONS["BITFIELDS"]:
+            SUPPORTED: dict[int, list[tuple[int, ...]]] = {
                 32: [
                     (0xFF0000, 0xFF00, 0xFF, 0x0),
                     (0xFF000000, 0xFF0000, 0xFF00, 0x0),
+                    (0xFF000000, 0xFF00, 0xFF, 0x0),
                     (0xFF000000, 0xFF0000, 0xFF00, 0xFF),
                     (0xFF, 0xFF00, 0xFF0000, 0xFF000000),
                     (0xFF0000, 0xFF00, 0xFF, 0xFF000000),
+                    (0xFF000000, 0xFF00, 0xFF, 0xFF0000),
                     (0x0, 0x0, 0x0, 0x0),
                 ],
                 24: [(0xFF0000, 0xFF00, 0xFF)],
@@ -186,9 +211,11 @@ def _bitmap(self, header=0, offset=0):
             MASK_MODES = {
                 (32, (0xFF0000, 0xFF00, 0xFF, 0x0)): "BGRX",
                 (32, (0xFF000000, 0xFF0000, 0xFF00, 0x0)): "XBGR",
+                (32, (0xFF000000, 0xFF00, 0xFF, 0x0)): "BGXR",
                 (32, (0xFF000000, 0xFF0000, 0xFF00, 0xFF)): "ABGR",
                 (32, (0xFF, 0xFF00, 0xFF0000, 0xFF000000)): "RGBA",
                 (32, (0xFF0000, 0xFF00, 0xFF, 0xFF000000)): "BGRA",
+                (32, (0xFF000000, 0xFF00, 0xFF, 0xFF0000)): "BGAR",
                 (32, (0x0, 0x0, 0x0, 0x0)): "BGRA",
                 (24, (0xFF0000, 0xFF00, 0xFF)): "BGR",
                 (16, (0xF800, 0x7E0, 0x1F)): "BGR;16",
@@ -199,12 +226,14 @@ def _bitmap(self, header=0, offset=0):
                     file_info["bits"] == 32
                     and file_info["rgba_mask"] in SUPPORTED[file_info["bits"]]
                 ):
+                    assert isinstance(file_info["rgba_mask"], tuple)
                     raw_mode = MASK_MODES[(file_info["bits"], file_info["rgba_mask"])]
                     self._mode = "RGBA" if "A" in raw_mode else self.mode
                 elif (
                     file_info["bits"] in (24, 16)
                     and file_info["rgb_mask"] in SUPPORTED[file_info["bits"]]
                 ):
+                    assert isinstance(file_info["rgb_mask"], tuple)
                     raw_mode = MASK_MODES[(file_info["bits"], file_info["rgb_mask"])]
                 else:
                     msg = "Unsupported BMP bitfields layout"
@@ -212,10 +241,13 @@ def _bitmap(self, header=0, offset=0):
             else:
                 msg = "Unsupported BMP bitfields layout"
                 raise OSError(msg)
-        elif file_info["compression"] == self.RAW:
+        elif file_info["compression"] == self.COMPRESSIONS["RAW"]:
             if file_info["bits"] == 32 and header == 22:  # 32-bit .cur offset
                 raw_mode, self._mode = "BGRA", "RGBA"
-        elif file_info["compression"] in (self.RLE8, self.RLE4):
+        elif file_info["compression"] in (
+            self.COMPRESSIONS["RLE8"],
+            self.COMPRESSIONS["RLE4"],
+        ):
             decoder_name = "bmp_rle"
         else:
             msg = f"Unsupported BMP compression ({file_info['compression']})"
@@ -228,6 +260,7 @@ def _bitmap(self, header=0, offset=0):
                 msg = f"Unsupported BMP Palette size ({file_info['colors']})"
                 raise OSError(msg)
             else:
+                assert isinstance(file_info["palette_padding"], int)
                 padding = file_info["palette_padding"]
                 palette = read(padding * file_info["colors"])
                 grayscale = True
@@ -255,14 +288,15 @@ def _bitmap(self, header=0, offset=0):
 
         # ---------------------------- Finally set the tile data for the plugin
         self.info["compression"] = file_info["compression"]
-        args = [raw_mode]
+        args: list[Any] = [raw_mode]
         if decoder_name == "bmp_rle":
-            args.append(file_info["compression"] == self.RLE4)
+            args.append(file_info["compression"] == self.COMPRESSIONS["RLE4"])
         else:
+            assert isinstance(file_info["width"], int)
             args.append(((file_info["width"] * file_info["bits"] + 31) >> 3) & (~3))
         args.append(file_info["direction"])
         self.tile = [
-            (
+            ImageFile._Tile(
                 decoder_name,
                 (0, 0, file_info["width"], file_info["height"]),
                 offset or self.fp.tell(),
@@ -270,7 +304,7 @@ def _bitmap(self, header=0, offset=0):
             )
         ]
 
-    def _open(self):
+    def _open(self) -> None:
         """Open file, check magic number and read header"""
         # read 14 bytes: magic number, filesize, reserved, header final offset
         head_data = self.fp.read(14)
@@ -287,11 +321,13 @@ def _open(self):
 class BmpRleDecoder(ImageFile.PyDecoder):
     _pulls_fd = True
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
         rle4 = self.args[1]
         data = bytearray()
         x = 0
-        while len(data) < self.state.xsize * self.state.ysize:
+        dest_length = self.state.xsize * self.state.ysize
+        while len(data) < dest_length:
             pixels = self.fd.read(1)
             byte = self.fd.read(1)
             if not pixels or not byte:
@@ -351,7 +387,7 @@ def decode(self, buffer):
                     if self.fd.tell() % 2 != 0:
                         self.fd.seek(1, os.SEEK_CUR)
         rawmode = "L" if self.mode == "L" else "P"
-        self.set_as_raw(bytes(data), (rawmode, 0, self.args[-1]))
+        self.set_as_raw(bytes(data), rawmode, (0, self.args[-1]))
         return -1, 0
 
 
@@ -362,7 +398,7 @@ class DibImageFile(BmpImageFile):
     format = "DIB"
     format_description = "Windows Bitmap"
 
-    def _open(self):
+    def _open(self) -> None:
         self._bitmap()
 
 
@@ -380,11 +416,13 @@ def _open(self):
 }
 
 
-def _dib_save(im, fp, filename):
+def _dib_save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     _save(im, fp, filename, False)
 
 
-def _save(im, fp, filename, bitmap_header=True):
+def _save(
+    im: Image.Image, fp: IO[bytes], filename: str | bytes, bitmap_header: bool = True
+) -> None:
     try:
         rawmode, bits, colors = SAVE[im.mode]
     except KeyError as e:
@@ -446,7 +484,9 @@ def _save(im, fp, filename, bitmap_header=True):
     if palette:
         fp.write(palette)
 
-    ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, stride, -1))])
+    ImageFile._save(
+        im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, stride, -1))]
+    )
 
 
 #
diff --git a/src/PIL/BufrStubImagePlugin.py b/src/PIL/BufrStubImagePlugin.py
index 60f3ec25b38..0ee2f653b2c 100644
--- a/src/PIL/BufrStubImagePlugin.py
+++ b/src/PIL/BufrStubImagePlugin.py
@@ -10,12 +10,14 @@
 #
 from __future__ import annotations
 
+from typing import IO
+
 from . import Image, ImageFile
 
 _handler = None
 
 
-def register_handler(handler):
+def register_handler(handler: ImageFile.StubHandler | None) -> None:
     """
     Install application-specific BUFR image handler.
 
@@ -29,7 +31,7 @@ def register_handler(handler):
 # Image adapter
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"BUFR" or prefix[:4] == b"ZCZC"
 
 
@@ -37,7 +39,7 @@ class BufrStubImageFile(ImageFile.StubImageFile):
     format = "BUFR"
     format_description = "BUFR"
 
-    def _open(self):
+    def _open(self) -> None:
         offset = self.fp.tell()
 
         if not _accept(self.fp.read(4)):
@@ -54,11 +56,11 @@ def _open(self):
         if loader:
             loader.open(self)
 
-    def _load(self):
+    def _load(self) -> ImageFile.StubHandler | None:
         return _handler
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if _handler is None or not hasattr(_handler, "save"):
         msg = "BUFR save handler not installed"
         raise OSError(msg)
diff --git a/src/PIL/ContainerIO.py b/src/PIL/ContainerIO.py
index 0035296a45c..ec9e66c714f 100644
--- a/src/PIL/ContainerIO.py
+++ b/src/PIL/ContainerIO.py
@@ -16,10 +16,11 @@
 from __future__ import annotations
 
 import io
-from typing import IO, AnyStr, Generic, Literal
+from collections.abc import Iterable
+from typing import IO, AnyStr, NoReturn
 
 
-class ContainerIO(Generic[AnyStr]):
+class ContainerIO(IO[AnyStr]):
     """
     A file object that provides read access to a part of an existing
     file (for example a TAR file).
@@ -45,7 +46,10 @@ def __init__(self, file: IO[AnyStr], offset: int, length: int) -> None:
     def isatty(self) -> bool:
         return False
 
-    def seek(self, offset: int, mode: Literal[0, 1, 2] = io.SEEK_SET) -> None:
+    def seekable(self) -> bool:
+        return True
+
+    def seek(self, offset: int, mode: int = io.SEEK_SET) -> int:
         """
         Move file pointer.
 
@@ -53,6 +57,7 @@ def seek(self, offset: int, mode: Literal[0, 1, 2] = io.SEEK_SET) -> None:
         :param mode: Starting position. Use 0 for beginning of region, 1
            for current offset, and 2 for end of region.  You cannot move
            the pointer outside the defined region.
+        :returns: Offset from start of region, in bytes.
         """
         if mode == 1:
             self.pos = self.pos + offset
@@ -63,6 +68,7 @@ def seek(self, offset: int, mode: Literal[0, 1, 2] = io.SEEK_SET) -> None:
         # clamp
         self.pos = max(0, min(self.pos, self.length))
         self.fh.seek(self.offset + self.pos)
+        return self.pos
 
     def tell(self) -> int:
         """
@@ -72,27 +78,32 @@ def tell(self) -> int:
         """
         return self.pos
 
-    def read(self, n: int = 0) -> AnyStr:
+    def readable(self) -> bool:
+        return True
+
+    def read(self, n: int = -1) -> AnyStr:
         """
         Read data.
 
-        :param n: Number of bytes to read. If omitted or zero,
+        :param n: Number of bytes to read. If omitted, zero or negative,
             read until end of region.
         :returns: An 8-bit string.
         """
-        if n:
+        if n > 0:
             n = min(n, self.length - self.pos)
         else:
             n = self.length - self.pos
-        if not n:  # EOF
+        if n <= 0:  # EOF
             return b"" if "b" in self.fh.mode else ""  # type: ignore[return-value]
         self.pos = self.pos + n
         return self.fh.read(n)
 
-    def readline(self) -> AnyStr:
+    def readline(self, n: int = -1) -> AnyStr:
         """
         Read a line of text.
 
+        :param n: Number of bytes to read. If omitted, zero or negative,
+            read until end of line.
         :returns: An 8-bit string.
         """
         s: AnyStr = b"" if "b" in self.fh.mode else ""  # type: ignore[assignment]
@@ -102,14 +113,16 @@ def readline(self) -> AnyStr:
             if not c:
                 break
             s = s + c
-            if c == newline_character:
+            if c == newline_character or len(s) == n:
                 break
         return s
 
-    def readlines(self) -> list[AnyStr]:
+    def readlines(self, n: int | None = -1) -> list[AnyStr]:
         """
         Read multiple lines of text.
 
+        :param n: Number of lines to read. If omitted, zero, negative or None,
+            read until end of region.
         :returns: A list of 8-bit strings.
         """
         lines = []
@@ -118,4 +131,43 @@ def readlines(self) -> list[AnyStr]:
             if not s:
                 break
             lines.append(s)
+            if len(lines) == n:
+                break
         return lines
+
+    def writable(self) -> bool:
+        return False
+
+    def write(self, b: AnyStr) -> NoReturn:
+        raise NotImplementedError()
+
+    def writelines(self, lines: Iterable[AnyStr]) -> NoReturn:
+        raise NotImplementedError()
+
+    def truncate(self, size: int | None = None) -> int:
+        raise NotImplementedError()
+
+    def __enter__(self) -> ContainerIO[AnyStr]:
+        return self
+
+    def __exit__(self, *args: object) -> None:
+        self.close()
+
+    def __iter__(self) -> ContainerIO[AnyStr]:
+        return self
+
+    def __next__(self) -> AnyStr:
+        line = self.readline()
+        if not line:
+            msg = "end of region"
+            raise StopIteration(msg)
+        return line
+
+    def fileno(self) -> int:
+        return self.fh.fileno()
+
+    def flush(self) -> None:
+        self.fh.flush()
+
+    def close(self) -> None:
+        self.fh.close()
diff --git a/src/PIL/CurImagePlugin.py b/src/PIL/CurImagePlugin.py
index 5fb2b0193ca..c4be0cecaf8 100644
--- a/src/PIL/CurImagePlugin.py
+++ b/src/PIL/CurImagePlugin.py
@@ -17,7 +17,7 @@
 #
 from __future__ import annotations
 
-from . import BmpImagePlugin, Image
+from . import BmpImagePlugin, Image, ImageFile
 from ._binary import i16le as i16
 from ._binary import i32le as i32
 
@@ -25,7 +25,7 @@
 # --------------------------------------------------------------------
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"\0\0\2\0"
 
 
@@ -37,7 +37,7 @@ class CurImageFile(BmpImagePlugin.BmpImageFile):
     format = "CUR"
     format_description = "Windows Cursor"
 
-    def _open(self):
+    def _open(self) -> None:
         offset = self.fp.tell()
 
         # check magic
@@ -64,7 +64,7 @@ def _open(self):
         # patch up the bitmap height
         self._size = self.size[0], self.size[1] // 2
         d, e, o, a = self.tile[0]
-        self.tile[0] = d, (0, 0) + self.size, o, a
+        self.tile[0] = ImageFile._Tile(d, (0, 0) + self.size, o, a)
 
 
 #
diff --git a/src/PIL/DcxImagePlugin.py b/src/PIL/DcxImagePlugin.py
index f7344df44a7..f67f27d73bb 100644
--- a/src/PIL/DcxImagePlugin.py
+++ b/src/PIL/DcxImagePlugin.py
@@ -29,7 +29,7 @@
 MAGIC = 0x3ADE68B1  # QUIZ: what's this value, then?
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return len(prefix) >= 4 and i32(prefix) == MAGIC
 
 
@@ -42,7 +42,7 @@ class DcxImageFile(PcxImageFile):
     format_description = "Intel DCX"
     _close_exclusive_fp_after_loading = False
 
-    def _open(self):
+    def _open(self) -> None:
         # Header
         s = self.fp.read(4)
         if not _accept(s):
@@ -58,12 +58,12 @@ def _open(self):
             self._offset.append(offset)
 
         self._fp = self.fp
-        self.frame = None
+        self.frame = -1
         self.n_frames = len(self._offset)
         self.is_animated = self.n_frames > 1
         self.seek(0)
 
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         if not self._seek_check(frame):
             return
         self.frame = frame
@@ -71,7 +71,7 @@ def seek(self, frame):
         self.fp.seek(self._offset[frame])
         PcxImageFile._open(self)
 
-    def tell(self):
+    def tell(self) -> int:
         return self.frame
 
 
diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py
index eb4c8f557af..1b64082370c 100644
--- a/src/PIL/DdsImagePlugin.py
+++ b/src/PIL/DdsImagePlugin.py
@@ -9,12 +9,14 @@
 Full text of the CC0 license:
 https://creativecommons.org/publicdomain/zero/1.0/
 """
+
 from __future__ import annotations
 
 import io
 import struct
 import sys
 from enum import IntEnum, IntFlag
+from typing import IO
 
 from . import Image, ImageFile, ImagePalette
 from ._binary import i32le as i32
@@ -269,13 +271,17 @@ class D3DFMT(IntEnum):
 # Backward compatibility layer
 module = sys.modules[__name__]
 for item in DDSD:
-    setattr(module, "DDSD_" + item.name, item.value)
-for item in DDSCAPS:
-    setattr(module, "DDSCAPS_" + item.name, item.value)
-for item in DDSCAPS2:
-    setattr(module, "DDSCAPS2_" + item.name, item.value)
-for item in DDPF:
-    setattr(module, "DDPF_" + item.name, item.value)
+    assert item.name is not None
+    setattr(module, f"DDSD_{item.name}", item.value)
+for item1 in DDSCAPS:
+    assert item1.name is not None
+    setattr(module, f"DDSCAPS_{item1.name}", item1.value)
+for item2 in DDSCAPS2:
+    assert item2.name is not None
+    setattr(module, f"DDSCAPS2_{item2.name}", item2.value)
+for item3 in DDPF:
+    assert item3.name is not None
+    setattr(module, f"DDPF_{item3.name}", item3.value)
 
 DDS_FOURCC = DDPF.FOURCC
 DDS_RGB = DDPF.RGB
@@ -326,7 +332,7 @@ class DdsImageFile(ImageFile.ImageFile):
     format = "DDS"
     format_description = "DirectDraw Surface"
 
-    def _open(self):
+    def _open(self) -> None:
         if not _accept(self.fp.read(4)):
             msg = "not a DDS file"
             raise SyntaxError(msg)
@@ -361,7 +367,7 @@ def _open(self):
                 mask_count = 3
 
             masks = struct.unpack(f"<{mask_count}I", header.read(mask_count * 4))
-            self.tile = [("dds_rgb", extents, 0, (bitcount, masks))]
+            self.tile = [ImageFile._Tile("dds_rgb", extents, 0, (bitcount, masks))]
             return
         elif pfflags & DDPF.LUMINANCE:
             if bitcount == 8:
@@ -374,6 +380,7 @@ def _open(self):
         elif pfflags & DDPF.PALETTEINDEXED8:
             self._mode = "P"
             self.palette = ImagePalette.raw("RGBA", self.fp.read(1024))
+            self.palette.mode = "RGBA"
         elif pfflags & DDPF.FOURCC:
             offset = header_size + 4
             if fourcc == D3DFMT.DXT1:
@@ -467,14 +474,15 @@ def _open(self):
         else:
             self.tile = [ImageFile._Tile("raw", extents, 0, rawmode or self.mode)]
 
-    def load_seek(self, pos):
+    def load_seek(self, pos: int) -> None:
         pass
 
 
 class DdsRgbDecoder(ImageFile.PyDecoder):
     _pulls_fd = True
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
         bitcount, masks = self.args
 
         # Some masks will be padded with zeros, e.g. R 0b11 G 0b1100
@@ -492,7 +500,8 @@ def decode(self, buffer):
 
         data = bytearray()
         bytecount = bitcount // 8
-        while len(data) < self.state.xsize * self.state.ysize * len(masks):
+        dest_length = self.state.xsize * self.state.ysize * len(masks)
+        while len(data) < dest_length:
             value = int.from_bytes(self.fd.read(bytecount), "little")
             for i, mask in enumerate(masks):
                 masked_value = value & mask
@@ -500,11 +509,11 @@ def decode(self, buffer):
                 data += o8(
                     int(((masked_value >> mask_offsets[i]) / mask_totals[i]) * 255)
                 )
-        self.set_as_raw(bytes(data))
+        self.set_as_raw(data)
         return -1, 0
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.mode not in ("RGB", "RGBA", "L", "LA"):
         msg = f"cannot write mode {im.mode} as DDS"
         raise OSError(msg)
@@ -556,7 +565,7 @@ def _save(im, fp, filename):
     )
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"DDS "
 
 
diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index d2e60aa0759..fb1e301c084 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -27,10 +27,10 @@
 import subprocess
 import sys
 import tempfile
+from typing import IO
 
 from . import Image, ImageFile
 from ._binary import i32le as i32
-from ._deprecate import deprecate
 
 # --------------------------------------------------------------------
 
@@ -38,11 +38,11 @@
 split = re.compile(r"^%%([^:]*):[ \t]*(.*)[ \t]*$")
 field = re.compile(r"^%[%!\w]([^:]*)[ \t]*$")
 
-gs_binary = None
+gs_binary: str | bool | None = None
 gs_windows_binary = None
 
 
-def has_ghostscript():
+def has_ghostscript() -> bool:
     global gs_binary, gs_windows_binary
     if gs_binary is None:
         if sys.platform.startswith("win"):
@@ -65,16 +65,24 @@ def has_ghostscript():
     return gs_binary is not False
 
 
-def Ghostscript(tile, size, fp, scale=1, transparency=False):
+def Ghostscript(
+    tile: list[ImageFile._Tile],
+    size: tuple[int, int],
+    fp: IO[bytes],
+    scale: int = 1,
+    transparency: bool = False,
+) -> Image.core.ImagingCore:
     """Render an image using Ghostscript"""
     global gs_binary
     if not has_ghostscript():
         msg = "Unable to locate Ghostscript on paths"
         raise OSError(msg)
+    assert isinstance(gs_binary, str)
 
     # Unpack decoder tile
-    decoder, tile, offset, data = tile[0]
-    length, bbox = data
+    args = tile[0].args
+    assert isinstance(args, tuple)
+    length, bbox = args
 
     # Hack to support hi-res rendering
     scale = int(scale) or 1
@@ -113,7 +121,13 @@ def Ghostscript(tile, size, fp, scale=1, transparency=False):
                 lengthfile -= len(s)
                 f.write(s)
 
-    device = "pngalpha" if transparency else "ppmraw"
+    if transparency:
+        # "RGBA"
+        device = "pngalpha"
+    else:
+        # "pnmraw" automatically chooses between
+        # PBM ("1"), PGM ("L"), and PPM ("RGB").
+        device = "pnmraw"
 
     # Build Ghostscript command
     command = [
@@ -143,8 +157,9 @@ def Ghostscript(tile, size, fp, scale=1, transparency=False):
             startupinfo = subprocess.STARTUPINFO()
             startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
         subprocess.check_call(command, startupinfo=startupinfo)
-        out_im = Image.open(outfile)
-        out_im.load()
+        with Image.open(outfile) as out_im:
+            out_im.load()
+            return out_im.im.copy()
     finally:
         try:
             os.unlink(outfile)
@@ -153,49 +168,8 @@ def Ghostscript(tile, size, fp, scale=1, transparency=False):
         except OSError:
             pass
 
-    im = out_im.im.copy()
-    out_im.close()
-    return im
-
-
-class PSFile:
-    """
-    Wrapper for bytesio object that treats either CR or LF as end of line.
-    This class is no longer used internally, but kept for backwards compatibility.
-    """
-
-    def __init__(self, fp):
-        deprecate(
-            "PSFile",
-            11,
-            action="If you need the functionality of this class "
-            "you will need to implement it yourself.",
-        )
-        self.fp = fp
-        self.char = None
-
-    def seek(self, offset, whence=io.SEEK_SET):
-        self.char = None
-        self.fp.seek(offset, whence)
 
-    def readline(self):
-        s = [self.char or b""]
-        self.char = None
-
-        c = self.fp.read(1)
-        while (c not in b"\r\n") and len(c):
-            s.append(c)
-            c = self.fp.read(1)
-
-        self.char = self.fp.read(1)
-        # line endings can be 1 or 2 of \r \n, in either order
-        if self.char in b"\r\n":
-            self.char = None
-
-        return b"".join(s).decode("latin-1")
-
-
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"%!PS" or (len(prefix) >= 4 and i32(prefix) == 0xC6D3D0C5)
 
 
@@ -212,14 +186,18 @@ class EpsImageFile(ImageFile.ImageFile):
 
     mode_map = {1: "L", 2: "LAB", 3: "RGB", 4: "CMYK"}
 
-    def _open(self):
+    def _open(self) -> None:
         (length, offset) = self._find_offset(self.fp)
 
         # go to offset - start of "%!PS"
         self.fp.seek(offset)
 
         self._mode = "RGB"
-        self._size = None
+
+        # When reading header comments, the first comment is used.
+        # When reading trailer comments, the last comment is used.
+        bounding_box: list[int] | None = None
+        imagedata_size: tuple[int, int] | None = None
 
         byte_arr = bytearray(255)
         bytes_mv = memoryview(byte_arr)
@@ -228,7 +206,12 @@ def _open(self):
         reading_trailer_comments = False
         trailer_reached = False
 
-        def check_required_header_comments():
+        def check_required_header_comments() -> None:
+            """
+            The EPS specification requires that some headers exist.
+            This should be checked when the header comments formally end,
+            when image data starts, or when the file ends, whichever comes first.
+            """
             if "PS-Adobe" not in self.info:
                 msg = 'EPS header missing "%!PS-Adobe" comment'
                 raise SyntaxError(msg)
@@ -236,41 +219,39 @@ def check_required_header_comments():
                 msg = 'EPS header missing "%%BoundingBox" comment'
                 raise SyntaxError(msg)
 
-        def _read_comment(s):
-            nonlocal reading_trailer_comments
+        def read_comment(s: str) -> bool:
+            nonlocal bounding_box, reading_trailer_comments
             try:
                 m = split.match(s)
             except re.error as e:
                 msg = "not an EPS file"
                 raise SyntaxError(msg) from e
 
-            if m:
-                k, v = m.group(1, 2)
-                self.info[k] = v
-                if k == "BoundingBox":
-                    if v == "(atend)":
-                        reading_trailer_comments = True
-                    elif not self._size or (
-                        trailer_reached and reading_trailer_comments
-                    ):
-                        try:
-                            # Note: The DSC spec says that BoundingBox
-                            # fields should be integers, but some drivers
-                            # put floating point values there anyway.
-                            box = [int(float(i)) for i in v.split()]
-                            self._size = box[2] - box[0], box[3] - box[1]
-                            self.tile = [
-                                ("eps", (0, 0) + self.size, offset, (length, box))
-                            ]
-                        except Exception:
-                            pass
-                return True
+            if not m:
+                return False
+
+            k, v = m.group(1, 2)
+            self.info[k] = v
+            if k == "BoundingBox":
+                if v == "(atend)":
+                    reading_trailer_comments = True
+                elif not bounding_box or (trailer_reached and reading_trailer_comments):
+                    try:
+                        # Note: The DSC spec says that BoundingBox
+                        # fields should be integers, but some drivers
+                        # put floating point values there anyway.
+                        bounding_box = [int(float(i)) for i in v.split()]
+                    except Exception:
+                        pass
+            return True
 
         while True:
             byte = self.fp.read(1)
             if byte == b"":
                 # if we didn't read a byte we must be at the end of the file
                 if bytes_read == 0:
+                    if reading_header_comments:
+                        check_required_header_comments()
                     break
             elif byte in b"\r\n":
                 # if we read a line ending character, ignore it and parse what
@@ -310,7 +291,7 @@ def _read_comment(s):
                     continue
 
                 s = str(bytes_mv[:bytes_read], "latin-1")
-                if not _read_comment(s):
+                if not read_comment(s):
                     m = field.match(s)
                     if m:
                         k = m.group(1)
@@ -329,6 +310,12 @@ def _read_comment(s):
                 # Check for an "ImageData" descriptor
                 # https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/#50577413_pgfId-1035096
 
+                # If we've already read an "ImageData" descriptor,
+                # don't read another one.
+                if imagedata_size:
+                    bytes_read = 0
+                    continue
+
                 # Values:
                 # columns
                 # rows
@@ -354,29 +341,36 @@ def _read_comment(s):
                 else:
                     break
 
-                self._size = columns, rows
-                return
+                # Parse the columns and rows after checking the bit depth and mode
+                # in case the bit depth and/or mode are invalid.
+                imagedata_size = columns, rows
+            elif bytes_mv[:5] == b"%%EOF":
+                break
             elif trailer_reached and reading_trailer_comments:
                 # Load EPS trailer
-
-                # if this line starts with "%%EOF",
-                # then we've reached the end of the file
-                if bytes_mv[:5] == b"%%EOF":
-                    break
-
                 s = str(bytes_mv[:bytes_read], "latin-1")
-                _read_comment(s)
+                read_comment(s)
             elif bytes_mv[:9] == b"%%Trailer":
                 trailer_reached = True
             bytes_read = 0
 
-        check_required_header_comments()
-
-        if not self._size:
+        # A "BoundingBox" is always required,
+        # even if an "ImageData" descriptor size exists.
+        if not bounding_box:
             msg = "cannot determine EPS bounding box"
             raise OSError(msg)
 
-    def _find_offset(self, fp):
+        # An "ImageData" size takes precedence over the "BoundingBox".
+        self._size = imagedata_size or (
+            bounding_box[2] - bounding_box[0],
+            bounding_box[3] - bounding_box[1],
+        )
+
+        self.tile = [
+            ImageFile._Tile("eps", (0, 0) + self.size, offset, (length, bounding_box))
+        ]
+
+    def _find_offset(self, fp: IO[bytes]) -> tuple[int, int]:
         s = fp.read(4)
 
         if s == b"%!PS":
@@ -399,7 +393,9 @@ def _find_offset(self, fp):
 
         return length, offset
 
-    def load(self, scale=1, transparency=False):
+    def load(
+        self, scale: int = 1, transparency: bool = False
+    ) -> Image.core.PixelAccess | None:
         # Load EPS via Ghostscript
         if self.tile:
             self.im = Ghostscript(self.tile, self.size, self.fp, scale, transparency)
@@ -408,7 +404,7 @@ def load(self, scale=1, transparency=False):
             self.tile = []
         return Image.Image.load(self)
 
-    def load_seek(self, *args, **kwargs):
+    def load_seek(self, pos: int) -> None:
         # we can't incrementally load, so force ImageFile.parser to
         # use our custom load method by defining this method.
         pass
@@ -417,7 +413,7 @@ def load_seek(self, *args, **kwargs):
 # --------------------------------------------------------------------
 
 
-def _save(im, fp, filename, eps=1):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes, eps: int = 1) -> None:
     """EPS Writer for the Python Imaging Library."""
 
     # make sure image data is available
@@ -458,7 +454,7 @@ def _save(im, fp, filename, eps=1):
     if hasattr(fp, "flush"):
         fp.flush()
 
-    ImageFile._save(im, fp, [("eps", (0, 0) + im.size, 0, None)])
+    ImageFile._save(im, fp, [ImageFile._Tile("eps", (0, 0) + im.size, 0, None)])
 
     fp.write(b"\n%%%%EndBinary\n")
     fp.write(b"grestore end\n")
diff --git a/src/PIL/ExifTags.py b/src/PIL/ExifTags.py
index 60a4d9774ae..39b4aa55262 100644
--- a/src/PIL/ExifTags.py
+++ b/src/PIL/ExifTags.py
@@ -346,7 +346,7 @@ class Interop(IntEnum):
     InteropVersion = 2
     RelatedImageFileFormat = 4096
     RelatedImageWidth = 4097
-    RleatedImageHeight = 4098
+    RelatedImageHeight = 4098
 
 
 class IFD(IntEnum):
diff --git a/src/PIL/FitsImagePlugin.py b/src/PIL/FitsImagePlugin.py
index 7dce2d60f76..6bbd2641aba 100644
--- a/src/PIL/FitsImagePlugin.py
+++ b/src/PIL/FitsImagePlugin.py
@@ -10,12 +10,13 @@
 #
 from __future__ import annotations
 
+import gzip
 import math
 
 from . import Image, ImageFile
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:6] == b"SIMPLE"
 
 
@@ -23,16 +24,36 @@ class FitsImageFile(ImageFile.ImageFile):
     format = "FITS"
     format_description = "FITS"
 
-    def _open(self):
-        headers = {}
+    def _open(self) -> None:
+        assert self.fp is not None
+
+        headers: dict[bytes, bytes] = {}
+        header_in_progress = False
+        decoder_name = ""
         while True:
             header = self.fp.read(80)
             if not header:
                 msg = "Truncated FITS file"
                 raise OSError(msg)
             keyword = header[:8].strip()
-            if keyword == b"END":
+            if keyword in (b"SIMPLE", b"XTENSION"):
+                header_in_progress = True
+            elif headers and not header_in_progress:
+                # This is now a data unit
                 break
+            elif keyword == b"END":
+                # Seek to the end of the header unit
+                self.fp.seek(math.ceil(self.fp.tell() / 2880) * 2880)
+                if not decoder_name:
+                    decoder_name, offset, args = self._parse_headers(headers)
+
+                header_in_progress = False
+                continue
+
+            if decoder_name:
+                # Keep going to read past the headers
+                continue
+
             value = header[8:].split(b"/")[0].strip()
             if value.startswith(b"="):
                 value = value[1:].strip()
@@ -41,32 +62,91 @@ def _open(self):
                 raise SyntaxError(msg)
             headers[keyword] = value
 
-        naxis = int(headers[b"NAXIS"])
-        if naxis == 0:
+        if not decoder_name:
             msg = "No image data"
             raise ValueError(msg)
-        elif naxis == 1:
-            self._size = 1, int(headers[b"NAXIS1"])
+
+        offset += self.fp.tell() - 80
+        self.tile = [ImageFile._Tile(decoder_name, (0, 0) + self.size, offset, args)]
+
+    def _get_size(
+        self, headers: dict[bytes, bytes], prefix: bytes
+    ) -> tuple[int, int] | None:
+        naxis = int(headers[prefix + b"NAXIS"])
+        if naxis == 0:
+            return None
+
+        if naxis == 1:
+            return 1, int(headers[prefix + b"NAXIS1"])
         else:
-            self._size = int(headers[b"NAXIS1"]), int(headers[b"NAXIS2"])
+            return int(headers[prefix + b"NAXIS1"]), int(headers[prefix + b"NAXIS2"])
+
+    def _parse_headers(
+        self, headers: dict[bytes, bytes]
+    ) -> tuple[str, int, tuple[str | int, ...]]:
+        prefix = b""
+        decoder_name = "raw"
+        offset = 0
+        if (
+            headers.get(b"XTENSION") == b"'BINTABLE'"
+            and headers.get(b"ZIMAGE") == b"T"
+            and headers[b"ZCMPTYPE"] == b"'GZIP_1  '"
+        ):
+            no_prefix_size = self._get_size(headers, prefix) or (0, 0)
+            number_of_bits = int(headers[b"BITPIX"])
+            offset = no_prefix_size[0] * no_prefix_size[1] * (number_of_bits // 8)
 
-        number_of_bits = int(headers[b"BITPIX"])
+            prefix = b"Z"
+            decoder_name = "fits_gzip"
+
+        size = self._get_size(headers, prefix)
+        if not size:
+            return "", 0, ()
+
+        self._size = size
+
+        number_of_bits = int(headers[prefix + b"BITPIX"])
         if number_of_bits == 8:
             self._mode = "L"
         elif number_of_bits == 16:
-            self._mode = "I"
+            self._mode = "I;16"
         elif number_of_bits == 32:
             self._mode = "I"
         elif number_of_bits in (-32, -64):
             self._mode = "F"
 
-        offset = math.ceil(self.fp.tell() / 2880) * 2880
-        self.tile = [("raw", (0, 0) + self.size, offset, (self.mode, 0, -1))]
+        args: tuple[str | int, ...]
+        if decoder_name == "raw":
+            args = (self.mode, 0, -1)
+        else:
+            args = (number_of_bits,)
+        return decoder_name, offset, args
+
+
+class FitsGzipDecoder(ImageFile.PyDecoder):
+    _pulls_fd = True
+
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
+        value = gzip.decompress(self.fd.read())
+
+        rows = []
+        offset = 0
+        number_of_bits = min(self.args[0] // 8, 4)
+        for y in range(self.state.ysize):
+            row = bytearray()
+            for x in range(self.state.xsize):
+                row += value[offset + (4 - number_of_bits) : offset + 4]
+                offset += 4
+            rows.append(row)
+        self.set_as_raw(bytes([pixel for row in rows[::-1] for pixel in row]))
+        return -1, 0
 
 
 # --------------------------------------------------------------------
 # Registry
 
 Image.register_open(FitsImageFile.format, FitsImageFile, _accept)
+Image.register_decoder("fits_gzip", FitsGzipDecoder)
 
 Image.register_extensions(FitsImageFile.format, [".fit", ".fits"])
diff --git a/src/PIL/FliImagePlugin.py b/src/PIL/FliImagePlugin.py
index 9769761fc15..666390be9ee 100644
--- a/src/PIL/FliImagePlugin.py
+++ b/src/PIL/FliImagePlugin.py
@@ -27,7 +27,7 @@
 # decoder
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return (
         len(prefix) >= 6
         and i16(prefix, 4) in [0xAF11, 0xAF12]
@@ -45,7 +45,7 @@ class FliImageFile(ImageFile.ImageFile):
     format_description = "Autodesk FLI/FLC Animation"
     _close_exclusive_fp_after_loading = False
 
-    def _open(self):
+    def _open(self) -> None:
         # HEAD
         s = self.fp.read(128)
         if not (_accept(s) and s[20:22] == b"\x00\x00"):
@@ -77,12 +77,13 @@ def _open(self):
         if i16(s, 4) == 0xF100:
             # prefix chunk; ignore it
             self.__offset = self.__offset + i32(s)
+            self.fp.seek(self.__offset)
             s = self.fp.read(16)
 
         if i16(s, 4) == 0xF1FA:
             # look for palette chunk
             number_of_subchunks = i16(s, 6)
-            chunk_size = None
+            chunk_size: int | None = None
             for _ in range(number_of_subchunks):
                 if chunk_size is not None:
                     self.fp.seek(chunk_size - 6, os.SEEK_CUR)
@@ -95,8 +96,9 @@ def _open(self):
                 if not chunk_size:
                     break
 
-        palette = [o8(r) + o8(g) + o8(b) for (r, g, b) in palette]
-        self.palette = ImagePalette.raw("RGB", b"".join(palette))
+        self.palette = ImagePalette.raw(
+            "RGB", b"".join(o8(r) + o8(g) + o8(b) for (r, g, b) in palette)
+        )
 
         # set things up to decode first frame
         self.__frame = -1
@@ -104,7 +106,7 @@ def _open(self):
         self.__rewind = self.fp.tell()
         self.seek(0)
 
-    def _palette(self, palette, shift):
+    def _palette(self, palette: list[tuple[int, int, int]], shift: int) -> None:
         # load palette
 
         i = 0
@@ -122,7 +124,7 @@ def _palette(self, palette, shift):
                 palette[i] = (r, g, b)
                 i += 1
 
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         if not self._seek_check(frame):
             return
         if frame < self.__frame:
@@ -131,7 +133,7 @@ def seek(self, frame):
         for f in range(self.__frame + 1, frame + 1):
             self._seek(f)
 
-    def _seek(self, frame):
+    def _seek(self, frame: int) -> None:
         if frame == 0:
             self.__frame = -1
             self._fp.seek(self.__rewind)
@@ -157,11 +159,11 @@ def _seek(self, frame):
         framesize = i32(s)
 
         self.decodermaxblock = framesize
-        self.tile = [("fli", (0, 0) + self.size, self.__offset, None)]
+        self.tile = [ImageFile._Tile("fli", (0, 0) + self.size, self.__offset, None)]
 
         self.__offset += framesize
 
-    def tell(self):
+    def tell(self) -> int:
         return self.__frame
 
 
diff --git a/src/PIL/FontFile.py b/src/PIL/FontFile.py
index 3ec1ae819fc..1e0c1c166b5 100644
--- a/src/PIL/FontFile.py
+++ b/src/PIL/FontFile.py
@@ -50,9 +50,7 @@ def __init__(self) -> None:
             | None
         ] = [None] * 256
 
-    def __getitem__(
-        self, ix: int
-    ) -> (
+    def __getitem__(self, ix: int) -> (
         tuple[
             tuple[int, int],
             tuple[int, int, int, int],
diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py
index 75680a94e02..8fef51076b4 100644
--- a/src/PIL/FpxImagePlugin.py
+++ b/src/PIL/FpxImagePlugin.py
@@ -41,7 +41,7 @@
 # --------------------------------------------------------------------
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:8] == olefile.MAGIC
 
 
@@ -53,7 +53,7 @@ class FpxImageFile(ImageFile.ImageFile):
     format = "FPX"
     format_description = "FlashPix"
 
-    def _open(self):
+    def _open(self) -> None:
         #
         # read the OLE directory and see if this is a likely
         # to be a FlashPix file
@@ -64,13 +64,14 @@ def _open(self):
             msg = "not an FPX file; invalid OLE file"
             raise SyntaxError(msg) from e
 
-        if self.ole.root.clsid != "56616700-C154-11CE-8553-00AA00A1F95B":
+        root = self.ole.root
+        if not root or root.clsid != "56616700-C154-11CE-8553-00AA00A1F95B":
             msg = "not an FPX file; bad root CLSID"
             raise SyntaxError(msg)
 
         self._open_index(1)
 
-    def _open_index(self, index=1):
+    def _open_index(self, index: int = 1) -> None:
         #
         # get the Image Contents Property Set
 
@@ -80,12 +81,14 @@ def _open_index(self, index=1):
 
         # size (highest resolution)
 
+        assert isinstance(prop[0x1000002], int)
+        assert isinstance(prop[0x1000003], int)
         self._size = prop[0x1000002], prop[0x1000003]
 
         size = max(self.size)
         i = 1
         while size > 64:
-            size = size / 2
+            size = size // 2
             i += 1
         self.maxid = i - 1
 
@@ -99,8 +102,7 @@ def _open_index(self, index=1):
 
         s = prop[0x2000002 | id]
 
-        bands = i32(s, 4)
-        if bands > 4:
+        if not isinstance(s, bytes) or (bands := i32(s, 4)) > 4:
             msg = "Invalid number of bands"
             raise OSError(msg)
 
@@ -118,7 +120,7 @@ def _open_index(self, index=1):
 
         self._open_subimage(1, self.maxid)
 
-    def _open_subimage(self, index=1, subimage=0):
+    def _open_subimage(self, index: int = 1, subimage: int = 0) -> None:
         #
         # setup tile descriptors for a given subimage
 
@@ -164,7 +166,7 @@ def _open_subimage(self, index=1, subimage=0):
 
             if compression == 0:
                 self.tile.append(
-                    (
+                    ImageFile._Tile(
                         "raw",
                         (x, y, x1, y1),
                         i32(s, i) + 28,
@@ -175,7 +177,7 @@ def _open_subimage(self, index=1, subimage=0):
             elif compression == 1:
                 # FIXME: the fill decoder is not implemented
                 self.tile.append(
-                    (
+                    ImageFile._Tile(
                         "fill",
                         (x, y, x1, y1),
                         i32(s, i) + 28,
@@ -203,7 +205,7 @@ def _open_subimage(self, index=1, subimage=0):
                     jpegmode = rawmode
 
                 self.tile.append(
-                    (
+                    ImageFile._Tile(
                         "jpeg",
                         (x, y, x1, y1),
                         i32(s, i) + 28,
@@ -231,17 +233,17 @@ def _open_subimage(self, index=1, subimage=0):
         self._fp = self.fp
         self.fp = None
 
-    def load(self):
+    def load(self) -> Image.core.PixelAccess | None:
         if not self.fp:
             self.fp = self.ole.openstream(self.stream[:2] + ["Subimage 0000 Data"])
 
         return ImageFile.ImageFile.load(self)
 
-    def close(self):
+    def close(self) -> None:
         self.ole.close()
         super().close()
 
-    def __exit__(self, *args):
+    def __exit__(self, *args: object) -> None:
         self.ole.close()
         super().__exit__()
 
diff --git a/src/PIL/FtexImagePlugin.py b/src/PIL/FtexImagePlugin.py
index d5513a56a11..ddb469bc332 100644
--- a/src/PIL/FtexImagePlugin.py
+++ b/src/PIL/FtexImagePlugin.py
@@ -50,6 +50,7 @@
 
 Note: All data is stored in little-Endian (Intel) byte order.
 """
+
 from __future__ import annotations
 
 import struct
@@ -70,7 +71,7 @@ class FtexImageFile(ImageFile.ImageFile):
     format = "FTEX"
     format_description = "Texture File Format (IW2:EOC)"
 
-    def _open(self):
+    def _open(self) -> None:
         if not _accept(self.fp.read(4)):
             msg = "not an FTEX file"
             raise SyntaxError(msg)
@@ -92,9 +93,9 @@ def _open(self):
 
         if format == Format.DXT1:
             self._mode = "RGBA"
-            self.tile = [("bcn", (0, 0) + self.size, 0, 1)]
+            self.tile = [ImageFile._Tile("bcn", (0, 0) + self.size, 0, (1,))]
         elif format == Format.UNCOMPRESSED:
-            self.tile = [("raw", (0, 0) + self.size, 0, ("RGB", 0, 1))]
+            self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 0, ("RGB", 0, 1))]
         else:
             msg = f"Invalid texture compression format: {repr(format)}"
             raise ValueError(msg)
@@ -102,11 +103,11 @@ def _open(self):
         self.fp.close()
         self.fp = BytesIO(data)
 
-    def load_seek(self, pos):
+    def load_seek(self, pos: int) -> None:
         pass
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == MAGIC
 
 
diff --git a/src/PIL/GbrImagePlugin.py b/src/PIL/GbrImagePlugin.py
index 6722fa2b144..f319d7e846e 100644
--- a/src/PIL/GbrImagePlugin.py
+++ b/src/PIL/GbrImagePlugin.py
@@ -29,7 +29,7 @@
 from ._binary import i32be as i32
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return len(prefix) >= 8 and i32(prefix, 0) >= 20 and i32(prefix, 4) in (1, 2)
 
 
@@ -41,7 +41,7 @@ class GbrImageFile(ImageFile.ImageFile):
     format = "GBR"
     format_description = "GIMP brush file"
 
-    def _open(self):
+    def _open(self) -> None:
         header_size = i32(self.fp.read(4))
         if header_size < 20:
             msg = "not a GIMP brush"
@@ -88,8 +88,8 @@ def _open(self):
         # Data is an uncompressed block of w * h * bytes/pixel
         self._data_size = width * height * color_depth
 
-    def load(self):
-        if not self.im:
+    def load(self) -> Image.core.PixelAccess | None:
+        if self._im is None:
             self.im = Image.core.new(self.mode, self.size)
             self.frombytes(self.fp.read(self._data_size))
         return Image.Image.load(self)
diff --git a/src/PIL/GdImageFile.py b/src/PIL/GdImageFile.py
index d84876eb6b6..f1b4969f2c4 100644
--- a/src/PIL/GdImageFile.py
+++ b/src/PIL/GdImageFile.py
@@ -27,9 +27,12 @@ class is not registered for use with :py:func:`PIL.Image.open()`.  To open a
 """
 from __future__ import annotations
 
+from typing import IO
+
 from . import ImageFile, ImagePalette, UnidentifiedImageError
 from ._binary import i16be as i16
 from ._binary import i32be as i32
+from ._typing import StrOrBytesPath
 
 
 class GdImageFile(ImageFile.ImageFile):
@@ -43,8 +46,10 @@ class GdImageFile(ImageFile.ImageFile):
     format = "GD"
     format_description = "GD uncompressed images"
 
-    def _open(self):
+    def _open(self) -> None:
         # Header
+        assert self.fp is not None
+
         s = self.fp.read(1037)
 
         if i16(s) not in [65534, 65535]:
@@ -67,7 +72,7 @@ def _open(self):
         )
 
         self.tile = [
-            (
+            ImageFile._Tile(
                 "raw",
                 (0, 0) + self.size,
                 7 + true_color_offset + 4 + 256 * 4,
@@ -76,7 +81,7 @@ def _open(self):
         ]
 
 
-def open(fp, mode="r"):
+def open(fp: StrOrBytesPath | IO[bytes], mode: str = "r") -> GdImageFile:
     """
     Load texture from a GD image file.
 
diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
index 57d87078bca..57c29179273 100644
--- a/src/PIL/GifImagePlugin.py
+++ b/src/PIL/GifImagePlugin.py
@@ -30,6 +30,8 @@
 import os
 import subprocess
 from enum import IntEnum
+from functools import cached_property
+from typing import IO, TYPE_CHECKING, Any, Literal, NamedTuple, Union
 
 from . import (
     Image,
@@ -44,6 +46,10 @@
 from ._binary import o8
 from ._binary import o16le as o16
 
+if TYPE_CHECKING:
+    from . import _imaging
+    from ._typing import Buffer
+
 
 class LoadingStrategy(IntEnum):
     """.. versionadded:: 9.1.0"""
@@ -60,7 +66,7 @@ class LoadingStrategy(IntEnum):
 # Identify/read GIF files
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:6] in [b"GIF87a", b"GIF89a"]
 
 
@@ -76,19 +82,19 @@ class GifImageFile(ImageFile.ImageFile):
 
     global_palette = None
 
-    def data(self):
+    def data(self) -> bytes | None:
         s = self.fp.read(1)
         if s and s[0]:
             return self.fp.read(s[0])
         return None
 
-    def _is_palette_needed(self, p):
+    def _is_palette_needed(self, p: bytes) -> bool:
         for i in range(0, len(p), 3):
             if not (i // 3 == p[i] == p[i + 1] == p[i + 2]):
                 return True
         return False
 
-    def _open(self):
+    def _open(self) -> None:
         # Screen
         s = self.fp.read(13)
         if not _accept(s):
@@ -112,12 +118,11 @@ def _open(self):
 
         self._fp = self.fp  # FIXME: hack
         self.__rewind = self.fp.tell()
-        self._n_frames = None
-        self._is_animated = None
+        self._n_frames: int | None = None
         self._seek(0)  # get ready to read first frame
 
     @property
-    def n_frames(self):
+    def n_frames(self) -> int:
         if self._n_frames is None:
             current = self.tell()
             try:
@@ -128,30 +133,29 @@ def n_frames(self):
             self.seek(current)
         return self._n_frames
 
-    @property
-    def is_animated(self):
-        if self._is_animated is None:
-            if self._n_frames is not None:
-                self._is_animated = self._n_frames != 1
-            else:
-                current = self.tell()
-                if current:
-                    self._is_animated = True
-                else:
-                    try:
-                        self._seek(1, False)
-                        self._is_animated = True
-                    except EOFError:
-                        self._is_animated = False
+    @cached_property
+    def is_animated(self) -> bool:
+        if self._n_frames is not None:
+            return self._n_frames != 1
+
+        current = self.tell()
+        if current:
+            return True
 
-                    self.seek(current)
-        return self._is_animated
+        try:
+            self._seek(1, False)
+            is_animated = True
+        except EOFError:
+            is_animated = False
 
-    def seek(self, frame):
+        self.seek(current)
+        return is_animated
+
+    def seek(self, frame: int) -> None:
         if not self._seek_check(frame):
             return
         if frame < self.__frame:
-            self.im = None
+            self._im = None
             self._seek(0)
 
         last_frame = self.__frame
@@ -163,11 +167,11 @@ def seek(self, frame):
                 msg = "no more images in GIF file"
                 raise EOFError(msg) from e
 
-    def _seek(self, frame, update_image=True):
+    def _seek(self, frame: int, update_image: bool = True) -> None:
         if frame == 0:
             # rewind
             self.__offset = 0
-            self.dispose = None
+            self.dispose: _imaging.ImagingCore | None = None
             self.__frame = -1
             self._fp.seek(self.__rewind)
             self.disposal_method = 0
@@ -195,9 +199,9 @@ def _seek(self, frame, update_image=True):
             msg = "no more images in GIF file"
             raise EOFError(msg)
 
-        palette = None
+        palette: ImagePalette.ImagePalette | Literal[False] | None = None
 
-        info = {}
+        info: dict[str, Any] = {}
         frame_transparency = None
         interlace = None
         frame_dispose_extent = None
@@ -213,7 +217,7 @@ def _seek(self, frame, update_image=True):
                 #
                 s = self.fp.read(1)
                 block = self.data()
-                if s[0] == 249:
+                if s[0] == 249 and block is not None:
                     #
                     # graphic control extension
                     #
@@ -249,14 +253,14 @@ def _seek(self, frame, update_image=True):
                         info["comment"] = comment
                     s = None
                     continue
-                elif s[0] == 255 and frame == 0:
+                elif s[0] == 255 and frame == 0 and block is not None:
                     #
                     # application extension
                     #
                     info["extension"] = block, self.fp.tell()
                     if block[:11] == b"NETSCAPE2.0":
                         block = self.data()
-                        if len(block) >= 3 and block[0] == 1:
+                        if block and len(block) >= 3 and block[0] == 1:
                             self.info["loop"] = i16(block, 1)
                 while self.data():
                     pass
@@ -316,18 +320,20 @@ def _seek(self, frame, update_image=True):
             else:
                 self._mode = "L"
 
-            if not palette and self.global_palette:
+            if palette:
+                self.palette = palette
+            elif self.global_palette:
                 from copy import copy
 
-                palette = copy(self.global_palette)
-            self.palette = palette
+                self.palette = copy(self.global_palette)
+            else:
+                self.palette = None
         else:
             if self.mode == "P":
                 if (
                     LOADING_STRATEGY != LoadingStrategy.RGB_AFTER_DIFFERENT_PALETTE_ONLY
                     or palette
                 ):
-                    self.pyaccess = None
                     if "transparency" in self.info:
                         self.im.putpalettealpha(self.info["transparency"], 0)
                         self.im = self.im.convert("RGBA", Image.Dither.FLOYDSTEINBERG)
@@ -337,60 +343,60 @@ def _seek(self, frame, update_image=True):
                         self._mode = "RGB"
                         self.im = self.im.convert("RGB", Image.Dither.FLOYDSTEINBERG)
 
-        def _rgb(color):
+        def _rgb(color: int) -> tuple[int, int, int]:
             if self._frame_palette:
                 if color * 3 + 3 > len(self._frame_palette.palette):
                     color = 0
-                color = tuple(self._frame_palette.palette[color * 3 : color * 3 + 3])
+                return tuple(self._frame_palette.palette[color * 3 : color * 3 + 3])
             else:
-                color = (color, color, color)
-            return color
+                return (color, color, color)
 
+        self.dispose = None
         self.dispose_extent = frame_dispose_extent
-        try:
-            if self.disposal_method < 2:
-                # do not dispose or none specified
-                self.dispose = None
-            elif self.disposal_method == 2:
-                # replace with background colour
-
-                # only dispose the extent in this frame
-                x0, y0, x1, y1 = self.dispose_extent
-                dispose_size = (x1 - x0, y1 - y0)
-
-                Image._decompression_bomb_check(dispose_size)
-
-                # by convention, attempt to use transparency first
-                dispose_mode = "P"
-                color = self.info.get("transparency", frame_transparency)
-                if color is not None:
-                    if self.mode in ("RGB", "RGBA"):
-                        dispose_mode = "RGBA"
-                        color = _rgb(color) + (0,)
-                else:
-                    color = self.info.get("background", 0)
-                    if self.mode in ("RGB", "RGBA"):
-                        dispose_mode = "RGB"
-                        color = _rgb(color)
-                self.dispose = Image.core.fill(dispose_mode, dispose_size, color)
-            else:
-                # replace with previous contents
-                if self.im is not None:
+        if self.dispose_extent and self.disposal_method >= 2:
+            try:
+                if self.disposal_method == 2:
+                    # replace with background colour
+
                     # only dispose the extent in this frame
-                    self.dispose = self._crop(self.im, self.dispose_extent)
-                elif frame_transparency is not None:
                     x0, y0, x1, y1 = self.dispose_extent
                     dispose_size = (x1 - x0, y1 - y0)
 
                     Image._decompression_bomb_check(dispose_size)
+
+                    # by convention, attempt to use transparency first
                     dispose_mode = "P"
-                    color = frame_transparency
-                    if self.mode in ("RGB", "RGBA"):
-                        dispose_mode = "RGBA"
-                        color = _rgb(frame_transparency) + (0,)
+                    color = self.info.get("transparency", frame_transparency)
+                    if color is not None:
+                        if self.mode in ("RGB", "RGBA"):
+                            dispose_mode = "RGBA"
+                            color = _rgb(color) + (0,)
+                    else:
+                        color = self.info.get("background", 0)
+                        if self.mode in ("RGB", "RGBA"):
+                            dispose_mode = "RGB"
+                            color = _rgb(color)
                     self.dispose = Image.core.fill(dispose_mode, dispose_size, color)
-        except AttributeError:
-            pass
+                else:
+                    # replace with previous contents
+                    if self._im is not None:
+                        # only dispose the extent in this frame
+                        self.dispose = self._crop(self.im, self.dispose_extent)
+                    elif frame_transparency is not None:
+                        x0, y0, x1, y1 = self.dispose_extent
+                        dispose_size = (x1 - x0, y1 - y0)
+
+                        Image._decompression_bomb_check(dispose_size)
+                        dispose_mode = "P"
+                        color = frame_transparency
+                        if self.mode in ("RGB", "RGBA"):
+                            dispose_mode = "RGBA"
+                            color = _rgb(frame_transparency) + (0,)
+                        self.dispose = Image.core.fill(
+                            dispose_mode, dispose_size, color
+                        )
+            except AttributeError:
+                pass
 
         if interlace is not None:
             transparency = -1
@@ -401,7 +407,7 @@ def _rgb(color):
                 elif self.mode not in ("RGB", "RGBA"):
                     transparency = frame_transparency
             self.tile = [
-                (
+                ImageFile._Tile(
                     "gif",
                     (x0, y0, x1, y1),
                     self.__offset,
@@ -417,7 +423,7 @@ def _rgb(color):
             elif k in self.info:
                 del self.info[k]
 
-    def load_prepare(self):
+    def load_prepare(self) -> None:
         temp_mode = "P" if self._frame_palette else "L"
         self._prev_im = None
         if self.__frame == 0:
@@ -429,15 +435,22 @@ def load_prepare(self):
             self._prev_im = self.im
             if self._frame_palette:
                 self.im = Image.core.fill("P", self.size, self._frame_transparency or 0)
-                self.im.putpalette(*self._frame_palette.getdata())
+                self.im.putpalette("RGB", *self._frame_palette.getdata())
             else:
-                self.im = None
+                self._im = None
+        if not self._prev_im and self._im is not None and self.size != self.im.size:
+            expanded_im = Image.core.fill(self.im.mode, self.size)
+            if self._frame_palette:
+                expanded_im.putpalette("RGB", *self._frame_palette.getdata())
+            expanded_im.paste(self.im, (0, 0) + self.im.size)
+
+            self.im = expanded_im
         self._mode = temp_mode
         self._frame_palette = None
 
         super().load_prepare()
 
-    def load_end(self):
+    def load_end(self) -> None:
         if self.__frame == 0:
             if self.mode == "P" and LOADING_STRATEGY == LoadingStrategy.RGB_ALWAYS:
                 if self._frame_transparency is not None:
@@ -449,11 +462,24 @@ def load_end(self):
             return
         if not self._prev_im:
             return
+        if self.size != self._prev_im.size:
+            if self._frame_transparency is not None:
+                expanded_im = Image.core.fill("RGBA", self.size)
+            else:
+                expanded_im = Image.core.fill("P", self.size)
+                expanded_im.putpalette("RGB", "RGB", self.im.getpalette())
+                expanded_im = expanded_im.convert("RGB")
+            expanded_im.paste(self._prev_im, (0, 0) + self._prev_im.size)
+
+            self._prev_im = expanded_im
+            assert self._prev_im is not None
         if self._frame_transparency is not None:
             self.im.putpalettealpha(self._frame_transparency, 0)
             frame_im = self.im.convert("RGBA")
         else:
             frame_im = self.im.convert("RGB")
+
+        assert self.dispose_extent is not None
         frame_im = self._crop(frame_im, self.dispose_extent)
 
         self.im = self._prev_im
@@ -463,7 +489,7 @@ def load_end(self):
         else:
             self.im.paste(frame_im, self.dispose_extent)
 
-    def tell(self):
+    def tell(self) -> int:
         return self.__frame
 
 
@@ -474,7 +500,7 @@ def tell(self):
 RAWMODE = {"1": "L", "L": "L", "P": "P"}
 
 
-def _normalize_mode(im):
+def _normalize_mode(im: Image.Image) -> Image.Image:
     """
     Takes an image (or frame), returns an image in a mode that is appropriate
     for saving in a Gif.
@@ -490,6 +516,7 @@ def _normalize_mode(im):
         return im
     if Image.getmodebase(im.mode) == "RGB":
         im = im.convert("P", palette=Image.Palette.ADAPTIVE)
+        assert im.palette is not None
         if im.palette.mode == "RGBA":
             for rgba in im.palette.colors:
                 if rgba[3] == 0:
@@ -499,7 +526,12 @@ def _normalize_mode(im):
     return im.convert("L")
 
 
-def _normalize_palette(im, palette, info):
+_Palette = Union[bytes, bytearray, list[int], ImagePalette.ImagePalette]
+
+
+def _normalize_palette(
+    im: Image.Image, palette: _Palette | None, info: dict[str, Any]
+) -> Image.Image:
     """
     Normalizes the palette for image.
       - Sets the palette to the incoming palette, if provided.
@@ -521,14 +553,18 @@ def _normalize_palette(im, palette, info):
 
     if im.mode == "P":
         if not source_palette:
-            source_palette = im.im.getpalette("RGB")[:768]
+            im_palette = im.getpalette(None)
+            assert im_palette is not None
+            source_palette = bytearray(im_palette)
     else:  # L-mode
         if not source_palette:
             source_palette = bytearray(i // 3 for i in range(768))
         im.palette = ImagePalette.ImagePalette("RGB", palette=source_palette)
+    assert source_palette is not None
 
     if palette:
-        used_palette_colors = []
+        used_palette_colors: list[int | None] = []
+        assert im.palette is not None
         for i in range(0, len(source_palette), 3):
             source_color = tuple(source_palette[i : i + 3])
             index = im.palette.colors.get(source_color)
@@ -541,28 +577,38 @@ def _normalize_palette(im, palette, info):
                     if j not in used_palette_colors:
                         used_palette_colors[i] = j
                         break
-        im = im.remap_palette(used_palette_colors)
+        dest_map: list[int] = []
+        for index in used_palette_colors:
+            assert index is not None
+            dest_map.append(index)
+        im = im.remap_palette(dest_map)
     else:
-        used_palette_colors = _get_optimize(im, info)
-        if used_palette_colors is not None:
-            im = im.remap_palette(used_palette_colors, source_palette)
+        optimized_palette_colors = _get_optimize(im, info)
+        if optimized_palette_colors is not None:
+            im = im.remap_palette(optimized_palette_colors, source_palette)
             if "transparency" in info:
                 try:
-                    info["transparency"] = used_palette_colors.index(
+                    info["transparency"] = optimized_palette_colors.index(
                         info["transparency"]
                     )
                 except ValueError:
                     del info["transparency"]
             return im
 
+    assert im.palette is not None
     im.palette.palette = source_palette
     return im
 
 
-def _write_single_frame(im, fp, palette):
+def _write_single_frame(
+    im: Image.Image,
+    fp: IO[bytes],
+    palette: _Palette | None,
+) -> None:
     im_out = _normalize_mode(im)
     for k, v in im_out.info.items():
-        im.encoderinfo.setdefault(k, v)
+        if isinstance(k, str):
+            im.encoderinfo.setdefault(k, v)
     im_out = _normalize_palette(im_out, palette, im.encoderinfo)
 
     for s in _get_global_header(im_out, im.encoderinfo):
@@ -575,25 +621,40 @@ def _write_single_frame(im, fp, palette):
     _write_local_header(fp, im, (0, 0), flags)
 
     im_out.encoderconfig = (8, get_interlace(im))
-    ImageFile._save(im_out, fp, [("gif", (0, 0) + im.size, 0, RAWMODE[im_out.mode])])
+    ImageFile._save(
+        im_out, fp, [ImageFile._Tile("gif", (0, 0) + im.size, 0, RAWMODE[im_out.mode])]
+    )
 
     fp.write(b"\0")  # end of image data
 
 
-def _getbbox(base_im, im_frame):
-    if _get_palette_bytes(im_frame) != _get_palette_bytes(base_im):
+def _getbbox(
+    base_im: Image.Image, im_frame: Image.Image
+) -> tuple[Image.Image, tuple[int, int, int, int] | None]:
+    palette_bytes = [
+        bytes(im.palette.palette) if im.palette else b"" for im in (base_im, im_frame)
+    ]
+    if palette_bytes[0] != palette_bytes[1]:
         im_frame = im_frame.convert("RGBA")
         base_im = base_im.convert("RGBA")
     delta = ImageChops.subtract_modulo(im_frame, base_im)
     return delta, delta.getbbox(alpha_only=False)
 
 
-def _write_multiple_frames(im, fp, palette):
+class _Frame(NamedTuple):
+    im: Image.Image
+    bbox: tuple[int, int, int, int] | None
+    encoderinfo: dict[str, Any]
+
+
+def _write_multiple_frames(
+    im: Image.Image, fp: IO[bytes], palette: _Palette | None
+) -> bool:
     duration = im.encoderinfo.get("duration")
     disposal = im.encoderinfo.get("disposal", im.info.get("disposal"))
 
-    im_frames = []
-    previous_im = None
+    im_frames: list[_Frame] = []
+    previous_im: Image.Image | None = None
     frame_count = 0
     background_im = None
     for imSequence in itertools.chain([im], im.encoderinfo.get("append_images", [])):
@@ -604,7 +665,8 @@ def _write_multiple_frames(im, fp, palette):
                 for k, v in im_frame.info.items():
                     if k == "transparency":
                         continue
-                    im.encoderinfo.setdefault(k, v)
+                    if isinstance(k, str):
+                        im.encoderinfo.setdefault(k, v)
 
             encoderinfo = im.encoderinfo.copy()
             if "transparency" in im_frame.info:
@@ -619,43 +681,50 @@ def _write_multiple_frames(im, fp, palette):
             frame_count += 1
 
             diff_frame = None
-            if im_frames:
+            if im_frames and previous_im:
                 # delta frame
                 delta, bbox = _getbbox(previous_im, im_frame)
                 if not bbox:
                     # This frame is identical to the previous frame
                     if encoderinfo.get("duration"):
-                        im_frames[-1]["encoderinfo"]["duration"] += encoderinfo[
-                            "duration"
-                        ]
+                        im_frames[-1].encoderinfo["duration"] += encoderinfo["duration"]
                     continue
-                if encoderinfo.get("disposal") == 2:
+                if im_frames[-1].encoderinfo.get("disposal") == 2:
                     if background_im is None:
                         color = im.encoderinfo.get(
                             "transparency", im.info.get("transparency", (0, 0, 0))
                         )
                         background = _get_background(im_frame, color)
                         background_im = Image.new("P", im_frame.size, background)
-                        background_im.putpalette(im_frames[0]["im"].palette)
-                    delta, bbox = _getbbox(background_im, im_frame)
-                if encoderinfo.get("optimize") and im_frame.mode != "1":
+                        assert im_frames[0].im.palette is not None
+                        background_im.putpalette(im_frames[0].im.palette)
+                    bbox = _getbbox(background_im, im_frame)[1]
+                elif encoderinfo.get("optimize") and im_frame.mode != "1":
                     if "transparency" not in encoderinfo:
+                        assert im_frame.palette is not None
                         try:
-                            encoderinfo[
-                                "transparency"
-                            ] = im_frame.palette._new_color_index(im_frame)
+                            encoderinfo["transparency"] = (
+                                im_frame.palette._new_color_index(im_frame)
+                            )
                         except ValueError:
                             pass
                     if "transparency" in encoderinfo:
                         # When the delta is zero, fill the image with transparency
                         diff_frame = im_frame.copy()
-                        fill = Image.new(
-                            "P", diff_frame.size, encoderinfo["transparency"]
-                        )
+                        fill = Image.new("P", delta.size, encoderinfo["transparency"])
                         if delta.mode == "RGBA":
                             r, g, b, a = delta.split()
-                            mask = ImageMath.eval(
-                                "convert(max(max(max(r, g), b), a) * 255, '1')",
+                            mask = ImageMath.lambda_eval(
+                                lambda args: args["convert"](
+                                    args["max"](
+                                        args["max"](
+                                            args["max"](args["r"], args["g"]), args["b"]
+                                        ),
+                                        args["a"],
+                                    )
+                                    * 255,
+                                    "1",
+                                ),
                                 r=r,
                                 g=g,
                                 b=b,
@@ -667,44 +736,47 @@ def _write_multiple_frames(im, fp, palette):
                                 delta_l = Image.new("L", delta.size)
                                 delta_l.putdata(delta.getdata())
                                 delta = delta_l
-                            mask = ImageMath.eval("convert(im * 255, '1')", im=delta)
+                            mask = ImageMath.lambda_eval(
+                                lambda args: args["convert"](args["im"] * 255, "1"),
+                                im=delta,
+                            )
                         diff_frame.paste(fill, mask=ImageOps.invert(mask))
             else:
                 bbox = None
             previous_im = im_frame
-            im_frames.append(
-                {"im": diff_frame or im_frame, "bbox": bbox, "encoderinfo": encoderinfo}
-            )
+            im_frames.append(_Frame(diff_frame or im_frame, bbox, encoderinfo))
 
     if len(im_frames) == 1:
         if "duration" in im.encoderinfo:
             # Since multiple frames will not be written, use the combined duration
-            im.encoderinfo["duration"] = im_frames[0]["encoderinfo"]["duration"]
-        return
+            im.encoderinfo["duration"] = im_frames[0].encoderinfo["duration"]
+        return False
 
     for frame_data in im_frames:
-        im_frame = frame_data["im"]
-        if not frame_data["bbox"]:
+        im_frame = frame_data.im
+        if not frame_data.bbox:
             # global header
-            for s in _get_global_header(im_frame, frame_data["encoderinfo"]):
+            for s in _get_global_header(im_frame, frame_data.encoderinfo):
                 fp.write(s)
             offset = (0, 0)
         else:
             # compress difference
             if not palette:
-                frame_data["encoderinfo"]["include_color_table"] = True
+                frame_data.encoderinfo["include_color_table"] = True
 
-            im_frame = im_frame.crop(frame_data["bbox"])
-            offset = frame_data["bbox"][:2]
-        _write_frame_data(fp, im_frame, offset, frame_data["encoderinfo"])
+            im_frame = im_frame.crop(frame_data.bbox)
+            offset = frame_data.bbox[:2]
+        _write_frame_data(fp, im_frame, offset, frame_data.encoderinfo)
     return True
 
 
-def _save_all(im, fp, filename):
+def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     _save(im, fp, filename, save_all=True)
 
 
-def _save(im, fp, filename, save_all=False):
+def _save(
+    im: Image.Image, fp: IO[bytes], filename: str | bytes, save_all: bool = False
+) -> None:
     # header
     if "palette" in im.encoderinfo or "palette" in im.info:
         palette = im.encoderinfo.get("palette", im.info.get("palette"))
@@ -721,7 +793,7 @@ def _save(im, fp, filename, save_all=False):
         fp.flush()
 
 
-def get_interlace(im):
+def get_interlace(im: Image.Image) -> int:
     interlace = im.encoderinfo.get("interlace", 1)
 
     # workaround for @PIL153
@@ -731,7 +803,9 @@ def get_interlace(im):
     return interlace
 
 
-def _write_local_header(fp, im, offset, flags):
+def _write_local_header(
+    fp: IO[bytes], im: Image.Image, offset: tuple[int, int], flags: int
+) -> None:
     try:
         transparency = im.encoderinfo["transparency"]
     except KeyError:
@@ -779,7 +853,7 @@ def _write_local_header(fp, im, offset, flags):
     fp.write(o8(8))  # bits
 
 
-def _save_netpbm(im, fp, filename):
+def _save_netpbm(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     # Unused by default.
     # To use, uncomment the register_save call at the end of the file.
     #
@@ -810,6 +884,7 @@ def _save_netpbm(im, fp, filename):
                 )
 
                 # Allow ppmquant to receive SIGPIPE if ppmtogif exits
+                assert quant_proc.stdout is not None
                 quant_proc.stdout.close()
 
                 retcode = quant_proc.wait()
@@ -831,7 +906,7 @@ def _save_netpbm(im, fp, filename):
 _FORCE_OPTIMIZE = False
 
 
-def _get_optimize(im, info):
+def _get_optimize(im: Image.Image, info: dict[str, Any]) -> list[int] | None:
     """
     Palette optimization is a potentially expensive operation.
 
@@ -864,6 +939,7 @@ def _get_optimize(im, info):
             if optimise or max(used_palette_colors) >= len(used_palette_colors):
                 return used_palette_colors
 
+            assert im.palette is not None
             num_palette_colors = len(im.palette.palette) // Image.getmodebands(
                 im.palette.mode
             )
@@ -875,9 +951,10 @@ def _get_optimize(im, info):
                 and current_palette_size > 2
             ):
                 return used_palette_colors
+    return None
 
 
-def _get_color_table_size(palette_bytes):
+def _get_color_table_size(palette_bytes: bytes) -> int:
     # calculate the palette size for the header
     if not palette_bytes:
         return 0
@@ -887,7 +964,7 @@ def _get_color_table_size(palette_bytes):
         return math.ceil(math.log(len(palette_bytes) // 3, 2)) - 1
 
 
-def _get_header_palette(palette_bytes):
+def _get_header_palette(palette_bytes: bytes) -> bytes:
     """
     Returns the palette, null padded to the next power of 2 (*3) bytes
     suitable for direct inclusion in the GIF header
@@ -905,23 +982,33 @@ def _get_header_palette(palette_bytes):
     return palette_bytes
 
 
-def _get_palette_bytes(im):
+def _get_palette_bytes(im: Image.Image) -> bytes:
     """
     Gets the palette for inclusion in the gif header
 
     :param im: Image object
     :returns: Bytes, len<=768 suitable for inclusion in gif header
     """
-    return im.palette.palette if im.palette else b""
+    if not im.palette:
+        return b""
 
+    palette = bytes(im.palette.palette)
+    if im.palette.mode == "RGBA":
+        palette = b"".join(palette[i * 4 : i * 4 + 3] for i in range(len(palette) // 3))
+    return palette
 
-def _get_background(im, info_background):
+
+def _get_background(
+    im: Image.Image,
+    info_background: int | tuple[int, int, int] | tuple[int, int, int, int] | None,
+) -> int:
     background = 0
     if info_background:
         if isinstance(info_background, tuple):
             # WebPImagePlugin stores an RGBA value in info["background"]
             # So it must be converted to the same format as GifImagePlugin's
             # info["background"] - a global color table index
+            assert im.palette is not None
             try:
                 background = im.palette.getcolor(info_background, im)
             except ValueError as e:
@@ -938,7 +1025,7 @@ def _get_background(im, info_background):
     return background
 
 
-def _get_global_header(im, info):
+def _get_global_header(im: Image.Image, info: dict[str, Any]) -> list[bytes]:
     """Return a list of strings representing a GIF header"""
 
     # Header Block
@@ -1000,7 +1087,12 @@ def _get_global_header(im, info):
     return header
 
 
-def _write_frame_data(fp, im_frame, offset, params):
+def _write_frame_data(
+    fp: IO[bytes],
+    im_frame: Image.Image,
+    offset: tuple[int, int],
+    params: dict[str, Any],
+) -> None:
     try:
         im_frame.encoderinfo = params
 
@@ -1008,7 +1100,9 @@ def _write_frame_data(fp, im_frame, offset, params):
         _write_local_header(fp, im_frame, offset, 0)
 
         ImageFile._save(
-            im_frame, fp, [("gif", (0, 0) + im_frame.size, 0, RAWMODE[im_frame.mode])]
+            im_frame,
+            fp,
+            [ImageFile._Tile("gif", (0, 0) + im_frame.size, 0, RAWMODE[im_frame.mode])],
         )
 
         fp.write(b"\0")  # end of image data
@@ -1020,7 +1114,9 @@ def _write_frame_data(fp, im_frame, offset, params):
 # Legacy GIF utilities
 
 
-def getheader(im, palette=None, info=None):
+def getheader(
+    im: Image.Image, palette: _Palette | None = None, info: dict[str, Any] | None = None
+) -> tuple[list[bytes], list[int] | None]:
     """
     Legacy Method to get Gif data from image.
 
@@ -1032,11 +1128,11 @@ def getheader(im, palette=None, info=None):
     :returns: tuple of(list of header items, optimized palette)
 
     """
-    used_palette_colors = _get_optimize(im, info)
-
     if info is None:
         info = {}
 
+    used_palette_colors = _get_optimize(im, info)
+
     if "background" not in info and "background" in im.info:
         info["background"] = im.info["background"]
 
@@ -1048,7 +1144,9 @@ def getheader(im, palette=None, info=None):
     return header, used_palette_colors
 
 
-def getdata(im, offset=(0, 0), **params):
+def getdata(
+    im: Image.Image, offset: tuple[int, int] = (0, 0), **params: Any
+) -> list[bytes]:
     """
     Legacy Method
 
@@ -1065,12 +1163,14 @@ def getdata(im, offset=(0, 0), **params):
     :returns: List of bytes containing GIF encoded frame data
 
     """
+    from io import BytesIO
 
-    class Collector:
+    class Collector(BytesIO):
         data = []
 
-        def write(self, data):
+        def write(self, data: Buffer) -> int:
             self.data.append(data)
+            return len(data)
 
     im.load()  # make sure raster data is available
 
diff --git a/src/PIL/GimpGradientFile.py b/src/PIL/GimpGradientFile.py
index 2d8c78ea91a..220eac57e38 100644
--- a/src/PIL/GimpGradientFile.py
+++ b/src/PIL/GimpGradientFile.py
@@ -21,6 +21,7 @@
 from __future__ import annotations
 
 from math import log, pi, sin, sqrt
+from typing import IO, Callable
 
 from ._binary import o8
 
@@ -28,7 +29,7 @@
 """"""  # Enable auto-doc for data member
 
 
-def linear(middle, pos):
+def linear(middle: float, pos: float) -> float:
     if pos <= middle:
         if middle < EPSILON:
             return 0.0
@@ -43,19 +44,19 @@ def linear(middle, pos):
             return 0.5 + 0.5 * pos / middle
 
 
-def curved(middle, pos):
+def curved(middle: float, pos: float) -> float:
     return pos ** (log(0.5) / log(max(middle, EPSILON)))
 
 
-def sine(middle, pos):
+def sine(middle: float, pos: float) -> float:
     return (sin((-pi / 2.0) + pi * linear(middle, pos)) + 1.0) / 2.0
 
 
-def sphere_increasing(middle, pos):
+def sphere_increasing(middle: float, pos: float) -> float:
     return sqrt(1.0 - (linear(middle, pos) - 1.0) ** 2)
 
 
-def sphere_decreasing(middle, pos):
+def sphere_decreasing(middle: float, pos: float) -> float:
     return 1.0 - sqrt(1.0 - linear(middle, pos) ** 2)
 
 
@@ -64,9 +65,22 @@ def sphere_decreasing(middle, pos):
 
 
 class GradientFile:
-    gradient = None
-
-    def getpalette(self, entries=256):
+    gradient: (
+        list[
+            tuple[
+                float,
+                float,
+                float,
+                list[float],
+                list[float],
+                Callable[[float, float], float],
+            ]
+        ]
+        | None
+    ) = None
+
+    def getpalette(self, entries: int = 256) -> tuple[bytes, str]:
+        assert self.gradient is not None
         palette = []
 
         ix = 0
@@ -101,7 +115,7 @@ def getpalette(self, entries=256):
 class GimpGradientFile(GradientFile):
     """File handler for GIMP's gradient format."""
 
-    def __init__(self, fp):
+    def __init__(self, fp: IO[bytes]) -> None:
         if fp.readline()[:13] != b"GIMP Gradient":
             msg = "not a GIMP gradient file"
             raise SyntaxError(msg)
@@ -114,7 +128,7 @@ def __init__(self, fp):
 
         count = int(line)
 
-        gradient = []
+        self.gradient = []
 
         for i in range(count):
             s = fp.readline().split()
@@ -132,6 +146,4 @@ def __init__(self, fp):
                 msg = "cannot handle HSV colour space"
                 raise OSError(msg)
 
-            gradient.append((x0, x1, xm, rgb0, rgb1, segment))
-
-        self.gradient = gradient
+            self.gradient.append((x0, x1, xm, rgb0, rgb1, segment))
diff --git a/src/PIL/GimpPaletteFile.py b/src/PIL/GimpPaletteFile.py
index a3109ebaa1b..4cad0ebeea1 100644
--- a/src/PIL/GimpPaletteFile.py
+++ b/src/PIL/GimpPaletteFile.py
@@ -16,6 +16,7 @@
 from __future__ import annotations
 
 import re
+from typing import IO
 
 from ._binary import o8
 
@@ -25,8 +26,8 @@ class GimpPaletteFile:
 
     rawmode = "RGB"
 
-    def __init__(self, fp):
-        self.palette = [o8(i) * 3 for i in range(256)]
+    def __init__(self, fp: IO[bytes]) -> None:
+        palette = [o8(i) * 3 for i in range(256)]
 
         if fp.readline()[:12] != b"GIMP Palette":
             msg = "not a GIMP palette file"
@@ -49,9 +50,9 @@ def __init__(self, fp):
                 msg = "bad palette entry"
                 raise ValueError(msg)
 
-            self.palette[i] = o8(v[0]) + o8(v[1]) + o8(v[2])
+            palette[i] = o8(v[0]) + o8(v[1]) + o8(v[2])
 
-        self.palette = b"".join(self.palette)
+        self.palette = b"".join(palette)
 
-    def getpalette(self):
+    def getpalette(self) -> tuple[bytes, str]:
         return self.palette, self.rawmode
diff --git a/src/PIL/GribStubImagePlugin.py b/src/PIL/GribStubImagePlugin.py
index f8106800c42..e9aa084b281 100644
--- a/src/PIL/GribStubImagePlugin.py
+++ b/src/PIL/GribStubImagePlugin.py
@@ -10,12 +10,14 @@
 #
 from __future__ import annotations
 
+from typing import IO
+
 from . import Image, ImageFile
 
 _handler = None
 
 
-def register_handler(handler):
+def register_handler(handler: ImageFile.StubHandler | None) -> None:
     """
     Install application-specific GRIB image handler.
 
@@ -29,7 +31,7 @@ def register_handler(handler):
 # Image adapter
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"GRIB" and prefix[7] == 1
 
 
@@ -37,7 +39,7 @@ class GribStubImageFile(ImageFile.StubImageFile):
     format = "GRIB"
     format_description = "GRIB"
 
-    def _open(self):
+    def _open(self) -> None:
         offset = self.fp.tell()
 
         if not _accept(self.fp.read(8)):
@@ -54,11 +56,11 @@ def _open(self):
         if loader:
             loader.open(self)
 
-    def _load(self):
+    def _load(self) -> ImageFile.StubHandler | None:
         return _handler
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if _handler is None or not hasattr(_handler, "save"):
         msg = "GRIB save handler not installed"
         raise OSError(msg)
diff --git a/src/PIL/Hdf5StubImagePlugin.py b/src/PIL/Hdf5StubImagePlugin.py
index 65409e269fc..cc9e73deb80 100644
--- a/src/PIL/Hdf5StubImagePlugin.py
+++ b/src/PIL/Hdf5StubImagePlugin.py
@@ -10,12 +10,14 @@
 #
 from __future__ import annotations
 
+from typing import IO
+
 from . import Image, ImageFile
 
 _handler = None
 
 
-def register_handler(handler):
+def register_handler(handler: ImageFile.StubHandler | None) -> None:
     """
     Install application-specific HDF5 image handler.
 
@@ -29,7 +31,7 @@ def register_handler(handler):
 # Image adapter
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:8] == b"\x89HDF\r\n\x1a\n"
 
 
@@ -37,7 +39,7 @@ class HDF5StubImageFile(ImageFile.StubImageFile):
     format = "HDF5"
     format_description = "HDF5"
 
-    def _open(self):
+    def _open(self) -> None:
         offset = self.fp.tell()
 
         if not _accept(self.fp.read(8)):
@@ -54,11 +56,11 @@ def _open(self):
         if loader:
             loader.open(self)
 
-    def _load(self):
+    def _load(self) -> ImageFile.StubHandler | None:
         return _handler
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if _handler is None or not hasattr(_handler, "save"):
         msg = "HDF5 save handler not installed"
         raise OSError(msg)
diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py
index d877b4ecba6..9757b2b142d 100644
--- a/src/PIL/IcnsImagePlugin.py
+++ b/src/PIL/IcnsImagePlugin.py
@@ -22,8 +22,10 @@
 import os
 import struct
 import sys
+from typing import IO
 
 from . import Image, ImageFile, PngImagePlugin, features
+from ._deprecate import deprecate
 
 enable_jpeg2k = features.check_codec("jpg_2000")
 if enable_jpeg2k:
@@ -33,11 +35,13 @@
 HEADERSIZE = 8
 
 
-def nextheader(fobj):
+def nextheader(fobj: IO[bytes]) -> tuple[bytes, int]:
     return struct.unpack(">4sI", fobj.read(HEADERSIZE))
 
 
-def read_32t(fobj, start_length, size):
+def read_32t(
+    fobj: IO[bytes], start_length: tuple[int, int], size: tuple[int, int, int]
+) -> dict[str, Image.Image]:
     # The 128x128 icon seems to have an extra header for some reason.
     (start, length) = start_length
     fobj.seek(start)
@@ -48,7 +52,9 @@ def read_32t(fobj, start_length, size):
     return read_32(fobj, (start + 4, length - 4), size)
 
 
-def read_32(fobj, start_length, size):
+def read_32(
+    fobj: IO[bytes], start_length: tuple[int, int], size: tuple[int, int, int]
+) -> dict[str, Image.Image]:
     """
     Read a 32bit RGB icon resource.  Seems to be either uncompressed or
     an RLE packbits-like scheme.
@@ -71,14 +77,14 @@ def read_32(fobj, start_length, size):
                 byte = fobj.read(1)
                 if not byte:
                     break
-                byte = byte[0]
-                if byte & 0x80:
-                    blocksize = byte - 125
+                byte_int = byte[0]
+                if byte_int & 0x80:
+                    blocksize = byte_int - 125
                     byte = fobj.read(1)
                     for i in range(blocksize):
                         data.append(byte)
                 else:
-                    blocksize = byte + 1
+                    blocksize = byte_int + 1
                     data.append(fobj.read(blocksize))
                 bytesleft -= blocksize
                 if bytesleft <= 0:
@@ -91,7 +97,9 @@ def read_32(fobj, start_length, size):
     return {"RGB": im}
 
 
-def read_mk(fobj, start_length, size):
+def read_mk(
+    fobj: IO[bytes], start_length: tuple[int, int], size: tuple[int, int, int]
+) -> dict[str, Image.Image]:
     # Alpha masks seem to be uncompressed
     start = start_length[0]
     fobj.seek(start)
@@ -101,10 +109,14 @@ def read_mk(fobj, start_length, size):
     return {"A": band}
 
 
-def read_png_or_jpeg2000(fobj, start_length, size):
+def read_png_or_jpeg2000(
+    fobj: IO[bytes], start_length: tuple[int, int], size: tuple[int, int, int]
+) -> dict[str, Image.Image]:
     (start, length) = start_length
     fobj.seek(start)
     sig = fobj.read(12)
+
+    im: Image.Image
     if sig[:8] == b"\x89PNG\x0d\x0a\x1a\x0a":
         fobj.seek(start)
         im = PngImagePlugin.PngImageFile(fobj)
@@ -163,12 +175,12 @@ class IcnsFile:
         ],
     }
 
-    def __init__(self, fobj):
+    def __init__(self, fobj: IO[bytes]) -> None:
         """
         fobj is a file-like object as an icns resource
         """
         # signature : (start, length)
-        self.dct = dct = {}
+        self.dct = {}
         self.fobj = fobj
         sig, filesize = nextheader(fobj)
         if not _accept(sig):
@@ -182,11 +194,11 @@ def __init__(self, fobj):
                 raise SyntaxError(msg)
             i += HEADERSIZE
             blocksize -= HEADERSIZE
-            dct[sig] = (i, blocksize)
+            self.dct[sig] = (i, blocksize)
             fobj.seek(blocksize, io.SEEK_CUR)
             i += blocksize
 
-    def itersizes(self):
+    def itersizes(self) -> list[tuple[int, int, int]]:
         sizes = []
         for size, fmts in self.SIZES.items():
             for fmt, reader in fmts:
@@ -195,14 +207,14 @@ def itersizes(self):
                     break
         return sizes
 
-    def bestsize(self):
+    def bestsize(self) -> tuple[int, int, int]:
         sizes = self.itersizes()
         if not sizes:
             msg = "No 32bit icon resources found"
             raise SyntaxError(msg)
         return max(sizes)
 
-    def dataforsize(self, size):
+    def dataforsize(self, size: tuple[int, int, int]) -> dict[str, Image.Image]:
         """
         Get an icon resource as {channel: array}.  Note that
         the arrays are bottom-up like windows bitmaps and will likely
@@ -215,18 +227,20 @@ def dataforsize(self, size):
                 dct.update(reader(self.fobj, desc, size))
         return dct
 
-    def getimage(self, size=None):
+    def getimage(
+        self, size: tuple[int, int] | tuple[int, int, int] | None = None
+    ) -> Image.Image:
         if size is None:
             size = self.bestsize()
-        if len(size) == 2:
+        elif len(size) == 2:
             size = (size[0], size[1], 1)
         channels = self.dataforsize(size)
 
-        im = channels.get("RGBA", None)
+        im = channels.get("RGBA")
         if im:
             return im
 
-        im = channels.get("RGB").copy()
+        im = channels["RGB"].copy()
         try:
             im.putalpha(channels["A"])
         except KeyError:
@@ -252,7 +266,7 @@ class IcnsImageFile(ImageFile.ImageFile):
     format = "ICNS"
     format_description = "Mac OS icns resource"
 
-    def _open(self):
+    def _open(self) -> None:
         self.icns = IcnsFile(self.fp)
         self._mode = "RGBA"
         self.info["sizes"] = self.icns.itersizes()
@@ -262,40 +276,40 @@ def _open(self):
             self.best_size[1] * self.best_size[2],
         )
 
-    @property
-    def size(self):
+    @property  # type: ignore[override]
+    def size(self) -> tuple[int, int] | tuple[int, int, int]:
         return self._size
 
     @size.setter
-    def size(self, value):
-        info_size = value
-        if info_size not in self.info["sizes"] and len(info_size) == 2:
-            info_size = (info_size[0], info_size[1], 1)
-        if (
-            info_size not in self.info["sizes"]
-            and len(info_size) == 3
-            and info_size[2] == 1
-        ):
-            simple_sizes = [
-                (size[0] * size[2], size[1] * size[2]) for size in self.info["sizes"]
-            ]
-            if value in simple_sizes:
-                info_size = self.info["sizes"][simple_sizes.index(value)]
-        if info_size not in self.info["sizes"]:
-            msg = "This is not one of the allowed sizes of this image"
-            raise ValueError(msg)
-        self._size = value
-
-    def load(self):
-        if len(self.size) == 3:
-            self.best_size = self.size
-            self.size = (
-                self.best_size[0] * self.best_size[2],
-                self.best_size[1] * self.best_size[2],
-            )
+    def size(self, value: tuple[int, int] | tuple[int, int, int]) -> None:
+        if len(value) == 3:
+            deprecate("Setting size to (width, height, scale)", 12, "load(scale)")
+            if value in self.info["sizes"]:
+                self._size = value  # type: ignore[assignment]
+                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"
+        raise ValueError(msg)
+
+    def load(self, scale: int | None = None) -> Image.core.PixelAccess | None:
+        if scale is not None or len(self.size) == 3:
+            if scale is None and len(self.size) == 3:
+                scale = self.size[2]
+            assert scale is not None
+            width, height = self.size[:2]
+            self.size = width * scale, height * scale
+            self.best_size = width, height, scale
 
         px = Image.Image.load(self)
-        if self.im is not None and self.im.size == self.size:
+        if self._im is not None and self.im.size == self.size:
             # Already loaded
             return px
         self.load_prepare()
@@ -312,7 +326,7 @@ def load(self):
         return px
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     """
     Saves the image as a series of PNG files,
     that are then combined into a .icns file.
@@ -346,35 +360,33 @@ def _save(im, fp, filename):
     entries = []
     for type, size in sizes.items():
         stream = size_streams[size]
-        entries.append(
-            {"type": type, "size": HEADERSIZE + len(stream), "stream": stream}
-        )
+        entries.append((type, HEADERSIZE + len(stream), stream))
 
     # Header
     fp.write(MAGIC)
     file_length = HEADERSIZE  # Header
     file_length += HEADERSIZE + 8 * len(entries)  # TOC
-    file_length += sum(entry["size"] for entry in entries)
+    file_length += sum(entry[1] for entry in entries)
     fp.write(struct.pack(">i", file_length))
 
     # TOC
     fp.write(b"TOC ")
     fp.write(struct.pack(">i", HEADERSIZE + len(entries) * HEADERSIZE))
     for entry in entries:
-        fp.write(entry["type"])
-        fp.write(struct.pack(">i", entry["size"]))
+        fp.write(entry[0])
+        fp.write(struct.pack(">i", entry[1]))
 
     # Data
     for entry in entries:
-        fp.write(entry["type"])
-        fp.write(struct.pack(">i", entry["size"]))
-        fp.write(entry["stream"])
+        fp.write(entry[0])
+        fp.write(struct.pack(">i", entry[1]))
+        fp.write(entry[2])
 
     if hasattr(fp, "flush"):
         fp.flush()
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == MAGIC
 
 
diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py
index 1b22f8645dc..e879f180154 100644
--- a/src/PIL/IcoImagePlugin.py
+++ b/src/PIL/IcoImagePlugin.py
@@ -25,6 +25,7 @@
 import warnings
 from io import BytesIO
 from math import ceil, log
+from typing import IO, NamedTuple
 
 from . import BmpImagePlugin, Image, ImageFile, PngImagePlugin
 from ._binary import i16le as i16
@@ -39,7 +40,7 @@
 _MAGIC = b"\0\0\1\0"
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     fp.write(_MAGIC)  # (2+2)
     bmp = im.encoderinfo.get("bitmap_format") == "bmp"
     sizes = im.encoderinfo.get(
@@ -96,7 +97,9 @@ def _save(im, fp, filename):
             if bits != 32:
                 and_mask = Image.new("1", size)
                 ImageFile._save(
-                    and_mask, image_io, [("raw", (0, 0) + size, 0, ("1", 0, -1))]
+                    and_mask,
+                    image_io,
+                    [ImageFile._Tile("raw", (0, 0) + size, 0, ("1", 0, -1))],
                 )
         else:
             frame.save(image_io, "png")
@@ -114,12 +117,26 @@ def _save(im, fp, filename):
         fp.seek(current)
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == _MAGIC
 
 
+class IconHeader(NamedTuple):
+    width: int
+    height: int
+    nb_color: int
+    reserved: int
+    planes: int
+    bpp: int
+    size: int
+    offset: int
+    dim: tuple[int, int]
+    square: int
+    color_depth: int
+
+
 class IcoFile:
-    def __init__(self, buf):
+    def __init__(self, buf: IO[bytes]) -> None:
         """
         Parse image from file-like object containing ico file data
         """
@@ -140,71 +157,65 @@ def __init__(self, buf):
         for i in range(self.nb_items):
             s = buf.read(16)
 
-            icon_header = {
-                "width": s[0],
-                "height": s[1],
-                "nb_color": s[2],  # No. of colors in image (0 if >=8bpp)
-                "reserved": s[3],
-                "planes": i16(s, 4),
-                "bpp": i16(s, 6),
-                "size": i32(s, 8),
-                "offset": i32(s, 12),
-            }
-
             # See Wikipedia
-            for j in ("width", "height"):
-                if not icon_header[j]:
-                    icon_header[j] = 256
-
-            # See Wikipedia notes about color depth.
-            # We need this just to differ images with equal sizes
-            icon_header["color_depth"] = (
-                icon_header["bpp"]
-                or (
-                    icon_header["nb_color"] != 0
-                    and ceil(log(icon_header["nb_color"], 2))
-                )
-                or 256
+            width = s[0] or 256
+            height = s[1] or 256
+
+            # No. of colors in image (0 if >=8bpp)
+            nb_color = s[2]
+            bpp = i16(s, 6)
+            icon_header = IconHeader(
+                width=width,
+                height=height,
+                nb_color=nb_color,
+                reserved=s[3],
+                planes=i16(s, 4),
+                bpp=i16(s, 6),
+                size=i32(s, 8),
+                offset=i32(s, 12),
+                dim=(width, height),
+                square=width * height,
+                # See Wikipedia notes about color depth.
+                # We need this just to differ images with equal sizes
+                color_depth=bpp or (nb_color != 0 and ceil(log(nb_color, 2))) or 256,
             )
 
-            icon_header["dim"] = (icon_header["width"], icon_header["height"])
-            icon_header["square"] = icon_header["width"] * icon_header["height"]
-
             self.entry.append(icon_header)
 
-        self.entry = sorted(self.entry, key=lambda x: x["color_depth"])
+        self.entry = sorted(self.entry, key=lambda x: x.color_depth)
         # ICO images are usually squares
-        self.entry = sorted(self.entry, key=lambda x: x["square"], reverse=True)
+        self.entry = sorted(self.entry, key=lambda x: x.square, reverse=True)
 
-    def sizes(self):
+    def sizes(self) -> set[tuple[int, int]]:
         """
-        Get a list of all available icon sizes and color depths.
+        Get a set of all available icon sizes and color depths.
         """
-        return {(h["width"], h["height"]) for h in self.entry}
+        return {(h.width, h.height) for h in self.entry}
 
-    def getentryindex(self, size, bpp=False):
+    def getentryindex(self, size: tuple[int, int], bpp: int | bool = False) -> int:
         for i, h in enumerate(self.entry):
-            if size == h["dim"] and (bpp is False or bpp == h["color_depth"]):
+            if size == h.dim and (bpp is False or bpp == h.color_depth):
                 return i
         return 0
 
-    def getimage(self, size, bpp=False):
+    def getimage(self, size: tuple[int, int], bpp: int | bool = False) -> Image.Image:
         """
         Get an image from the icon
         """
         return self.frame(self.getentryindex(size, bpp))
 
-    def frame(self, idx):
+    def frame(self, idx: int) -> Image.Image:
         """
         Get an image from frame idx
         """
 
         header = self.entry[idx]
 
-        self.buf.seek(header["offset"])
+        self.buf.seek(header.offset)
         data = self.buf.read(8)
-        self.buf.seek(header["offset"])
+        self.buf.seek(header.offset)
 
+        im: Image.Image
         if data[:8] == PngImagePlugin._MAGIC:
             # png frame
             im = PngImagePlugin.PngImageFile(self.buf)
@@ -217,11 +228,10 @@ def frame(self, idx):
             # change tile dimension to only encompass XOR image
             im._size = (im.size[0], int(im.size[1] / 2))
             d, e, o, a = im.tile[0]
-            im.tile[0] = d, (0, 0) + im.size, o, a
+            im.tile[0] = ImageFile._Tile(d, (0, 0) + im.size, o, a)
 
             # figure out where AND mask image starts
-            bpp = header["bpp"]
-            if 32 == bpp:
+            if header.bpp == 32:
                 # 32-bit color depth icon image allows semitransparent areas
                 # PIL's DIB format ignores transparency bits, recover them.
                 # The DIB is packed in BGRX byte order where X is the alpha
@@ -233,13 +243,19 @@ def frame(self, idx):
                 alpha_bytes = self.buf.read(im.size[0] * im.size[1] * 4)[3::4]
 
                 # convert to an 8bpp grayscale image
-                mask = Image.frombuffer(
-                    "L",  # 8bpp
-                    im.size,  # (w, h)
-                    alpha_bytes,  # source chars
-                    "raw",  # raw decoder
-                    ("L", 0, -1),  # 8bpp inverted, unpadded, reversed
-                )
+                try:
+                    mask = Image.frombuffer(
+                        "L",  # 8bpp
+                        im.size,  # (w, h)
+                        alpha_bytes,  # source chars
+                        "raw",  # raw decoder
+                        ("L", 0, -1),  # 8bpp inverted, unpadded, reversed
+                    )
+                except ValueError:
+                    if ImageFile.LOAD_TRUNCATED_IMAGES:
+                        mask = None
+                    else:
+                        raise
             else:
                 # get AND image from end of bitmap
                 w = im.size[0]
@@ -251,25 +267,32 @@ def frame(self, idx):
                 # padded row size * height / bits per char
 
                 total_bytes = int((w * im.size[1]) / 8)
-                and_mask_offset = header["offset"] + header["size"] - total_bytes
+                and_mask_offset = header.offset + header.size - total_bytes
 
                 self.buf.seek(and_mask_offset)
                 mask_data = self.buf.read(total_bytes)
 
                 # convert raw data to image
-                mask = Image.frombuffer(
-                    "1",  # 1 bpp
-                    im.size,  # (w, h)
-                    mask_data,  # source chars
-                    "raw",  # raw decoder
-                    ("1;I", int(w / 8), -1),  # 1bpp inverted, padded, reversed
-                )
+                try:
+                    mask = Image.frombuffer(
+                        "1",  # 1 bpp
+                        im.size,  # (w, h)
+                        mask_data,  # source chars
+                        "raw",  # raw decoder
+                        ("1;I", int(w / 8), -1),  # 1bpp inverted, padded, reversed
+                    )
+                except ValueError:
+                    if ImageFile.LOAD_TRUNCATED_IMAGES:
+                        mask = None
+                    else:
+                        raise
 
                 # now we have two images, im is XOR image and mask is AND image
 
             # apply mask image as alpha channel
-            im = im.convert("RGBA")
-            im.putalpha(mask)
+            if mask:
+                im = im.convert("RGBA")
+                im.putalpha(mask)
 
         return im
 
@@ -302,33 +325,34 @@ class IcoImageFile(ImageFile.ImageFile):
     format = "ICO"
     format_description = "Windows Icon"
 
-    def _open(self):
+    def _open(self) -> None:
         self.ico = IcoFile(self.fp)
         self.info["sizes"] = self.ico.sizes()
-        self.size = self.ico.entry[0]["dim"]
+        self.size = self.ico.entry[0].dim
         self.load()
 
     @property
-    def size(self):
+    def size(self) -> tuple[int, int]:
         return self._size
 
     @size.setter
-    def size(self, value):
+    def size(self, value: tuple[int, int]) -> None:
         if value not in self.info["sizes"]:
             msg = "This is not one of the allowed sizes of this image"
             raise ValueError(msg)
         self._size = value
 
-    def load(self):
-        if self.im is not None and self.im.size == self.size:
+    def load(self) -> Image.core.PixelAccess | None:
+        if self._im is not None and self.im.size == self.size:
             # Already loaded
             return Image.Image.load(self)
         im = self.ico.getimage(self.size)
         # if tile is PNG, it won't really be loaded yet
         im.load()
         self.im = im.im
-        self.pyaccess = None
         self._mode = im.mode
+        if im.palette:
+            self.palette = im.palette
         if im.size != self.size:
             warnings.warn("Image was not the expected size")
 
@@ -338,8 +362,9 @@ def load(self):
             self.info["sizes"] = set(sizes)
 
             self.size = im.size
+        return None
 
-    def load_seek(self):
+    def load_seek(self, pos: int) -> None:
         # Flag the ImageFile.Parser so that it
         # just does all the decode at the end.
         pass
diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py
index 97d726a8a65..f9f47348c66 100644
--- a/src/PIL/ImImagePlugin.py
+++ b/src/PIL/ImImagePlugin.py
@@ -28,6 +28,7 @@
 
 import os
 import re
+from typing import IO, Any
 
 from . import Image, ImageFile, ImagePalette
 
@@ -78,7 +79,7 @@
     "LA image": ("LA", "LA;L"),
     "PA image": ("LA", "PA;L"),
     "RGBA image": ("RGBA", "RGBA;L"),
-    "RGBX image": ("RGBX", "RGBX;L"),
+    "RGBX image": ("RGB", "RGBX;L"),
     "CMYK image": ("CMYK", "CMYK;L"),
     "YCC image": ("YCbCr", "YCbCr;L"),
 }
@@ -93,8 +94,8 @@
 for i in ["32S"]:
     OPEN[f"L {i} image"] = ("I", f"I;{i}")
     OPEN[f"L*{i} image"] = ("I", f"I;{i}")
-for i in range(2, 33):
-    OPEN[f"L*{i} image"] = ("F", f"F;{i}")
+for j in range(2, 33):
+    OPEN[f"L*{j} image"] = ("F", f"F;{j}")
 
 
 # --------------------------------------------------------------------
@@ -103,7 +104,7 @@
 split = re.compile(rb"^([A-Za-z][^:]*):[ \t]*(.*)[ \t]*$")
 
 
-def number(s):
+def number(s: Any) -> float:
     try:
         return int(s)
     except ValueError:
@@ -119,7 +120,7 @@ class ImImageFile(ImageFile.ImageFile):
     format_description = "IFUNC Image Memory"
     _close_exclusive_fp_after_loading = False
 
-    def _open(self):
+    def _open(self) -> None:
         # Quick rejection: if there's not an LF among the first
         # 100 bytes, this is (probably) not a text header.
 
@@ -196,7 +197,7 @@ def _open(self):
                     n += 1
 
             else:
-                msg = "Syntax error in IM header: " + s.decode("ascii", "replace")
+                msg = f"Syntax error in IM header: {s.decode('ascii', 'replace')}"
                 raise SyntaxError(msg)
 
         if not n:
@@ -252,7 +253,11 @@ def _open(self):
                 # use bit decoder (if necessary)
                 bits = int(self.rawmode[2:])
                 if bits not in [8, 16, 32]:
-                    self.tile = [("bit", (0, 0) + self.size, offs, (bits, 8, 3, 0, -1))]
+                    self.tile = [
+                        ImageFile._Tile(
+                            "bit", (0, 0) + self.size, offs, (bits, 8, 3, 0, -1)
+                        )
+                    ]
                     return
             except ValueError:
                 pass
@@ -262,23 +267,27 @@ def _open(self):
             # ever stumbled upon such a file ;-)
             size = self.size[0] * self.size[1]
             self.tile = [
-                ("raw", (0, 0) + self.size, offs, ("G", 0, -1)),
-                ("raw", (0, 0) + self.size, offs + size, ("R", 0, -1)),
-                ("raw", (0, 0) + self.size, offs + 2 * size, ("B", 0, -1)),
+                ImageFile._Tile("raw", (0, 0) + self.size, offs, ("G", 0, -1)),
+                ImageFile._Tile("raw", (0, 0) + self.size, offs + size, ("R", 0, -1)),
+                ImageFile._Tile(
+                    "raw", (0, 0) + self.size, offs + 2 * size, ("B", 0, -1)
+                ),
             ]
         else:
             # LabEye/IFUNC files
-            self.tile = [("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))]
+            self.tile = [
+                ImageFile._Tile("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))
+            ]
 
     @property
-    def n_frames(self):
+    def n_frames(self) -> int:
         return self.info[FRAMES]
 
     @property
-    def is_animated(self):
+    def is_animated(self) -> bool:
         return self.info[FRAMES] > 1
 
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         if not self._seek_check(frame):
             return
 
@@ -294,9 +303,11 @@ def seek(self, frame):
 
         self.fp = self._fp
 
-        self.tile = [("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))]
+        self.tile = [
+            ImageFile._Tile("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))
+        ]
 
-    def tell(self):
+    def tell(self) -> int:
         return self.frame
 
 
@@ -325,7 +336,7 @@ def tell(self):
 }
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     try:
         image_type, rawmode = SAVE[im.mode]
     except KeyError as e:
@@ -340,6 +351,8 @@ def _save(im, fp, filename):
         # or: SyntaxError("not an IM file")
         # 8 characters are used for "Name: " and "\r\n"
         # Keep just the filename, ditch the potentially overlong path
+        if isinstance(filename, bytes):
+            filename = filename.decode("ascii")
         name, ext = os.path.splitext(os.path.basename(filename))
         name = "".join([name[: 92 - len(ext)], ext])
 
@@ -357,7 +370,9 @@ def _save(im, fp, filename):
             palette += im_palette[colors * i : colors * (i + 1)]
             palette += b"\x00" * (256 - colors)
         fp.write(palette)  # 768 bytes
-    ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, -1))])
+    ImageFile._save(
+        im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, -1))]
+    )
 
 
 #
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
index 1bba9aad2c1..44270392c4d 100644
--- a/src/PIL/Image.py
+++ b/src/PIL/Image.py
@@ -26,6 +26,7 @@
 
 from __future__ import annotations
 
+import abc
 import atexit
 import builtins
 import io
@@ -37,14 +38,17 @@
 import sys
 import tempfile
 import warnings
-from collections.abc import Callable, MutableMapping
+from collections.abc import Callable, Iterator, MutableMapping, Sequence
 from enum import IntEnum
-from pathlib import Path
-
-try:
-    from defusedxml import ElementTree
-except ImportError:
-    ElementTree = None
+from types import ModuleType
+from typing import (
+    IO,
+    TYPE_CHECKING,
+    Any,
+    Literal,
+    Protocol,
+    cast,
+)
 
 # VERSION was removed in Pillow 6.0.0.
 # PILLOW_VERSION was removed in Pillow 9.0.0.
@@ -58,8 +62,15 @@
     _plugins,
 )
 from ._binary import i32le, o32be, o32le
+from ._deprecate import deprecate
 from ._util import DeferredError, is_path
 
+ElementTree: ModuleType | None
+try:
+    from defusedxml import ElementTree
+except ImportError:
+    ElementTree = None
+
 logger = logging.getLogger(__name__)
 
 
@@ -71,8 +82,10 @@ class DecompressionBombError(Exception):
     pass
 
 
+WARN_POSSIBLE_FORMATS: bool = False
+
 # Limit to around a quarter gigabyte for a 24-bit (3 bpp) image
-MAX_IMAGE_PIXELS = int(1024 * 1024 * 1024 // 4 // 3)
+MAX_IMAGE_PIXELS: int | None = int(1024 * 1024 * 1024 // 4 // 3)
 
 
 try:
@@ -109,14 +122,7 @@ class DecompressionBombError(Exception):
     raise
 
 
-USE_CFFI_ACCESS = False
-try:
-    import cffi
-except ImportError:
-    cffi = None
-
-
-def isImageType(t):
+def isImageType(t: Any) -> TypeGuard[Image]:
     """
     Checks if an object is an image object.
 
@@ -127,6 +133,7 @@ def isImageType(t):
     :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")
 
 
@@ -211,14 +218,28 @@ class Quantize(IntEnum):
 # --------------------------------------------------------------------
 # Registries
 
-ID = []
-OPEN = {}
-MIME = {}
-SAVE = {}
-SAVE_ALL = {}
-EXTENSION = {}
-DECODERS = {}
-ENCODERS = {}
+if TYPE_CHECKING:
+    import mmap
+    from xml.etree.ElementTree import Element
+
+    from IPython.lib.pretty import PrettyPrinter
+
+    from . import ImageFile, ImageFilter, ImagePalette, ImageQt, TiffImagePlugin
+    from ._typing import CapsuleType, NumpyArray, StrOrBytesPath, TypeGuard
+ID: list[str] = []
+OPEN: dict[
+    str,
+    tuple[
+        Callable[[IO[bytes], str | bytes], ImageFile.ImageFile],
+        Callable[[bytes], bool | str] | None,
+    ],
+] = {}
+MIME: dict[str, str] = {}
+SAVE: dict[str, Callable[[Image, IO[bytes], str | bytes], None]] = {}
+SAVE_ALL: dict[str, Callable[[Image, IO[bytes], str | bytes], None]] = {}
+EXTENSION: dict[str, str] = {}
+DECODERS: dict[str, type[ImageFile.PyDecoder]] = {}
+ENCODERS: dict[str, type[ImageFile.PyEncoder]] = {}
 
 # --------------------------------------------------------------------
 # Modes
@@ -226,23 +247,44 @@ class Quantize(IntEnum):
 _ENDIAN = "<" if sys.byteorder == "little" else ">"
 
 
-def _conv_type_shape(im):
+def _conv_type_shape(im: Image) -> tuple[tuple[int, ...], str]:
     m = ImageMode.getmode(im.mode)
-    shape = (im.height, im.width)
+    shape: tuple[int, ...] = (im.height, im.width)
     extra = len(m.bands)
     if extra != 1:
         shape += (extra,)
     return shape, m.typestr
 
 
-MODES = ["1", "CMYK", "F", "HSV", "I", "L", "LAB", "P", "RGB", "RGBA", "RGBX", "YCbCr"]
+MODES = [
+    "1",
+    "CMYK",
+    "F",
+    "HSV",
+    "I",
+    "I;16",
+    "I;16B",
+    "I;16L",
+    "I;16N",
+    "L",
+    "LA",
+    "La",
+    "LAB",
+    "P",
+    "PA",
+    "RGB",
+    "RGBA",
+    "RGBa",
+    "RGBX",
+    "YCbCr",
+]
 
 # raw modes that may be memory mapped.  NOTE: if you change this, you
 # may have to modify the stride calculation in map.c too!
 _MAPMODES = ("L", "P", "RGBX", "RGBA", "CMYK", "I;16", "I;16L", "I;16B")
 
 
-def getmodebase(mode):
+def getmodebase(mode: str) -> str:
     """
     Gets the "base" mode for given mode.  This function returns "L" for
     images that contain grayscale data, and "RGB" for images that
@@ -255,7 +297,7 @@ def getmodebase(mode):
     return ImageMode.getmode(mode).basemode
 
 
-def getmodetype(mode):
+def getmodetype(mode: str) -> str:
     """
     Gets the storage type mode.  Given a mode, this function returns a
     single-layer mode suitable for storing individual bands.
@@ -267,7 +309,7 @@ def getmodetype(mode):
     return ImageMode.getmode(mode).basetype
 
 
-def getmodebandnames(mode):
+def getmodebandnames(mode: str) -> tuple[str, ...]:
     """
     Gets a list of individual band names.  Given a mode, this function returns
     a tuple containing the names of individual bands (use
@@ -282,7 +324,7 @@ def getmodebandnames(mode):
     return ImageMode.getmode(mode).bands
 
 
-def getmodebands(mode):
+def getmodebands(mode: str) -> int:
     """
     Gets the number of individual bands for this mode.
 
@@ -299,7 +341,7 @@ def getmodebands(mode):
 _initialized = 0
 
 
-def preinit():
+def preinit() -> None:
     """
     Explicitly loads BMP, GIF, JPEG, PPM and PPM file format drivers.
 
@@ -344,7 +386,7 @@ def preinit():
     _initialized = 1
 
 
-def init():
+def init() -> bool:
     """
     Explicitly initializes the Python Imaging Library. This function
     loads all available file format drivers.
@@ -355,7 +397,7 @@ def init():
 
     global _initialized
     if _initialized >= 2:
-        return 0
+        return False
 
     parent_name = __name__.rpartition(".")[0]
     for plugin in _plugins:
@@ -367,14 +409,17 @@ def init():
 
     if OPEN or SAVE:
         _initialized = 2
-        return 1
+        return True
+    return False
 
 
 # --------------------------------------------------------------------
 # Codec factories (used by tobytes/frombytes and ImageFile.load)
 
 
-def _getdecoder(mode, decoder_name, args, extra=()):
+def _getdecoder(
+    mode: str, decoder_name: str, args: Any, extra: tuple[Any, ...] = ()
+) -> core.ImagingDecoder | ImageFile.PyDecoder:
     # tweak arguments
     if args is None:
         args = ()
@@ -390,14 +435,16 @@ def _getdecoder(mode, decoder_name, args, extra=()):
 
     try:
         # get decoder
-        decoder = getattr(core, decoder_name + "_decoder")
+        decoder = getattr(core, f"{decoder_name}_decoder")
     except AttributeError as e:
         msg = f"decoder {decoder_name} not available"
         raise OSError(msg) from e
     return decoder(mode, *args + extra)
 
 
-def _getencoder(mode, encoder_name, args, extra=()):
+def _getencoder(
+    mode: str, encoder_name: str, args: Any, extra: tuple[Any, ...] = ()
+) -> core.ImagingEncoder | ImageFile.PyEncoder:
     # tweak arguments
     if args is None:
         args = ()
@@ -413,7 +460,7 @@ def _getencoder(mode, encoder_name, args, extra=()):
 
     try:
         # get encoder
-        encoder = getattr(core, encoder_name + "_encoder")
+        encoder = getattr(core, f"{encoder_name}_encoder")
     except AttributeError as e:
         msg = f"encoder {encoder_name} not available"
         raise OSError(msg) from e
@@ -424,49 +471,65 @@ def _getencoder(mode, encoder_name, args, extra=()):
 # Simple expression analyzer
 
 
-class _E:
-    def __init__(self, scale, offset):
+class ImagePointTransform:
+    """
+    Used with :py:meth:`~PIL.Image.Image.point` for single band images with more than
+    8 bits, this represents an affine transformation, where the value is multiplied by
+    ``scale`` and ``offset`` is added.
+    """
+
+    def __init__(self, scale: float, offset: float) -> None:
         self.scale = scale
         self.offset = offset
 
-    def __neg__(self):
-        return _E(-self.scale, -self.offset)
+    def __neg__(self) -> ImagePointTransform:
+        return ImagePointTransform(-self.scale, -self.offset)
 
-    def __add__(self, other):
-        if isinstance(other, _E):
-            return _E(self.scale + other.scale, self.offset + other.offset)
-        return _E(self.scale, self.offset + other)
+    def __add__(self, other: ImagePointTransform | float) -> ImagePointTransform:
+        if isinstance(other, ImagePointTransform):
+            return ImagePointTransform(
+                self.scale + other.scale, self.offset + other.offset
+            )
+        return ImagePointTransform(self.scale, self.offset + other)
 
     __radd__ = __add__
 
-    def __sub__(self, other):
+    def __sub__(self, other: ImagePointTransform | float) -> ImagePointTransform:
         return self + -other
 
-    def __rsub__(self, other):
+    def __rsub__(self, other: ImagePointTransform | float) -> ImagePointTransform:
         return other + -self
 
-    def __mul__(self, other):
-        if isinstance(other, _E):
+    def __mul__(self, other: ImagePointTransform | float) -> ImagePointTransform:
+        if isinstance(other, ImagePointTransform):
             return NotImplemented
-        return _E(self.scale * other, self.offset * other)
+        return ImagePointTransform(self.scale * other, self.offset * other)
 
     __rmul__ = __mul__
 
-    def __truediv__(self, other):
-        if isinstance(other, _E):
+    def __truediv__(self, other: ImagePointTransform | float) -> ImagePointTransform:
+        if isinstance(other, ImagePointTransform):
             return NotImplemented
-        return _E(self.scale / other, self.offset / other)
+        return ImagePointTransform(self.scale / other, self.offset / other)
 
 
-def _getscaleoffset(expr):
-    a = expr(_E(1, 0))
-    return (a.scale, a.offset) if isinstance(a, _E) else (0, a)
+def _getscaleoffset(
+    expr: Callable[[ImagePointTransform], ImagePointTransform | float]
+) -> tuple[float, float]:
+    a = expr(ImagePointTransform(1, 0))
+    return (a.scale, a.offset) if isinstance(a, ImagePointTransform) else (0, a)
 
 
 # --------------------------------------------------------------------
 # Implementation wrapper
 
 
+class SupportsGetData(Protocol):
+    def getdata(
+        self,
+    ) -> tuple[Transform, Sequence[int]]: ...
+
+
 class Image:
     """
     This class represents an image object.  To create
@@ -483,35 +546,45 @@ class Image:
     format_description: str | None = None
     _close_exclusive_fp_after_loading = True
 
-    def __init__(self):
+    def __init__(self) -> None:
         # FIXME: take "new" parameters / other image?
         # FIXME: turn mode and size into delegating properties?
-        self.im = None
+        self._im: core.ImagingCore | DeferredError | None = None
         self._mode = ""
         self._size = (0, 0)
-        self.palette = None
-        self.info = {}
+        self.palette: ImagePalette.ImagePalette | None = None
+        self.info: dict[str | tuple[int, int], Any] = {}
         self.readonly = 0
-        self.pyaccess = None
-        self._exif = None
+        self._exif: Exif | None = None
 
     @property
-    def width(self):
+    def im(self) -> core.ImagingCore:
+        if isinstance(self._im, DeferredError):
+            raise self._im.ex
+        assert self._im is not None
+        return self._im
+
+    @im.setter
+    def im(self, im: core.ImagingCore) -> None:
+        self._im = im
+
+    @property
+    def width(self) -> int:
         return self.size[0]
 
     @property
-    def height(self):
+    def height(self) -> int:
         return self.size[1]
 
     @property
-    def size(self):
+    def size(self) -> tuple[int, int]:
         return self._size
 
     @property
-    def mode(self):
+    def mode(self) -> str:
         return self._mode
 
-    def _new(self, im):
+    def _new(self, im: core.ImagingCore) -> Image:
         new = Image()
         new.im = im
         new._mode = im.mode
@@ -544,7 +617,7 @@ def __exit__(self, *args):
                 self._close_fp()
             self.fp = None
 
-    def close(self):
+    def close(self) -> None:
         """
         Closes the file pointer, if possible.
 
@@ -564,29 +637,30 @@ def close(self):
                 logger.debug("Error closing: %s", msg)
 
         if getattr(self, "map", None):
-            self.map = None
+            self.map: mmap.mmap | None = None
 
         # Instead of simply setting to None, we're setting up a
         # deferred error that will better explain that the core image
         # object is gone.
-        self.im = DeferredError(ValueError("Operation on closed image"))
+        self._im = DeferredError(ValueError("Operation on closed image"))
 
-    def _copy(self):
+    def _copy(self) -> None:
         self.load()
         self.im = self.im.copy()
-        self.pyaccess = None
         self.readonly = 0
 
-    def _ensure_mutable(self):
+    def _ensure_mutable(self) -> None:
         if self.readonly:
             self._copy()
         else:
             self.load()
 
-    def _dump(self, file=None, format=None, **options):
+    def _dump(
+        self, file: str | None = None, format: str | None = None, **options: Any
+    ) -> str:
         suffix = ""
         if format:
-            suffix = "." + format
+            suffix = f".{format}"
 
         if not file:
             f, filename = tempfile.mkstemp(suffix)
@@ -605,17 +679,19 @@ def _dump(self, file=None, format=None, **options):
 
         return filename
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
+        if self.__class__ is not other.__class__:
+            return False
+        assert isinstance(other, Image)
         return (
-            self.__class__ is other.__class__
-            and self.mode == other.mode
+            self.mode == other.mode
             and self.size == other.size
             and self.info == other.info
             and self.getpalette() == other.getpalette()
             and self.tobytes() == other.tobytes()
         )
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "<%s.%s image mode=%s size=%dx%d at 0x%X>" % (
             self.__class__.__module__,
             self.__class__.__name__,
@@ -625,7 +701,7 @@ def __repr__(self):
             id(self),
         )
 
-    def _repr_pretty_(self, p, cycle):
+    def _repr_pretty_(self, p: PrettyPrinter, cycle: bool) -> None:
         """IPython plain text display support"""
 
         # Same as __repr__ but without unpredictable id(self),
@@ -641,7 +717,7 @@ def _repr_pretty_(self, p, cycle):
             )
         )
 
-    def _repr_image(self, image_format, **kwargs):
+    def _repr_image(self, image_format: str, **kwargs: Any) -> bytes | None:
         """Helper function for iPython display hook.
 
         :param image_format: Image format.
@@ -654,14 +730,14 @@ def _repr_image(self, image_format, **kwargs):
             return None
         return b.getvalue()
 
-    def _repr_png_(self):
+    def _repr_png_(self) -> bytes | None:
         """iPython display hook support for PNG format.
 
         :returns: PNG version of the image as bytes
         """
         return self._repr_image("PNG", compress_level=1)
 
-    def _repr_jpeg_(self):
+    def _repr_jpeg_(self) -> bytes | None:
         """iPython display hook support for JPEG format.
 
         :returns: JPEG version of the image as bytes
@@ -669,35 +745,23 @@ def _repr_jpeg_(self):
         return self._repr_image("JPEG")
 
     @property
-    def __array_interface__(self):
+    def __array_interface__(self) -> dict[str, str | bytes | int | tuple[int, ...]]:
         # numpy array interface support
-        new = {"version": 3}
-        try:
-            if self.mode == "1":
-                # Binary images need to be extended from bits to bytes
-                # See: https://github.com/python-pillow/Pillow/issues/350
-                new["data"] = self.tobytes("raw", "L")
-            else:
-                new["data"] = self.tobytes()
-        except Exception as e:
-            if not isinstance(e, (MemoryError, RecursionError)):
-                try:
-                    import numpy
-                    from packaging.version import parse as parse_version
-                except ImportError:
-                    pass
-                else:
-                    if parse_version(numpy.__version__) < parse_version("1.23"):
-                        warnings.warn(e)
-            raise
+        new: dict[str, str | bytes | int | tuple[int, ...]] = {"version": 3}
+        if self.mode == "1":
+            # Binary images need to be extended from bits to bytes
+            # See: https://github.com/python-pillow/Pillow/issues/350
+            new["data"] = self.tobytes("raw", "L")
+        else:
+            new["data"] = self.tobytes()
         new["shape"], new["typestr"] = _conv_type_shape(self)
         return new
 
-    def __getstate__(self):
+    def __getstate__(self) -> list[Any]:
         im_data = self.tobytes()  # load image first
         return [self.info, self.mode, self.size, self.getpalette(), im_data]
 
-    def __setstate__(self, state):
+    def __setstate__(self, state: list[Any]) -> None:
         Image.__init__(self)
         info, mode, size, palette, data = state
         self.info = info
@@ -708,7 +772,7 @@ def __setstate__(self, state):
             self.putpalette(palette)
         self.frombytes(data)
 
-    def tobytes(self, encoder_name="raw", *args):
+    def tobytes(self, encoder_name: str = "raw", *args: Any) -> bytes:
         """
         Return image as a bytes object.
 
@@ -730,12 +794,13 @@ def tobytes(self, encoder_name="raw", *args):
         :returns: A :py:class:`bytes` object.
         """
 
-        # may pass tuple instead of argument list
-        if len(args) == 1 and isinstance(args[0], tuple):
-            args = args[0]
+        encoder_args: Any = args
+        if len(encoder_args) == 1 and isinstance(encoder_args[0], tuple):
+            # may pass tuple instead of argument list
+            encoder_args = encoder_args[0]
 
-        if encoder_name == "raw" and args == ():
-            args = self.mode
+        if encoder_name == "raw" and encoder_args == ():
+            encoder_args = self.mode
 
         self.load()
 
@@ -743,7 +808,7 @@ def tobytes(self, encoder_name="raw", *args):
             return b""
 
         # unpack data
-        e = _getencoder(self.mode, encoder_name, args)
+        e = _getencoder(self.mode, encoder_name, encoder_args)
         e.setimage(self.im)
 
         bufsize = max(65536, self.size[0] * 4)  # see RawEncode.c
@@ -760,7 +825,7 @@ def tobytes(self, encoder_name="raw", *args):
 
         return b"".join(output)
 
-    def tobitmap(self, name="image"):
+    def tobitmap(self, name: str = "image") -> bytes:
         """
         Returns the image converted to an X11 bitmap.
 
@@ -786,7 +851,12 @@ def tobitmap(self, name="image"):
             ]
         )
 
-    def frombytes(self, data, decoder_name="raw", *args):
+    def frombytes(
+        self,
+        data: bytes | bytearray | SupportsArrayInterface,
+        decoder_name: str = "raw",
+        *args: Any,
+    ) -> None:
         """
         Loads this image with pixel data from a bytes object.
 
@@ -797,16 +867,17 @@ def frombytes(self, data, decoder_name="raw", *args):
         if self.width == 0 or self.height == 0:
             return
 
-        # may pass tuple instead of argument list
-        if len(args) == 1 and isinstance(args[0], tuple):
-            args = args[0]
+        decoder_args: Any = args
+        if len(decoder_args) == 1 and isinstance(decoder_args[0], tuple):
+            # may pass tuple instead of argument list
+            decoder_args = decoder_args[0]
 
         # default format
-        if decoder_name == "raw" and args == ():
-            args = self.mode
+        if decoder_name == "raw" and decoder_args == ():
+            decoder_args = self.mode
 
         # unpack data
-        d = _getdecoder(self.mode, decoder_name, args)
+        d = _getdecoder(self.mode, decoder_name, decoder_args)
         d.setimage(self.im)
         s = d.decode(data)
 
@@ -817,7 +888,7 @@ def frombytes(self, data, decoder_name="raw", *args):
             msg = "cannot decode image data"
             raise ValueError(msg)
 
-    def load(self):
+    def load(self) -> core.PixelAccess | None:
         """
         Allocates storage for the image and loads the pixel data.  In
         normal cases, you don't need to call this method, since the
@@ -830,12 +901,12 @@ def load(self):
         operations. See :ref:`file-handling` for more information.
 
         :returns: An image access object.
-        :rtype: :ref:`PixelAccess` or :py:class:`PIL.PyAccess`
+        :rtype: :py:class:`.PixelAccess`
         """
-        if self.im is not None and self.palette and self.palette.dirty:
+        if self._im is not None and self.palette and self.palette.dirty:
             # realize palette
             mode, arr = self.palette.getdata()
-            self.im.putpalette(mode, arr)
+            self.im.putpalette(self.palette.mode, mode, arr)
             self.palette.dirty = 0
             self.palette.rawmode = None
             if "transparency" in self.info and mode in ("LA", "PA"):
@@ -845,22 +916,15 @@ def load(self):
                     self.im.putpalettealphas(self.info["transparency"])
                 self.palette.mode = "RGBA"
             else:
-                palette_mode = "RGBA" if mode.startswith("RGBA") else "RGB"
-                self.palette.mode = palette_mode
-                self.palette.palette = self.im.getpalette(palette_mode, palette_mode)
-
-        if self.im is not None:
-            if cffi and USE_CFFI_ACCESS:
-                if self.pyaccess:
-                    return self.pyaccess
-                from . import PyAccess
-
-                self.pyaccess = PyAccess.new(self, self.readonly)
-                if self.pyaccess:
-                    return self.pyaccess
+                self.palette.palette = self.im.getpalette(
+                    self.palette.mode, self.palette.mode
+                )
+
+        if self._im is not None:
             return self.im.pixel_access(self.readonly)
+        return None
 
-    def verify(self):
+    def verify(self) -> None:
         """
         Verifies the contents of a file. For data read from a file, this
         method attempts to determine if the file is broken, without
@@ -872,17 +936,21 @@ def verify(self):
         pass
 
     def convert(
-        self, mode=None, matrix=None, dither=None, palette=Palette.WEB, colors=256
-    ):
+        self,
+        mode: str | None = None,
+        matrix: tuple[float, ...] | None = None,
+        dither: Dither | None = None,
+        palette: Palette = Palette.WEB,
+        colors: int = 256,
+    ) -> Image:
         """
         Returns a converted copy of this image. For the "P" mode, this
         method translates pixels through the palette.  If mode is
         omitted, a mode is chosen so that all information in the image
         and the palette can be represented without a palette.
 
-        The current version supports all possible conversions between
-        "L", "RGB" and "CMYK". The ``matrix`` argument only supports "L"
-        and "RGB".
+        This supports all possible conversions between "L", "RGB" and "CMYK". The
+        ``matrix`` argument only supports "L" and "RGB".
 
         When translating a color image to grayscale (mode "L"),
         the library uses the ITU-R 601-2 luma transform::
@@ -919,6 +987,9 @@ def convert(
         :returns: An :py:class:`~PIL.Image.Image` object.
         """
 
+        if mode in ("BGR;15", "BGR;16", "BGR;24"):
+            deprecate(mode, 12)
+
         self.load()
 
         has_transparency = "transparency" in self.info
@@ -943,9 +1014,11 @@ def convert(
             if has_transparency and self.im.bands == 3:
                 transparency = new_im.info["transparency"]
 
-                def convert_transparency(m, v):
-                    v = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3] * 0.5
-                    return max(0, min(255, int(v)))
+                def convert_transparency(
+                    m: tuple[float, ...], v: tuple[int, int, int]
+                ) -> int:
+                    value = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3] * 0.5
+                    return max(0, min(255, int(value)))
 
                 if mode == "L":
                     transparency = convert_transparency(matrix, transparency)
@@ -964,8 +1037,8 @@ def convert_transparency(m, v):
         delete_trns = False
         # transparency handling
         if has_transparency:
-            if (self.mode in ("1", "L", "I") and mode in ("LA", "RGBA")) or (
-                self.mode == "RGB" and mode == "RGBA"
+            if (self.mode in ("1", "L", "I", "I;16") and mode in ("LA", "RGBA")) or (
+                self.mode == "RGB" and mode in ("La", "LA", "RGBa", "RGBA")
             ):
                 # Use transparent conversion to promote from transparent
                 # color to an alpha channel.
@@ -988,9 +1061,11 @@ def convert_transparency(m, v):
                     # use existing conversions
                     trns_im = new(self.mode, (1, 1))
                     if self.mode == "P":
-                        trns_im.putpalette(self.palette)
+                        assert self.palette is not None
+                        trns_im.putpalette(self.palette, self.palette.mode)
                         if isinstance(t, tuple):
                             err = "Couldn't allocate a palette color for transparency"
+                            assert trns_im.palette is not None
                             try:
                                 t = trns_im.palette.getcolor(t, self)
                             except ValueError as e:
@@ -1039,7 +1114,10 @@ def convert_transparency(m, v):
                 del new_im.info["transparency"]
             if trns is not None:
                 try:
-                    new_im.info["transparency"] = new_im.palette.getcolor(trns, new_im)
+                    new_im.info["transparency"] = new_im.palette.getcolor(
+                        cast(tuple[int, ...], trns),  # trns was converted to RGB
+                        new_im,
+                    )
                 except Exception:
                     # if we can't make a transparent color, don't leave the old
                     # transparency hanging around to mess us up.
@@ -1048,17 +1126,23 @@ def convert_transparency(m, v):
             return new_im
 
         if "LAB" in (self.mode, mode):
-            other_mode = mode if self.mode == "LAB" else self.mode
+            im = self
+            if mode == "LAB":
+                if im.mode not in ("RGB", "RGBA", "RGBX"):
+                    im = im.convert("RGBA")
+                other_mode = im.mode
+            else:
+                other_mode = mode
             if other_mode in ("RGB", "RGBA", "RGBX"):
                 from . import ImageCms
 
                 srgb = ImageCms.createProfile("sRGB")
                 lab = ImageCms.createProfile("LAB")
-                profiles = [lab, srgb] if self.mode == "LAB" else [srgb, lab]
+                profiles = [lab, srgb] if im.mode == "LAB" else [srgb, lab]
                 transform = ImageCms.buildTransform(
-                    profiles[0], profiles[1], self.mode, mode
+                    profiles[0], profiles[1], im.mode, mode
                 )
-                return transform.apply(self)
+                return transform.apply(im)
 
         # colorspace conversion
         if dither is None:
@@ -1087,9 +1171,11 @@ def convert_transparency(m, v):
             # crash fail if we leave a bytes transparency in an rgb/l mode.
             del new_im.info["transparency"]
         if trns is not None:
-            if new_im.mode == "P":
+            if new_im.mode == "P" and new_im.palette:
                 try:
-                    new_im.info["transparency"] = new_im.palette.getcolor(trns, new_im)
+                    new_im.info["transparency"] = new_im.palette.getcolor(
+                        cast(tuple[int, ...], trns), new_im  # trns was converted to RGB
+                    )
                 except ValueError as e:
                     del new_im.info["transparency"]
                     if str(e) != "cannot allocate more than 256 colors":
@@ -1104,12 +1190,12 @@ def convert_transparency(m, v):
 
     def quantize(
         self,
-        colors=256,
-        method=None,
-        kmeans=0,
-        palette=None,
-        dither=Dither.FLOYDSTEINBERG,
-    ):
+        colors: int = 256,
+        method: int | None = None,
+        kmeans: int = 0,
+        palette: Image | None = None,
+        dither: Dither = Dither.FLOYDSTEINBERG,
+    ) -> Image:
         """
         Convert the image to 'P' mode with the specified number
         of colors.
@@ -1127,7 +1213,7 @@ def quantize(
                        The exception to this is RGBA images. :data:`Quantize.MEDIANCUT`
                        and :data:`Quantize.MAXCOVERAGE` do not support RGBA images, so
                        :data:`Quantize.FASTOCTREE` is used by default instead.
-        :param kmeans: Integer
+        :param kmeans: Integer greater than or equal to zero.
         :param palette: Quantize to the palette of given
                         :py:class:`PIL.Image.Image`.
         :param dither: Dithering method, used when converting from
@@ -1167,16 +1253,21 @@ def quantize(
                 raise ValueError(msg)
             im = self.im.convert("P", dither, palette.im)
             new_im = self._new(im)
+            assert palette.palette is not None
             new_im.palette = palette.palette.copy()
             return new_im
 
+        if kmeans < 0:
+            msg = "kmeans must not be negative"
+            raise ValueError(msg)
+
         im = self._new(self.im.quantize(colors, method, kmeans))
 
         from . import ImagePalette
 
         mode = im.im.getpalettemode()
-        palette = im.im.getpalette(mode, mode)[: colors * len(mode)]
-        im.palette = ImagePalette.ImagePalette(mode, palette)
+        palette_data = im.im.getpalette(mode, mode)[: colors * len(mode)]
+        im.palette = ImagePalette.ImagePalette(mode, palette_data)
 
         return im
 
@@ -1193,7 +1284,7 @@ def copy(self) -> Image:
 
     __copy__ = copy
 
-    def crop(self, box=None) -> Image:
+    def crop(self, box: tuple[float, float, float, float] | None = None) -> Image:
         """
         Returns a rectangular region from this image. The box is a
         4-tuple defining the left, upper, right, and lower pixel
@@ -1219,7 +1310,9 @@ def crop(self, box=None) -> Image:
         self.load()
         return self._new(self._crop(self.im, box))
 
-    def _crop(self, im, box):
+    def _crop(
+        self, im: core.ImagingCore, box: tuple[float, float, float, float]
+    ) -> core.ImagingCore:
         """
         Returns a rectangular region from the core image object im.
 
@@ -1239,7 +1332,9 @@ def _crop(self, im, box):
 
         return im.crop((x0, y0, x1, y1))
 
-    def draft(self, mode, size):
+    def draft(
+        self, mode: str | None, size: tuple[int, int] | None
+    ) -> tuple[str, tuple[int, int, float, float]] | None:
         """
         Configures the image file loader so it returns a version of the
         image that as closely as possible matches the given mode and
@@ -1262,13 +1357,13 @@ def draft(self, mode, size):
         """
         pass
 
-    def _expand(self, xmargin, ymargin=None):
+    def _expand(self, xmargin: int, ymargin: int | None = None) -> Image:
         if ymargin is None:
             ymargin = xmargin
         self.load()
         return self._new(self.im.expand(xmargin, ymargin))
 
-    def filter(self, filter):
+    def filter(self, filter: ImageFilter.Filter | type[ImageFilter.Filter]) -> Image:
         """
         Filters this image using the given filter.  For a list of
         available filters, see the :py:mod:`~PIL.ImageFilter` module.
@@ -1280,7 +1375,7 @@ def filter(self, filter):
 
         self.load()
 
-        if isinstance(filter, Callable):
+        if callable(filter):
             filter = filter()
         if not hasattr(filter, "filter"):
             msg = "filter argument should be ImageFilter.Filter instance or class"
@@ -1295,7 +1390,7 @@ def filter(self, filter):
         ]
         return merge(self.mode, ims)
 
-    def getbands(self):
+    def getbands(self) -> tuple[str, ...]:
         """
         Returns a tuple containing the name of each band in this image.
         For example, ``getbands`` on an RGB image returns ("R", "G", "B").
@@ -1305,7 +1400,7 @@ def getbands(self):
         """
         return ImageMode.getmode(self.mode).bands
 
-    def getbbox(self, *, alpha_only=True):
+    def getbbox(self, *, alpha_only: bool = True) -> tuple[int, int, int, int] | None:
         """
         Calculates the bounding box of the non-zero regions in the
         image.
@@ -1324,7 +1419,9 @@ def getbbox(self, *, alpha_only=True):
         self.load()
         return self.im.getbbox(alpha_only)
 
-    def getcolors(self, maxcolors=256):
+    def getcolors(
+        self, maxcolors: int = 256
+    ) -> list[tuple[int, tuple[int, ...]]] | list[tuple[int, float]] | None:
         """
         Returns a list of colors used in this image.
 
@@ -1341,13 +1438,13 @@ def getcolors(self, maxcolors=256):
         self.load()
         if self.mode in ("1", "L", "P"):
             h = self.im.histogram()
-            out = [(h[i], i) for i in range(256) if h[i]]
+            out: list[tuple[int, float]] = [(h[i], i) for i in range(256) if h[i]]
             if len(out) > maxcolors:
                 return None
             return out
         return self.im.getcolors(maxcolors)
 
-    def getdata(self, band=None):
+    def getdata(self, band: int | None = None) -> core.ImagingCore:
         """
         Returns the contents of this image as a sequence object
         containing pixel values.  The sequence object is flattened, so
@@ -1370,7 +1467,7 @@ def getdata(self, band=None):
             return self.im.getband(band)
         return self.im  # could be abused
 
-    def getextrema(self):
+    def getextrema(self) -> tuple[float, float] | tuple[tuple[int, int], ...]:
         """
         Gets the minimum and maximum pixel values for each band in
         the image.
@@ -1385,12 +1482,19 @@ def getextrema(self):
             return tuple(self.im.getband(i).getextrema() for i in range(self.im.bands))
         return self.im.getextrema()
 
-    def _getxmp(self, xmp_tags):
-        def get_name(tag):
+    def getxmp(self) -> dict[str, Any]:
+        """
+        Returns a dictionary containing the XMP tags.
+        Requires defusedxml to be installed.
+
+        :returns: XMP tags in a dictionary.
+        """
+
+        def get_name(tag: str) -> str:
             return re.sub("^{[^}]+}", "", tag)
 
-        def get_value(element):
-            value = {get_name(k): v for k, v in element.attrib.items()}
+        def get_value(element: Element) -> str | dict[str, Any] | None:
+            value: dict[str, Any] = {get_name(k): v for k, v in element.attrib.items()}
             children = list(element)
             if children:
                 for child in children:
@@ -1412,11 +1516,12 @@ def get_value(element):
         if ElementTree is None:
             warnings.warn("XMP data cannot be read without defusedxml dependency")
             return {}
-        else:
-            root = ElementTree.fromstring(xmp_tags)
-            return {get_name(root.tag): get_value(root)}
+        if "xmp" not in self.info:
+            return {}
+        root = ElementTree.fromstring(self.info["xmp"].rstrip(b"\x00"))
+        return {get_name(root.tag): get_value(root)}
 
-    def getexif(self):
+    def getexif(self) -> Exif:
         """
         Gets EXIF data from the image.
 
@@ -1424,7 +1529,6 @@ def getexif(self):
         """
         if self._exif is None:
             self._exif = Exif()
-            self._exif._loaded = False
         elif self._exif._loaded:
             return self._exif
         self._exif._loaded = True
@@ -1452,13 +1556,13 @@ def getexif(self):
 
         return self._exif
 
-    def _reload_exif(self):
+    def _reload_exif(self) -> None:
         if self._exif is None or not self._exif._loaded:
             return
         self._exif._loaded = False
         self.getexif()
 
-    def get_child_images(self):
+    def get_child_images(self) -> list[ImageFile.ImageFile]:
         child_images = []
         exif = self.getexif()
         ifds = []
@@ -1471,6 +1575,7 @@ def get_child_images(self):
                     ifds.append((exif._get_ifd_dict(subifd_offset), subifd_offset))
         ifd1 = exif.get_ifd(ExifTags.IFD.IFD1)
         if ifd1 and ifd1.get(513):
+            assert exif._info is not None
             ifds.append((ifd1, exif._info.next))
 
         offset = None
@@ -1480,18 +1585,20 @@ def get_child_images(self):
                 offset = current_offset
 
             fp = self.fp
-            thumbnail_offset = ifd.get(513)
-            if thumbnail_offset is not None:
-                try:
-                    thumbnail_offset += self._exif_offset
-                except AttributeError:
-                    pass
-                self.fp.seek(thumbnail_offset)
-                data = self.fp.read(ifd.get(514))
-                fp = io.BytesIO(data)
+            if ifd is not None:
+                thumbnail_offset = ifd.get(513)
+                if thumbnail_offset is not None:
+                    thumbnail_offset += getattr(self, "_exif_offset", 0)
+                    self.fp.seek(thumbnail_offset)
+                    data = self.fp.read(ifd.get(514))
+                    fp = io.BytesIO(data)
 
             with open(fp) as im:
-                if thumbnail_offset is None:
+                from . import TiffImagePlugin
+
+                if thumbnail_offset is None and isinstance(
+                    im, TiffImagePlugin.TiffImageFile
+                ):
                     im._frame_pos = [ifd_offset]
                     im._seek(0)
                 im.load()
@@ -1501,7 +1608,7 @@ def get_child_images(self):
             self.fp.seek(offset)
         return child_images
 
-    def getim(self):
+    def getim(self) -> CapsuleType:
         """
         Returns a capsule that points to the internal image memory.
 
@@ -1511,7 +1618,7 @@ def getim(self):
         self.load()
         return self.im.ptr
 
-    def getpalette(self, rawmode="RGB"):
+    def getpalette(self, rawmode: str | None = "RGB") -> list[int] | None:
         """
         Returns the image palette as a list.
 
@@ -1545,13 +1652,17 @@ def has_transparency_data(self) -> bool:
 
         :returns: A boolean.
         """
-        return (
+        if (
             self.mode in ("LA", "La", "PA", "RGBA", "RGBa")
-            or (self.mode == "P" and self.palette.mode.endswith("A"))
             or "transparency" in self.info
-        )
+        ):
+            return True
+        if self.mode == "P":
+            assert self.palette is not None
+            return self.palette.mode.endswith("A")
+        return False
 
-    def apply_transparency(self):
+    def apply_transparency(self) -> None:
         """
         If a P mode image has a "transparency" key in the info dictionary,
         remove the key and instead apply the transparency to the palette.
@@ -1563,6 +1674,7 @@ def apply_transparency(self):
         from . import ImagePalette
 
         palette = self.getpalette("RGBA")
+        assert palette is not None
         transparency = self.info["transparency"]
         if isinstance(transparency, bytes):
             for i, alpha in enumerate(transparency):
@@ -1574,7 +1686,9 @@ def apply_transparency(self):
 
         del self.info["transparency"]
 
-    def getpixel(self, xy):
+    def getpixel(
+        self, xy: tuple[int, int] | list[int]
+    ) -> float | tuple[int, ...] | None:
         """
         Returns the pixel value at a given position.
 
@@ -1585,11 +1699,9 @@ def getpixel(self, xy):
         """
 
         self.load()
-        if self.pyaccess:
-            return self.pyaccess.getpixel(xy)
         return self.im.getpixel(tuple(xy))
 
-    def getprojection(self):
+    def getprojection(self) -> tuple[list[int], list[int]]:
         """
         Get projection to x and y axes
 
@@ -1601,7 +1713,9 @@ def getprojection(self):
         x, y = self.im.getprojection()
         return list(x), list(y)
 
-    def histogram(self, mask=None, extrema=None):
+    def histogram(
+        self, mask: Image | None = None, extrema: tuple[float, float] | None = None
+    ) -> list[int]:
         """
         Returns a histogram for the image. The histogram is returned as a
         list of pixel counts, one for each pixel value in the source
@@ -1627,12 +1741,14 @@ def histogram(self, mask=None, extrema=None):
             mask.load()
             return self.im.histogram((0, 0), mask.im)
         if self.mode in ("I", "F"):
-            if extrema is None:
-                extrema = self.getextrema()
-            return self.im.histogram(extrema)
+            return self.im.histogram(
+                extrema if extrema is not None else self.getextrema()
+            )
         return self.im.histogram()
 
-    def entropy(self, mask=None, extrema=None):
+    def entropy(
+        self, mask: Image | None = None, extrema: tuple[float, float] | None = None
+    ) -> float:
         """
         Calculates and returns the entropy for the image.
 
@@ -1653,12 +1769,17 @@ def entropy(self, mask=None, extrema=None):
             mask.load()
             return self.im.entropy((0, 0), mask.im)
         if self.mode in ("I", "F"):
-            if extrema is None:
-                extrema = self.getextrema()
-            return self.im.entropy(extrema)
+            return self.im.entropy(
+                extrema if extrema is not None else self.getextrema()
+            )
         return self.im.entropy()
 
-    def paste(self, im, box=None, mask=None) -> None:
+    def paste(
+        self,
+        im: Image | str | float | tuple[float, ...],
+        box: Image | tuple[int, int, int, int] | tuple[int, int] | None = None,
+        mask: Image | None = None,
+    ) -> None:
         """
         Pastes another image into this image. The box argument is either
         a 2-tuple giving the upper left corner, a 4-tuple defining the
@@ -1686,7 +1807,7 @@ def paste(self, im, box=None, mask=None) -> None:
         See :py:meth:`~PIL.Image.Image.alpha_composite` if you want to
         combine images with respect to their alpha channels.
 
-        :param im: Source image or pixel value (integer or tuple).
+        :param im: Source image or pixel value (integer, float or tuple).
         :param box: An optional 4-tuple giving the region to paste into.
            If a 2-tuple is used instead, it's treated as the upper left
            corner.  If omitted or None, the source is pasted into the
@@ -1698,7 +1819,10 @@ def paste(self, im, box=None, mask=None) -> None:
         :param mask: An optional mask image.
         """
 
-        if isImageType(box) and mask is None:
+        if isinstance(box, Image):
+            if mask is not None:
+                msg = "If using second argument as mask, third argument must be None"
+                raise ValueError(msg)
             # abbreviated paste(im, mask) syntax
             mask = box
             box = None
@@ -1708,9 +1832,9 @@ def paste(self, im, box=None, mask=None) -> None:
 
         if len(box) == 2:
             # upper left corner given; get size from image or mask
-            if isImageType(im):
+            if isinstance(im, Image):
                 size = im.size
-            elif isImageType(mask):
+            elif isinstance(mask, Image):
                 size = mask.size
             else:
                 # FIXME: use self.size here?
@@ -1718,28 +1842,32 @@ def paste(self, im, box=None, mask=None) -> None:
                 raise ValueError(msg)
             box += (box[0] + size[0], box[1] + size[1])
 
+        source: core.ImagingCore | str | float | tuple[float, ...]
         if isinstance(im, str):
             from . import ImageColor
 
-            im = ImageColor.getcolor(im, self.mode)
-
-        elif isImageType(im):
+            source = ImageColor.getcolor(im, self.mode)
+        elif isinstance(im, Image):
             im.load()
             if self.mode != im.mode:
                 if self.mode != "RGB" or im.mode not in ("LA", "RGBA", "RGBa"):
                     # should use an adapter for this!
                     im = im.convert(self.mode)
-            im = im.im
+            source = im.im
+        else:
+            source = im
 
         self._ensure_mutable()
 
         if mask:
             mask.load()
-            self.im.paste(im, box, mask.im)
+            self.im.paste(source, box, mask.im)
         else:
-            self.im.paste(im, box)
+            self.im.paste(source, box)
 
-    def alpha_composite(self, im, dest=(0, 0), source=(0, 0)):
+    def alpha_composite(
+        self, im: Image, dest: Sequence[int] = (0, 0), source: Sequence[int] = (0, 0)
+    ) -> None:
         """'In-place' analog of Image.alpha_composite. Composites an image
         onto this image.
 
@@ -1754,32 +1882,35 @@ def alpha_composite(self, im, dest=(0, 0), source=(0, 0)):
         """
 
         if not isinstance(source, (list, tuple)):
-            msg = "Source must be a tuple"
+            msg = "Source must be a list or tuple"
             raise ValueError(msg)
         if not isinstance(dest, (list, tuple)):
-            msg = "Destination must be a tuple"
+            msg = "Destination must be a list or tuple"
             raise ValueError(msg)
-        if len(source) not in (2, 4):
-            msg = "Source must be a 2 or 4-tuple"
+
+        if len(source) == 4:
+            overlay_crop_box = tuple(source)
+        elif len(source) == 2:
+            overlay_crop_box = tuple(source) + im.size
+        else:
+            msg = "Source must be a sequence of length 2 or 4"
             raise ValueError(msg)
+
         if not len(dest) == 2:
-            msg = "Destination must be a 2-tuple"
+            msg = "Destination must be a sequence of length 2"
             raise ValueError(msg)
         if min(source) < 0:
             msg = "Source must be non-negative"
             raise ValueError(msg)
 
-        if len(source) == 2:
-            source = source + im.size
-
-        # over image, crop if it's not the whole thing.
-        if source == (0, 0) + im.size:
+        # over image, crop if it's not the whole image.
+        if overlay_crop_box == (0, 0) + im.size:
             overlay = im
         else:
-            overlay = im.crop(source)
+            overlay = im.crop(overlay_crop_box)
 
         # target for the paste
-        box = dest + (dest[0] + overlay.width, dest[1] + overlay.height)
+        box = tuple(dest) + (dest[0] + overlay.width, dest[1] + overlay.height)
 
         # destination image. don't copy if we're using the whole image.
         if box == (0, 0) + self.size:
@@ -1790,7 +1921,17 @@ def alpha_composite(self, im, dest=(0, 0), source=(0, 0)):
         result = alpha_composite(background, overlay)
         self.paste(result, box)
 
-    def point(self, lut, mode=None):
+    def point(
+        self,
+        lut: (
+            Sequence[float]
+            | NumpyArray
+            | Callable[[int], float]
+            | Callable[[ImagePointTransform], ImagePointTransform | float]
+            | ImagePointHandler
+        ),
+        mode: str | None = None,
+    ) -> Image:
         """
         Maps this image through a lookup table or function.
 
@@ -1805,11 +1946,10 @@ def point(self, lut, mode=None):
            object::
 
                class Example(Image.ImagePointHandler):
-                 def point(self, data):
+                 def point(self, im: Image) -> Image:
                    # Return result
-        :param mode: Output mode (default is same as input).  In the
-           current version, this can only be used if the source image
-           has mode "L" or "P", and the output has mode "1" or the
+        :param mode: Output mode (default is same as input). This can only be used if
+           the source image has mode "L" or "P", and the output has mode "1" or the
            source image mode is "I" and the output mode is "L".
         :returns: An :py:class:`~PIL.Image.Image` object.
         """
@@ -1825,10 +1965,12 @@ def point(self, data):
                 # check if the function can be used with point_transform
                 # UNDONE wiredfool -- I think this prevents us from ever doing
                 # a gamma function point transform on > 8bit images.
-                scale, offset = _getscaleoffset(lut)
+                scale, offset = _getscaleoffset(lut)  # type: ignore[arg-type]
                 return self._new(self.im.point_transform(scale, offset))
             # for other modes, convert the function to a table
-            lut = [lut(i) for i in range(256)] * self.im.bands
+            flatLut = [lut(i) for i in range(256)] * self.im.bands  # type: ignore[arg-type]
+        else:
+            flatLut = lut
 
         if self.mode == "F":
             # FIXME: _imaging returns a confusing error message for this case
@@ -1836,18 +1978,17 @@ def point(self, data):
             raise ValueError(msg)
 
         if mode != "F":
-            lut = [round(i) for i in lut]
-        return self._new(self.im.point(lut, mode))
+            flatLut = [round(i) for i in flatLut]
+        return self._new(self.im.point(flatLut, mode))
 
-    def putalpha(self, alpha):
+    def putalpha(self, alpha: Image | int) -> None:
         """
         Adds or replaces the alpha layer in this image.  If the image
         does not have an alpha layer, it's converted to "LA" or "RGBA".
         The new layer must be either "L" or "1".
 
         :param alpha: The new alpha layer.  This can either be an "L" or "1"
-           image having the same size as this image, or an integer or
-           other color value.
+           image having the same size as this image, or an integer.
         """
 
         self._ensure_mutable()
@@ -1865,7 +2006,6 @@ def putalpha(self, alpha):
                         msg = "alpha channel could not be added"
                         raise ValueError(msg) from e  # sanity check
                     self.im = im
-                self.pyaccess = None
                 self._mode = self.im.mode
             except KeyError as e:
                 msg = "illegal image mode"
@@ -1876,7 +2016,7 @@ def putalpha(self, alpha):
         else:
             band = 3
 
-        if isImageType(alpha):
+        if isinstance(alpha, Image):
             # alpha layer
             if alpha.mode not in ("1", "L"):
                 msg = "illegal image mode"
@@ -1896,7 +2036,12 @@ def putalpha(self, alpha):
 
         self.im.putband(alpha.im, band)
 
-    def putdata(self, data, scale=1.0, offset=0.0):
+    def putdata(
+        self,
+        data: Sequence[float] | Sequence[Sequence[int]] | core.ImagingCore | NumpyArray,
+        scale: float = 1.0,
+        offset: float = 0.0,
+    ) -> None:
         """
         Copies pixel data from a flattened sequence object into the image. The
         values should start at the upper left corner (0, 0), continue to the
@@ -1914,7 +2059,11 @@ def putdata(self, data, scale=1.0, offset=0.0):
 
         self.im.putdata(data, scale, offset)
 
-    def putpalette(self, data, rawmode="RGB"):
+    def putpalette(
+        self,
+        data: ImagePalette.ImagePalette | bytes | Sequence[int],
+        rawmode: str = "RGB",
+    ) -> None:
         """
         Attaches a palette to this image.  The image must be a "P", "PA", "L"
         or "LA" image.
@@ -1939,17 +2088,23 @@ def putpalette(self, data, rawmode="RGB"):
             msg = "illegal image mode"
             raise ValueError(msg)
         if isinstance(data, ImagePalette.ImagePalette):
-            palette = ImagePalette.raw(data.rawmode, data.palette)
+            if data.rawmode is not None:
+                palette = ImagePalette.raw(data.rawmode, data.palette)
+            else:
+                palette = ImagePalette.ImagePalette(palette=data.palette)
+                palette.dirty = 1
         else:
             if not isinstance(data, bytes):
                 data = bytes(data)
             palette = ImagePalette.raw(rawmode, data)
         self._mode = "PA" if "A" in self.mode else "P"
         self.palette = palette
-        self.palette.mode = "RGB"
+        self.palette.mode = "RGBA" if "A" in rawmode else "RGB"
         self.load()  # install new palette
 
-    def putpixel(self, xy, value):
+    def putpixel(
+        self, xy: tuple[int, int], value: float | tuple[int, ...] | list[int]
+    ) -> None:
         """
         Modifies the pixel at the given position. The color is given as
         a single numerical value for single-band images, and a tuple for
@@ -1975,9 +2130,6 @@ def putpixel(self, xy, value):
             self._copy()
         self.load()
 
-        if self.pyaccess:
-            return self.pyaccess.putpixel(xy, value)
-
         if (
             self.mode in ("P", "PA")
             and isinstance(value, (list, tuple))
@@ -1987,12 +2139,14 @@ def putpixel(self, xy, value):
             if self.mode == "PA":
                 alpha = value[3] if len(value) == 4 else 255
                 value = value[:3]
-            value = self.palette.getcolor(value, self)
-            if self.mode == "PA":
-                value = (value, alpha)
+            assert self.palette is not None
+            palette_index = self.palette.getcolor(tuple(value), self)
+            value = (palette_index, alpha) if self.mode == "PA" else palette_index
         return self.im.putpixel(xy, value)
 
-    def remap_palette(self, dest_map, source_palette=None):
+    def remap_palette(
+        self, dest_map: list[int], source_palette: bytes | bytearray | None = None
+    ) -> Image:
         """
         Rewrites the image to reorder the palette.
 
@@ -2020,6 +2174,9 @@ def remap_palette(self, dest_map, source_palette=None):
                 source_palette = self.im.getpalette(palette_mode, palette_mode)
             else:  # L-mode
                 source_palette = bytearray(i // 3 for i in range(768))
+        elif len(source_palette) > 768:
+            bands = 4
+            palette_mode = "RGBA"
 
         palette_bytes = b""
         new_positions = [0] * 256
@@ -2061,7 +2218,7 @@ def remap_palette(self, dest_map, source_palette=None):
         # m_im.putpalette(mapping_palette, 'L')  # converts to 'P'
         # or just force it.
         # UNDONE -- this is part of the general issue with palettes
-        m_im.im.putpalette(palette_mode + ";L", m_im.palette.tobytes())
+        m_im.im.putpalette(palette_mode, palette_mode + ";L", m_im.palette.tobytes())
 
         m_im = m_im.convert("L")
 
@@ -2077,7 +2234,12 @@ def remap_palette(self, dest_map, source_palette=None):
 
         return m_im
 
-    def _get_safe_box(self, size, resample, box):
+    def _get_safe_box(
+        self,
+        size: tuple[int, int],
+        resample: Resampling,
+        box: tuple[float, float, float, float],
+    ) -> tuple[int, int, int, int]:
         """Expands the box so it includes adjacent pixels
         that may be used by resampling with the given resampling filter.
         """
@@ -2094,19 +2256,25 @@ def _get_safe_box(self, size, resample, box):
             min(self.size[1], math.ceil(box[3] + support_y)),
         )
 
-    def resize(self, size, resample=None, box=None, reducing_gap=None):
+    def resize(
+        self,
+        size: tuple[int, int] | list[int] | NumpyArray,
+        resample: int | None = None,
+        box: tuple[float, float, float, float] | None = None,
+        reducing_gap: float | None = None,
+    ) -> Image:
         """
         Returns a resized copy of this image.
 
-        :param size: The requested size in pixels, as a 2-tuple:
+        :param size: The requested size in pixels, as a tuple or array:
            (width, height).
         :param resample: An optional resampling filter.  This can be
            one of :py:data:`Resampling.NEAREST`, :py:data:`Resampling.BOX`,
            :py:data:`Resampling.BILINEAR`, :py:data:`Resampling.HAMMING`,
            :py:data:`Resampling.BICUBIC` or :py:data:`Resampling.LANCZOS`.
            If the image has mode "1" or "P", it is always set to
-           :py:data:`Resampling.NEAREST`. If the image mode specifies a number
-           of bits, such as "I;16", then the default filter is
+           :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.BICUBIC`. See: :ref:`concept-filters`.
         :param box: An optional 4-tuple of floats providing
@@ -2129,8 +2297,8 @@ def resize(self, size, resample=None, box=None, reducing_gap=None):
         """
 
         if resample is None:
-            type_special = ";" in self.mode
-            resample = Resampling.NEAREST if type_special else Resampling.BICUBIC
+            bgr = self.mode.startswith("BGR;")
+            resample = Resampling.NEAREST if bgr else Resampling.BICUBIC
         elif resample not in (
             Resampling.NEAREST,
             Resampling.BILINEAR,
@@ -2152,21 +2320,17 @@ def resize(self, size, resample=None, box=None, reducing_gap=None):
                     (Resampling.HAMMING, "Image.Resampling.HAMMING"),
                 )
             ]
-            msg += " Use " + ", ".join(filters[:-1]) + " or " + filters[-1]
+            msg += f" Use {', '.join(filters[:-1])} or {filters[-1]}"
             raise ValueError(msg)
 
         if reducing_gap is not None and reducing_gap < 1.0:
             msg = "reducing_gap must be 1.0 or greater"
             raise ValueError(msg)
 
-        size = tuple(size)
-
-        self.load()
         if box is None:
             box = (0, 0) + self.size
-        else:
-            box = tuple(box)
 
+        size = tuple(size)
         if self.size == size and box == (0, 0) + self.size:
             return self.copy()
 
@@ -2184,12 +2348,13 @@ def resize(self, size, resample=None, box=None, reducing_gap=None):
             factor_x = int((box[2] - box[0]) / size[0] / reducing_gap) or 1
             factor_y = int((box[3] - box[1]) / size[1] / reducing_gap) or 1
             if factor_x > 1 or factor_y > 1:
-                reduce_box = self._get_safe_box(size, resample, box)
+                reduce_box = self._get_safe_box(size, cast(Resampling, resample), box)
                 factor = (factor_x, factor_y)
-                if callable(self.reduce):
-                    self = self.reduce(factor, box=reduce_box)
-                else:
-                    self = Image.reduce(self, factor, box=reduce_box)
+                self = (
+                    self.reduce(factor, box=reduce_box)
+                    if callable(self.reduce)
+                    else Image.reduce(self, factor, box=reduce_box)
+                )
                 box = (
                     (box[0] - reduce_box[0]) / factor_x,
                     (box[1] - reduce_box[1]) / factor_y,
@@ -2199,7 +2364,11 @@ def resize(self, size, resample=None, box=None, reducing_gap=None):
 
         return self._new(self.im.resize(size, resample, box))
 
-    def reduce(self, factor, box=None):
+    def reduce(
+        self,
+        factor: int | tuple[int, int],
+        box: tuple[int, int, int, int] | None = None,
+    ) -> Image:
         """
         Returns a copy of the image reduced ``factor`` times.
         If the size of the image is not dividable by ``factor``,
@@ -2217,8 +2386,6 @@ def reduce(self, factor, box=None):
 
         if box is None:
             box = (0, 0) + self.size
-        else:
-            box = tuple(box)
 
         if factor == (1, 1) and box == (0, 0) + self.size:
             return self.copy()
@@ -2234,13 +2401,13 @@ def reduce(self, factor, box=None):
 
     def rotate(
         self,
-        angle,
-        resample=Resampling.NEAREST,
-        expand=0,
-        center=None,
-        translate=None,
-        fillcolor=None,
-    ):
+        angle: float,
+        resample: Resampling = Resampling.NEAREST,
+        expand: int | bool = False,
+        center: tuple[float, float] | None = None,
+        translate: tuple[int, int] | None = None,
+        fillcolor: float | tuple[float, ...] | str | None = None,
+    ) -> Image:
         """
         Returns a rotated copy of this image.  This method returns a
         copy of this image, rotated the given number of degrees counter
@@ -2305,10 +2472,7 @@ def rotate(
         else:
             post_trans = translate
         if center is None:
-            # FIXME These should be rounded to ints?
-            rotn_center = (w / 2.0, h / 2.0)
-        else:
-            rotn_center = center
+            center = (w / 2, h / 2)
 
         angle = -math.radians(angle)
         matrix = [
@@ -2320,24 +2484,24 @@ def rotate(
             0.0,
         ]
 
-        def transform(x, y, matrix):
+        def transform(x: float, y: float, matrix: list[float]) -> tuple[float, float]:
             (a, b, c, d, e, f) = matrix
             return a * x + b * y + c, d * x + e * y + f
 
         matrix[2], matrix[5] = transform(
-            -rotn_center[0] - post_trans[0], -rotn_center[1] - post_trans[1], matrix
+            -center[0] - post_trans[0], -center[1] - post_trans[1], matrix
         )
-        matrix[2] += rotn_center[0]
-        matrix[5] += rotn_center[1]
+        matrix[2] += center[0]
+        matrix[5] += center[1]
 
         if expand:
             # calculate output size
             xx = []
             yy = []
             for x, y in ((0, 0), (w, 0), (w, h), (0, h)):
-                x, y = transform(x, y, matrix)
-                xx.append(x)
-                yy.append(y)
+                transformed_x, transformed_y = transform(x, y, matrix)
+                xx.append(transformed_x)
+                yy.append(transformed_y)
             nw = math.ceil(max(xx)) - math.floor(min(xx))
             nh = math.ceil(max(yy)) - math.floor(min(yy))
 
@@ -2351,7 +2515,9 @@ def transform(x, y, matrix):
             (w, h), Transform.AFFINE, matrix, resample, fillcolor=fillcolor
         )
 
-    def save(self, fp, format=None, **params) -> None:
+    def save(
+        self, fp: StrOrBytesPath | IO[bytes], format: str | None = None, **params: Any
+    ) -> None:
         """
         Saves this image under the given filename.  If no format is
         specified, the format to use is determined from the filename
@@ -2368,7 +2534,7 @@ def save(self, fp, format=None, **params) -> None:
         implement the ``seek``, ``tell``, and ``write``
         methods, and be opened in binary mode.
 
-        :param fp: A filename (string), pathlib.Path object or file object.
+        :param fp: A filename (string), os.PathLike object or file object.
         :param format: Optional format override.  If omitted, the
            format to use is determined from the filename extension.
            If a file object was used instead of a filename, this
@@ -2381,13 +2547,10 @@ def save(self, fp, format=None, **params) -> None:
            may have been created, and may contain partial data.
         """
 
-        filename = ""
+        filename: str | bytes = ""
         open_fp = False
-        if isinstance(fp, Path):
-            filename = str(fp)
-            open_fp = True
-        elif is_path(fp):
-            filename = fp
+        if is_path(fp):
+            filename = os.path.realpath(os.fspath(fp))
             open_fp = True
         elif fp == sys.stdout:
             try:
@@ -2396,18 +2559,19 @@ def save(self, fp, format=None, **params) -> None:
                 pass
         if not filename and hasattr(fp, "name") and is_path(fp.name):
             # only set the name for metadata purposes
-            filename = fp.name
+            filename = os.path.realpath(os.fspath(fp.name))
 
         # may mutate self!
         self._ensure_mutable()
 
         save_all = params.pop("save_all", False)
         self.encoderinfo = params
-        self.encoderconfig = ()
+        self.encoderconfig: tuple[Any, ...] = ()
 
         preinit()
 
-        ext = os.path.splitext(filename)[1].lower()
+        filename_ext = os.path.splitext(filename)[1].lower()
+        ext = filename_ext.decode() if isinstance(filename_ext, bytes) else filename_ext
 
         if not format:
             if ext not in EXTENSION:
@@ -2434,6 +2598,8 @@ def save(self, fp, format=None, **params) -> None:
                 fp = builtins.open(filename, "r+b")
             else:
                 fp = builtins.open(filename, "w+b")
+        else:
+            fp = cast(IO[bytes], fp)
 
         try:
             save_handler(self, fp, filename)
@@ -2449,7 +2615,7 @@ def save(self, fp, format=None, **params) -> None:
         if open_fp:
             fp.close()
 
-    def seek(self, frame) -> Image:
+    def seek(self, frame: int) -> None:
         """
         Seeks to the given frame in this sequence file. If you seek
         beyond the end of the sequence, the method raises an
@@ -2471,7 +2637,7 @@ def seek(self, frame) -> Image:
             msg = "no more images in file"
             raise EOFError(msg)
 
-    def show(self, title=None):
+    def show(self, title: str | None = None) -> None:
         """
         Displays this image. This method is mainly intended for debugging purposes.
 
@@ -2493,7 +2659,7 @@ def show(self, title=None):
 
         _show(self, title=title)
 
-    def split(self):
+    def split(self) -> tuple[Image, ...]:
         """
         Split this image into individual bands. This method returns a
         tuple of individual image bands from an image. For example,
@@ -2509,12 +2675,10 @@ def split(self):
 
         self.load()
         if self.im.bands == 1:
-            ims = [self.copy()]
-        else:
-            ims = map(self._new, self.im.split())
-        return tuple(ims)
+            return (self.copy(),)
+        return tuple(map(self._new, self.im.split()))
 
-    def getchannel(self, channel):
+    def getchannel(self, channel: int | str) -> Image:
         """
         Returns an image containing a single channel of the source image.
 
@@ -2547,7 +2711,12 @@ def tell(self) -> int:
         """
         return 0
 
-    def thumbnail(self, size, resample=Resampling.BICUBIC, reducing_gap=2.0):
+    def thumbnail(
+        self,
+        size: tuple[float, float],
+        resample: Resampling = Resampling.BICUBIC,
+        reducing_gap: float | None = 2.0,
+    ) -> None:
         """
         Make this image into a thumbnail.  This method modifies the
         image to contain a thumbnail version of itself, no larger than
@@ -2589,13 +2758,13 @@ def thumbnail(self, size, resample=Resampling.BICUBIC, reducing_gap=2.0):
 
         provided_size = tuple(map(math.floor, size))
 
-        def preserve_aspect_ratio():
-            def round_aspect(number, key):
+        def preserve_aspect_ratio() -> tuple[int, int] | None:
+            def round_aspect(number: float, key: Callable[[int], float]) -> int:
                 return max(min(math.floor(number), math.ceil(number), key=key), 1)
 
             x, y = provided_size
             if x >= self.width and y >= self.height:
-                return
+                return None
 
             aspect = self.width / self.height
             if x / y >= aspect:
@@ -2606,43 +2775,38 @@ def round_aspect(number, key):
                 )
             return x, y
 
+        preserved_size = preserve_aspect_ratio()
+        if preserved_size is None:
+            return
+        final_size = preserved_size
+
         box = None
         if reducing_gap is not None:
-            size = preserve_aspect_ratio()
-            if size is None:
-                return
-
-            res = self.draft(None, (size[0] * reducing_gap, size[1] * reducing_gap))
+            res = self.draft(
+                None, (int(size[0] * reducing_gap), int(size[1] * reducing_gap))
+            )
             if res is not None:
                 box = res[1]
-        if box is None:
-            self.load()
 
-            # load() may have changed the size of the image
-            size = preserve_aspect_ratio()
-            if size is None:
-                return
-
-        if self.size != size:
-            im = self.resize(size, resample, box=box, reducing_gap=reducing_gap)
+        if self.size != final_size:
+            im = self.resize(final_size, resample, box=box, reducing_gap=reducing_gap)
 
             self.im = im.im
-            self._size = size
+            self._size = final_size
             self._mode = self.im.mode
 
         self.readonly = 0
-        self.pyaccess = None
 
     # FIXME: the different transform methods need further explanation
     # instead of bloating the method docs, add a separate chapter.
     def transform(
         self,
-        size,
-        method,
-        data=None,
-        resample=Resampling.NEAREST,
-        fill=1,
-        fillcolor=None,
+        size: tuple[int, int],
+        method: Transform | ImageTransformHandler | SupportsGetData,
+        data: Sequence[Any] | None = None,
+        resample: int = Resampling.NEAREST,
+        fill: int = 1,
+        fillcolor: float | tuple[float, ...] | str | None = None,
     ) -> Image:
         """
         Transforms this image.  This method creates a new image with the
@@ -2666,6 +2830,10 @@ class Example(Image.ImageTransformHandler):
                 def transform(self, size, data, resample, fill=1):
                     # Return result
 
+          Implementations of :py:class:`~PIL.Image.ImageTransformHandler`
+          for some of the :py:class:`Transform` methods are provided
+          in :py:mod:`~PIL.ImageTransform`.
+
           It may also be an object with a ``method.getdata`` method
           that returns a tuple supplying new ``method`` and ``data`` values::
 
@@ -2726,8 +2894,14 @@ def getdata(self):
         return im
 
     def __transformer(
-        self, box, image, method, data, resample=Resampling.NEAREST, fill=1
-    ):
+        self,
+        box: tuple[int, int, int, int],
+        image: Image,
+        method: Transform,
+        data: Sequence[float],
+        resample: int = Resampling.NEAREST,
+        fill: bool = True,
+    ) -> None:
         w = box[2] - box[0]
         h = box[3] - box[1]
 
@@ -2776,11 +2950,12 @@ def __transformer(
             Resampling.BICUBIC,
         ):
             if resample in (Resampling.BOX, Resampling.HAMMING, Resampling.LANCZOS):
-                msg = {
+                unusable: dict[int, str] = {
                     Resampling.BOX: "Image.Resampling.BOX",
                     Resampling.HAMMING: "Image.Resampling.HAMMING",
                     Resampling.LANCZOS: "Image.Resampling.LANCZOS",
-                }[resample] + f" ({resample}) cannot be used."
+                }
+                msg = unusable[resample] + f" ({resample}) cannot be used."
             else:
                 msg = f"Unknown resampling filter ({resample})."
 
@@ -2792,7 +2967,7 @@ def __transformer(
                     (Resampling.BICUBIC, "Image.Resampling.BICUBIC"),
                 )
             ]
-            msg += " Use " + ", ".join(filters[:-1]) + " or " + filters[-1]
+            msg += f" Use {', '.join(filters[:-1])} or {filters[-1]}"
             raise ValueError(msg)
 
         image.load()
@@ -2802,9 +2977,9 @@ def __transformer(
         if image.mode in ("1", "P"):
             resample = Resampling.NEAREST
 
-        self.im.transform2(box, image.im, method, data, resample, fill)
+        self.im.transform(box, image.im, method, data, resample, fill)
 
-    def transpose(self, method):
+    def transpose(self, method: Transpose) -> Image:
         """
         Transpose image (flip or rotate in 90 degree steps)
 
@@ -2818,7 +2993,7 @@ def transpose(self, method):
         self.load()
         return self._new(self.im.transpose(method))
 
-    def effect_spread(self, distance):
+    def effect_spread(self, distance: int) -> Image:
         """
         Randomly spread pixels in an image.
 
@@ -2827,7 +3002,7 @@ def effect_spread(self, distance):
         self.load()
         return self._new(self.im.effect_spread(distance))
 
-    def toqimage(self):
+    def toqimage(self) -> ImageQt.ImageQt:
         """Returns a QImage copy of this image"""
         from . import ImageQt
 
@@ -2836,7 +3011,7 @@ def toqimage(self):
             raise ImportError(msg)
         return ImageQt.toqimage(self)
 
-    def toqpixmap(self):
+    def toqpixmap(self) -> ImageQt.QPixmap:
         """Returns a QPixmap copy of this image"""
         from . import ImageQt
 
@@ -2856,7 +3031,9 @@ class ImagePointHandler:
     (for use with :py:meth:`~PIL.Image.Image.point`)
     """
 
-    pass
+    @abc.abstractmethod
+    def point(self, im: Image) -> Image:
+        pass
 
 
 class ImageTransformHandler:
@@ -2865,7 +3042,14 @@ class ImageTransformHandler:
     (for use with :py:meth:`~PIL.Image.Image.transform`)
     """
 
-    pass
+    @abc.abstractmethod
+    def transform(
+        self,
+        size: tuple[int, int],
+        image: Image,
+        **options: Any,
+    ) -> Image:
+        pass
 
 
 # --------------------------------------------------------------------
@@ -2875,34 +3059,36 @@ class ImageTransformHandler:
 # Debugging
 
 
-def _wedge():
+def _wedge() -> Image:
     """Create grayscale wedge (for debugging only)"""
 
     return Image()._new(core.wedge("L"))
 
 
-def _check_size(size):
+def _check_size(size: Any) -> None:
     """
     Common check to enforce type and sanity check on size tuples
 
     :param size: Should be a 2 tuple of (width, height)
-    :returns: True, or raises a ValueError
+    :returns: None, or raises a ValueError
     """
 
     if not isinstance(size, (list, tuple)):
-        msg = "Size must be a tuple"
+        msg = "Size must be a list or tuple"
         raise ValueError(msg)
     if len(size) != 2:
-        msg = "Size must be a tuple of length 2"
+        msg = "Size must be a sequence of length 2"
         raise ValueError(msg)
     if size[0] < 0 or size[1] < 0:
         msg = "Width and height must be >= 0"
         raise ValueError(msg)
 
-    return True
 
-
-def new(mode, size, color=0) -> Image:
+def new(
+    mode: str,
+    size: tuple[int, int] | list[int],
+    color: float | tuple[float, ...] | str | None = 0,
+) -> Image:
     """
     Creates a new image with the given mode and size.
 
@@ -2918,6 +3104,9 @@ def new(mode, size, color=0) -> Image:
     :returns: An :py:class:`~PIL.Image.Image` object.
     """
 
+    if mode in ("BGR;15", "BGR;16", "BGR;24"):
+        deprecate(mode, 12)
+
     _check_size(size)
 
     if color is None:
@@ -2932,16 +3121,28 @@ def new(mode, size, color=0) -> Image:
         color = ImageColor.getcolor(color, mode)
 
     im = Image()
-    if mode == "P" and isinstance(color, (list, tuple)) and len(color) in [3, 4]:
-        # RGB or RGBA value for a P image
-        from . import ImagePalette
+    if (
+        mode == "P"
+        and isinstance(color, (list, tuple))
+        and all(isinstance(i, int) for i in color)
+    ):
+        color_ints: tuple[int, ...] = cast(tuple[int, ...], tuple(color))
+        if len(color_ints) == 3 or len(color_ints) == 4:
+            # RGB or RGBA value for a P image
+            from . import ImagePalette
 
-        im.palette = ImagePalette.ImagePalette()
-        color = im.palette.getcolor(color)
+            im.palette = ImagePalette.ImagePalette()
+            color = im.palette.getcolor(color_ints)
     return im._new(core.fill(mode, size, color))
 
 
-def frombytes(mode, size, data, decoder_name="raw", *args) -> Image:
+def frombytes(
+    mode: str,
+    size: tuple[int, int],
+    data: bytes | bytearray | SupportsArrayInterface,
+    decoder_name: str = "raw",
+    *args: Any,
+) -> Image:
     """
     Creates a copy of an image memory from pixel data in a buffer.
 
@@ -2969,18 +3170,25 @@ def frombytes(mode, size, data, decoder_name="raw", *args) -> Image:
 
     im = new(mode, size)
     if im.width != 0 and im.height != 0:
-        # may pass tuple instead of argument list
-        if len(args) == 1 and isinstance(args[0], tuple):
-            args = args[0]
+        decoder_args: Any = args
+        if len(decoder_args) == 1 and isinstance(decoder_args[0], tuple):
+            # may pass tuple instead of argument list
+            decoder_args = decoder_args[0]
 
-        if decoder_name == "raw" and args == ():
-            args = mode
+        if decoder_name == "raw" and decoder_args == ():
+            decoder_args = mode
 
-        im.frombytes(data, decoder_name, args)
+        im.frombytes(data, decoder_name, decoder_args)
     return im
 
 
-def frombuffer(mode, size, data, decoder_name="raw", *args):
+def frombuffer(
+    mode: str,
+    size: tuple[int, int],
+    data: bytes | SupportsArrayInterface,
+    decoder_name: str = "raw",
+    *args: Any,
+) -> Image:
     """
     Creates an image memory referencing pixel data in a byte buffer.
 
@@ -2993,11 +3201,10 @@ def frombuffer(mode, size, data, decoder_name="raw", *args):
     If you have an entire image file in a string, wrap it in a
     :py:class:`~io.BytesIO` object, and use :py:func:`~PIL.Image.open` to load it.
 
-    In the current version, the default parameters used for the "raw" decoder
-    differs from that used for :py:func:`~PIL.Image.frombytes`.  This is a
-    bug, and will probably be fixed in a future release.  The current release
-    issues a warning if you do this; to disable the warning, you should provide
-    the full set of parameters.  See below for details.
+    The default parameters used for the "raw" decoder differs from that used for
+    :py:func:`~PIL.Image.frombytes`. This is a bug, and will probably be fixed in a
+    future release. The current release issues a warning if you do this; to disable
+    the warning, you should provide the full set of parameters. See below for details.
 
     :param mode: The image mode. See: :ref:`concept-modes`.
     :param size: The image size.
@@ -3037,7 +3244,17 @@ def frombuffer(mode, size, data, decoder_name="raw", *args):
     return frombytes(mode, size, data, decoder_name, args)
 
 
-def fromarray(obj, mode=None):
+class SupportsArrayInterface(Protocol):
+    """
+    An object that has an ``__array_interface__`` dictionary.
+    """
+
+    @property
+    def __array_interface__(self) -> dict[str, Any]:
+        raise NotImplementedError()
+
+
+def fromarray(obj: SupportsArrayInterface, mode: str | None = None) -> Image:
     """
     Creates an image memory from an object exporting the array interface
     (using the buffer protocol)::
@@ -3116,13 +3333,16 @@ def fromarray(obj, mode=None):
     if strides is not None:
         if hasattr(obj, "tobytes"):
             obj = obj.tobytes()
-        else:
+        elif hasattr(obj, "tostring"):
             obj = obj.tostring()
+        else:
+            msg = "'strides' requires either tobytes() or tostring()"
+            raise ValueError(msg)
 
     return frombuffer(mode, size, obj, "raw", rawmode, 0, 1)
 
 
-def fromqimage(im):
+def fromqimage(im: ImageQt.QImage) -> ImageFile.ImageFile:
     """Creates an image instance from a QImage image"""
     from . import ImageQt
 
@@ -3132,7 +3352,7 @@ def fromqimage(im):
     return ImageQt.fromqimage(im)
 
 
-def fromqpixmap(im):
+def fromqpixmap(im: ImageQt.QPixmap) -> ImageFile.ImageFile:
     """Creates an image instance from a QPixmap image"""
     from . import ImageQt
 
@@ -3164,12 +3384,12 @@ def fromqpixmap(im):
     ((1, 1, 3), "|u1"): ("RGB", "RGB"),
     ((1, 1, 4), "|u1"): ("RGBA", "RGBA"),
     # shortcuts:
-    ((1, 1), _ENDIAN + "i4"): ("I", "I"),
-    ((1, 1), _ENDIAN + "f4"): ("F", "F"),
+    ((1, 1), f"{_ENDIAN}i4"): ("I", "I"),
+    ((1, 1), f"{_ENDIAN}f4"): ("F", "F"),
 }
 
 
-def _decompression_bomb_check(size):
+def _decompression_bomb_check(size: tuple[int, int]) -> None:
     if MAX_IMAGE_PIXELS is None:
         return
 
@@ -3190,7 +3410,11 @@ def _decompression_bomb_check(size):
         )
 
 
-def open(fp, mode="r", formats=None) -> Image:
+def open(
+    fp: StrOrBytesPath | IO[bytes],
+    mode: Literal["r"] = "r",
+    formats: list[str] | tuple[str, ...] | None = None,
+) -> ImageFile.ImageFile:
     """
     Opens and identifies the given image file.
 
@@ -3200,7 +3424,7 @@ def open(fp, mode="r", formats=None) -> Image:
     :py:meth:`~PIL.Image.Image.load` method).  See
     :py:func:`~PIL.Image.new`. See :ref:`file-handling`.
 
-    :param fp: A filename (string), pathlib.Path object or a file object.
+    :param fp: A filename (string), os.PathLike object or a file object.
        The file object must implement ``file.read``,
        ``file.seek``, and ``file.tell`` methods,
        and be opened in binary mode. The file object will also seek to zero
@@ -3221,10 +3445,10 @@ def open(fp, mode="r", formats=None) -> Image:
     """
 
     if mode != "r":
-        msg = f"bad mode {repr(mode)}"
+        msg = f"bad mode {repr(mode)}"  # type: ignore[unreachable]
         raise ValueError(msg)
     elif isinstance(fp, io.StringIO):
-        msg = (
+        msg = (  # type: ignore[unreachable]
             "StringIO cannot be used to open an image. "
             "Binary data must be used instead."
         )
@@ -3233,19 +3457,19 @@ def open(fp, mode="r", formats=None) -> Image:
     if formats is None:
         formats = ID
     elif not isinstance(formats, (list, tuple)):
-        msg = "formats must be a list or tuple"
+        msg = "formats must be a list or tuple"  # type: ignore[unreachable]
         raise TypeError(msg)
 
     exclusive_fp = False
-    filename = ""
-    if isinstance(fp, Path):
-        filename = str(fp.resolve())
-    elif is_path(fp):
-        filename = fp
+    filename: str | bytes = ""
+    if is_path(fp):
+        filename = os.path.realpath(os.fspath(fp))
 
     if filename:
         fp = builtins.open(filename, "rb")
         exclusive_fp = True
+    else:
+        fp = cast(IO[bytes], fp)
 
     try:
         fp.seek(0)
@@ -3257,9 +3481,14 @@ def open(fp, mode="r", formats=None) -> Image:
 
     preinit()
 
-    accept_warnings = []
+    warning_messages: list[str] = []
 
-    def _open_core(fp, filename, prefix, formats):
+    def _open_core(
+        fp: IO[bytes],
+        filename: str | bytes,
+        prefix: bytes,
+        formats: list[str] | tuple[str, ...],
+    ) -> ImageFile.ImageFile | None:
         for i in formats:
             i = i.upper()
             if i not in OPEN:
@@ -3267,18 +3496,16 @@ def _open_core(fp, filename, prefix, formats):
             try:
                 factory, accept = OPEN[i]
                 result = not accept or accept(prefix)
-                if type(result) in [str, bytes]:
-                    accept_warnings.append(result)
+                if isinstance(result, str):
+                    warning_messages.append(result)
                 elif result:
                     fp.seek(0)
                     im = factory(fp, filename)
                     _decompression_bomb_check(im.size)
                     return im
-            except (SyntaxError, IndexError, TypeError, struct.error):
-                # Leave disabled by default, spams the logs with image
-                # opening failures that are entirely expected.
-                # logger.debug("", exc_info=True)
-                continue
+            except (SyntaxError, IndexError, TypeError, struct.error) as e:
+                if WARN_POSSIBLE_FORMATS:
+                    warning_messages.append(i + " opening failed. " + str(e))
             except BaseException:
                 if exclusive_fp:
                     fp.close()
@@ -3288,7 +3515,7 @@ def _open_core(fp, filename, prefix, formats):
     im = _open_core(fp, filename, prefix, formats)
 
     if im is None and formats is ID:
-        checked_formats = formats.copy()
+        checked_formats = ID.copy()
         if init():
             im = _open_core(
                 fp,
@@ -3303,7 +3530,7 @@ def _open_core(fp, filename, prefix, formats):
 
     if exclusive_fp:
         fp.close()
-    for message in accept_warnings:
+    for message in warning_messages:
         warnings.warn(message)
     msg = "cannot identify image file %r" % (filename if filename else fp)
     raise UnidentifiedImageError(msg)
@@ -3313,7 +3540,7 @@ def _open_core(fp, filename, prefix, formats):
 # Image processing.
 
 
-def alpha_composite(im1, im2):
+def alpha_composite(im1: Image, im2: Image) -> Image:
     """
     Alpha composite im2 over im1.
 
@@ -3328,7 +3555,7 @@ def alpha_composite(im1, im2):
     return im1._new(core.alpha_composite(im1.im, im2.im))
 
 
-def blend(im1, im2, alpha):
+def blend(im1: Image, im2: Image, alpha: float) -> Image:
     """
     Creates a new image by interpolating between two input images, using
     a constant alpha::
@@ -3351,7 +3578,7 @@ def blend(im1, im2, alpha):
     return im1._new(core.blend(im1.im, im2.im, alpha))
 
 
-def composite(image1, image2, mask):
+def composite(image1: Image, image2: Image, mask: Image) -> Image:
     """
     Create composite image by blending images using a transparency mask.
 
@@ -3368,7 +3595,7 @@ def composite(image1, image2, mask):
     return image
 
 
-def eval(image, *args):
+def eval(image: Image, *args: Callable[[int], float]) -> Image:
     """
     Applies the function (which should take one argument) to each pixel
     in the given image. If the image has more than one band, the same
@@ -3384,7 +3611,7 @@ def eval(image, *args):
     return image.point(args[0])
 
 
-def merge(mode, bands):
+def merge(mode: str, bands: Sequence[Image]) -> Image:
     """
     Merge a set of single band images into a new multiband image.
 
@@ -3415,7 +3642,14 @@ def merge(mode, bands):
 # Plugin registry
 
 
-def register_open(id, factory, accept=None) -> None:
+def register_open(
+    id: str,
+    factory: (
+        Callable[[IO[bytes], str | bytes], ImageFile.ImageFile]
+        | type[ImageFile.ImageFile]
+    ),
+    accept: Callable[[bytes], bool | str] | None = None,
+) -> None:
     """
     Register an image file plugin.  This function should not be used
     in application code.
@@ -3431,7 +3665,7 @@ def register_open(id, factory, accept=None) -> None:
     OPEN[id] = factory, accept
 
 
-def register_mime(id, mimetype):
+def register_mime(id: str, mimetype: str) -> None:
     """
     Registers an image MIME type by populating ``Image.MIME``. This function
     should not be used in application code.
@@ -3446,7 +3680,9 @@ def register_mime(id, mimetype):
     MIME[id.upper()] = mimetype
 
 
-def register_save(id, driver):
+def register_save(
+    id: str, driver: Callable[[Image, IO[bytes], str | bytes], None]
+) -> None:
     """
     Registers an image save function.  This function should not be
     used in application code.
@@ -3457,7 +3693,9 @@ def register_save(id, driver):
     SAVE[id.upper()] = driver
 
 
-def register_save_all(id, driver):
+def register_save_all(
+    id: str, driver: Callable[[Image, IO[bytes], str | bytes], None]
+) -> None:
     """
     Registers an image function to save all the frames
     of a multiframe format.  This function should not be
@@ -3469,7 +3707,7 @@ def register_save_all(id, driver):
     SAVE_ALL[id.upper()] = driver
 
 
-def register_extension(id, extension) -> None:
+def register_extension(id: str, extension: str) -> None:
     """
     Registers an image extension.  This function should not be
     used in application code.
@@ -3480,7 +3718,7 @@ def register_extension(id, extension) -> None:
     EXTENSION[extension.lower()] = id.upper()
 
 
-def register_extensions(id, extensions):
+def register_extensions(id: str, extensions: list[str]) -> None:
     """
     Registers image extensions.  This function should not be
     used in application code.
@@ -3492,7 +3730,7 @@ def register_extensions(id, extensions):
         register_extension(id, extension)
 
 
-def registered_extensions():
+def registered_extensions() -> dict[str, str]:
     """
     Returns a dictionary containing all file extensions belonging
     to registered plugins
@@ -3501,28 +3739,26 @@ def registered_extensions():
     return EXTENSION
 
 
-def register_decoder(name, decoder):
+def register_decoder(name: str, decoder: type[ImageFile.PyDecoder]) -> None:
     """
     Registers an image decoder.  This function should not be
     used in application code.
 
     :param name: The name of the decoder
-    :param decoder: A callable(mode, args) that returns an
-                    ImageFile.PyDecoder object
+    :param decoder: An ImageFile.PyDecoder object
 
     .. versionadded:: 4.1.0
     """
     DECODERS[name] = decoder
 
 
-def register_encoder(name, encoder):
+def register_encoder(name: str, encoder: type[ImageFile.PyEncoder]) -> None:
     """
     Registers an image encoder.  This function should not be
     used in application code.
 
     :param name: The name of the encoder
-    :param encoder: A callable(mode, args) that returns an
-                    ImageFile.PyEncoder object
+    :param encoder: An ImageFile.PyEncoder object
 
     .. versionadded:: 4.1.0
     """
@@ -3533,7 +3769,7 @@ def register_encoder(name, encoder):
 # Simple display support.
 
 
-def _show(image, **options):
+def _show(image: Image, **options: Any) -> None:
     from . import ImageShow
 
     ImageShow.show(image, **options)
@@ -3543,7 +3779,9 @@ def _show(image, **options):
 # Effects
 
 
-def effect_mandelbrot(size, extent, quality):
+def effect_mandelbrot(
+    size: tuple[int, int], extent: tuple[float, float, float, float], quality: int
+) -> Image:
     """
     Generate a Mandelbrot set covering the given extent.
 
@@ -3556,7 +3794,7 @@ def effect_mandelbrot(size, extent, quality):
     return Image()._new(core.effect_mandelbrot(size, extent, quality))
 
 
-def effect_noise(size, sigma):
+def effect_noise(size: tuple[int, int], sigma: float) -> Image:
     """
     Generate Gaussian noise centered around 128.
 
@@ -3567,7 +3805,7 @@ def effect_noise(size, sigma):
     return Image()._new(core.effect_noise(size, sigma))
 
 
-def linear_gradient(mode):
+def linear_gradient(mode: str) -> Image:
     """
     Generate 256x256 linear gradient from black to white, top to bottom.
 
@@ -3576,7 +3814,7 @@ def linear_gradient(mode):
     return Image()._new(core.linear_gradient(mode))
 
 
-def radial_gradient(mode):
+def radial_gradient(mode: str) -> Image:
     """
     Generate 256x256 radial gradient from black to white, centre to edge.
 
@@ -3589,19 +3827,18 @@ def radial_gradient(mode):
 # Resources
 
 
-def _apply_env_variables(env=None):
-    if env is None:
-        env = os.environ
+def _apply_env_variables(env: dict[str, str] | None = None) -> None:
+    env_dict = env if env is not None else os.environ
 
     for var_name, setter in [
         ("PILLOW_ALIGNMENT", core.set_alignment),
         ("PILLOW_BLOCK_SIZE", core.set_block_size),
         ("PILLOW_BLOCKS_MAX", core.set_blocks_max),
     ]:
-        if var_name not in env:
+        if var_name not in env_dict:
             continue
 
-        var = env[var_name].lower()
+        var = env_dict[var_name].lower()
 
         units = 1
         for postfix, mul in [("k", 1024), ("m", 1024 * 1024)]:
@@ -3610,13 +3847,13 @@ def _apply_env_variables(env=None):
                 var = var[: -len(postfix)]
 
         try:
-            var = int(var) * units
+            var_int = int(var) * units
         except ValueError:
             warnings.warn(f"{var_name} is not int")
             continue
 
         try:
-            setter(var)
+            setter(var_int)
         except ValueError as e:
             warnings.warn(f"{var_name}: {e}")
 
@@ -3625,7 +3862,13 @@ def _apply_env_variables(env=None):
 atexit.register(core.clear_cache)
 
 
-class Exif(MutableMapping):
+if TYPE_CHECKING:
+    _ExifBase = MutableMapping[int, Any]
+else:
+    _ExifBase = MutableMapping
+
+
+class Exif(_ExifBase):
     """
     This class provides read and write access to EXIF image data::
 
@@ -3659,17 +3902,18 @@ class Exif(MutableMapping):
       print(gps_ifd[ExifTags.GPS.GPSDateStamp])  # 1999:99:99 99:99:99
     """
 
-    endian = None
+    endian: str | None = None
     bigtiff = False
+    _loaded = False
 
-    def __init__(self):
-        self._data = {}
-        self._hidden_data = {}
-        self._ifds = {}
-        self._info = None
-        self._loaded_exif = None
+    def __init__(self) -> None:
+        self._data: dict[int, Any] = {}
+        self._hidden_data: dict[int, Any] = {}
+        self._ifds: dict[int, dict[int, Any]] = {}
+        self._info: TiffImagePlugin.ImageFileDirectory_v2 | None = None
+        self._loaded_exif: bytes | None = None
 
-    def _fixup(self, value):
+    def _fixup(self, value: Any) -> Any:
         try:
             if len(value) == 1 and isinstance(value, tuple):
                 return value[0]
@@ -3677,26 +3921,28 @@ def _fixup(self, value):
             pass
         return value
 
-    def _fixup_dict(self, src_dict):
+    def _fixup_dict(self, src_dict: dict[int, Any]) -> dict[int, Any]:
         # Helper function
         # returns a dict with any single item tuples/lists as individual values
         return {k: self._fixup(v) for k, v in src_dict.items()}
 
-    def _get_ifd_dict(self, offset):
+    def _get_ifd_dict(
+        self, offset: int, group: int | None = None
+    ) -> dict[int, Any] | None:
         try:
             # an offset pointer to the location of the nested embedded IFD.
             # It should be a long, but may be corrupted.
             self.fp.seek(offset)
         except (KeyError, TypeError):
-            pass
+            return None
         else:
             from . import TiffImagePlugin
 
-            info = TiffImagePlugin.ImageFileDirectory_v2(self.head)
+            info = TiffImagePlugin.ImageFileDirectory_v2(self.head, group=group)
             info.load(self.fp)
-            return self._fixup_dict(info)
+            return self._fixup_dict(dict(info))
 
-    def _get_head(self):
+    def _get_head(self) -> bytes:
         version = b"\x2B" if self.bigtiff else b"\x2A"
         if self.endian == "<":
             head = b"II" + version + b"\x00" + o32le(8)
@@ -3707,7 +3953,7 @@ def _get_head(self):
             head += b"\x00\x00\x00\x00"
         return head
 
-    def load(self, data):
+    def load(self, data: bytes) -> None:
         # Extract EXIF information.  This is highly experimental,
         # and is likely to be replaced with something better in a future
         # version.
@@ -3720,13 +3966,13 @@ def load(self, data):
         self._data.clear()
         self._hidden_data.clear()
         self._ifds.clear()
-        if data and data.startswith(b"Exif\x00\x00"):
+        while data and data.startswith(b"Exif\x00\x00"):
             data = data[6:]
         if not data:
             self._info = None
             return
 
-        self.fp = io.BytesIO(data)
+        self.fp: IO[bytes] = io.BytesIO(data)
         self.head = self.fp.read(8)
         # process dictionary
         from . import TiffImagePlugin
@@ -3736,7 +3982,7 @@ def load(self, data):
         self.fp.seek(self._info.next)
         self._info.load(self.fp)
 
-    def load_from_fp(self, fp, offset=None):
+    def load_from_fp(self, fp: IO[bytes], offset: int | None = None) -> None:
         self._loaded_exif = None
         self._data.clear()
         self._hidden_data.clear()
@@ -3759,24 +4005,24 @@ def load_from_fp(self, fp, offset=None):
         self.fp.seek(offset)
         self._info.load(self.fp)
 
-    def _get_merged_dict(self):
+    def _get_merged_dict(self) -> dict[int, Any]:
         merged_dict = dict(self)
 
         # get EXIF extension
         if ExifTags.IFD.Exif in self:
-            ifd = self._get_ifd_dict(self[ExifTags.IFD.Exif])
+            ifd = self._get_ifd_dict(self[ExifTags.IFD.Exif], ExifTags.IFD.Exif)
             if ifd:
                 merged_dict.update(ifd)
 
         # GPS
         if ExifTags.IFD.GPSInfo in self:
             merged_dict[ExifTags.IFD.GPSInfo] = self._get_ifd_dict(
-                self[ExifTags.IFD.GPSInfo]
+                self[ExifTags.IFD.GPSInfo], ExifTags.IFD.GPSInfo
             )
 
         return merged_dict
 
-    def tobytes(self, offset=8):
+    def tobytes(self, offset: int = 8) -> bytes:
         from . import TiffImagePlugin
 
         head = self._get_head()
@@ -3797,15 +4043,19 @@ def tobytes(self, offset=8):
             ifd[tag] = value
         return b"Exif\x00\x00" + head + ifd.tobytes(offset)
 
-    def get_ifd(self, tag):
+    def get_ifd(self, tag: int) -> dict[int, Any]:
         if tag not in self._ifds:
             if tag == ExifTags.IFD.IFD1:
                 if self._info is not None and self._info.next != 0:
-                    self._ifds[tag] = self._get_ifd_dict(self._info.next)
+                    ifd = self._get_ifd_dict(self._info.next)
+                    if ifd is not None:
+                        self._ifds[tag] = ifd
             elif tag in [ExifTags.IFD.Exif, ExifTags.IFD.GPSInfo]:
                 offset = self._hidden_data.get(tag, self.get(tag))
                 if offset is not None:
-                    self._ifds[tag] = self._get_ifd_dict(offset)
+                    ifd = self._get_ifd_dict(offset, tag)
+                    if ifd is not None:
+                        self._ifds[tag] = ifd
             elif tag in [ExifTags.IFD.Interop, ExifTags.IFD.Makernote]:
                 if ExifTags.IFD.Exif not in self._ifds:
                     self.get_ifd(ExifTags.IFD.Exif)
@@ -3862,7 +4112,9 @@ def get_ifd(self, tag):
                                 (offset,) = struct.unpack(">L", data)
                                 self.fp.seek(offset)
 
-                                camerainfo = {"ModelID": self.fp.read(4)}
+                                camerainfo: dict[str, int | bytes] = {
+                                    "ModelID": self.fp.read(4)
+                                }
 
                                 self.fp.read(4)
                                 # Seconds since 2000
@@ -3878,17 +4130,19 @@ def get_ifd(self, tag):
                                 ][1]
                                 camerainfo["Parallax"] = handler(
                                     ImageFileDirectory_v2(), parallax, False
-                                )
+                                )[0]
 
                                 self.fp.read(4)
                                 camerainfo["Category"] = self.fp.read(2)
 
-                                makernote = {0x1101: dict(self._fixup_dict(camerainfo))}
+                                makernote = {0x1101: camerainfo}
                         self._ifds[tag] = makernote
                 else:
                     # Interop
-                    self._ifds[tag] = self._get_ifd_dict(tag_data)
-        ifd = self._ifds.get(tag, {})
+                    ifd = self._get_ifd_dict(tag_data, tag)
+                    if ifd is not None:
+                        self._ifds[tag] = ifd
+        ifd = self._ifds.setdefault(tag, {})
         if tag == ExifTags.IFD.Exif and self._hidden_data:
             ifd = {
                 k: v
@@ -3897,13 +4151,13 @@ def get_ifd(self, tag):
             }
         return ifd
 
-    def hide_offsets(self):
+    def hide_offsets(self) -> None:
         for tag in (ExifTags.IFD.Exif, ExifTags.IFD.GPSInfo):
             if tag in self:
                 self._hidden_data[tag] = self[tag]
                 del self[tag]
 
-    def __str__(self):
+    def __str__(self) -> str:
         if self._info is not None:
             # Load all keys into self._data
             for tag in self._info:
@@ -3911,33 +4165,33 @@ def __str__(self):
 
         return str(self._data)
 
-    def __len__(self):
+    def __len__(self) -> int:
         keys = set(self._data)
         if self._info is not None:
             keys.update(self._info)
         return len(keys)
 
-    def __getitem__(self, tag):
+    def __getitem__(self, tag: int) -> Any:
         if self._info is not None and tag not in self._data and tag in self._info:
             self._data[tag] = self._fixup(self._info[tag])
             del self._info[tag]
         return self._data[tag]
 
-    def __contains__(self, tag):
+    def __contains__(self, tag: object) -> bool:
         return tag in self._data or (self._info is not None and tag in self._info)
 
-    def __setitem__(self, tag, value):
+    def __setitem__(self, tag: int, value: Any) -> None:
         if self._info is not None and tag in self._info:
             del self._info[tag]
         self._data[tag] = value
 
-    def __delitem__(self, tag):
+    def __delitem__(self, tag: int) -> None:
         if self._info is not None and tag in self._info:
             del self._info[tag]
         else:
             del self._data[tag]
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[int]:
         keys = set(self._data)
         if self._info is not None:
             keys.update(self._info)
diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py
index 643fce830ba..fdfbee78974 100644
--- a/src/PIL/ImageCms.py
+++ b/src/PIL/ImageCms.py
@@ -4,6 +4,9 @@
 # Optional color management support, based on Kevin Cazabon's PyCMS
 # library.
 
+# Originally released under LGPL.  Graciously donated to PIL in
+# March 2009, for distribution under the standard PIL license
+
 # History:
 
 # 2009-03-08 fl   Added to PIL.
@@ -16,21 +19,30 @@
 # below for the original description.
 from __future__ import annotations
 
+import operator
 import sys
-from enum import IntEnum
+from enum import IntEnum, IntFlag
+from functools import reduce
+from typing import Any, Literal, SupportsFloat, SupportsInt, Union
 
-from . import Image
+from . import Image, __version__
+from ._deprecate import deprecate
+from ._typing import SupportsRead
 
 try:
-    from . import _imagingcms
+    from . import _imagingcms as core
+
+    _CmsProfileCompatible = Union[
+        str, SupportsRead[bytes], core.CmsProfile, "ImageCmsProfile"
+    ]
 except ImportError as ex:
     # Allow error import for doc purposes, but error out when accessing
     # anything in core.
     from ._util import DeferredError
 
-    _imagingcms = DeferredError.new(ex)
+    core = DeferredError.new(ex)
 
-DESCRIPTION = """
+_DESCRIPTION = """
 pyCMS
 
     a Python / PIL interface to the littleCMS ICC Color Management System
@@ -93,11 +105,25 @@
 
 """
 
-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)
+
 
 # --------------------------------------------------------------------.
 
-core = _imagingcms
 
 #
 # intent/direction values
@@ -119,7 +145,70 @@ class Direction(IntEnum):
 #
 # flags
 
-FLAGS = {
+
+class Flags(IntFlag):
+    """Flags and documentation are taken from ``lcms2.h``."""
+
+    NONE = 0
+    NOCACHE = 0x0040
+    """Inhibit 1-pixel cache"""
+    NOOPTIMIZE = 0x0100
+    """Inhibit optimizations"""
+    NULLTRANSFORM = 0x0200
+    """Don't transform anyway"""
+    GAMUTCHECK = 0x1000
+    """Out of Gamut alarm"""
+    SOFTPROOFING = 0x4000
+    """Do softproofing"""
+    BLACKPOINTCOMPENSATION = 0x2000
+    NOWHITEONWHITEFIXUP = 0x0004
+    """Don't fix scum dot"""
+    HIGHRESPRECALC = 0x0400
+    """Use more memory to give better accuracy"""
+    LOWRESPRECALC = 0x0800
+    """Use less memory to minimize resources"""
+    # this should be 8BITS_DEVICELINK, but that is not a valid name in Python:
+    USE_8BITS_DEVICELINK = 0x0008
+    """Create 8 bits devicelinks"""
+    GUESSDEVICECLASS = 0x0020
+    """Guess device class (for ``transform2devicelink``)"""
+    KEEP_SEQUENCE = 0x0080
+    """Keep profile sequence for devicelink creation"""
+    FORCE_CLUT = 0x0002
+    """Force CLUT optimization"""
+    CLUT_POST_LINEARIZATION = 0x0001
+    """create postlinearization tables if possible"""
+    CLUT_PRE_LINEARIZATION = 0x0010
+    """create prelinearization tables if possible"""
+    NONEGATIVES = 0x8000
+    """Prevent negative numbers in floating point transforms"""
+    COPY_ALPHA = 0x04000000
+    """Alpha channels are copied on ``cmsDoTransform()``"""
+    NODEFAULTRESOURCEDEF = 0x01000000
+
+    _GRIDPOINTS_1 = 1 << 16
+    _GRIDPOINTS_2 = 2 << 16
+    _GRIDPOINTS_4 = 4 << 16
+    _GRIDPOINTS_8 = 8 << 16
+    _GRIDPOINTS_16 = 16 << 16
+    _GRIDPOINTS_32 = 32 << 16
+    _GRIDPOINTS_64 = 64 << 16
+    _GRIDPOINTS_128 = 128 << 16
+
+    @staticmethod
+    def GRIDPOINTS(n: int) -> Flags:
+        """
+        Fine-tune control over number of gridpoints
+
+        :param n: :py:class:`int` in range ``0 <= n <= 255``
+        """
+        return Flags.NONE | ((n & 0xFF) << 16)
+
+
+_MAX_FLAG = reduce(operator.or_, Flags)
+
+
+_FLAGS = {
     "MATRIXINPUT": 1,
     "MATRIXOUTPUT": 2,
     "MATRIXONLY": (1 | 2),
@@ -142,11 +231,6 @@ class Direction(IntEnum):
     "GRIDPOINTS": lambda n: (n & 0xFF) << 16,  # Gridpoints
 }
 
-_MAX_FLAG = 0
-for flag in FLAGS.values():
-    if isinstance(flag, int):
-        _MAX_FLAG = _MAX_FLAG | flag
-
 
 # --------------------------------------------------------------------.
 # Experimental PIL-level API
@@ -157,7 +241,7 @@ class Direction(IntEnum):
 
 
 class ImageCmsProfile:
-    def __init__(self, profile):
+    def __init__(self, profile: str | SupportsRead[bytes] | core.CmsProfile) -> None:
         """
         :param profile: Either a string representing a filename,
             a file like object containing a profile or a
@@ -177,19 +261,19 @@ def __init__(self, profile):
             self._set(core.profile_open(profile), profile)
         elif hasattr(profile, "read"):
             self._set(core.profile_frombytes(profile.read()))
-        elif isinstance(profile, _imagingcms.CmsProfile):
+        elif isinstance(profile, core.CmsProfile):
             self._set(profile)
         else:
-            msg = "Invalid type for Profile"
+            msg = "Invalid type for Profile"  # type: ignore[unreachable]
             raise TypeError(msg)
 
-    def _set(self, profile, filename=None):
+    def _set(self, profile: core.CmsProfile, filename: str | None = None) -> None:
         self.profile = profile
         self.filename = filename
         self.product_name = None  # profile.product_name
         self.product_info = None  # profile.product_info
 
-    def tobytes(self):
+    def tobytes(self) -> bytes:
         """
         Returns the profile in a format suitable for embedding in
         saved images.
@@ -201,7 +285,6 @@ def tobytes(self):
 
 
 class ImageCmsTransform(Image.ImagePointHandler):
-
     """
     Transform.  This can be used with the procedural API, or with the standard
     :py:func:`~PIL.Image.Image.point` method.
@@ -211,15 +294,40 @@ class ImageCmsTransform(Image.ImagePointHandler):
 
     def __init__(
         self,
-        input,
-        output,
-        input_mode,
-        output_mode,
-        intent=Intent.PERCEPTUAL,
-        proof=None,
-        proof_intent=Intent.ABSOLUTE_COLORIMETRIC,
-        flags=0,
+        input: ImageCmsProfile,
+        output: ImageCmsProfile,
+        input_mode: str,
+        output_mode: str,
+        intent: Intent = Intent.PERCEPTUAL,
+        proof: ImageCmsProfile | None = None,
+        proof_intent: Intent = Intent.ABSOLUTE_COLORIMETRIC,
+        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:
             self.transform = core.buildTransform(
                 input.profile, output.profile, input_mode, output_mode, intent, flags
@@ -241,28 +349,26 @@ def __init__(
 
         self.output_profile = output
 
-    def point(self, im):
+    def point(self, im: Image.Image) -> Image.Image:
         return self.apply(im)
 
-    def apply(self, im, imOut=None):
-        im.load()
+    def apply(self, im: Image.Image, imOut: Image.Image | None = None) -> Image.Image:
         if imOut is None:
             imOut = Image.new(self.output_mode, im.size, None)
-        self.transform.apply(im.im.id, imOut.im.id)
+        self.transform.apply(im.getim(), imOut.getim())
         imOut.info["icc_profile"] = self.output_profile.tobytes()
         return imOut
 
-    def apply_in_place(self, im):
-        im.load()
+    def apply_in_place(self, im: Image.Image) -> Image.Image:
         if im.mode != self.output_mode:
             msg = "mode mismatch"
             raise ValueError(msg)  # wrong output mode
-        self.transform.apply(im.im.id, im.im.id)
+        self.transform.apply(im.getim(), im.getim())
         im.info["icc_profile"] = self.output_profile.tobytes()
         return im
 
 
-def get_display_profile(handle=None):
+def get_display_profile(handle: SupportsInt | None = None) -> ImageCmsProfile | None:
     """
     (experimental) Fetches the profile for the current display device.
 
@@ -272,12 +378,12 @@ def get_display_profile(handle=None):
     if sys.platform != "win32":
         return None
 
-    from . import ImageWin
+    from . import ImageWin  # type: ignore[unused-ignore, unreachable]
 
     if isinstance(handle, ImageWin.HDC):
-        profile = core.get_display_profile_win32(handle, 1)
+        profile = core.get_display_profile_win32(int(handle), 1)
     else:
-        profile = core.get_display_profile_win32(handle or 0)
+        profile = core.get_display_profile_win32(int(handle or 0))
     if profile is None:
         return None
     return ImageCmsProfile(profile)
@@ -289,7 +395,6 @@ def get_display_profile(handle=None):
 
 
 class PyCMSError(Exception):
-
     """(pyCMS) Exception class.
     This is used for all errors in the pyCMS API."""
 
@@ -297,14 +402,14 @@ class PyCMSError(Exception):
 
 
 def profileToProfile(
-    im,
-    inputProfile,
-    outputProfile,
-    renderingIntent=Intent.PERCEPTUAL,
-    outputMode=None,
-    inPlace=False,
-    flags=0,
-):
+    im: Image.Image,
+    inputProfile: _CmsProfileCompatible,
+    outputProfile: _CmsProfileCompatible,
+    renderingIntent: Intent = Intent.PERCEPTUAL,
+    outputMode: str | None = None,
+    inPlace: bool = False,
+    flags: Flags = Flags.NONE,
+) -> Image.Image | None:
     """
     (pyCMS) Applies an ICC transformation to a given image, mapping from
     ``inputProfile`` to ``outputProfile``.
@@ -392,7 +497,9 @@ def profileToProfile(
     return imOut
 
 
-def getOpenProfile(profileFilename):
+def getOpenProfile(
+    profileFilename: str | SupportsRead[bytes] | core.CmsProfile,
+) -> ImageCmsProfile:
     """
     (pyCMS) Opens an ICC profile file.
 
@@ -415,13 +522,13 @@ def getOpenProfile(profileFilename):
 
 
 def buildTransform(
-    inputProfile,
-    outputProfile,
-    inMode,
-    outMode,
-    renderingIntent=Intent.PERCEPTUAL,
-    flags=0,
-):
+    inputProfile: _CmsProfileCompatible,
+    outputProfile: _CmsProfileCompatible,
+    inMode: str,
+    outMode: str,
+    renderingIntent: Intent = Intent.PERCEPTUAL,
+    flags: Flags = Flags.NONE,
+) -> ImageCmsTransform:
     """
     (pyCMS) Builds an ICC transform mapping from the ``inputProfile`` to the
     ``outputProfile``. Use applyTransform to apply the transform to a given
@@ -482,7 +589,7 @@ def buildTransform(
         raise PyCMSError(msg)
 
     if not isinstance(flags, int) or not (0 <= flags <= _MAX_FLAG):
-        msg = "flags must be an integer between 0 and %s" + _MAX_FLAG
+        msg = f"flags must be an integer between 0 and {_MAX_FLAG}"
         raise PyCMSError(msg)
 
     try:
@@ -498,15 +605,15 @@ def buildTransform(
 
 
 def buildProofTransform(
-    inputProfile,
-    outputProfile,
-    proofProfile,
-    inMode,
-    outMode,
-    renderingIntent=Intent.PERCEPTUAL,
-    proofRenderingIntent=Intent.ABSOLUTE_COLORIMETRIC,
-    flags=FLAGS["SOFTPROOFING"],
-):
+    inputProfile: _CmsProfileCompatible,
+    outputProfile: _CmsProfileCompatible,
+    proofProfile: _CmsProfileCompatible,
+    inMode: str,
+    outMode: str,
+    renderingIntent: Intent = Intent.PERCEPTUAL,
+    proofRenderingIntent: Intent = Intent.ABSOLUTE_COLORIMETRIC,
+    flags: Flags = Flags.SOFTPROOFING,
+) -> ImageCmsTransform:
     """
     (pyCMS) Builds an ICC transform mapping from the ``inputProfile`` to the
     ``outputProfile``, but tries to simulate the result that would be
@@ -586,7 +693,7 @@ def buildProofTransform(
         raise PyCMSError(msg)
 
     if not isinstance(flags, int) or not (0 <= flags <= _MAX_FLAG):
-        msg = "flags must be an integer between 0 and %s" + _MAX_FLAG
+        msg = f"flags must be an integer between 0 and {_MAX_FLAG}"
         raise PyCMSError(msg)
 
     try:
@@ -614,16 +721,18 @@ def buildProofTransform(
 buildProofTransformFromOpenProfiles = buildProofTransform
 
 
-def applyTransform(im, transform, inPlace=False):
+def applyTransform(
+    im: Image.Image, transform: ImageCmsTransform, inPlace: bool = False
+) -> Image.Image | None:
     """
     (pyCMS) Applies a transform to a given image.
 
-    If ``im.mode != transform.inMode``, a :exc:`PyCMSError` is raised.
+    If ``im.mode != transform.input_mode``, a :exc:`PyCMSError` is raised.
 
-    If ``inPlace`` is ``True`` and ``transform.inMode != transform.outMode``, a
+    If ``inPlace`` is ``True`` and ``transform.input_mode != transform.output_mode``, a
     :exc:`PyCMSError` is raised.
 
-    If ``im.mode``, ``transform.inMode`` or ``transform.outMode`` is not
+    If ``im.mode``, ``transform.input_mode`` or ``transform.output_mode`` is not
     supported by pyCMSdll or the profiles you used for the transform, a
     :exc:`PyCMSError` is raised.
 
@@ -637,13 +746,13 @@ def applyTransform(im, transform, inPlace=False):
 
     If you want to modify im in-place instead of receiving a new image as
     the return value, set ``inPlace`` to ``True``.  This can only be done if
-    ``transform.inMode`` and ``transform.outMode`` are the same, because we can't
-    change the mode in-place (the buffer sizes for some modes are
+    ``transform.input_mode`` and ``transform.output_mode`` are the same, because we
+    can't change the mode in-place (the buffer sizes for some modes are
     different).  The default behavior is to return a new :py:class:`~PIL.Image.Image`
-    object of the same dimensions in mode ``transform.outMode``.
+    object of the same dimensions in mode ``transform.output_mode``.
 
-    :param im: An :py:class:`~PIL.Image.Image` object, and im.mode must be the same
-        as the ``inMode`` supported by the transform.
+    :param im: An :py:class:`~PIL.Image.Image` object, and ``im.mode`` must be the same
+        as the ``input_mode`` supported by the transform.
     :param transform: A valid CmsTransform class object
     :param inPlace: Bool.  If ``True``, ``im`` is modified in place and ``None`` is
         returned, if ``False``, a new :py:class:`~PIL.Image.Image` object with the
@@ -667,7 +776,9 @@ def applyTransform(im, transform, inPlace=False):
     return imOut
 
 
-def createProfile(colorSpace, colorTemp=-1):
+def createProfile(
+    colorSpace: Literal["LAB", "XYZ", "sRGB"], colorTemp: SupportsFloat = 0
+) -> core.CmsProfile:
     """
     (pyCMS) Creates a profile.
 
@@ -689,7 +800,7 @@ def createProfile(colorSpace, colorTemp=-1):
     :param colorSpace: String, the color space of the profile you wish to
         create.
         Currently only "LAB", "XYZ", and "sRGB" are supported.
-    :param colorTemp: Positive integer for the white point for the profile, in
+    :param colorTemp: Positive number for the white point for the profile, in
         degrees Kelvin (i.e. 5000, 6500, 9600, etc.).  The default is for D50
         illuminant if omitted (5000k).  colorTemp is ONLY applied to LAB
         profiles, and is ignored for XYZ and sRGB.
@@ -716,7 +827,7 @@ def createProfile(colorSpace, colorTemp=-1):
         raise PyCMSError(v) from v
 
 
-def getProfileName(profile):
+def getProfileName(profile: _CmsProfileCompatible) -> str:
     """
 
     (pyCMS) Gets the internal product name for the given profile.
@@ -750,15 +861,15 @@ def getProfileName(profile):
 
         if not (model or manufacturer):
             return (profile.profile.profile_description or "") + "\n"
-        if not manufacturer or len(model) > 30:
-            return model + "\n"
+        if not manufacturer or (model and len(model) > 30):
+            return f"{model}\n"
         return f"{model} - {manufacturer}\n"
 
     except (AttributeError, OSError, TypeError, ValueError) as v:
         raise PyCMSError(v) from v
 
 
-def getProfileInfo(profile):
+def getProfileInfo(profile: _CmsProfileCompatible) -> str:
     """
     (pyCMS) Gets the internal product information for the given profile.
 
@@ -795,7 +906,7 @@ def getProfileInfo(profile):
         raise PyCMSError(v) from v
 
 
-def getProfileCopyright(profile):
+def getProfileCopyright(profile: _CmsProfileCompatible) -> str:
     """
     (pyCMS) Gets the copyright for the given profile.
 
@@ -823,7 +934,7 @@ def getProfileCopyright(profile):
         raise PyCMSError(v) from v
 
 
-def getProfileManufacturer(profile):
+def getProfileManufacturer(profile: _CmsProfileCompatible) -> str:
     """
     (pyCMS) Gets the manufacturer for the given profile.
 
@@ -851,7 +962,7 @@ def getProfileManufacturer(profile):
         raise PyCMSError(v) from v
 
 
-def getProfileModel(profile):
+def getProfileModel(profile: _CmsProfileCompatible) -> str:
     """
     (pyCMS) Gets the model for the given profile.
 
@@ -880,7 +991,7 @@ def getProfileModel(profile):
         raise PyCMSError(v) from v
 
 
-def getProfileDescription(profile):
+def getProfileDescription(profile: _CmsProfileCompatible) -> str:
     """
     (pyCMS) Gets the description for the given profile.
 
@@ -909,7 +1020,7 @@ def getProfileDescription(profile):
         raise PyCMSError(v) from v
 
 
-def getDefaultIntent(profile):
+def getDefaultIntent(profile: _CmsProfileCompatible) -> int:
     """
     (pyCMS) Gets the default intent name for the given profile.
 
@@ -948,7 +1059,9 @@ def getDefaultIntent(profile):
         raise PyCMSError(v) from v
 
 
-def isIntentSupported(profile, intent, direction):
+def isIntentSupported(
+    profile: _CmsProfileCompatible, intent: Intent, direction: Direction
+) -> Literal[-1, 1]:
     """
     (pyCMS) Checks if a given intent is supported.
 
@@ -999,9 +1112,14 @@ def isIntentSupported(profile, intent, direction):
         raise PyCMSError(v) from v
 
 
-def versions():
+def versions() -> tuple[str, str | None, str, str]:
     """
     (pyCMS) Fetches versions.
     """
 
-    return VERSION, core.littlecms_version, sys.version.split()[0], Image.__version__
+    deprecate(
+        "PIL.ImageCms.versions()",
+        12,
+        '(PIL.features.version("littlecms2"), sys.version, PIL.__version__)',
+    )
+    return _VERSION, core.littlecms_version, sys.version.split()[0], __version__
diff --git a/src/PIL/ImageColor.py b/src/PIL/ImageColor.py
index ad59b066779..9a15a8eb759 100644
--- a/src/PIL/ImageColor.py
+++ b/src/PIL/ImageColor.py
@@ -25,7 +25,7 @@
 
 
 @lru_cache
-def getrgb(color):
+def getrgb(color: str) -> tuple[int, int, int] | tuple[int, int, int, int]:
     """
      Convert a color string to an RGB or RGBA tuple. If the string cannot be
      parsed, this function raises a :py:exc:`ValueError` exception.
@@ -44,8 +44,10 @@ def getrgb(color):
     if rgb:
         if isinstance(rgb, tuple):
             return rgb
-        colormap[color] = rgb = getrgb(rgb)
-        return rgb
+        rgb_tuple = getrgb(rgb)
+        assert len(rgb_tuple) == 3
+        colormap[color] = rgb_tuple
+        return rgb_tuple
 
     # check for known string formats
     if re.match("#[a-f0-9]{3}$", color):
@@ -88,15 +90,15 @@ def getrgb(color):
     if m:
         from colorsys import hls_to_rgb
 
-        rgb = hls_to_rgb(
+        rgb_floats = hls_to_rgb(
             float(m.group(1)) / 360.0,
             float(m.group(3)) / 100.0,
             float(m.group(2)) / 100.0,
         )
         return (
-            int(rgb[0] * 255 + 0.5),
-            int(rgb[1] * 255 + 0.5),
-            int(rgb[2] * 255 + 0.5),
+            int(rgb_floats[0] * 255 + 0.5),
+            int(rgb_floats[1] * 255 + 0.5),
+            int(rgb_floats[2] * 255 + 0.5),
         )
 
     m = re.match(
@@ -105,15 +107,15 @@ def getrgb(color):
     if m:
         from colorsys import hsv_to_rgb
 
-        rgb = hsv_to_rgb(
+        rgb_floats = hsv_to_rgb(
             float(m.group(1)) / 360.0,
             float(m.group(2)) / 100.0,
             float(m.group(3)) / 100.0,
         )
         return (
-            int(rgb[0] * 255 + 0.5),
-            int(rgb[1] * 255 + 0.5),
-            int(rgb[2] * 255 + 0.5),
+            int(rgb_floats[0] * 255 + 0.5),
+            int(rgb_floats[1] * 255 + 0.5),
+            int(rgb_floats[2] * 255 + 0.5),
         )
 
     m = re.match(r"rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$", color)
@@ -124,7 +126,7 @@ def getrgb(color):
 
 
 @lru_cache
-def getcolor(color, mode):
+def getcolor(color: str, mode: str) -> int | tuple[int, ...]:
     """
     Same as :py:func:`~PIL.ImageColor.getrgb` for most modes. However, if
     ``mode`` is HSV, converts the RGB value to a HSV value, or if ``mode`` is
@@ -136,33 +138,34 @@ def getcolor(color, mode):
 
     :param color: A color string
     :param mode: Convert result to this mode
-    :return: ``(graylevel[, alpha]) or (red, green, blue[, alpha])``
+    :return: ``graylevel, (graylevel, alpha) or (red, green, blue[, alpha])``
     """
     # same as getrgb, but converts the result to the given mode
-    color, alpha = getrgb(color), 255
-    if len(color) == 4:
-        color, alpha = color[:3], color[3]
+    rgb, alpha = getrgb(color), 255
+    if len(rgb) == 4:
+        alpha = rgb[3]
+        rgb = rgb[:3]
 
     if mode == "HSV":
         from colorsys import rgb_to_hsv
 
-        r, g, b = color
+        r, g, b = rgb
         h, s, v = rgb_to_hsv(r / 255, g / 255, b / 255)
         return int(h * 255), int(s * 255), int(v * 255)
     elif Image.getmodebase(mode) == "L":
-        r, g, b = color
+        r, g, b = rgb
         # ITU-R Recommendation 601-2 for nonlinear RGB
         # scaled to 24 bits to match the convert's implementation.
-        color = (r * 19595 + g * 38470 + b * 7471 + 0x8000) >> 16
+        graylevel = (r * 19595 + g * 38470 + b * 7471 + 0x8000) >> 16
         if mode[-1] == "A":
-            return color, alpha
-    else:
-        if mode[-1] == "A":
-            return color + (alpha,)
-    return color
+            return graylevel, alpha
+        return graylevel
+    elif mode[-1] == "A":
+        return rgb + (alpha,)
+    return rgb
 
 
-colormap = {
+colormap: dict[str, str | tuple[int, int, int]] = {
     # X11 colour table from https://drafts.csswg.org/css-color-4/, with
     # gray/grey spelling issues fixed.  This is a superset of HTML 4.0
     # colour names used in CSS 1.
diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py
index 84665f54fff..d8e4c0c60de 100644
--- a/src/PIL/ImageDraw.py
+++ b/src/PIL/ImageDraw.py
@@ -32,10 +32,26 @@
 from __future__ import annotations
 
 import math
-import numbers
 import struct
+from collections.abc import Sequence
+from types import ModuleType
+from typing import TYPE_CHECKING, Any, AnyStr, Callable, Union, cast
 
 from . import Image, ImageColor
+from ._deprecate import deprecate
+from ._typing import Coords
+
+# experimental access to the outline API
+Outline: Callable[[], Image.core._Outline] | None
+try:
+    Outline = Image.core.outline
+except AttributeError:
+    Outline = None
+
+if TYPE_CHECKING:
+    from . import ImageDraw2, ImageFont
+
+_Ink = Union[float, tuple[int, ...], str]
 
 """
 A simple 2D drawing interface for PIL images.
@@ -46,9 +62,11 @@
 
 
 class ImageDraw:
-    font = None
+    font: (
+        ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont | None
+    ) = None
 
-    def __init__(self, im, mode=None):
+    def __init__(self, im: Image.Image, mode: str | None = None) -> None:
         """
         Create a drawing instance.
 
@@ -90,7 +108,9 @@ def __init__(self, im, mode=None):
             self.fontmode = "L"  # aliasing is okay for other modes
         self.fill = False
 
-    def getfont(self):
+    def getfont(
+        self,
+    ) -> ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont:
         """
         Get the current default font.
 
@@ -115,43 +135,57 @@ def getfont(self):
             self.font = ImageFont.load_default()
         return self.font
 
-    def _getfont(self, font_size):
+    def _getfont(
+        self, font_size: float | None
+    ) -> ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont:
         if font_size is not None:
             from . import ImageFont
 
-            font = ImageFont.load_default(font_size)
+            return ImageFont.load_default(font_size)
         else:
-            font = self.getfont()
-        return font
+            return self.getfont()
 
-    def _getink(self, ink, fill=None):
+    def _getink(
+        self, ink: _Ink | None, fill: _Ink | None = None
+    ) -> tuple[int | None, int | None]:
+        result_ink = None
+        result_fill = None
         if ink is None and fill is None:
             if self.fill:
-                fill = self.ink
+                result_fill = self.ink
             else:
-                ink = self.ink
+                result_ink = self.ink
         else:
             if ink is not None:
                 if isinstance(ink, str):
                     ink = ImageColor.getcolor(ink, self.mode)
-                if self.palette and not isinstance(ink, numbers.Number):
+                if self.palette and isinstance(ink, tuple):
                     ink = self.palette.getcolor(ink, self._image)
-                ink = self.draw.draw_ink(ink)
+                result_ink = self.draw.draw_ink(ink)
             if fill is not None:
                 if isinstance(fill, str):
                     fill = ImageColor.getcolor(fill, self.mode)
-                if self.palette and not isinstance(fill, numbers.Number):
+                if self.palette and isinstance(fill, tuple):
                     fill = self.palette.getcolor(fill, self._image)
-                fill = self.draw.draw_ink(fill)
-        return ink, fill
+                result_fill = self.draw.draw_ink(fill)
+        return result_ink, result_fill
 
-    def arc(self, xy, start, end, fill=None, width=1):
+    def arc(
+        self,
+        xy: Coords,
+        start: float,
+        end: float,
+        fill: _Ink | None = None,
+        width: int = 1,
+    ) -> None:
         """Draw an arc."""
         ink, fill = self._getink(fill)
         if ink is not None:
             self.draw.draw_arc(xy, start, end, ink, width)
 
-    def bitmap(self, xy, bitmap, fill=None):
+    def bitmap(
+        self, xy: Sequence[int], bitmap: Image.Image, fill: _Ink | None = None
+    ) -> None:
         """Draw a bitmap."""
         bitmap.load()
         ink, fill = self._getink(fill)
@@ -160,42 +194,85 @@ def bitmap(self, xy, bitmap, fill=None):
         if ink is not None:
             self.draw.draw_bitmap(xy, bitmap.im, ink)
 
-    def chord(self, xy, start, end, fill=None, outline=None, width=1):
+    def chord(
+        self,
+        xy: Coords,
+        start: float,
+        end: float,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+        width: int = 1,
+    ) -> None:
         """Draw a chord."""
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_chord(xy, start, end, fill, 1)
-        if ink is not None and ink != fill and width != 0:
+        ink, fill_ink = self._getink(outline, fill)
+        if fill_ink is not None:
+            self.draw.draw_chord(xy, start, end, fill_ink, 1)
+        if ink is not None and ink != fill_ink and width != 0:
             self.draw.draw_chord(xy, start, end, ink, 0, width)
 
-    def ellipse(self, xy, fill=None, outline=None, width=1):
+    def ellipse(
+        self,
+        xy: Coords,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+        width: int = 1,
+    ) -> None:
         """Draw an ellipse."""
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_ellipse(xy, fill, 1)
-        if ink is not None and ink != fill and width != 0:
+        ink, fill_ink = self._getink(outline, fill)
+        if fill_ink is not None:
+            self.draw.draw_ellipse(xy, fill_ink, 1)
+        if ink is not None and ink != fill_ink and width != 0:
             self.draw.draw_ellipse(xy, ink, 0, width)
 
-    def line(self, xy, fill=None, width=0, joint=None):
+    def circle(
+        self,
+        xy: Sequence[float],
+        radius: float,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+        width: int = 1,
+    ) -> None:
+        """Draw a circle given center coordinates and a radius."""
+        ellipse_xy = (xy[0] - radius, xy[1] - radius, xy[0] + radius, xy[1] + radius)
+        self.ellipse(ellipse_xy, fill, outline, width)
+
+    def line(
+        self,
+        xy: Coords,
+        fill: _Ink | None = None,
+        width: int = 0,
+        joint: str | None = None,
+    ) -> None:
         """Draw a line, or a connected sequence of line segments."""
         ink = self._getink(fill)[0]
         if ink is not None:
             self.draw.draw_lines(xy, ink, width)
             if joint == "curve" and width > 4:
-                if not isinstance(xy[0], (list, tuple)):
-                    xy = [tuple(xy[i : i + 2]) for i in range(0, len(xy), 2)]
-                for i in range(1, len(xy) - 1):
-                    point = xy[i]
+                points: Sequence[Sequence[float]]
+                if isinstance(xy[0], (list, tuple)):
+                    points = cast(Sequence[Sequence[float]], xy)
+                else:
+                    points = [
+                        cast(Sequence[float], tuple(xy[i : i + 2]))
+                        for i in range(0, len(xy), 2)
+                    ]
+                for i in range(1, len(points) - 1):
+                    point = points[i]
                     angles = [
                         math.degrees(math.atan2(end[0] - start[0], start[1] - end[1]))
                         % 360
-                        for start, end in ((xy[i - 1], point), (point, xy[i + 1]))
+                        for start, end in (
+                            (points[i - 1], point),
+                            (point, points[i + 1]),
+                        )
                     ]
                     if angles[0] == angles[1]:
                         # This is a straight line, so no joint is required
                         continue
 
-                    def coord_at_angle(coord, angle):
+                    def coord_at_angle(
+                        coord: Sequence[float], angle: float
+                    ) -> tuple[float, ...]:
                         x, y = coord
                         angle -= 90
                         distance = width / 2 - 1
@@ -236,38 +313,57 @@ def coord_at_angle(coord, angle):
                             ]
                         self.line(gap_coords, fill, width=3)
 
-    def shape(self, shape, fill=None, outline=None):
+    def shape(
+        self,
+        shape: Image.core._Outline,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+    ) -> None:
         """(Experimental) Draw a shape."""
         shape.close()
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_outline(shape, fill, 1)
-        if ink is not None and ink != fill:
+        ink, fill_ink = self._getink(outline, fill)
+        if fill_ink is not None:
+            self.draw.draw_outline(shape, fill_ink, 1)
+        if ink is not None and ink != fill_ink:
             self.draw.draw_outline(shape, ink, 0)
 
-    def pieslice(self, xy, start, end, fill=None, outline=None, width=1):
+    def pieslice(
+        self,
+        xy: Coords,
+        start: float,
+        end: float,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+        width: int = 1,
+    ) -> None:
         """Draw a pieslice."""
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_pieslice(xy, start, end, fill, 1)
-        if ink is not None and ink != fill and width != 0:
+        ink, fill_ink = self._getink(outline, fill)
+        if fill_ink is not None:
+            self.draw.draw_pieslice(xy, start, end, fill_ink, 1)
+        if ink is not None and ink != fill_ink and width != 0:
             self.draw.draw_pieslice(xy, start, end, ink, 0, width)
 
-    def point(self, xy, fill=None):
+    def point(self, xy: Coords, fill: _Ink | None = None) -> None:
         """Draw one or more individual pixels."""
         ink, fill = self._getink(fill)
         if ink is not None:
             self.draw.draw_points(xy, ink)
 
-    def polygon(self, xy, fill=None, outline=None, width=1):
+    def polygon(
+        self,
+        xy: Coords,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+        width: int = 1,
+    ) -> None:
         """Draw a polygon."""
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_polygon(xy, fill, 1)
-        if ink is not None and ink != fill and width != 0:
+        ink, fill_ink = self._getink(outline, fill)
+        if fill_ink is not None:
+            self.draw.draw_polygon(xy, fill_ink, 1)
+        if ink is not None and ink != fill_ink and width != 0:
             if width == 1:
                 self.draw.draw_polygon(xy, ink, 0, width)
-            else:
+            elif self.im is not None:
                 # To avoid expanding the polygon outwards,
                 # use the fill as a mask
                 mask = Image.new("1", self.im.size)
@@ -290,28 +386,47 @@ def polygon(self, xy, fill=None, outline=None, width=1):
                 self.im.paste(im.im, (0, 0) + im.size, mask.im)
 
     def regular_polygon(
-        self, bounding_circle, n_sides, rotation=0, fill=None, outline=None, width=1
-    ):
+        self,
+        bounding_circle: Sequence[Sequence[float] | float],
+        n_sides: int,
+        rotation: float = 0,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+        width: int = 1,
+    ) -> None:
         """Draw a regular polygon."""
         xy = _compute_regular_polygon_vertices(bounding_circle, n_sides, rotation)
         self.polygon(xy, fill, outline, width)
 
-    def rectangle(self, xy, fill=None, outline=None, width=1):
+    def rectangle(
+        self,
+        xy: Coords,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+        width: int = 1,
+    ) -> None:
         """Draw a rectangle."""
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_rectangle(xy, fill, 1)
-        if ink is not None and ink != fill and width != 0:
+        ink, fill_ink = self._getink(outline, fill)
+        if fill_ink is not None:
+            self.draw.draw_rectangle(xy, fill_ink, 1)
+        if ink is not None and ink != fill_ink and width != 0:
             self.draw.draw_rectangle(xy, ink, 0, width)
 
     def rounded_rectangle(
-        self, xy, radius=0, fill=None, outline=None, width=1, *, corners=None
-    ):
+        self,
+        xy: Coords,
+        radius: float = 0,
+        fill: _Ink | None = None,
+        outline: _Ink | None = None,
+        width: int = 1,
+        *,
+        corners: tuple[bool, bool, bool, bool] | None = None,
+    ) -> None:
         """Draw a rounded rectangle."""
         if isinstance(xy[0], (list, tuple)):
-            (x0, y0), (x1, y1) = xy
+            (x0, y0), (x1, y1) = cast(Sequence[Sequence[float]], xy)
         else:
-            x0, y0, x1, y1 = xy
+            x0, y0, x1, y1 = cast(Sequence[float], xy)
         if x1 < x0:
             msg = "x1 must be greater than or equal to x0"
             raise ValueError(msg)
@@ -323,6 +438,10 @@ def rounded_rectangle(
 
         d = radius * 2
 
+        x0 = round(x0)
+        y0 = round(y0)
+        x1 = round(x1)
+        y1 = round(y1)
         full_x, full_y = False, False
         if all(corners):
             full_x = d >= x1 - x0 - 1
@@ -343,10 +462,11 @@ def rounded_rectangle(
             # that is a rectangle
             return self.rectangle(xy, fill, outline, width)
 
-        r = d // 2
-        ink, fill = self._getink(outline, fill)
+        r = int(d // 2)
+        ink, fill_ink = self._getink(outline, fill)
 
-        def draw_corners(pieslice):
+        def draw_corners(pieslice: bool) -> None:
+            parts: tuple[tuple[tuple[float, float, float, float], int, int], ...]
             if full_x:
                 # Draw top and bottom halves
                 parts = (
@@ -361,45 +481,46 @@ def draw_corners(pieslice):
                 )
             else:
                 # Draw four separate corners
-                parts = []
-                for i, part in enumerate(
-                    (
-                        ((x0, y0, x0 + d, y0 + d), 180, 270),
-                        ((x1 - d, y0, x1, y0 + d), 270, 360),
-                        ((x1 - d, y1 - d, x1, y1), 0, 90),
-                        ((x0, y1 - d, x0 + d, y1), 90, 180),
+                parts = tuple(
+                    part
+                    for i, part in enumerate(
+                        (
+                            ((x0, y0, x0 + d, y0 + d), 180, 270),
+                            ((x1 - d, y0, x1, y0 + d), 270, 360),
+                            ((x1 - d, y1 - d, x1, y1), 0, 90),
+                            ((x0, y1 - d, x0 + d, y1), 90, 180),
+                        )
                     )
-                ):
-                    if corners[i]:
-                        parts.append(part)
+                    if corners[i]
+                )
             for part in parts:
                 if pieslice:
-                    self.draw.draw_pieslice(*(part + (fill, 1)))
+                    self.draw.draw_pieslice(*(part + (fill_ink, 1)))
                 else:
                     self.draw.draw_arc(*(part + (ink, width)))
 
-        if fill is not None:
+        if fill_ink is not None:
             draw_corners(True)
 
             if full_x:
-                self.draw.draw_rectangle((x0, y0 + r + 1, x1, y1 - r - 1), fill, 1)
-            else:
-                self.draw.draw_rectangle((x0 + r + 1, y0, x1 - r - 1, y1), fill, 1)
+                self.draw.draw_rectangle((x0, y0 + r + 1, x1, y1 - r - 1), fill_ink, 1)
+            elif x1 - r - 1 > x0 + r + 1:
+                self.draw.draw_rectangle((x0 + r + 1, y0, x1 - r - 1, y1), fill_ink, 1)
             if not full_x and not full_y:
                 left = [x0, y0, x0 + r, y1]
                 if corners[0]:
                     left[1] += r + 1
                 if corners[3]:
                     left[3] -= r + 1
-                self.draw.draw_rectangle(left, fill, 1)
+                self.draw.draw_rectangle(left, fill_ink, 1)
 
                 right = [x1 - r, y0, x1, y1]
                 if corners[1]:
                     right[1] += r + 1
                 if corners[2]:
                     right[3] -= r + 1
-                self.draw.draw_rectangle(right, fill, 1)
-        if ink is not None and ink != fill and width != 0:
+                self.draw.draw_rectangle(right, fill_ink, 1)
+        if ink is not None and ink != fill_ink and width != 0:
             draw_corners(False)
 
             if not full_x:
@@ -431,17 +552,20 @@ def draw_corners(pieslice):
                     right[3] -= r + 1
                 self.draw.draw_rectangle(right, ink, 1)
 
-    def _multiline_check(self, text):
+    def _multiline_check(self, text: AnyStr) -> bool:
         split_character = "\n" if isinstance(text, str) else b"\n"
 
         return split_character in text
 
-    def _multiline_split(self, text):
-        split_character = "\n" if isinstance(text, str) else b"\n"
-
-        return text.split(split_character)
+    def _multiline_split(self, text: AnyStr) -> list[AnyStr]:
+        return text.split("\n" if isinstance(text, str) else b"\n")
 
-    def _multiline_spacing(self, font, spacing, stroke_width):
+    def _multiline_spacing(
+        self,
+        font: ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont,
+        spacing: float,
+        stroke_width: float,
+    ) -> float:
         return (
             self.textbbox((0, 0), "A", font, stroke_width=stroke_width)[3]
             + stroke_width
@@ -450,22 +574,27 @@ def _multiline_spacing(self, font, spacing, stroke_width):
 
     def text(
         self,
-        xy,
-        text,
-        fill=None,
-        font=None,
-        anchor=None,
-        spacing=4,
-        align="left",
-        direction=None,
-        features=None,
-        language=None,
-        stroke_width=0,
-        stroke_fill=None,
-        embedded_color=False,
-        *args,
-        **kwargs,
-    ):
+        xy: tuple[float, float],
+        text: AnyStr,
+        fill: _Ink | None = None,
+        font: (
+            ImageFont.ImageFont
+            | ImageFont.FreeTypeFont
+            | ImageFont.TransposedFont
+            | None
+        ) = None,
+        anchor: str | None = None,
+        spacing: float = 4,
+        align: str = "left",
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+        stroke_width: float = 0,
+        stroke_fill: _Ink | None = None,
+        embedded_color: bool = False,
+        *args: Any,
+        **kwargs: Any,
+    ) -> None:
         """Draw text."""
         if embedded_color and self.mode not in ("RGB", "RGBA"):
             msg = "Embedded color supported only in RGB and RGBA modes"
@@ -491,23 +620,23 @@ def text(
                 embedded_color,
             )
 
-        def getink(fill):
-            ink, fill = self._getink(fill)
+        def getink(fill: _Ink | None) -> int:
+            ink, fill_ink = self._getink(fill)
             if ink is None:
-                return fill
+                assert fill_ink is not None
+                return fill_ink
             return ink
 
-        def draw_text(ink, stroke_width=0, stroke_offset=None):
+        def draw_text(ink: int, stroke_width: float = 0) -> None:
             mode = self.fontmode
             if stroke_width == 0 and embedded_color:
                 mode = "RGBA"
             coord = []
-            start = []
             for i in range(2):
                 coord.append(int(xy[i]))
-                start.append(math.modf(xy[i])[0])
+            start = (math.modf(xy[0])[0], math.modf(xy[1])[0])
             try:
-                mask, offset = font.getmask2(
+                mask, offset = font.getmask2(  # type: ignore[union-attr,misc]
                     text,
                     mode,
                     direction=direction,
@@ -520,10 +649,10 @@ def draw_text(ink, stroke_width=0, stroke_offset=None):
                     *args,
                     **kwargs,
                 )
-                coord = coord[0] + offset[0], coord[1] + offset[1]
+                coord = [coord[0] + offset[0], coord[1] + offset[1]]
             except AttributeError:
                 try:
-                    mask = font.getmask(
+                    mask = font.getmask(  # type: ignore[misc]
                         text,
                         mode,
                         direction,
@@ -538,8 +667,6 @@ def draw_text(ink, stroke_width=0, stroke_offset=None):
                     )
                 except TypeError:
                     mask = font.getmask(text)
-            if stroke_offset:
-                coord = coord[0] + stroke_offset[0], coord[1] + stroke_offset[1]
             if mode == "RGBA":
                 # font.getmask2(mode="RGBA") returns color in RGB bands and mask in A
                 # extract mask and set text alpha
@@ -547,7 +674,10 @@ def draw_text(ink, stroke_width=0, stroke_offset=None):
                 ink_alpha = struct.pack("i", ink)[3]
                 color.fillband(3, ink_alpha)
                 x, y = coord
-                self.im.paste(color, (x, y, x + mask.size[0], y + mask.size[1]), mask)
+                if self.im is not None:
+                    self.im.paste(
+                        color, (x, y, x + mask.size[0], y + mask.size[1]), mask
+                    )
             else:
                 self.draw.draw_bitmap(coord, mask, ink)
 
@@ -569,22 +699,27 @@ def draw_text(ink, stroke_width=0, stroke_offset=None):
 
     def multiline_text(
         self,
-        xy,
-        text,
-        fill=None,
-        font=None,
-        anchor=None,
-        spacing=4,
-        align="left",
-        direction=None,
-        features=None,
-        language=None,
-        stroke_width=0,
-        stroke_fill=None,
-        embedded_color=False,
+        xy: tuple[float, float],
+        text: AnyStr,
+        fill: _Ink | None = None,
+        font: (
+            ImageFont.ImageFont
+            | ImageFont.FreeTypeFont
+            | ImageFont.TransposedFont
+            | None
+        ) = None,
+        anchor: str | None = None,
+        spacing: float = 4,
+        align: str = "left",
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+        stroke_width: float = 0,
+        stroke_fill: _Ink | None = None,
+        embedded_color: bool = False,
         *,
-        font_size=None,
-    ):
+        font_size: float | None = None,
+    ) -> None:
         if direction == "ttb":
             msg = "ttb direction is unsupported for multiline text"
             raise ValueError(msg)
@@ -602,7 +737,7 @@ def multiline_text(
             font = self._getfont(font_size)
 
         widths = []
-        max_width = 0
+        max_width: float = 0
         lines = self._multiline_split(text)
         line_spacing = self._multiline_spacing(font, spacing, stroke_width)
         for line in lines:
@@ -656,15 +791,20 @@ def multiline_text(
 
     def textlength(
         self,
-        text,
-        font=None,
-        direction=None,
-        features=None,
-        language=None,
-        embedded_color=False,
+        text: AnyStr,
+        font: (
+            ImageFont.ImageFont
+            | ImageFont.FreeTypeFont
+            | ImageFont.TransposedFont
+            | None
+        ) = None,
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+        embedded_color: bool = False,
         *,
-        font_size=None,
-    ):
+        font_size: float | None = None,
+    ) -> float:
         """Get the length of a given string, in pixels with 1/64 precision."""
         if self._multiline_check(text):
             msg = "can't measure length of multiline text"
@@ -680,20 +820,25 @@ def textlength(
 
     def textbbox(
         self,
-        xy,
-        text,
-        font=None,
-        anchor=None,
-        spacing=4,
-        align="left",
-        direction=None,
-        features=None,
-        language=None,
-        stroke_width=0,
-        embedded_color=False,
+        xy: tuple[float, float],
+        text: AnyStr,
+        font: (
+            ImageFont.ImageFont
+            | ImageFont.FreeTypeFont
+            | ImageFont.TransposedFont
+            | None
+        ) = None,
+        anchor: str | None = None,
+        spacing: float = 4,
+        align: str = "left",
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+        stroke_width: float = 0,
+        embedded_color: bool = False,
         *,
-        font_size=None,
-    ):
+        font_size: float | None = None,
+    ) -> tuple[float, float, float, float]:
         """Get the bounding box of a given string, in pixels."""
         if embedded_color and self.mode not in ("RGB", "RGBA"):
             msg = "Embedded color supported only in RGB and RGBA modes"
@@ -725,20 +870,25 @@ def textbbox(
 
     def multiline_textbbox(
         self,
-        xy,
-        text,
-        font=None,
-        anchor=None,
-        spacing=4,
-        align="left",
-        direction=None,
-        features=None,
-        language=None,
-        stroke_width=0,
-        embedded_color=False,
+        xy: tuple[float, float],
+        text: AnyStr,
+        font: (
+            ImageFont.ImageFont
+            | ImageFont.FreeTypeFont
+            | ImageFont.TransposedFont
+            | None
+        ) = None,
+        anchor: str | None = None,
+        spacing: float = 4,
+        align: str = "left",
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+        stroke_width: float = 0,
+        embedded_color: bool = False,
         *,
-        font_size=None,
-    ):
+        font_size: float | None = None,
+    ) -> tuple[float, float, float, float]:
         if direction == "ttb":
             msg = "ttb direction is unsupported for multiline text"
             raise ValueError(msg)
@@ -756,7 +906,7 @@ def multiline_textbbox(
             font = self._getfont(font_size)
 
         widths = []
-        max_width = 0
+        max_width: float = 0
         lines = self._multiline_split(text)
         line_spacing = self._multiline_spacing(font, spacing, stroke_width)
         for line in lines:
@@ -777,7 +927,7 @@ def multiline_textbbox(
         elif anchor[1] == "d":
             top -= (len(lines) - 1) * line_spacing
 
-        bbox = None
+        bbox: tuple[float, float, float, float] | None = None
 
         for idx, line in enumerate(lines):
             left = xy[0]
@@ -828,7 +978,7 @@ def multiline_textbbox(
         return bbox
 
 
-def Draw(im, mode=None):
+def Draw(im: Image.Image, mode: str | None = None) -> ImageDraw:
     """
     A simple 2D drawing interface for PIL images.
 
@@ -840,45 +990,38 @@ def Draw(im, mode=None):
        defaults to the mode of the image.
     """
     try:
-        return im.getdraw(mode)
+        return getattr(im, "getdraw")(mode)
     except AttributeError:
         return ImageDraw(im, mode)
 
 
-# experimental access to the outline API
-try:
-    Outline = Image.core.outline
-except AttributeError:
-    Outline = None
-
-
-def getdraw(im=None, hints=None):
+def getdraw(
+    im: Image.Image | None = None, hints: list[str] | None = None
+) -> tuple[ImageDraw2.Draw | None, ModuleType]:
     """
-    (Experimental) A more advanced 2D drawing interface for PIL images,
-    based on the WCK interface.
-
     :param im: The image to draw in.
-    :param hints: An optional list of hints.
+    :param hints: An optional list of hints. Deprecated.
     :returns: A (drawing context, drawing resource factory) tuple.
     """
-    # FIXME: this needs more work!
-    # FIXME: come up with a better 'hints' scheme.
-    handler = None
-    if not hints or "nicest" in hints:
-        try:
-            from . import _imagingagg as handler
-        except ImportError:
-            pass
-    if handler is None:
-        from . import ImageDraw2 as handler
-    if im:
-        im = handler.Draw(im)
-    return im, handler
-
-
-def floodfill(image, xy, value, border=None, thresh=0):
+    if hints is not None:
+        deprecate("'hints' parameter", 12)
+    from . import ImageDraw2
+
+    draw = ImageDraw2.Draw(im) if im is not None else None
+    return draw, ImageDraw2
+
+
+def floodfill(
+    image: Image.Image,
+    xy: tuple[int, int],
+    value: float | tuple[int, ...],
+    border: float | tuple[int, ...] | None = None,
+    thresh: float = 0,
+) -> None:
     """
-    (experimental) Fills a bounded region with a given color.
+    .. warning:: This method is experimental.
+
+    Fills a bounded region with a given color.
 
     :param image: Target image.
     :param xy: Seed position (a 2-item coordinate tuple). See
@@ -896,6 +1039,7 @@ def floodfill(image, xy, value, border=None, thresh=0):
     # based on an implementation by Eric S. Raymond
     # amended by yo1995 @20180806
     pixel = image.load()
+    assert pixel is not None
     x, y = xy
     try:
         background = pixel[x, y]
@@ -932,11 +1076,13 @@ def floodfill(image, xy, value, border=None, thresh=0):
         edge = new_edge
 
 
-def _compute_regular_polygon_vertices(bounding_circle, n_sides, rotation):
+def _compute_regular_polygon_vertices(
+    bounding_circle: Sequence[Sequence[float] | float], n_sides: int, rotation: float
+) -> list[tuple[float, float]]:
     """
     Generate a list of vertices for a 2D regular polygon.
 
-    :param bounding_circle: The bounding circle is a tuple defined
+    :param bounding_circle: The bounding circle is a sequence defined
         by a point and radius. The polygon is inscribed in this circle.
         (e.g. ``bounding_circle=(x, y, r)`` or ``((x, y), r)``)
     :param n_sides: Number of sides
@@ -974,7 +1120,7 @@ def _compute_regular_polygon_vertices(bounding_circle, n_sides, rotation):
     # 1. Error Handling
     # 1.1 Check `n_sides` has an appropriate value
     if not isinstance(n_sides, int):
-        msg = "n_sides should be an int"
+        msg = "n_sides should be an int"  # type: ignore[unreachable]
         raise TypeError(msg)
     if n_sides < 3:
         msg = "n_sides should be an int > 2"
@@ -982,13 +1128,28 @@ def _compute_regular_polygon_vertices(bounding_circle, n_sides, rotation):
 
     # 1.2 Check `bounding_circle` has an appropriate value
     if not isinstance(bounding_circle, (list, tuple)):
-        msg = "bounding_circle should be a tuple"
+        msg = "bounding_circle should be a sequence"
         raise TypeError(msg)
 
     if len(bounding_circle) == 3:
-        *centroid, polygon_radius = bounding_circle
-    elif len(bounding_circle) == 2:
-        centroid, polygon_radius = bounding_circle
+        if not all(isinstance(i, (int, float)) for i in bounding_circle):
+            msg = "bounding_circle should only contain numeric data"
+            raise ValueError(msg)
+
+        *centroid, polygon_radius = cast(list[float], list(bounding_circle))
+    elif len(bounding_circle) == 2 and isinstance(bounding_circle[0], (list, tuple)):
+        if not all(
+            isinstance(i, (int, float)) for i in bounding_circle[0]
+        ) or not isinstance(bounding_circle[1], (int, float)):
+            msg = "bounding_circle should only contain numeric data"
+            raise ValueError(msg)
+
+        if len(bounding_circle[0]) != 2:
+            msg = "bounding_circle centre should contain 2D coordinates (e.g. (x, y))"
+            raise ValueError(msg)
+
+        centroid = cast(list[float], list(bounding_circle[0]))
+        polygon_radius = cast(float, bounding_circle[1])
     else:
         msg = (
             "bounding_circle should contain 2D coordinates "
@@ -996,25 +1157,17 @@ def _compute_regular_polygon_vertices(bounding_circle, n_sides, rotation):
         )
         raise ValueError(msg)
 
-    if not all(isinstance(i, (int, float)) for i in (*centroid, polygon_radius)):
-        msg = "bounding_circle should only contain numeric data"
-        raise ValueError(msg)
-
-    if not len(centroid) == 2:
-        msg = "bounding_circle centre should contain 2D coordinates (e.g. (x, y))"
-        raise ValueError(msg)
-
     if polygon_radius <= 0:
         msg = "bounding_circle radius should be > 0"
         raise ValueError(msg)
 
     # 1.3 Check `rotation` has an appropriate value
     if not isinstance(rotation, (int, float)):
-        msg = "rotation should be an int or float"
+        msg = "rotation should be an int or float"  # type: ignore[unreachable]
         raise ValueError(msg)
 
     # 2. Define Helper Functions
-    def _apply_rotation(point, degrees, centroid):
+    def _apply_rotation(point: list[float], degrees: float) -> tuple[float, float]:
         return (
             round(
                 point[0] * math.cos(math.radians(360 - degrees))
@@ -1030,11 +1183,11 @@ def _apply_rotation(point, degrees, centroid):
             ),
         )
 
-    def _compute_polygon_vertex(centroid, polygon_radius, angle):
+    def _compute_polygon_vertex(angle: float) -> tuple[float, float]:
         start_point = [polygon_radius, 0]
-        return _apply_rotation(start_point, angle, centroid)
+        return _apply_rotation(start_point, angle)
 
-    def _get_angles(n_sides, rotation):
+    def _get_angles(n_sides: int, rotation: float) -> list[float]:
         angles = []
         degrees = 360 / n_sides
         # Start with the bottom left polygon vertex
@@ -1050,16 +1203,16 @@ def _get_angles(n_sides, rotation):
     angles = _get_angles(n_sides, rotation)
 
     # 4. Compute Vertices
-    return [
-        _compute_polygon_vertex(centroid, polygon_radius, angle) for angle in angles
-    ]
+    return [_compute_polygon_vertex(angle) for angle in angles]
 
 
-def _color_diff(color1, color2):
+def _color_diff(
+    color1: float | tuple[int, ...], color2: float | tuple[int, ...]
+) -> float:
     """
     Uses 1-norm distance to calculate difference between two values.
     """
-    if isinstance(color2, tuple):
-        return sum(abs(color1[i] - color2[i]) for i in range(0, len(color2)))
-    else:
-        return abs(color1 - color2)
+    first = color1 if isinstance(color1, tuple) else (color1,)
+    second = color2 if isinstance(color2, tuple) else (color2,)
+
+    return sum(abs(first[i] - second[i]) for i in range(0, len(second)))
diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py
index 35ee5834e34..3d68658ed5b 100644
--- a/src/PIL/ImageDraw2.py
+++ b/src/PIL/ImageDraw2.py
@@ -24,13 +24,16 @@
 """
 from __future__ import annotations
 
+from typing import Any, AnyStr, BinaryIO
+
 from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath
+from ._typing import Coords, StrOrBytesPath
 
 
 class Pen:
     """Stores an outline color and width."""
 
-    def __init__(self, color, width=1, opacity=255):
+    def __init__(self, color: str, width: int = 1, opacity: int = 255) -> None:
         self.color = ImageColor.getrgb(color)
         self.width = width
 
@@ -38,14 +41,16 @@ def __init__(self, color, width=1, opacity=255):
 class Brush:
     """Stores a fill color"""
 
-    def __init__(self, color, opacity=255):
+    def __init__(self, color: str, opacity: int = 255) -> None:
         self.color = ImageColor.getrgb(color)
 
 
 class Font:
     """Stores a TrueType font and color"""
 
-    def __init__(self, color, file, size=12):
+    def __init__(
+        self, color: str, file: StrOrBytesPath | BinaryIO, size: float = 12
+    ) -> None:
         # FIXME: add support for bitmap fonts
         self.color = ImageColor.getrgb(color)
         self.font = ImageFont.truetype(file, size)
@@ -56,17 +61,32 @@ class Draw:
     (Experimental) WCK-style drawing interface
     """
 
-    def __init__(self, image, size=None, color=None):
-        if not hasattr(image, "im"):
+    def __init__(
+        self,
+        image: Image.Image | str,
+        size: tuple[int, int] | list[int] | None = None,
+        color: float | tuple[float, ...] | str | None = None,
+    ) -> None:
+        if isinstance(image, str):
+            if size is None:
+                msg = "If image argument is mode string, size must be a list or tuple"
+                raise ValueError(msg)
             image = Image.new(image, size, color)
         self.draw = ImageDraw.Draw(image)
         self.image = image
-        self.transform = None
+        self.transform: tuple[float, float, float, float, float, float] | None = None
 
-    def flush(self):
+    def flush(self) -> Image.Image:
         return self.image
 
-    def render(self, op, xy, pen, brush=None):
+    def render(
+        self,
+        op: str,
+        xy: Coords,
+        pen: Pen | Brush | None,
+        brush: Brush | Pen | None = None,
+        **kwargs: Any,
+    ) -> None:
         # handle color arguments
         outline = fill = None
         width = 1
@@ -82,63 +102,89 @@ def render(self, op, xy, pen, brush=None):
             fill = pen.color
         # handle transformation
         if self.transform:
-            xy = ImagePath.Path(xy)
-            xy.transform(self.transform)
+            path = ImagePath.Path(xy)
+            path.transform(self.transform)
+            xy = path
         # render the item
-        if op == "line":
-            self.draw.line(xy, fill=outline, width=width)
+        if op in ("arc", "line"):
+            kwargs.setdefault("fill", outline)
         else:
-            getattr(self.draw, op)(xy, fill=fill, outline=outline)
+            kwargs.setdefault("fill", fill)
+            kwargs.setdefault("outline", outline)
+        if op == "line":
+            kwargs.setdefault("width", width)
+        getattr(self.draw, op)(xy, **kwargs)
 
-    def settransform(self, offset):
+    def settransform(self, offset: tuple[float, float]) -> None:
         """Sets a transformation offset."""
         (xoffset, yoffset) = offset
         self.transform = (1, 0, xoffset, 0, 1, yoffset)
 
-    def arc(self, xy, start, end, *options):
+    def arc(
+        self,
+        xy: Coords,
+        pen: Pen | Brush | None,
+        start: float,
+        end: float,
+        *options: Any,
+    ) -> None:
         """
         Draws an arc (a portion of a circle outline) between the start and end
         angles, inside the given bounding box.
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.arc`
         """
-        self.render("arc", xy, start, end, *options)
+        self.render("arc", xy, pen, *options, start=start, end=end)
 
-    def chord(self, xy, start, end, *options):
+    def chord(
+        self,
+        xy: Coords,
+        pen: Pen | Brush | None,
+        start: float,
+        end: float,
+        *options: Any,
+    ) -> None:
         """
         Same as :py:meth:`~PIL.ImageDraw2.Draw.arc`, but connects the end points
         with a straight line.
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.chord`
         """
-        self.render("chord", xy, start, end, *options)
+        self.render("chord", xy, pen, *options, start=start, end=end)
 
-    def ellipse(self, xy, *options):
+    def ellipse(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None:
         """
         Draws an ellipse inside the given bounding box.
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.ellipse`
         """
-        self.render("ellipse", xy, *options)
+        self.render("ellipse", xy, pen, *options)
 
-    def line(self, xy, *options):
+    def line(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None:
         """
         Draws a line between the coordinates in the ``xy`` list.
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.line`
         """
-        self.render("line", xy, *options)
+        self.render("line", xy, pen, *options)
 
-    def pieslice(self, xy, start, end, *options):
+    def pieslice(
+        self,
+        xy: Coords,
+        pen: Pen | Brush | None,
+        start: float,
+        end: float,
+        *options: Any,
+    ) -> None:
         """
         Same as arc, but also draws straight lines between the end points and the
         center of the bounding box.
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.pieslice`
         """
-        self.render("pieslice", xy, start, end, *options)
+        self.render("pieslice", xy, pen, *options, start=start, end=end)
 
-    def polygon(self, xy, *options):
+    def polygon(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None:
         """
         Draws a polygon.
 
@@ -149,28 +195,31 @@ def polygon(self, xy, *options):
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.polygon`
         """
-        self.render("polygon", xy, *options)
+        self.render("polygon", xy, pen, *options)
 
-    def rectangle(self, xy, *options):
+    def rectangle(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None:
         """
         Draws a rectangle.
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.rectangle`
         """
-        self.render("rectangle", xy, *options)
+        self.render("rectangle", xy, pen, *options)
 
-    def text(self, xy, text, font):
+    def text(self, xy: tuple[float, float], text: AnyStr, font: Font) -> None:
         """
         Draws the string at the given position.
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.text`
         """
         if self.transform:
-            xy = ImagePath.Path(xy)
-            xy.transform(self.transform)
+            path = ImagePath.Path(xy)
+            path.transform(self.transform)
+            xy = path
         self.draw.text(xy, text, font=font.font, fill=font.color)
 
-    def textbbox(self, xy, text, font):
+    def textbbox(
+        self, xy: tuple[float, float], text: AnyStr, font: Font
+    ) -> tuple[float, float, float, float]:
         """
         Returns bounding box (in pixels) of given text.
 
@@ -179,11 +228,12 @@ def textbbox(self, xy, text, font):
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textbbox`
         """
         if self.transform:
-            xy = ImagePath.Path(xy)
-            xy.transform(self.transform)
+            path = ImagePath.Path(xy)
+            path.transform(self.transform)
+            xy = path
         return self.draw.textbbox(xy, text, font=font.font)
 
-    def textlength(self, text, font):
+    def textlength(self, text: AnyStr, font: Font) -> float:
         """
         Returns length (in pixels) of given text.
         This is the amount by which following text should be offset.
diff --git a/src/PIL/ImageEnhance.py b/src/PIL/ImageEnhance.py
index 93a50d2a2b9..0e7e6dd8ae6 100644
--- a/src/PIL/ImageEnhance.py
+++ b/src/PIL/ImageEnhance.py
@@ -23,7 +23,10 @@
 
 
 class _Enhance:
-    def enhance(self, factor):
+    image: Image.Image
+    degenerate: Image.Image
+
+    def enhance(self, factor: float) -> Image.Image:
         """
         Returns an enhanced image.
 
@@ -46,13 +49,15 @@ class Color(_Enhance):
     the original image.
     """
 
-    def __init__(self, image):
+    def __init__(self, image: Image.Image) -> None:
         self.image = image
         self.intermediate_mode = "L"
         if "A" in image.getbands():
             self.intermediate_mode = "LA"
 
-        self.degenerate = image.convert(self.intermediate_mode).convert(image.mode)
+        if self.intermediate_mode != image.mode:
+            image = image.convert(self.intermediate_mode).convert(image.mode)
+        self.degenerate = image
 
 
 class Contrast(_Enhance):
@@ -63,13 +68,17 @@ class Contrast(_Enhance):
     gives a solid gray image. A factor of 1.0 gives the original image.
     """
 
-    def __init__(self, image):
+    def __init__(self, image: Image.Image) -> None:
         self.image = image
-        mean = int(ImageStat.Stat(image.convert("L")).mean[0] + 0.5)
-        self.degenerate = Image.new("L", image.size, mean).convert(image.mode)
+        if image.mode != "L":
+            image = image.convert("L")
+        mean = int(ImageStat.Stat(image).mean[0] + 0.5)
+        self.degenerate = Image.new("L", image.size, mean)
+        if self.degenerate.mode != self.image.mode:
+            self.degenerate = self.degenerate.convert(self.image.mode)
 
-        if "A" in image.getbands():
-            self.degenerate.putalpha(image.getchannel("A"))
+        if "A" in self.image.getbands():
+            self.degenerate.putalpha(self.image.getchannel("A"))
 
 
 class Brightness(_Enhance):
@@ -80,7 +89,7 @@ class Brightness(_Enhance):
     original image.
     """
 
-    def __init__(self, image):
+    def __init__(self, image: Image.Image) -> None:
         self.image = image
         self.degenerate = Image.new(image.mode, image.size, 0)
 
@@ -96,7 +105,7 @@ class Sharpness(_Enhance):
     original image, and a factor of 2.0 gives a sharpened image.
     """
 
-    def __init__(self, image):
+    def __init__(self, image: Image.Image) -> None:
         self.image = image
         self.degenerate = image.filter(ImageFilter.SMOOTH)
 
diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py
index 0923979af8b..d69d8456850 100644
--- a/src/PIL/ImageFile.py
+++ b/src/PIL/ImageFile.py
@@ -28,16 +28,21 @@
 #
 from __future__ import annotations
 
+import abc
 import io
 import itertools
+import os
 import struct
 import sys
-from typing import Any, NamedTuple
+from typing import IO, TYPE_CHECKING, Any, NamedTuple, cast
 
 from . import Image
 from ._deprecate import deprecate
 from ._util import is_path
 
+if TYPE_CHECKING:
+    from ._typing import StrOrBytesPath
+
 MAXBLOCK = 65536
 
 SAFEBLOCK = 1024 * 1024
@@ -64,7 +69,7 @@
 # Helpers
 
 
-def _get_oserror(error, *, encoder):
+def _get_oserror(error: int, *, encoder: bool) -> OSError:
     try:
         msg = Image.core.getcodecstatus(error)
     except AttributeError:
@@ -75,7 +80,7 @@ def _get_oserror(error, *, encoder):
     return OSError(msg)
 
 
-def raise_oserror(error):
+def raise_oserror(error: int) -> OSError:
     deprecate(
         "raise_oserror",
         12,
@@ -85,14 +90,14 @@ def raise_oserror(error):
     raise _get_oserror(error, encoder=False)
 
 
-def _tilesort(t):
+def _tilesort(t: _Tile) -> int:
     # sort on offset
     return t[2]
 
 
 class _Tile(NamedTuple):
-    encoder_name: str
-    extents: tuple[int, int, int, int]
+    codec_name: str
+    extents: tuple[int, int, int, int] | None
     offset: int
     args: tuple[Any, ...] | str | None
 
@@ -105,32 +110,34 @@ class _Tile(NamedTuple):
 class ImageFile(Image.Image):
     """Base class for image file format handlers."""
 
-    def __init__(self, fp=None, filename=None):
+    def __init__(
+        self, fp: StrOrBytesPath | IO[bytes], filename: str | bytes | None = None
+    ) -> None:
         super().__init__()
 
         self._min_frame = 0
 
-        self.custom_mimetype = None
+        self.custom_mimetype: str | None = None
 
-        self.tile = None
+        self.tile: list[_Tile] = []
         """ A list of tile descriptors, or ``None`` """
 
         self.readonly = 1  # until we know better
 
-        self.decoderconfig = ()
+        self.decoderconfig: tuple[Any, ...] = ()
         self.decodermaxblock = MAXBLOCK
 
         if is_path(fp):
             # filename
             self.fp = open(fp, "rb")
-            self.filename = fp
+            self.filename = os.path.realpath(os.fspath(fp))
             self._exclusive_fp = True
         else:
             # stream
-            self.fp = fp
-            self.filename = filename
+            self.fp = cast(IO[bytes], fp)
+            self.filename = filename if filename is not None else ""
             # can be overridden
-            self._exclusive_fp = None
+            self._exclusive_fp = False
 
         try:
             try:
@@ -153,17 +160,21 @@ def __init__(self, fp=None, filename=None):
                 self.fp.close()
             raise
 
-    def get_format_mimetype(self):
+    def _open(self) -> None:
+        pass
+
+    def get_format_mimetype(self) -> str | None:
         if self.custom_mimetype:
             return self.custom_mimetype
         if self.format is not None:
             return Image.MIME.get(self.format.upper())
+        return None
 
-    def __setstate__(self, state):
+    def __setstate__(self, state: list[Any]) -> None:
         self.tile = []
         super().__setstate__(state)
 
-    def verify(self):
+    def verify(self) -> None:
         """Check file integrity"""
 
         # raise exception if something's wrong.  must be called
@@ -172,10 +183,10 @@ def verify(self):
             self.fp.close()
         self.fp = None
 
-    def load(self):
+    def load(self) -> Image.core.PixelAccess | None:
         """Load image data based on tile list"""
 
-        if self.tile is None:
+        if not self.tile and self._im is None:
             msg = "cannot load this image"
             raise OSError(msg)
 
@@ -183,7 +194,7 @@ def load(self):
         if not self.tile:
             return pixel
 
-        self.map = None
+        self.map: mmap.mmap | None = None
         use_mmap = self.filename and len(self.tile) == 1
         # As of pypy 2.1.0, memory mapping was failing here.
         use_mmap = use_mmap and not hasattr(sys, "pypy_version_info")
@@ -191,17 +202,17 @@ def load(self):
         readonly = 0
 
         # look for read/seek overrides
-        try:
+        if hasattr(self, "load_read"):
             read = self.load_read
             # don't use mmap if there are custom read/seek functions
             use_mmap = False
-        except AttributeError:
+        else:
             read = self.fp.read
 
-        try:
+        if hasattr(self, "load_seek"):
             seek = self.load_seek
             use_mmap = False
-        except AttributeError:
+        else:
             seek = self.fp.seek
 
         if use_mmap:
@@ -211,6 +222,7 @@ def load(self):
                 args = (args, 0, 1)
             if (
                 decoder_name == "raw"
+                and isinstance(args, tuple)
                 and len(args) >= 3
                 and args[0] == self.mode
                 and args[0] in Image._MAPMODES
@@ -241,11 +253,8 @@ def load(self):
             # sort tiles in file order
             self.tile.sort(key=_tilesort)
 
-            try:
-                # FIXME: This is a hack to handle TIFF's JpegTables tag.
-                prefix = self.tile_prefix
-            except AttributeError:
-                prefix = b""
+            # FIXME: This is a hack to handle TIFF's JpegTables tag.
+            prefix = getattr(self, "tile_prefix", b"")
 
             # Remove consecutive duplicates that only differ by their offset
             self.tile = [
@@ -311,34 +320,34 @@ def load(self):
 
         return Image.Image.load(self)
 
-    def load_prepare(self):
+    def load_prepare(self) -> None:
         # create image memory if necessary
-        if not self.im or self.im.mode != self.mode or self.im.size != self.size:
+        if self._im is None:
             self.im = Image.core.new(self.mode, self.size)
         # create palette (optional)
         if self.mode == "P":
             Image.Image.load(self)
 
-    def load_end(self):
+    def load_end(self) -> None:
         # may be overridden
         pass
 
     # may be defined for contained formats
-    # def load_seek(self, pos):
+    # def load_seek(self, pos: int) -> None:
     #     pass
 
     # may be defined for blocked formats (e.g. PNG)
-    # def load_read(self, bytes):
+    # def load_read(self, read_bytes: int) -> bytes:
     #     pass
 
-    def _seek_check(self, frame):
+    def _seek_check(self, frame: int) -> bool:
         if (
             frame < self._min_frame
             # Only check upper limit on frames if additional seek operations
             # are not required to do so
             or (
                 not (hasattr(self, "_n_frames") and self._n_frames is None)
-                and frame >= self.n_frames + self._min_frame
+                and frame >= getattr(self, "n_frames") + self._min_frame
             )
         ):
             msg = "attempt to seek outside sequence"
@@ -347,6 +356,15 @@ def _seek_check(self, frame):
         return self.tell() != frame
 
 
+class StubHandler:
+    def open(self, im: StubImageFile) -> None:
+        pass
+
+    @abc.abstractmethod
+    def load(self, im: StubImageFile) -> Image.Image:
+        pass
+
+
 class StubImageFile(ImageFile):
     """
     Base class for stub image loaders.
@@ -355,11 +373,11 @@ class StubImageFile(ImageFile):
     certain format, but relies on external code to load the file.
     """
 
-    def _open(self):
+    def _open(self) -> None:
         msg = "StubImageFile subclass must implement _open"
         raise NotImplementedError(msg)
 
-    def load(self):
+    def load(self) -> Image.core.PixelAccess | None:
         loader = self._load()
         if loader is None:
             msg = f"cannot find loader for this {self.format} file"
@@ -367,11 +385,11 @@ def load(self):
         image = loader.load(self)
         assert image is not None
         # become the other object (!)
-        self.__class__ = image.__class__
+        self.__class__ = image.__class__  # type: ignore[assignment]
         self.__dict__ = image.__dict__
         return image.load()
 
-    def _load(self):
+    def _load(self) -> StubHandler | None:
         """(Hook) Find actual image loader."""
         msg = "StubImageFile subclass must implement _load"
         raise NotImplementedError(msg)
@@ -384,13 +402,13 @@ class Parser:
     """
 
     incremental = None
-    image = None
-    data = None
-    decoder = None
+    image: Image.Image | None = None
+    data: bytes | None = None
+    decoder: Image.core.ImagingDecoder | PyDecoder | None = None
     offset = 0
     finished = 0
 
-    def reset(self):
+    def reset(self) -> None:
         """
         (Consumer) Reset the parser.  Note that you can only call this
         method immediately after you've created a parser; parser
@@ -398,7 +416,7 @@ def reset(self):
         """
         assert self.data is None, "cannot reuse parsers"
 
-    def feed(self, data):
+    def feed(self, data: bytes) -> None:
         """
         (Consumer) Feed data to the parser.
 
@@ -474,13 +492,13 @@ def feed(self, data):
 
                 self.image = im
 
-    def __enter__(self):
+    def __enter__(self) -> Parser:
         return self
 
-    def __exit__(self, *args):
+    def __exit__(self, *args: object) -> None:
         self.close()
 
-    def close(self):
+    def close(self) -> Image.Image:
         """
         (Consumer) Close the stream.
 
@@ -514,7 +532,7 @@ def close(self):
 # --------------------------------------------------------------------
 
 
-def _save(im, fp, tile, bufsize=0):
+def _save(im: Image.Image, fp: IO[bytes], tile: list[_Tile], bufsize: int = 0) -> None:
     """Helper to save image based on tile list
 
     :param im: Image object.
@@ -542,7 +560,14 @@ def _save(im, fp, tile, bufsize=0):
         fp.flush()
 
 
-def _encode_tile(im, fp, tile: list[_Tile], bufsize, fh, exc=None):
+def _encode_tile(
+    im: Image.Image,
+    fp: IO[bytes],
+    tile: list[_Tile],
+    bufsize: int,
+    fh: int | None,
+    exc: BaseException | None = None,
+) -> None:
     for encoder_name, extents, offset, args in tile:
         if offset > 0:
             fp.seek(offset)
@@ -562,6 +587,7 @@ def _encode_tile(im, fp, tile: list[_Tile], bufsize, fh, exc=None):
                             break
                 else:
                     # slight speedup: compress to real file object
+                    assert fh is not None
                     errcode = encoder.encode_to_file(fh, bufsize)
             if errcode < 0:
                 raise _get_oserror(errcode, encoder=True) from exc
@@ -569,7 +595,7 @@ def _encode_tile(im, fp, tile: list[_Tile], bufsize, fh, exc=None):
             encoder.cleanup()
 
 
-def _safe_read(fp, size):
+def _safe_read(fp: IO[bytes], size: int) -> bytes:
     """
     Reads large blocks in a safe way.  Unlike fp.read(n), this function
     doesn't trust the user.  If the requested size is larger than
@@ -590,49 +616,51 @@ def _safe_read(fp, size):
             msg = "Truncated File Read"
             raise OSError(msg)
         return data
-    data = []
+    blocks: list[bytes] = []
     remaining_size = size
     while remaining_size > 0:
         block = fp.read(min(remaining_size, SAFEBLOCK))
         if not block:
             break
-        data.append(block)
+        blocks.append(block)
         remaining_size -= len(block)
-    if sum(len(d) for d in data) < size:
+    if sum(len(block) for block in blocks) < size:
         msg = "Truncated File Read"
         raise OSError(msg)
-    return b"".join(data)
+    return b"".join(blocks)
 
 
 class PyCodecState:
-    def __init__(self):
+    def __init__(self) -> None:
         self.xsize = 0
         self.ysize = 0
         self.xoff = 0
         self.yoff = 0
 
-    def extents(self):
+    def extents(self) -> tuple[int, int, int, int]:
         return self.xoff, self.yoff, self.xoff + self.xsize, self.yoff + self.ysize
 
 
 class PyCodec:
-    def __init__(self, mode, *args):
-        self.im = None
+    fd: IO[bytes] | None
+
+    def __init__(self, mode: str, *args: Any) -> None:
+        self.im: Image.core.ImagingCore | None = None
         self.state = PyCodecState()
         self.fd = None
         self.mode = mode
         self.init(args)
 
-    def init(self, args):
+    def init(self, args: tuple[Any, ...]) -> None:
         """
         Override to perform codec specific initialization
 
-        :param args: Array of args items from the tile entry
+        :param args: Tuple of arg items from the tile entry
         :returns: None
         """
         self.args = args
 
-    def cleanup(self):
+    def cleanup(self) -> None:
         """
         Override to perform codec specific cleanup
 
@@ -640,7 +668,7 @@ def cleanup(self):
         """
         pass
 
-    def setfd(self, fd):
+    def setfd(self, fd: IO[bytes]) -> None:
         """
         Called from ImageFile to set the Python file-like object
 
@@ -649,7 +677,11 @@ def setfd(self, fd):
         """
         self.fd = fd
 
-    def setimage(self, im, extents=None):
+    def setimage(
+        self,
+        im: Image.core.ImagingCore,
+        extents: tuple[int, int, int, int] | None = None,
+    ) -> None:
         """
         Called from ImageFile to set the core output image for the codec
 
@@ -698,10 +730,10 @@ class PyDecoder(PyCodec):
     _pulls_fd = False
 
     @property
-    def pulls_fd(self):
+    def pulls_fd(self) -> bool:
         return self._pulls_fd
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
         """
         Override to perform the decoding process.
 
@@ -713,19 +745,23 @@ def decode(self, buffer):
         msg = "unavailable in base decoder"
         raise NotImplementedError(msg)
 
-    def set_as_raw(self, data, rawmode=None):
+    def set_as_raw(
+        self, data: bytes, rawmode: str | None = None, extra: tuple[Any, ...] = ()
+    ) -> None:
         """
         Convenience method to set the internal image from a stream of raw data
 
         :param data: Bytes to be set
         :param rawmode: The rawmode to be used for the decoder.
             If not specified, it will default to the mode of the image
+        :param extra: Extra arguments for the decoder.
         :returns: None
         """
 
         if not rawmode:
             rawmode = self.mode
-        d = Image._getdecoder(self.mode, "raw", rawmode)
+        d = Image._getdecoder(self.mode, "raw", rawmode, extra)
+        assert self.im is not None
         d.setimage(self.im, self.state.extents())
         s = d.decode(data)
 
@@ -748,10 +784,10 @@ class PyEncoder(PyCodec):
     _pushes_fd = False
 
     @property
-    def pushes_fd(self):
+    def pushes_fd(self) -> bool:
         return self._pushes_fd
 
-    def encode(self, bufsize):
+    def encode(self, bufsize: int) -> tuple[int, int, bytes]:
         """
         Override to perform the encoding process.
 
@@ -763,7 +799,7 @@ def encode(self, bufsize):
         msg = "unavailable in base encoder"
         raise NotImplementedError(msg)
 
-    def encode_to_pyfd(self):
+    def encode_to_pyfd(self) -> tuple[int, int]:
         """
         If ``pushes_fd`` is ``True``, then this method will be used,
         and ``encode()`` will only be called once.
@@ -775,10 +811,11 @@ def encode_to_pyfd(self):
             return 0, -8  # bad configuration
         bytes_consumed, errcode, data = self.encode(0)
         if data:
+            assert self.fd is not None
             self.fd.write(data)
         return bytes_consumed, errcode
 
-    def encode_to_file(self, fh, bufsize):
+    def encode_to_file(self, fh: int, bufsize: int) -> int:
         """
         :param fh: File handle.
         :param bufsize: Buffer size.
@@ -791,5 +828,5 @@ def encode_to_file(self, fh, bufsize):
         while errcode == 0:
             status, errcode, buf = self.encode(bufsize)
             if status > 0:
-                fh.write(buf[status:])
+                os.write(fh, buf[status:])
         return errcode
diff --git a/src/PIL/ImageFilter.py b/src/PIL/ImageFilter.py
index 035b83c4d77..8b0974b2c37 100644
--- a/src/PIL/ImageFilter.py
+++ b/src/PIL/ImageFilter.py
@@ -16,11 +16,21 @@
 #
 from __future__ import annotations
 
+import abc
 import functools
+from collections.abc import Sequence
+from types import ModuleType
+from typing import TYPE_CHECKING, Any, Callable, cast
+
+if TYPE_CHECKING:
+    from . import _imaging
+    from ._typing import NumpyArray
 
 
 class Filter:
-    pass
+    @abc.abstractmethod
+    def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
+        pass
 
 
 class MultibandFilter(Filter):
@@ -28,7 +38,9 @@ class MultibandFilter(Filter):
 
 
 class BuiltinFilter(MultibandFilter):
-    def filter(self, image):
+    filterargs: tuple[Any, ...]
+
+    def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
         if image.mode == "P":
             msg = "cannot filter palette images"
             raise ValueError(msg)
@@ -37,26 +49,29 @@ def filter(self, image):
 
 class Kernel(BuiltinFilter):
     """
-    Create a convolution kernel. The current version only
-    supports 3x3 and 5x5 integer and floating point kernels.
-
-    In the current version, kernels can only be applied to
-    "L" and "RGB" images.
-
-    :param size: Kernel size, given as (width, height). In the current
-                    version, this must be (3,3) or (5,5).
-    :param kernel: A sequence containing kernel weights. The kernel will
-                   be flipped vertically before being applied to the image.
-    :param scale: Scale factor. If given, the result for each pixel is
-                    divided by this value. The default is the sum of the
-                    kernel weights.
-    :param offset: Offset. If given, this value is added to the result,
-                    after it has been divided by the scale factor.
+    Create a convolution kernel. This only supports 3x3 and 5x5 integer and floating
+    point kernels.
+
+    Kernels can only be applied to "L" and "RGB" images.
+
+    :param size: Kernel size, given as (width, height). This must be (3,3) or (5,5).
+    :param kernel: A sequence containing kernel weights. The kernel will be flipped
+                   vertically before being applied to the image.
+    :param scale: Scale factor. If given, the result for each pixel is divided by this
+                  value. The default is the sum of the kernel weights.
+    :param offset: Offset. If given, this value is added to the result, after it has
+                   been divided by the scale factor.
     """
 
     name = "Kernel"
 
-    def __init__(self, size, kernel, scale=None, offset=0):
+    def __init__(
+        self,
+        size: tuple[int, int],
+        kernel: Sequence[float],
+        scale: float | None = None,
+        offset: float = 0,
+    ) -> None:
         if scale is None:
             # default scale is sum of kernel
             scale = functools.reduce(lambda a, b: a + b, kernel)
@@ -79,11 +94,11 @@ class RankFilter(Filter):
 
     name = "Rank"
 
-    def __init__(self, size, rank):
+    def __init__(self, size: int, rank: int) -> None:
         self.size = size
         self.rank = rank
 
-    def filter(self, image):
+    def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
         if image.mode == "P":
             msg = "cannot filter palette images"
             raise ValueError(msg)
@@ -101,7 +116,7 @@ class MedianFilter(RankFilter):
 
     name = "Median"
 
-    def __init__(self, size=3):
+    def __init__(self, size: int = 3) -> None:
         self.size = size
         self.rank = size * size // 2
 
@@ -116,7 +131,7 @@ class MinFilter(RankFilter):
 
     name = "Min"
 
-    def __init__(self, size=3):
+    def __init__(self, size: int = 3) -> None:
         self.size = size
         self.rank = 0
 
@@ -131,7 +146,7 @@ class MaxFilter(RankFilter):
 
     name = "Max"
 
-    def __init__(self, size=3):
+    def __init__(self, size: int = 3) -> None:
         self.size = size
         self.rank = size * size - 1
 
@@ -147,10 +162,10 @@ class ModeFilter(Filter):
 
     name = "Mode"
 
-    def __init__(self, size=3):
+    def __init__(self, size: int = 3) -> None:
         self.size = size
 
-    def filter(self, image):
+    def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
         return image.modefilter(self.size)
 
 
@@ -165,12 +180,12 @@ class GaussianBlur(MultibandFilter):
 
     name = "GaussianBlur"
 
-    def __init__(self, radius=2):
+    def __init__(self, radius: float | Sequence[float] = 2) -> None:
         self.radius = radius
 
-    def filter(self, image):
+    def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
         xy = self.radius
-        if not isinstance(xy, (tuple, list)):
+        if isinstance(xy, (int, float)):
             xy = (xy, xy)
         if xy == (0, 0):
             return image.copy()
@@ -193,18 +208,16 @@ class BoxBlur(MultibandFilter):
 
     name = "BoxBlur"
 
-    def __init__(self, radius):
-        xy = radius
-        if not isinstance(xy, (tuple, list)):
-            xy = (xy, xy)
+    def __init__(self, radius: float | Sequence[float]) -> None:
+        xy = radius if isinstance(radius, (tuple, list)) else (radius, radius)
         if xy[0] < 0 or xy[1] < 0:
             msg = "radius must be >= 0"
             raise ValueError(msg)
         self.radius = radius
 
-    def filter(self, image):
+    def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
         xy = self.radius
-        if not isinstance(xy, (tuple, list)):
+        if isinstance(xy, (int, float)):
             xy = (xy, xy)
         if xy == (0, 0):
             return image.copy()
@@ -228,12 +241,14 @@ class UnsharpMask(MultibandFilter):
 
     name = "UnsharpMask"
 
-    def __init__(self, radius=2, percent=150, threshold=3):
+    def __init__(
+        self, radius: float = 2, percent: int = 150, threshold: int = 3
+    ) -> None:
         self.radius = radius
         self.percent = percent
         self.threshold = threshold
 
-    def filter(self, image):
+    def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
         return image.unsharp_mask(self.radius, self.percent, self.threshold)
 
 
@@ -378,7 +393,14 @@ class Color3DLUT(MultibandFilter):
 
     name = "Color 3D LUT"
 
-    def __init__(self, size, table, channels=3, target_mode=None, **kwargs):
+    def __init__(
+        self,
+        size: int | tuple[int, int, int],
+        table: Sequence[float] | Sequence[Sequence[int]] | NumpyArray,
+        channels: int = 3,
+        target_mode: str | None = None,
+        **kwargs: bool,
+    ) -> None:
         if channels not in (3, 4):
             msg = "Only 3 or 4 output channels are supported"
             raise ValueError(msg)
@@ -392,7 +414,7 @@ def __init__(self, size, table, channels=3, target_mode=None, **kwargs):
         items = size[0] * size[1] * size[2]
         wrong_size = False
 
-        numpy = None
+        numpy: ModuleType | None = None
         if hasattr(table, "shape"):
             try:
                 import numpy
@@ -400,15 +422,16 @@ def __init__(self, size, table, channels=3, target_mode=None, **kwargs):
                 pass
 
         if numpy and isinstance(table, numpy.ndarray):
+            numpy_table: NumpyArray = table
             if copy_table:
-                table = table.copy()
+                numpy_table = numpy_table.copy()
 
-            if table.shape in [
+            if numpy_table.shape in [
                 (items * channels,),
                 (items, channels),
                 (size[2], size[1], size[0], channels),
             ]:
-                table = table.reshape(items * channels)
+                table = numpy_table.reshape(items * channels)
             else:
                 wrong_size = True
 
@@ -418,7 +441,8 @@ def __init__(self, size, table, channels=3, target_mode=None, **kwargs):
 
             # Convert to a flat list
             if table and isinstance(table[0], (list, tuple)):
-                table, raw_table = [], table
+                raw_table = cast(Sequence[Sequence[int]], table)
+                flat_table: list[int] = []
                 for pixel in raw_table:
                     if len(pixel) != channels:
                         msg = (
@@ -426,7 +450,8 @@ def __init__(self, size, table, channels=3, target_mode=None, **kwargs):
                             f"have a length of {channels}."
                         )
                         raise ValueError(msg)
-                    table.extend(pixel)
+                    flat_table.extend(pixel)
+                table = flat_table
 
         if wrong_size or len(table) != items * channels:
             msg = (
@@ -439,7 +464,7 @@ def __init__(self, size, table, channels=3, target_mode=None, **kwargs):
         self.table = table
 
     @staticmethod
-    def _check_size(size):
+    def _check_size(size: Any) -> tuple[int, int, int]:
         try:
             _, _, _ = size
         except ValueError as e:
@@ -447,7 +472,7 @@ def _check_size(size):
             raise ValueError(msg) from e
         except TypeError:
             size = (size, size, size)
-        size = [int(x) for x in size]
+        size = tuple(int(x) for x in size)
         for size_1d in size:
             if not 2 <= size_1d <= 65:
                 msg = "Size should be in [2, 65] range."
@@ -455,7 +480,13 @@ def _check_size(size):
         return size
 
     @classmethod
-    def generate(cls, size, callback, channels=3, target_mode=None):
+    def generate(
+        cls,
+        size: int | tuple[int, int, int],
+        callback: Callable[[float, float, float], tuple[float, ...]],
+        channels: int = 3,
+        target_mode: str | None = None,
+    ) -> Color3DLUT:
         """Generates new LUT using provided callback.
 
         :param size: Size of the table. Passed to the constructor.
@@ -472,7 +503,7 @@ def generate(cls, size, callback, channels=3, target_mode=None):
             msg = "Only 3 or 4 output channels are supported"
             raise ValueError(msg)
 
-        table = [0] * (size_1d * size_2d * size_3d * channels)
+        table: list[float] = [0] * (size_1d * size_2d * size_3d * channels)
         idx_out = 0
         for b in range(size_3d):
             for g in range(size_2d):
@@ -490,7 +521,13 @@ def generate(cls, size, callback, channels=3, target_mode=None):
             _copy_table=False,
         )
 
-    def transform(self, callback, with_normals=False, channels=None, target_mode=None):
+    def transform(
+        self,
+        callback: Callable[..., tuple[float, ...]],
+        with_normals: bool = False,
+        channels: int | None = None,
+        target_mode: str | None = None,
+    ) -> Color3DLUT:
         """Transforms the table values using provided callback and returns
         a new LUT with altered values.
 
@@ -544,7 +581,7 @@ def transform(self, callback, with_normals=False, channels=None, target_mode=Non
             _copy_table=False,
         )
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         r = [
             f"{self.__class__.__name__} from {self.table.__class__.__name__}",
             "size={:d}x{:d}x{:d}".format(*self.size),
@@ -554,7 +591,7 @@ def __repr__(self):
             r.append(f"target_mode={self.mode}")
         return "<{}>".format(" ".join(r))
 
-    def filter(self, image):
+    def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
         from . import Image
 
         return image.color_lut_3d(
diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
index 8213d030a46..b694b817e65 100644
--- a/src/PIL/ImageFont.py
+++ b/src/PIL/ImageFont.py
@@ -33,11 +33,24 @@
 import warnings
 from enum import IntEnum
 from io import BytesIO
-from pathlib import Path
-from typing import BinaryIO
+from types import ModuleType
+from typing import IO, TYPE_CHECKING, Any, BinaryIO, TypedDict, cast
 
-from . import Image
-from ._util import is_directory, is_path
+from . import Image, features
+from ._typing import StrOrBytesPath
+from ._util import DeferredError, is_path
+
+if TYPE_CHECKING:
+    from . import ImageFile
+    from ._imaging import ImagingFont
+    from ._imagingft import Font
+
+
+class Axis(TypedDict):
+    minimum: int | None
+    default: int | None
+    maximum: int | None
+    name: bytes | None
 
 
 class Layout(IntEnum):
@@ -48,15 +61,14 @@ class Layout(IntEnum):
 MAX_STRING_LENGTH = 1_000_000
 
 
+core: ModuleType | DeferredError
 try:
     from . import _imagingft as core
 except ImportError as ex:
-    from ._util import DeferredError
-
     core = DeferredError.new(ex)
 
 
-def _string_length_check(text):
+def _string_length_check(text: str | bytes | bytearray) -> None:
     if MAX_STRING_LENGTH is not None and len(text) > MAX_STRING_LENGTH:
         msg = "too many characters in string"
         raise ValueError(msg)
@@ -81,14 +93,18 @@ def _string_length_check(text):
 class ImageFont:
     """PIL font wrapper"""
 
-    def _load_pilfont(self, filename):
+    font: ImagingFont
+
+    def _load_pilfont(self, filename: str) -> None:
         with open(filename, "rb") as fp:
-            image = None
+            image: ImageFile.ImageFile | None = None
+            root = os.path.splitext(filename)[0]
+
             for ext in (".png", ".gif", ".pbm"):
                 if image:
                     image.close()
                 try:
-                    fullname = os.path.splitext(filename)[0] + ext
+                    fullname = root + ext
                     image = Image.open(fullname)
                 except Exception:
                     pass
@@ -98,7 +114,8 @@ def _load_pilfont(self, filename):
             else:
                 if image:
                     image.close()
-                msg = "cannot find glyph data file"
+
+                msg = f"cannot find glyph data file {root}.{{gif|pbm|png}}"
                 raise OSError(msg)
 
             self.file = fullname
@@ -106,7 +123,7 @@ def _load_pilfont(self, filename):
             self._load_pilfont_data(fp, image)
             image.close()
 
-    def _load_pilfont_data(self, file, image):
+    def _load_pilfont_data(self, file: IO[bytes], image: Image.Image) -> None:
         # read PILfont header
         if file.readline() != b"PILfont\n":
             msg = "Not a PILfont file"
@@ -131,7 +148,9 @@ def _load_pilfont_data(self, file, image):
 
         self.font = Image.core.font(image.im, data)
 
-    def getmask(self, text, mode="", *args, **kwargs):
+    def getmask(
+        self, text: str | bytes, mode: str = "", *args: Any, **kwargs: Any
+    ) -> Image.core.ImagingCore:
         """
         Create a bitmap for the text.
 
@@ -153,17 +172,15 @@ def getmask(self, text, mode="", *args, **kwargs):
         Image._decompression_bomb_check(self.font.getsize(text))
         return self.font.getmask(text, mode)
 
-    def getbbox(self, text, *args, **kwargs):
+    def getbbox(
+        self, text: str | bytes | bytearray, *args: Any, **kwargs: Any
+    ) -> tuple[int, int, int, int]:
         """
         Returns bounding box (in pixels) of given text.
 
         .. versionadded:: 9.2.0
 
         :param text: Text to render.
-        :param mode: Used by some graphics drivers to indicate what mode the
-                     driver prefers; if empty, the renderer may return either
-                     mode. Note that the mode is always a string, to simplify
-                     C-level implementations.
 
         :return: ``(left, top, right, bottom)`` bounding box
         """
@@ -171,7 +188,9 @@ def getbbox(self, text, *args, **kwargs):
         width, height = self.font.getsize(text)
         return 0, 0, width, height
 
-    def getlength(self, text, *args, **kwargs):
+    def getlength(
+        self, text: str | bytes | bytearray, *args: Any, **kwargs: Any
+    ) -> int:
         """
         Returns length (in pixels) of given text.
         This is the amount by which following text should be offset.
@@ -191,9 +210,12 @@ def getlength(self, text, *args, **kwargs):
 class FreeTypeFont:
     """FreeType font wrapper (requires _imagingft service)"""
 
+    font: Font
+    font_bytes: bytes
+
     def __init__(
         self,
-        font: bytes | str | Path | BinaryIO | None = None,
+        font: StrOrBytesPath | BinaryIO,
         size: float = 10,
         index: int = 0,
         encoding: str = "",
@@ -201,8 +223,11 @@ def __init__(
     ) -> None:
         # FIXME: use service provider instead
 
+        if isinstance(core, DeferredError):
+            raise core.ex
+
         if size <= 0:
-            msg = "font size must be greater than 0"
+            msg = f"font size must be greater than 0, not {size}"
             raise ValueError(msg)
 
         self.path = font
@@ -210,6 +235,21 @@ def __init__(
         self.index = index
         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):
             layout_engine = Layout.BASIC
             if core.HAVE_RAQM:
@@ -223,15 +263,14 @@ def __init__(
 
         self.layout_engine = layout_engine
 
-        def load_from_bytes(f):
+        def load_from_bytes(f: IO[bytes]) -> None:
             self.font_bytes = f.read()
             self.font = core.getfont(
                 "", size, index, encoding, self.font_bytes, layout_engine
             )
 
         if is_path(font):
-            if isinstance(font, Path):
-                font = str(font)
+            font = os.path.realpath(os.fspath(font))
             if sys.platform == "win32":
                 font_bytes_path = font if isinstance(font, bytes) else font.encode()
                 try:
@@ -246,23 +285,23 @@ def load_from_bytes(f):
                 font, size, index, encoding, layout_engine=layout_engine
             )
         else:
-            load_from_bytes(font)
+            load_from_bytes(cast(IO[bytes], font))
 
-    def __getstate__(self):
+    def __getstate__(self) -> list[Any]:
         return [self.path, self.size, self.index, self.encoding, self.layout_engine]
 
-    def __setstate__(self, state):
+    def __setstate__(self, state: list[Any]) -> None:
         path, size, index, encoding, layout_engine = state
-        self.__init__(path, size, index, encoding, layout_engine)
+        FreeTypeFont.__init__(self, path, size, index, encoding, layout_engine)
 
-    def getname(self):
+    def getname(self) -> tuple[str | None, str | None]:
         """
         :return: A tuple of the font family (e.g. Helvetica) and the font style
             (e.g. Bold)
         """
         return self.font.family, self.font.style
 
-    def getmetrics(self):
+    def getmetrics(self) -> tuple[int, int]:
         """
         :return: A tuple of the font ascent (the distance from the baseline to
             the highest outline point) and descent (the distance from the
@@ -270,7 +309,14 @@ def getmetrics(self):
         """
         return self.font.ascent, self.font.descent
 
-    def getlength(self, text, mode="", direction=None, features=None, language=None):
+    def getlength(
+        self,
+        text: str | bytes,
+        mode: str = "",
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+    ) -> float:
         """
         Returns length (in pixels with 1/64 precision) of given text when rendered
         in font with provided direction, features, and language.
@@ -344,14 +390,14 @@ def getlength(self, text, mode="", direction=None, features=None, language=None)
 
     def getbbox(
         self,
-        text,
-        mode="",
-        direction=None,
-        features=None,
-        language=None,
-        stroke_width=0,
-        anchor=None,
-    ):
+        text: str | bytes,
+        mode: str = "",
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+        stroke_width: float = 0,
+        anchor: str | None = None,
+    ) -> tuple[float, float, float, float]:
         """
         Returns bounding box (in pixels) of given text relative to given anchor
         when rendered in font with provided direction, features, and language.
@@ -410,16 +456,16 @@ def getbbox(
 
     def getmask(
         self,
-        text,
-        mode="",
-        direction=None,
-        features=None,
-        language=None,
-        stroke_width=0,
-        anchor=None,
-        ink=0,
-        start=None,
-    ):
+        text: str | bytes,
+        mode: str = "",
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+        stroke_width: float = 0,
+        anchor: str | None = None,
+        ink: int = 0,
+        start: tuple[float, float] | None = None,
+    ) -> Image.core.ImagingCore:
         """
         Create a bitmap for the text.
 
@@ -501,18 +547,18 @@ def getmask(
 
     def getmask2(
         self,
-        text,
-        mode="",
-        direction=None,
-        features=None,
-        language=None,
-        stroke_width=0,
-        anchor=None,
-        ink=0,
-        start=None,
-        *args,
-        **kwargs,
-    ):
+        text: str | bytes,
+        mode: str = "",
+        direction: str | None = None,
+        features: list[str] | None = None,
+        language: str | None = None,
+        stroke_width: float = 0,
+        anchor: str | None = None,
+        ink: int = 0,
+        start: tuple[float, float] | None = None,
+        *args: Any,
+        **kwargs: Any,
+    ) -> tuple[Image.core.ImagingCore, tuple[int, int]]:
         """
         Create a bitmap for the text.
 
@@ -584,22 +630,13 @@ def getmask2(
         _string_length_check(text)
         if start is None:
             start = (0, 0)
-        im = None
-        size = None
-
-        def fill(width, height):
-            nonlocal im, size
 
+        def fill(width: int, height: int) -> Image.core.ImagingCore:
             size = (width, height)
-            if Image.MAX_IMAGE_PIXELS is not None:
-                pixels = max(1, width) * max(1, height)
-                if pixels > 2 * Image.MAX_IMAGE_PIXELS:
-                    return
-
-            im = Image.core.fill("RGBA" if mode == "RGBA" else "L", size)
-            return im
+            Image._decompression_bomb_check(size)
+            return Image.core.fill("RGBA" if mode == "RGBA" else "L", size)
 
-        offset = self.font.render(
+        return self.font.render(
             text,
             fill,
             mode,
@@ -612,12 +649,15 @@ def fill(width, height):
             start[0],
             start[1],
         )
-        Image._decompression_bomb_check(size)
-        return im, offset
 
     def font_variant(
-        self, font=None, size=None, index=None, encoding=None, layout_engine=None
-    ):
+        self,
+        font: StrOrBytesPath | BinaryIO | None = None,
+        size: float | None = None,
+        index: int | None = None,
+        encoding: str | None = None,
+        layout_engine: Layout | None = None,
+    ) -> FreeTypeFont:
         """
         Create a copy of this FreeTypeFont object,
         using any specified arguments to override the settings.
@@ -640,7 +680,7 @@ def font_variant(
             layout_engine=layout_engine or self.layout_engine,
         )
 
-    def get_variation_names(self):
+    def get_variation_names(self) -> list[bytes]:
         """
         :returns: A list of the named styles in a variation font.
         :exception OSError: If the font is not a variation font.
@@ -652,7 +692,7 @@ def get_variation_names(self):
             raise NotImplementedError(msg) from e
         return [name.replace(b"\x00", b"") for name in names]
 
-    def set_variation_by_name(self, name):
+    def set_variation_by_name(self, name: str | bytes) -> None:
         """
         :param name: The name of the style.
         :exception OSError: If the font is not a variation font.
@@ -671,7 +711,7 @@ def set_variation_by_name(self, name):
 
         self.font.setvarname(index)
 
-    def get_variation_axes(self):
+    def get_variation_axes(self) -> list[Axis]:
         """
         :returns: A list of the axes in a variation font.
         :exception OSError: If the font is not a variation font.
@@ -682,10 +722,11 @@ def get_variation_axes(self):
             msg = "FreeType 2.9.1 or greater is required"
             raise NotImplementedError(msg) from e
         for axis in axes:
-            axis["name"] = axis["name"].replace(b"\x00", b"")
+            if axis["name"]:
+                axis["name"] = axis["name"].replace(b"\x00", b"")
         return axes
 
-    def set_variation_by_axes(self, axes):
+    def set_variation_by_axes(self, axes: list[float]) -> None:
         """
         :param axes: A list of values for each axis.
         :exception OSError: If the font is not a variation font.
@@ -700,7 +741,9 @@ def set_variation_by_axes(self, axes):
 class TransposedFont:
     """Wrapper for writing rotated or mirrored text"""
 
-    def __init__(self, font, orientation=None):
+    def __init__(
+        self, font: ImageFont | FreeTypeFont, orientation: Image.Transpose | None = None
+    ):
         """
         Wrapper that creates a transposed font from any existing font
         object.
@@ -714,13 +757,17 @@ def __init__(self, font, orientation=None):
         self.font = font
         self.orientation = orientation  # any 'transpose' argument, or None
 
-    def getmask(self, text, mode="", *args, **kwargs):
+    def getmask(
+        self, text: str | bytes, mode: str = "", *args: Any, **kwargs: Any
+    ) -> Image.core.ImagingCore:
         im = self.font.getmask(text, mode, *args, **kwargs)
         if self.orientation is not None:
             return im.transpose(self.orientation)
         return im
 
-    def getbbox(self, text, *args, **kwargs):
+    def getbbox(
+        self, text: str | bytes, *args: Any, **kwargs: Any
+    ) -> tuple[int, int, float, float]:
         # TransposedFont doesn't support getmask2, move top-left point to (0, 0)
         # this has no effect on ImageFont and simulates anchor="lt" for FreeTypeFont
         left, top, right, bottom = self.font.getbbox(text, *args, **kwargs)
@@ -730,17 +777,18 @@ def getbbox(self, text, *args, **kwargs):
             return 0, 0, height, width
         return 0, 0, width, height
 
-    def getlength(self, text, *args, **kwargs):
+    def getlength(self, text: str | bytes, *args: Any, **kwargs: Any) -> float:
         if self.orientation in (Image.Transpose.ROTATE_90, Image.Transpose.ROTATE_270):
             msg = "text length is undefined for text rotated by 90 or 270 degrees"
             raise ValueError(msg)
         return self.font.getlength(text, *args, **kwargs)
 
 
-def load(filename):
+def load(filename: str) -> ImageFont:
     """
-    Load a font file.  This function loads a font object from the given
-    bitmap font file, and returns the corresponding font object.
+    Load a font file. This function loads a font object from the given
+    bitmap font file, and returns the corresponding font object. For loading TrueType
+    or OpenType fonts instead, see :py:func:`~PIL.ImageFont.truetype`.
 
     :param filename: Name of font file.
     :return: A font object.
@@ -751,12 +799,19 @@ def load(filename):
     return f
 
 
-def truetype(font=None, size=10, index=0, encoding="", layout_engine=None):
+def truetype(
+    font: StrOrBytesPath | BinaryIO,
+    size: float = 10,
+    index: int = 0,
+    encoding: str = "",
+    layout_engine: Layout | None = None,
+) -> FreeTypeFont:
     """
     Load a TrueType or OpenType font from a file or file-like object,
-    and create a font object.
-    This function loads a font object from the given file or file-like
-    object, and creates a font object for a font of the given size.
+    and create a font object. This function loads a font object from the given
+    file or file-like object, and creates a font object for a font of the given
+    size. For loading bitmap fonts instead, see :py:func:`~PIL.ImageFont.load`
+    and :py:func:`~PIL.ImageFont.load_path`.
 
     Pillow uses FreeType to open font files. On Windows, be aware that FreeType
     will keep the file open as long as the FreeTypeFont object exists. Windows
@@ -769,10 +824,15 @@ def truetype(font=None, size=10, index=0, encoding="", layout_engine=None):
 
     :param font: A filename or file-like object containing a TrueType font.
                  If the file is not found in this filename, the loader may also
-                 search in other directories, such as the :file:`fonts/`
-                 directory on Windows or :file:`/Library/Fonts/`,
-                 :file:`/System/Library/Fonts/` and :file:`~/Library/Fonts/` on
-                 macOS.
+                 search in other directories, such as:
+
+                 * The :file:`fonts/` directory on Windows,
+                 * :file:`/Library/Fonts/`, :file:`/System/Library/Fonts/`
+                   and :file:`~/Library/Fonts/` on macOS.
+                 * :file:`~/.local/share/fonts`, :file:`/usr/local/share/fonts`,
+                   and :file:`/usr/share/fonts` on Linux; or those specified by
+                   the ``XDG_DATA_HOME`` and ``XDG_DATA_DIRS`` environment variables
+                   for user-installed and system-wide fonts, respectively.
 
     :param size: The requested size, in pixels.
     :param index: Which font face to load (default is first available face).
@@ -812,7 +872,7 @@ def truetype(font=None, size=10, index=0, encoding="", layout_engine=None):
     :exception ValueError: If the font size is not greater than zero.
     """
 
-    def freetype(font):
+    def freetype(font: StrOrBytesPath | BinaryIO) -> FreeTypeFont:
         return FreeTypeFont(font, size, index, encoding, layout_engine)
 
     try:
@@ -831,12 +891,21 @@ def freetype(font):
             if windir:
                 dirs.append(os.path.join(windir, "fonts"))
         elif sys.platform in ("linux", "linux2"):
-            lindirs = os.environ.get("XDG_DATA_DIRS")
-            if not lindirs:
-                # According to the freedesktop spec, XDG_DATA_DIRS should
-                # default to /usr/share
-                lindirs = "/usr/share"
-            dirs += [os.path.join(lindir, "fonts") for lindir in lindirs.split(":")]
+            data_home = os.environ.get("XDG_DATA_HOME")
+            if not data_home:
+                # The freedesktop spec defines the following default directory for
+                # when XDG_DATA_HOME is unset or empty. This user-level directory
+                # takes precedence over system-level directories.
+                data_home = os.path.expanduser("~/.local/share")
+            xdg_dirs = [data_home]
+
+            data_dirs = os.environ.get("XDG_DATA_DIRS")
+            if not data_dirs:
+                # Similarly, defaults are defined for the system-level directories
+                data_dirs = "/usr/local/share:/usr/share"
+            xdg_dirs += data_dirs.split(":")
+
+            dirs += [os.path.join(xdg_dir, "fonts") for xdg_dir in xdg_dirs]
         elif sys.platform == "darwin":
             dirs += [
                 "/Library/Fonts",
@@ -862,7 +931,7 @@ def freetype(font):
         raise
 
 
-def load_path(filename):
+def load_path(filename: str | bytes) -> ImageFont:
     """
     Load font file. Same as :py:func:`~PIL.ImageFont.load`, but searches for a
     bitmap font along the Python path.
@@ -871,19 +940,157 @@ def load_path(filename):
     :return: A font object.
     :exception OSError: If the file could not be read.
     """
+    if not isinstance(filename, str):
+        filename = filename.decode("utf-8")
     for directory in sys.path:
-        if is_directory(directory):
-            if not isinstance(filename, str):
-                filename = filename.decode("utf-8")
-            try:
-                return load(os.path.join(directory, filename))
-            except OSError:
-                pass
-    msg = "cannot find font file"
+        try:
+            return load(os.path.join(directory, filename))
+        except OSError:
+            pass
+    msg = f'cannot find font file "{filename}" in sys.path'
+    if os.path.exists(filename):
+        msg += f', did you mean ImageFont.load("{filename}") instead?'
+
     raise OSError(msg)
 
 
-def load_default(size=None):
+def load_default_imagefont() -> ImageFont:
+    f = ImageFont()
+    f._load_pilfont_data(
+        # courB08
+        BytesIO(
+            base64.b64decode(
+                b"""
+UElMZm9udAo7Ozs7OzsxMDsKREFUQQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAA//8AAQAAAAAAAAABAAEA
+BgAAAAH/+gADAAAAAQAAAAMABgAGAAAAAf/6AAT//QADAAAABgADAAYAAAAA//kABQABAAYAAAAL
+AAgABgAAAAD/+AAFAAEACwAAABAACQAGAAAAAP/5AAUAAAAQAAAAFQAHAAYAAP////oABQAAABUA
+AAAbAAYABgAAAAH/+QAE//wAGwAAAB4AAwAGAAAAAf/5AAQAAQAeAAAAIQAIAAYAAAAB//kABAAB
+ACEAAAAkAAgABgAAAAD/+QAE//0AJAAAACgABAAGAAAAAP/6AAX//wAoAAAALQAFAAYAAAAB//8A
+BAACAC0AAAAwAAMABgAAAAD//AAF//0AMAAAADUAAQAGAAAAAf//AAMAAAA1AAAANwABAAYAAAAB
+//kABQABADcAAAA7AAgABgAAAAD/+QAFAAAAOwAAAEAABwAGAAAAAP/5AAYAAABAAAAARgAHAAYA
+AAAA//kABQAAAEYAAABLAAcABgAAAAD/+QAFAAAASwAAAFAABwAGAAAAAP/5AAYAAABQAAAAVgAH
+AAYAAAAA//kABQAAAFYAAABbAAcABgAAAAD/+QAFAAAAWwAAAGAABwAGAAAAAP/5AAUAAABgAAAA
+ZQAHAAYAAAAA//kABQAAAGUAAABqAAcABgAAAAD/+QAFAAAAagAAAG8ABwAGAAAAAf/8AAMAAABv
+AAAAcQAEAAYAAAAA//wAAwACAHEAAAB0AAYABgAAAAD/+gAE//8AdAAAAHgABQAGAAAAAP/7AAT/
+/gB4AAAAfAADAAYAAAAB//oABf//AHwAAACAAAUABgAAAAD/+gAFAAAAgAAAAIUABgAGAAAAAP/5
+AAYAAQCFAAAAiwAIAAYAAP////oABgAAAIsAAACSAAYABgAA////+gAFAAAAkgAAAJgABgAGAAAA
+AP/6AAUAAACYAAAAnQAGAAYAAP////oABQAAAJ0AAACjAAYABgAA////+gAFAAAAowAAAKkABgAG
+AAD////6AAUAAACpAAAArwAGAAYAAAAA//oABQAAAK8AAAC0AAYABgAA////+gAGAAAAtAAAALsA
+BgAGAAAAAP/6AAQAAAC7AAAAvwAGAAYAAP////oABQAAAL8AAADFAAYABgAA////+gAGAAAAxQAA
+AMwABgAGAAD////6AAUAAADMAAAA0gAGAAYAAP////oABQAAANIAAADYAAYABgAA////+gAGAAAA
+2AAAAN8ABgAGAAAAAP/6AAUAAADfAAAA5AAGAAYAAP////oABQAAAOQAAADqAAYABgAAAAD/+gAF
+AAEA6gAAAO8ABwAGAAD////6AAYAAADvAAAA9gAGAAYAAAAA//oABQAAAPYAAAD7AAYABgAA////
++gAFAAAA+wAAAQEABgAGAAD////6AAYAAAEBAAABCAAGAAYAAP////oABgAAAQgAAAEPAAYABgAA
+////+gAGAAABDwAAARYABgAGAAAAAP/6AAYAAAEWAAABHAAGAAYAAP////oABgAAARwAAAEjAAYA
+BgAAAAD/+gAFAAABIwAAASgABgAGAAAAAf/5AAQAAQEoAAABKwAIAAYAAAAA//kABAABASsAAAEv
+AAgABgAAAAH/+QAEAAEBLwAAATIACAAGAAAAAP/5AAX//AEyAAABNwADAAYAAAAAAAEABgACATcA
+AAE9AAEABgAAAAH/+QAE//wBPQAAAUAAAwAGAAAAAP/7AAYAAAFAAAABRgAFAAYAAP////kABQAA
+AUYAAAFMAAcABgAAAAD/+wAFAAABTAAAAVEABQAGAAAAAP/5AAYAAAFRAAABVwAHAAYAAAAA//sA
+BQAAAVcAAAFcAAUABgAAAAD/+QAFAAABXAAAAWEABwAGAAAAAP/7AAYAAgFhAAABZwAHAAYAAP//
+//kABQAAAWcAAAFtAAcABgAAAAD/+QAGAAABbQAAAXMABwAGAAAAAP/5AAQAAgFzAAABdwAJAAYA
+AP////kABgAAAXcAAAF+AAcABgAAAAD/+QAGAAABfgAAAYQABwAGAAD////7AAUAAAGEAAABigAF
+AAYAAP////sABQAAAYoAAAGQAAUABgAAAAD/+wAFAAABkAAAAZUABQAGAAD////7AAUAAgGVAAAB
+mwAHAAYAAAAA//sABgACAZsAAAGhAAcABgAAAAD/+wAGAAABoQAAAacABQAGAAAAAP/7AAYAAAGn
+AAABrQAFAAYAAAAA//kABgAAAa0AAAGzAAcABgAA////+wAGAAABswAAAboABQAGAAD////7AAUA
+AAG6AAABwAAFAAYAAP////sABgAAAcAAAAHHAAUABgAAAAD/+wAGAAABxwAAAc0ABQAGAAD////7
+AAYAAgHNAAAB1AAHAAYAAAAA//sABQAAAdQAAAHZAAUABgAAAAH/+QAFAAEB2QAAAd0ACAAGAAAA
+Av/6AAMAAQHdAAAB3gAHAAYAAAAA//kABAABAd4AAAHiAAgABgAAAAD/+wAF//0B4gAAAecAAgAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAB
+//sAAwACAecAAAHpAAcABgAAAAD/+QAFAAEB6QAAAe4ACAAGAAAAAP/5AAYAAAHuAAAB9AAHAAYA
+AAAA//oABf//AfQAAAH5AAUABgAAAAD/+QAGAAAB+QAAAf8ABwAGAAAAAv/5AAMAAgH/AAACAAAJ
+AAYAAAAA//kABQABAgAAAAIFAAgABgAAAAH/+gAE//sCBQAAAggAAQAGAAAAAP/5AAYAAAIIAAAC
+DgAHAAYAAAAB//kABf/+Ag4AAAISAAUABgAA////+wAGAAACEgAAAhkABQAGAAAAAP/7AAX//gIZ
+AAACHgADAAYAAAAA//wABf/9Ah4AAAIjAAEABgAAAAD/+QAHAAACIwAAAioABwAGAAAAAP/6AAT/
++wIqAAACLgABAAYAAAAA//kABP/8Ai4AAAIyAAMABgAAAAD/+gAFAAACMgAAAjcABgAGAAAAAf/5
+AAT//QI3AAACOgAEAAYAAAAB//kABP/9AjoAAAI9AAQABgAAAAL/+QAE//sCPQAAAj8AAgAGAAD/
+///7AAYAAgI/AAACRgAHAAYAAAAA//kABgABAkYAAAJMAAgABgAAAAH//AAD//0CTAAAAk4AAQAG
+AAAAAf//AAQAAgJOAAACUQADAAYAAAAB//kABP/9AlEAAAJUAAQABgAAAAH/+QAF//4CVAAAAlgA
+BQAGAAD////7AAYAAAJYAAACXwAFAAYAAP////kABgAAAl8AAAJmAAcABgAA////+QAGAAACZgAA
+Am0ABwAGAAD////5AAYAAAJtAAACdAAHAAYAAAAA//sABQACAnQAAAJ5AAcABgAA////9wAGAAAC
+eQAAAoAACQAGAAD////3AAYAAAKAAAAChwAJAAYAAP////cABgAAAocAAAKOAAkABgAA////9wAG
+AAACjgAAApUACQAGAAD////4AAYAAAKVAAACnAAIAAYAAP////cABgAAApwAAAKjAAkABgAA////
++gAGAAACowAAAqoABgAGAAAAAP/6AAUAAgKqAAACrwAIAAYAAP////cABQAAAq8AAAK1AAkABgAA
+////9wAFAAACtQAAArsACQAGAAD////3AAUAAAK7AAACwQAJAAYAAP////gABQAAAsEAAALHAAgA
+BgAAAAD/9wAEAAACxwAAAssACQAGAAAAAP/3AAQAAALLAAACzwAJAAYAAAAA//cABAAAAs8AAALT
+AAkABgAAAAD/+AAEAAAC0wAAAtcACAAGAAD////6AAUAAALXAAAC3QAGAAYAAP////cABgAAAt0A
+AALkAAkABgAAAAD/9wAFAAAC5AAAAukACQAGAAAAAP/3AAUAAALpAAAC7gAJAAYAAAAA//cABQAA
+Au4AAALzAAkABgAAAAD/9wAFAAAC8wAAAvgACQAGAAAAAP/4AAUAAAL4AAAC/QAIAAYAAAAA//oA
+Bf//Av0AAAMCAAUABgAA////+gAGAAADAgAAAwkABgAGAAD////3AAYAAAMJAAADEAAJAAYAAP//
+//cABgAAAxAAAAMXAAkABgAA////9wAGAAADFwAAAx4ACQAGAAD////4AAYAAAAAAAoABwASAAYA
+AP////cABgAAAAcACgAOABMABgAA////+gAFAAAADgAKABQAEAAGAAD////6AAYAAAAUAAoAGwAQ
+AAYAAAAA//gABgAAABsACgAhABIABgAAAAD/+AAGAAAAIQAKACcAEgAGAAAAAP/4AAYAAAAnAAoA
+LQASAAYAAAAA//gABgAAAC0ACgAzABIABgAAAAD/+QAGAAAAMwAKADkAEQAGAAAAAP/3AAYAAAA5
+AAoAPwATAAYAAP////sABQAAAD8ACgBFAA8ABgAAAAD/+wAFAAIARQAKAEoAEQAGAAAAAP/4AAUA
+AABKAAoATwASAAYAAAAA//gABQAAAE8ACgBUABIABgAAAAD/+AAFAAAAVAAKAFkAEgAGAAAAAP/5
+AAUAAABZAAoAXgARAAYAAAAA//gABgAAAF4ACgBkABIABgAAAAD/+AAGAAAAZAAKAGoAEgAGAAAA
+AP/4AAYAAABqAAoAcAASAAYAAAAA//kABgAAAHAACgB2ABEABgAAAAD/+AAFAAAAdgAKAHsAEgAG
+AAD////4AAYAAAB7AAoAggASAAYAAAAA//gABQAAAIIACgCHABIABgAAAAD/+AAFAAAAhwAKAIwA
+EgAGAAAAAP/4AAUAAACMAAoAkQASAAYAAAAA//gABQAAAJEACgCWABIABgAAAAD/+QAFAAAAlgAK
+AJsAEQAGAAAAAP/6AAX//wCbAAoAoAAPAAYAAAAA//oABQABAKAACgClABEABgAA////+AAGAAAA
+pQAKAKwAEgAGAAD////4AAYAAACsAAoAswASAAYAAP////gABgAAALMACgC6ABIABgAA////+QAG
+AAAAugAKAMEAEQAGAAD////4AAYAAgDBAAoAyAAUAAYAAP////kABQACAMgACgDOABMABgAA////
++QAGAAIAzgAKANUAEw==
+"""
+            )
+        ),
+        Image.open(
+            BytesIO(
+                base64.b64decode(
+                    b"""
+iVBORw0KGgoAAAANSUhEUgAAAx4AAAAUAQAAAAArMtZoAAAEwElEQVR4nABlAJr/AHVE4czCI/4u
+Mc4b7vuds/xzjz5/3/7u/n9vMe7vnfH/9++vPn/xyf5zhxzjt8GHw8+2d83u8x27199/nxuQ6Od9
+M43/5z2I+9n9ZtmDBwMQECDRQw/eQIQohJXxpBCNVE6QCCAAAAD//wBlAJr/AgALyj1t/wINwq0g
+LeNZUworuN1cjTPIzrTX6ofHWeo3v336qPzfEwRmBnHTtf95/fglZK5N0PDgfRTslpGBvz7LFc4F
+IUXBWQGjQ5MGCx34EDFPwXiY4YbYxavpnhHFrk14CDAAAAD//wBlAJr/AgKqRooH2gAgPeggvUAA
+Bu2WfgPoAwzRAABAAAAAAACQgLz/3Uv4Gv+gX7BJgDeeGP6AAAD1NMDzKHD7ANWr3loYbxsAD791
+NAADfcoIDyP44K/jv4Y63/Z+t98Ovt+ub4T48LAAAAD//wBlAJr/AuplMlADJAAAAGuAphWpqhMx
+in0A/fRvAYBABPgBwBUgABBQ/sYAyv9g0bCHgOLoGAAAAAAAREAAwI7nr0ArYpow7aX8//9LaP/9
+SjdavWA8ePHeBIKB//81/83ndznOaXx379wAAAD//wBlAJr/AqDxW+D3AABAAbUh/QMnbQag/gAY
+AYDAAACgtgD/gOqAAAB5IA/8AAAk+n9w0AAA8AAAmFRJuPo27ciC0cD5oeW4E7KA/wD3ECMAn2tt
+y8PgwH8AfAxFzC0JzeAMtratAsC/ffwAAAD//wBlAJr/BGKAyCAA4AAAAvgeYTAwHd1kmQF5chkG
+ABoMIHcL5xVpTfQbUqzlAAAErwAQBgAAEOClA5D9il08AEh/tUzdCBsXkbgACED+woQg8Si9VeqY
+lODCn7lmF6NhnAEYgAAA/NMIAAAAAAD//2JgjLZgVGBg5Pv/Tvpc8hwGBjYGJADjHDrAwPzAjv/H
+/Wf3PzCwtzcwHmBgYGcwbZz8wHaCAQMDOwMDQ8MCBgYOC3W7mp+f0w+wHOYxO3OG+e376hsMZjk3
+AAAAAP//YmCMY2A4wMAIN5e5gQETPD6AZisDAwMDgzSDAAPjByiHcQMDAwMDg1nOze1lByRu5/47
+c4859311AYNZzg0AAAAA//9iYGDBYihOIIMuwIjGL39/fwffA8b//xv/P2BPtzzHwCBjUQAAAAD/
+/yLFBrIBAAAA//9i1HhcwdhizX7u8NZNzyLbvT97bfrMf/QHI8evOwcSqGUJAAAA//9iYBB81iSw
+pEE170Qrg5MIYydHqwdDQRMrAwcVrQAAAAD//2J4x7j9AAMDn8Q/BgYLBoaiAwwMjPdvMDBYM1Tv
+oJodAAAAAP//Yqo/83+dxePWlxl3npsel9lvLfPcqlE9725C+acfVLMEAAAA//9i+s9gwCoaaGMR
+evta/58PTEWzr21hufPjA8N+qlnBwAAAAAD//2JiWLci5v1+HmFXDqcnULE/MxgYGBj+f6CaJQAA
+AAD//2Ji2FrkY3iYpYC5qDeGgeEMAwPDvwQBBoYvcTwOVLMEAAAA//9isDBgkP///0EOg9z35v//
+Gc/eeW7BwPj5+QGZhANUswMAAAD//2JgqGBgYGBgqEMXlvhMPUsAAAAA//8iYDd1AAAAAP//AwDR
+w7IkEbzhVQAAAABJRU5ErkJggg==
+"""
+                )
+            )
+        ),
+    )
+    return f
+
+
+def load_default(size: float | None = None) -> FreeTypeFont | ImageFont:
     """If FreeType support is available, load a version of Aileron Regular,
     https://dotcolon.net/font/aileron, with a more limited character set.
 
@@ -897,8 +1104,8 @@ def load_default(size=None):
 
     :return: A font object.
     """
-    if core.__class__.__name__ == "module" or size is not None:
-        f = truetype(
+    if isinstance(core, ModuleType) or size is not None:
+        return truetype(
             BytesIO(
                 base64.b64decode(
                     b"""
@@ -1128,137 +1335,4 @@ def load_default(size=None):
             10 if size is None else size,
             layout_engine=Layout.BASIC,
         )
-    else:
-        f = ImageFont()
-        f._load_pilfont_data(
-            # courB08
-            BytesIO(
-                base64.b64decode(
-                    b"""
-UElMZm9udAo7Ozs7OzsxMDsKREFUQQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAA//8AAQAAAAAAAAABAAEA
-BgAAAAH/+gADAAAAAQAAAAMABgAGAAAAAf/6AAT//QADAAAABgADAAYAAAAA//kABQABAAYAAAAL
-AAgABgAAAAD/+AAFAAEACwAAABAACQAGAAAAAP/5AAUAAAAQAAAAFQAHAAYAAP////oABQAAABUA
-AAAbAAYABgAAAAH/+QAE//wAGwAAAB4AAwAGAAAAAf/5AAQAAQAeAAAAIQAIAAYAAAAB//kABAAB
-ACEAAAAkAAgABgAAAAD/+QAE//0AJAAAACgABAAGAAAAAP/6AAX//wAoAAAALQAFAAYAAAAB//8A
-BAACAC0AAAAwAAMABgAAAAD//AAF//0AMAAAADUAAQAGAAAAAf//AAMAAAA1AAAANwABAAYAAAAB
-//kABQABADcAAAA7AAgABgAAAAD/+QAFAAAAOwAAAEAABwAGAAAAAP/5AAYAAABAAAAARgAHAAYA
-AAAA//kABQAAAEYAAABLAAcABgAAAAD/+QAFAAAASwAAAFAABwAGAAAAAP/5AAYAAABQAAAAVgAH
-AAYAAAAA//kABQAAAFYAAABbAAcABgAAAAD/+QAFAAAAWwAAAGAABwAGAAAAAP/5AAUAAABgAAAA
-ZQAHAAYAAAAA//kABQAAAGUAAABqAAcABgAAAAD/+QAFAAAAagAAAG8ABwAGAAAAAf/8AAMAAABv
-AAAAcQAEAAYAAAAA//wAAwACAHEAAAB0AAYABgAAAAD/+gAE//8AdAAAAHgABQAGAAAAAP/7AAT/
-/gB4AAAAfAADAAYAAAAB//oABf//AHwAAACAAAUABgAAAAD/+gAFAAAAgAAAAIUABgAGAAAAAP/5
-AAYAAQCFAAAAiwAIAAYAAP////oABgAAAIsAAACSAAYABgAA////+gAFAAAAkgAAAJgABgAGAAAA
-AP/6AAUAAACYAAAAnQAGAAYAAP////oABQAAAJ0AAACjAAYABgAA////+gAFAAAAowAAAKkABgAG
-AAD////6AAUAAACpAAAArwAGAAYAAAAA//oABQAAAK8AAAC0AAYABgAA////+gAGAAAAtAAAALsA
-BgAGAAAAAP/6AAQAAAC7AAAAvwAGAAYAAP////oABQAAAL8AAADFAAYABgAA////+gAGAAAAxQAA
-AMwABgAGAAD////6AAUAAADMAAAA0gAGAAYAAP////oABQAAANIAAADYAAYABgAA////+gAGAAAA
-2AAAAN8ABgAGAAAAAP/6AAUAAADfAAAA5AAGAAYAAP////oABQAAAOQAAADqAAYABgAAAAD/+gAF
-AAEA6gAAAO8ABwAGAAD////6AAYAAADvAAAA9gAGAAYAAAAA//oABQAAAPYAAAD7AAYABgAA////
-+gAFAAAA+wAAAQEABgAGAAD////6AAYAAAEBAAABCAAGAAYAAP////oABgAAAQgAAAEPAAYABgAA
-////+gAGAAABDwAAARYABgAGAAAAAP/6AAYAAAEWAAABHAAGAAYAAP////oABgAAARwAAAEjAAYA
-BgAAAAD/+gAFAAABIwAAASgABgAGAAAAAf/5AAQAAQEoAAABKwAIAAYAAAAA//kABAABASsAAAEv
-AAgABgAAAAH/+QAEAAEBLwAAATIACAAGAAAAAP/5AAX//AEyAAABNwADAAYAAAAAAAEABgACATcA
-AAE9AAEABgAAAAH/+QAE//wBPQAAAUAAAwAGAAAAAP/7AAYAAAFAAAABRgAFAAYAAP////kABQAA
-AUYAAAFMAAcABgAAAAD/+wAFAAABTAAAAVEABQAGAAAAAP/5AAYAAAFRAAABVwAHAAYAAAAA//sA
-BQAAAVcAAAFcAAUABgAAAAD/+QAFAAABXAAAAWEABwAGAAAAAP/7AAYAAgFhAAABZwAHAAYAAP//
-//kABQAAAWcAAAFtAAcABgAAAAD/+QAGAAABbQAAAXMABwAGAAAAAP/5AAQAAgFzAAABdwAJAAYA
-AP////kABgAAAXcAAAF+AAcABgAAAAD/+QAGAAABfgAAAYQABwAGAAD////7AAUAAAGEAAABigAF
-AAYAAP////sABQAAAYoAAAGQAAUABgAAAAD/+wAFAAABkAAAAZUABQAGAAD////7AAUAAgGVAAAB
-mwAHAAYAAAAA//sABgACAZsAAAGhAAcABgAAAAD/+wAGAAABoQAAAacABQAGAAAAAP/7AAYAAAGn
-AAABrQAFAAYAAAAA//kABgAAAa0AAAGzAAcABgAA////+wAGAAABswAAAboABQAGAAD////7AAUA
-AAG6AAABwAAFAAYAAP////sABgAAAcAAAAHHAAUABgAAAAD/+wAGAAABxwAAAc0ABQAGAAD////7
-AAYAAgHNAAAB1AAHAAYAAAAA//sABQAAAdQAAAHZAAUABgAAAAH/+QAFAAEB2QAAAd0ACAAGAAAA
-Av/6AAMAAQHdAAAB3gAHAAYAAAAA//kABAABAd4AAAHiAAgABgAAAAD/+wAF//0B4gAAAecAAgAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAB
-//sAAwACAecAAAHpAAcABgAAAAD/+QAFAAEB6QAAAe4ACAAGAAAAAP/5AAYAAAHuAAAB9AAHAAYA
-AAAA//oABf//AfQAAAH5AAUABgAAAAD/+QAGAAAB+QAAAf8ABwAGAAAAAv/5AAMAAgH/AAACAAAJ
-AAYAAAAA//kABQABAgAAAAIFAAgABgAAAAH/+gAE//sCBQAAAggAAQAGAAAAAP/5AAYAAAIIAAAC
-DgAHAAYAAAAB//kABf/+Ag4AAAISAAUABgAA////+wAGAAACEgAAAhkABQAGAAAAAP/7AAX//gIZ
-AAACHgADAAYAAAAA//wABf/9Ah4AAAIjAAEABgAAAAD/+QAHAAACIwAAAioABwAGAAAAAP/6AAT/
-+wIqAAACLgABAAYAAAAA//kABP/8Ai4AAAIyAAMABgAAAAD/+gAFAAACMgAAAjcABgAGAAAAAf/5
-AAT//QI3AAACOgAEAAYAAAAB//kABP/9AjoAAAI9AAQABgAAAAL/+QAE//sCPQAAAj8AAgAGAAD/
-///7AAYAAgI/AAACRgAHAAYAAAAA//kABgABAkYAAAJMAAgABgAAAAH//AAD//0CTAAAAk4AAQAG
-AAAAAf//AAQAAgJOAAACUQADAAYAAAAB//kABP/9AlEAAAJUAAQABgAAAAH/+QAF//4CVAAAAlgA
-BQAGAAD////7AAYAAAJYAAACXwAFAAYAAP////kABgAAAl8AAAJmAAcABgAA////+QAGAAACZgAA
-Am0ABwAGAAD////5AAYAAAJtAAACdAAHAAYAAAAA//sABQACAnQAAAJ5AAcABgAA////9wAGAAAC
-eQAAAoAACQAGAAD////3AAYAAAKAAAAChwAJAAYAAP////cABgAAAocAAAKOAAkABgAA////9wAG
-AAACjgAAApUACQAGAAD////4AAYAAAKVAAACnAAIAAYAAP////cABgAAApwAAAKjAAkABgAA////
-+gAGAAACowAAAqoABgAGAAAAAP/6AAUAAgKqAAACrwAIAAYAAP////cABQAAAq8AAAK1AAkABgAA
-////9wAFAAACtQAAArsACQAGAAD////3AAUAAAK7AAACwQAJAAYAAP////gABQAAAsEAAALHAAgA
-BgAAAAD/9wAEAAACxwAAAssACQAGAAAAAP/3AAQAAALLAAACzwAJAAYAAAAA//cABAAAAs8AAALT
-AAkABgAAAAD/+AAEAAAC0wAAAtcACAAGAAD////6AAUAAALXAAAC3QAGAAYAAP////cABgAAAt0A
-AALkAAkABgAAAAD/9wAFAAAC5AAAAukACQAGAAAAAP/3AAUAAALpAAAC7gAJAAYAAAAA//cABQAA
-Au4AAALzAAkABgAAAAD/9wAFAAAC8wAAAvgACQAGAAAAAP/4AAUAAAL4AAAC/QAIAAYAAAAA//oA
-Bf//Av0AAAMCAAUABgAA////+gAGAAADAgAAAwkABgAGAAD////3AAYAAAMJAAADEAAJAAYAAP//
-//cABgAAAxAAAAMXAAkABgAA////9wAGAAADFwAAAx4ACQAGAAD////4AAYAAAAAAAoABwASAAYA
-AP////cABgAAAAcACgAOABMABgAA////+gAFAAAADgAKABQAEAAGAAD////6AAYAAAAUAAoAGwAQ
-AAYAAAAA//gABgAAABsACgAhABIABgAAAAD/+AAGAAAAIQAKACcAEgAGAAAAAP/4AAYAAAAnAAoA
-LQASAAYAAAAA//gABgAAAC0ACgAzABIABgAAAAD/+QAGAAAAMwAKADkAEQAGAAAAAP/3AAYAAAA5
-AAoAPwATAAYAAP////sABQAAAD8ACgBFAA8ABgAAAAD/+wAFAAIARQAKAEoAEQAGAAAAAP/4AAUA
-AABKAAoATwASAAYAAAAA//gABQAAAE8ACgBUABIABgAAAAD/+AAFAAAAVAAKAFkAEgAGAAAAAP/5
-AAUAAABZAAoAXgARAAYAAAAA//gABgAAAF4ACgBkABIABgAAAAD/+AAGAAAAZAAKAGoAEgAGAAAA
-AP/4AAYAAABqAAoAcAASAAYAAAAA//kABgAAAHAACgB2ABEABgAAAAD/+AAFAAAAdgAKAHsAEgAG
-AAD////4AAYAAAB7AAoAggASAAYAAAAA//gABQAAAIIACgCHABIABgAAAAD/+AAFAAAAhwAKAIwA
-EgAGAAAAAP/4AAUAAACMAAoAkQASAAYAAAAA//gABQAAAJEACgCWABIABgAAAAD/+QAFAAAAlgAK
-AJsAEQAGAAAAAP/6AAX//wCbAAoAoAAPAAYAAAAA//oABQABAKAACgClABEABgAA////+AAGAAAA
-pQAKAKwAEgAGAAD////4AAYAAACsAAoAswASAAYAAP////gABgAAALMACgC6ABIABgAA////+QAG
-AAAAugAKAMEAEQAGAAD////4AAYAAgDBAAoAyAAUAAYAAP////kABQACAMgACgDOABMABgAA////
-+QAGAAIAzgAKANUAEw==
-"""
-                )
-            ),
-            Image.open(
-                BytesIO(
-                    base64.b64decode(
-                        b"""
-iVBORw0KGgoAAAANSUhEUgAAAx4AAAAUAQAAAAArMtZoAAAEwElEQVR4nABlAJr/AHVE4czCI/4u
-Mc4b7vuds/xzjz5/3/7u/n9vMe7vnfH/9++vPn/xyf5zhxzjt8GHw8+2d83u8x27199/nxuQ6Od9
-M43/5z2I+9n9ZtmDBwMQECDRQw/eQIQohJXxpBCNVE6QCCAAAAD//wBlAJr/AgALyj1t/wINwq0g
-LeNZUworuN1cjTPIzrTX6ofHWeo3v336qPzfEwRmBnHTtf95/fglZK5N0PDgfRTslpGBvz7LFc4F
-IUXBWQGjQ5MGCx34EDFPwXiY4YbYxavpnhHFrk14CDAAAAD//wBlAJr/AgKqRooH2gAgPeggvUAA
-Bu2WfgPoAwzRAABAAAAAAACQgLz/3Uv4Gv+gX7BJgDeeGP6AAAD1NMDzKHD7ANWr3loYbxsAD791
-NAADfcoIDyP44K/jv4Y63/Z+t98Ovt+ub4T48LAAAAD//wBlAJr/AuplMlADJAAAAGuAphWpqhMx
-in0A/fRvAYBABPgBwBUgABBQ/sYAyv9g0bCHgOLoGAAAAAAAREAAwI7nr0ArYpow7aX8//9LaP/9
-SjdavWA8ePHeBIKB//81/83ndznOaXx379wAAAD//wBlAJr/AqDxW+D3AABAAbUh/QMnbQag/gAY
-AYDAAACgtgD/gOqAAAB5IA/8AAAk+n9w0AAA8AAAmFRJuPo27ciC0cD5oeW4E7KA/wD3ECMAn2tt
-y8PgwH8AfAxFzC0JzeAMtratAsC/ffwAAAD//wBlAJr/BGKAyCAA4AAAAvgeYTAwHd1kmQF5chkG
-ABoMIHcL5xVpTfQbUqzlAAAErwAQBgAAEOClA5D9il08AEh/tUzdCBsXkbgACED+woQg8Si9VeqY
-lODCn7lmF6NhnAEYgAAA/NMIAAAAAAD//2JgjLZgVGBg5Pv/Tvpc8hwGBjYGJADjHDrAwPzAjv/H
-/Wf3PzCwtzcwHmBgYGcwbZz8wHaCAQMDOwMDQ8MCBgYOC3W7mp+f0w+wHOYxO3OG+e376hsMZjk3
-AAAAAP//YmCMY2A4wMAIN5e5gQETPD6AZisDAwMDgzSDAAPjByiHcQMDAwMDg1nOze1lByRu5/47
-c4859311AYNZzg0AAAAA//9iYGDBYihOIIMuwIjGL39/fwffA8b//xv/P2BPtzzHwCBjUQAAAAD/
-/yLFBrIBAAAA//9i1HhcwdhizX7u8NZNzyLbvT97bfrMf/QHI8evOwcSqGUJAAAA//9iYBB81iSw
-pEE170Qrg5MIYydHqwdDQRMrAwcVrQAAAAD//2J4x7j9AAMDn8Q/BgYLBoaiAwwMjPdvMDBYM1Tv
-oJodAAAAAP//Yqo/83+dxePWlxl3npsel9lvLfPcqlE9725C+acfVLMEAAAA//9i+s9gwCoaaGMR
-evta/58PTEWzr21hufPjA8N+qlnBwAAAAAD//2JiWLci5v1+HmFXDqcnULE/MxgYGBj+f6CaJQAA
-AAD//2Ji2FrkY3iYpYC5qDeGgeEMAwPDvwQBBoYvcTwOVLMEAAAA//9isDBgkP///0EOg9z35v//
-Gc/eeW7BwPj5+QGZhANUswMAAAD//2JgqGBgYGBgqEMXlvhMPUsAAAAA//8iYDd1AAAAAP//AwDR
-w7IkEbzhVQAAAABJRU5ErkJggg==
-"""
-                    )
-                )
-            ),
-        )
-    return f
+    return load_default_imagefont()
diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py
index a4993d3d4b8..e27ca7e5033 100644
--- a/src/PIL/ImageGrab.py
+++ b/src/PIL/ImageGrab.py
@@ -26,7 +26,13 @@
 from . import Image
 
 
-def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=None):
+def grab(
+    bbox: tuple[int, int, int, int] | None = None,
+    include_layered_windows: bool = False,
+    all_screens: bool = False,
+    xdisplay: str | None = None,
+) -> Image.Image:
+    im: Image.Image
     if xdisplay is None:
         if sys.platform == "darwin":
             fh, filepath = tempfile.mkstemp(".png")
@@ -63,14 +69,16 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N
                 left, top, right, bottom = bbox
                 im = im.crop((left - x0, top - y0, right - x0, bottom - y0))
             return im
+    # Cast to Optional[str] needed for Windows and macOS.
+    display_name: str | None = xdisplay
     try:
         if not Image.core.HAVE_XCB:
             msg = "Pillow was built without XCB support"
             raise OSError(msg)
-        size, data = Image.core.grabscreen_x11(xdisplay)
+        size, data = Image.core.grabscreen_x11(display_name)
     except OSError:
         if (
-            xdisplay is None
+            display_name is None
             and sys.platform not in ("darwin", "win32")
             and shutil.which("gnome-screenshot")
         ):
@@ -94,7 +102,7 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N
         return im
 
 
-def grabclipboard():
+def grabclipboard() -> Image.Image | list[str] | None:
     if sys.platform == "darwin":
         fh, filepath = tempfile.mkstemp(".png")
         os.close(fh)
@@ -149,18 +157,7 @@ def grabclipboard():
             session_type = None
 
         if shutil.which("wl-paste") and session_type in ("wayland", None):
-            output = subprocess.check_output(["wl-paste", "-l"]).decode()
-            mimetypes = output.splitlines()
-            if "image/png" in mimetypes:
-                mimetype = "image/png"
-            elif mimetypes:
-                mimetype = mimetypes[0]
-            else:
-                mimetype = None
-
-            args = ["wl-paste"]
-            if mimetype:
-                args.extend(["-t", mimetype])
+            args = ["wl-paste", "-t", "image"]
         elif shutil.which("xclip") and session_type in ("x11", None):
             args = ["xclip", "-selection", "clipboard", "-t", "image/png", "-o"]
         else:
@@ -168,10 +165,29 @@ def grabclipboard():
             raise NotImplementedError(msg)
 
         p = subprocess.run(args, capture_output=True)
-        err = p.stderr
-        if err:
-            msg = f"{args[0]} error: {err.strip().decode()}"
+        if p.returncode != 0:
+            err = p.stderr
+            for silent_error in [
+                # wl-paste, when the clipboard is empty
+                b"Nothing is copied",
+                # Ubuntu/Debian wl-paste, when the clipboard is empty
+                b"No selection",
+                # Ubuntu/Debian wl-paste, when an image isn't available
+                b"No suitable type of content copied",
+                # wl-paste or Ubuntu/Debian xclip, when an image isn't available
+                b" not available",
+                # xclip, when an image isn't available
+                b"cannot convert ",
+                # xclip, when the clipboard isn't initialized
+                b"xclip: Error: There is no owner for the ",
+            ]:
+                if silent_error in err:
+                    return None
+            msg = f"{args[0]} error"
+            if err:
+                msg += f": {err.strip().decode()}"
             raise ChildProcessError(msg)
+
         data = io.BytesIO(p.stdout)
         im = Image.open(data)
         im.load()
diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py
index b77f4bce567..484797f912c 100644
--- a/src/PIL/ImageMath.py
+++ b/src/PIL/ImageMath.py
@@ -17,17 +17,20 @@
 from __future__ import annotations
 
 import builtins
+from types import CodeType
+from typing import Any, Callable
 
 from . import Image, _imagingmath
+from ._deprecate import deprecate
 
 
 class _Operand:
     """Wraps an image operand, providing standard operators"""
 
-    def __init__(self, im):
+    def __init__(self, im: Image.Image):
         self.im = im
 
-    def __fixup(self, im1):
+    def __fixup(self, im1: _Operand | float) -> Image.Image:
         # convert image to suitable mode
         if isinstance(im1, _Operand):
             # argument was an image.
@@ -45,209 +48,280 @@ def __fixup(self, im1):
             else:
                 return Image.new("F", self.im.size, im1)
 
-    def apply(self, op, im1, im2=None, mode=None):
-        im1 = self.__fixup(im1)
+    def apply(
+        self,
+        op: str,
+        im1: _Operand | float,
+        im2: _Operand | float | None = None,
+        mode: str | None = None,
+    ) -> _Operand:
+        im_1 = self.__fixup(im1)
         if im2 is None:
             # unary operation
-            out = Image.new(mode or im1.mode, im1.size, None)
-            im1.load()
+            out = Image.new(mode or im_1.mode, im_1.size, None)
             try:
-                op = getattr(_imagingmath, op + "_" + im1.mode)
+                op = getattr(_imagingmath, f"{op}_{im_1.mode}")
             except AttributeError as e:
                 msg = f"bad operand type for '{op}'"
                 raise TypeError(msg) from e
-            _imagingmath.unop(op, out.im.id, im1.im.id)
+            _imagingmath.unop(op, out.getim(), im_1.getim())
         else:
             # binary operation
-            im2 = self.__fixup(im2)
-            if im1.mode != im2.mode:
+            im_2 = self.__fixup(im2)
+            if im_1.mode != im_2.mode:
                 # convert both arguments to floating point
-                if im1.mode != "F":
-                    im1 = im1.convert("F")
-                if im2.mode != "F":
-                    im2 = im2.convert("F")
-            if im1.size != im2.size:
+                if im_1.mode != "F":
+                    im_1 = im_1.convert("F")
+                if im_2.mode != "F":
+                    im_2 = im_2.convert("F")
+            if im_1.size != im_2.size:
                 # crop both arguments to a common size
-                size = (min(im1.size[0], im2.size[0]), min(im1.size[1], im2.size[1]))
-                if im1.size != size:
-                    im1 = im1.crop((0, 0) + size)
-                if im2.size != size:
-                    im2 = im2.crop((0, 0) + size)
-            out = Image.new(mode or im1.mode, im1.size, None)
-            im1.load()
-            im2.load()
+                size = (
+                    min(im_1.size[0], im_2.size[0]),
+                    min(im_1.size[1], im_2.size[1]),
+                )
+                if im_1.size != size:
+                    im_1 = im_1.crop((0, 0) + size)
+                if im_2.size != size:
+                    im_2 = im_2.crop((0, 0) + size)
+            out = Image.new(mode or im_1.mode, im_1.size, None)
             try:
-                op = getattr(_imagingmath, op + "_" + im1.mode)
+                op = getattr(_imagingmath, f"{op}_{im_1.mode}")
             except AttributeError as e:
                 msg = f"bad operand type for '{op}'"
                 raise TypeError(msg) from e
-            _imagingmath.binop(op, out.im.id, im1.im.id, im2.im.id)
+            _imagingmath.binop(op, out.getim(), im_1.getim(), im_2.getim())
         return _Operand(out)
 
     # unary operators
-    def __bool__(self):
+    def __bool__(self) -> bool:
         # an image is "true" if it contains at least one non-zero pixel
         return self.im.getbbox() is not None
 
-    def __abs__(self):
+    def __abs__(self) -> _Operand:
         return self.apply("abs", self)
 
-    def __pos__(self):
+    def __pos__(self) -> _Operand:
         return self
 
-    def __neg__(self):
+    def __neg__(self) -> _Operand:
         return self.apply("neg", self)
 
     # binary operators
-    def __add__(self, other):
+    def __add__(self, other: _Operand | float) -> _Operand:
         return self.apply("add", self, other)
 
-    def __radd__(self, other):
+    def __radd__(self, other: _Operand | float) -> _Operand:
         return self.apply("add", other, self)
 
-    def __sub__(self, other):
+    def __sub__(self, other: _Operand | float) -> _Operand:
         return self.apply("sub", self, other)
 
-    def __rsub__(self, other):
+    def __rsub__(self, other: _Operand | float) -> _Operand:
         return self.apply("sub", other, self)
 
-    def __mul__(self, other):
+    def __mul__(self, other: _Operand | float) -> _Operand:
         return self.apply("mul", self, other)
 
-    def __rmul__(self, other):
+    def __rmul__(self, other: _Operand | float) -> _Operand:
         return self.apply("mul", other, self)
 
-    def __truediv__(self, other):
+    def __truediv__(self, other: _Operand | float) -> _Operand:
         return self.apply("div", self, other)
 
-    def __rtruediv__(self, other):
+    def __rtruediv__(self, other: _Operand | float) -> _Operand:
         return self.apply("div", other, self)
 
-    def __mod__(self, other):
+    def __mod__(self, other: _Operand | float) -> _Operand:
         return self.apply("mod", self, other)
 
-    def __rmod__(self, other):
+    def __rmod__(self, other: _Operand | float) -> _Operand:
         return self.apply("mod", other, self)
 
-    def __pow__(self, other):
+    def __pow__(self, other: _Operand | float) -> _Operand:
         return self.apply("pow", self, other)
 
-    def __rpow__(self, other):
+    def __rpow__(self, other: _Operand | float) -> _Operand:
         return self.apply("pow", other, self)
 
     # bitwise
-    def __invert__(self):
+    def __invert__(self) -> _Operand:
         return self.apply("invert", self)
 
-    def __and__(self, other):
+    def __and__(self, other: _Operand | float) -> _Operand:
         return self.apply("and", self, other)
 
-    def __rand__(self, other):
+    def __rand__(self, other: _Operand | float) -> _Operand:
         return self.apply("and", other, self)
 
-    def __or__(self, other):
+    def __or__(self, other: _Operand | float) -> _Operand:
         return self.apply("or", self, other)
 
-    def __ror__(self, other):
+    def __ror__(self, other: _Operand | float) -> _Operand:
         return self.apply("or", other, self)
 
-    def __xor__(self, other):
+    def __xor__(self, other: _Operand | float) -> _Operand:
         return self.apply("xor", self, other)
 
-    def __rxor__(self, other):
+    def __rxor__(self, other: _Operand | float) -> _Operand:
         return self.apply("xor", other, self)
 
-    def __lshift__(self, other):
+    def __lshift__(self, other: _Operand | float) -> _Operand:
         return self.apply("lshift", self, other)
 
-    def __rshift__(self, other):
+    def __rshift__(self, other: _Operand | float) -> _Operand:
         return self.apply("rshift", self, other)
 
     # logical
-    def __eq__(self, other):
+    def __eq__(self, other: _Operand | float) -> _Operand:  # type: ignore[override]
         return self.apply("eq", self, other)
 
-    def __ne__(self, other):
+    def __ne__(self, other: _Operand | float) -> _Operand:  # type: ignore[override]
         return self.apply("ne", self, other)
 
-    def __lt__(self, other):
+    def __lt__(self, other: _Operand | float) -> _Operand:
         return self.apply("lt", self, other)
 
-    def __le__(self, other):
+    def __le__(self, other: _Operand | float) -> _Operand:
         return self.apply("le", self, other)
 
-    def __gt__(self, other):
+    def __gt__(self, other: _Operand | float) -> _Operand:
         return self.apply("gt", self, other)
 
-    def __ge__(self, other):
+    def __ge__(self, other: _Operand | float) -> _Operand:
         return self.apply("ge", self, other)
 
 
 # conversions
-def imagemath_int(self):
+def imagemath_int(self: _Operand) -> _Operand:
     return _Operand(self.im.convert("I"))
 
 
-def imagemath_float(self):
+def imagemath_float(self: _Operand) -> _Operand:
     return _Operand(self.im.convert("F"))
 
 
 # logical
-def imagemath_equal(self, other):
+def imagemath_equal(self: _Operand, other: _Operand | float | None) -> _Operand:
     return self.apply("eq", self, other, mode="I")
 
 
-def imagemath_notequal(self, other):
+def imagemath_notequal(self: _Operand, other: _Operand | float | None) -> _Operand:
     return self.apply("ne", self, other, mode="I")
 
 
-def imagemath_min(self, other):
+def imagemath_min(self: _Operand, other: _Operand | float | None) -> _Operand:
     return self.apply("min", self, other)
 
 
-def imagemath_max(self, other):
+def imagemath_max(self: _Operand, other: _Operand | float | None) -> _Operand:
     return self.apply("max", self, other)
 
 
-def imagemath_convert(self, mode):
+def imagemath_convert(self: _Operand, mode: str) -> _Operand:
     return _Operand(self.im.convert(mode))
 
 
-ops = {}
-for k, v in list(globals().items()):
-    if k[:10] == "imagemath_":
-        ops[k[10:]] = v
+ops = {
+    "int": imagemath_int,
+    "float": imagemath_float,
+    "equal": imagemath_equal,
+    "notequal": imagemath_notequal,
+    "min": imagemath_min,
+    "max": imagemath_max,
+    "convert": imagemath_convert,
+}
 
 
-def eval(expression, _dict={}, **kw):
+def lambda_eval(
+    expression: Callable[[dict[str, Any]], Any],
+    options: dict[str, Any] = {},
+    **kw: Any,
+) -> Any:
     """
-    Evaluates an image expression.
+    Returns the result of an image function.
+
+    :py:mod:`~PIL.ImageMath` only supports single-layer images. To process multi-band
+    images, use the :py:meth:`~PIL.Image.Image.split` method or
+    :py:func:`~PIL.Image.merge` function.
+
+    :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.
+    :return: The expression result. This is usually an image object, but can
+             also be an integer, a floating point value, or a pixel tuple,
+             depending on the expression.
+    """
+
+    if options:
+        deprecate(
+            "ImageMath.lambda_eval options",
+            12,
+            "ImageMath.lambda_eval keyword arguments",
+        )
+
+    args: dict[str, Any] = ops.copy()
+    args.update(options)
+    args.update(kw)
+    for k, v in args.items():
+        if isinstance(v, Image.Image):
+            args[k] = _Operand(v)
+
+    out = expression(args)
+    try:
+        return out.im
+    except AttributeError:
+        return out
+
+
+def unsafe_eval(
+    expression: str,
+    options: dict[str, Any] = {},
+    **kw: Any,
+) -> Any:
+    """
+    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
+    recommended to process expressions without considering this.
+    :py:meth:`~lambda_eval` is a more secure alternative.
+
+    :py:mod:`~PIL.ImageMath` only supports single-layer images. To process multi-band
+    images, use the :py:meth:`~PIL.Image.Image.split` method or
+    :py:func:`~PIL.Image.merge` function.
 
     :param expression: A string containing a Python-style expression.
-    :param options: Values to add to the evaluation context.  You
-                    can either use a dictionary, or one or more keyword
-                    arguments.
+    :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.
     :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.
     """
 
+    if options:
+        deprecate(
+            "ImageMath.unsafe_eval options",
+            12,
+            "ImageMath.unsafe_eval keyword arguments",
+        )
+
     # build execution namespace
-    args = ops.copy()
-    for k in list(_dict.keys()) + list(kw.keys()):
+    args: dict[str, Any] = ops.copy()
+    for k in list(options.keys()) + list(kw.keys()):
         if "__" in k or hasattr(builtins, k):
             msg = f"'{k}' not allowed"
             raise ValueError(msg)
 
-    args.update(_dict)
+    args.update(options)
     args.update(kw)
     for k, v in args.items():
-        if hasattr(v, "im"):
+        if isinstance(v, Image.Image):
             args[k] = _Operand(v)
 
     compiled_code = compile(expression, "<string>", "eval")
 
-    def scan(code):
+    def scan(code: CodeType) -> None:
         for const in code.co_consts:
             if type(const) is type(compiled_code):
                 scan(const)
@@ -263,3 +337,32 @@ def scan(code):
         return out.im
     except AttributeError:
         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)
diff --git a/src/PIL/ImageMode.py b/src/PIL/ImageMode.py
index 0b31f608174..92a08d2cbcb 100644
--- a/src/PIL/ImageMode.py
+++ b/src/PIL/ImageMode.py
@@ -16,24 +16,19 @@
 
 import sys
 from functools import lru_cache
+from typing import NamedTuple
 
+from ._deprecate import deprecate
 
-class ModeDescriptor:
+
+class ModeDescriptor(NamedTuple):
     """Wrapper for mode strings."""
 
-    def __init__(
-        self,
-        mode: str,
-        bands: tuple[str, ...],
-        basemode: str,
-        basetype: str,
-        typestr: str,
-    ) -> None:
-        self.mode = mode
-        self.bands = bands
-        self.basemode = basemode
-        self.basetype = basetype
-        self.typestr = typestr
+    mode: str
+    bands: tuple[str, ...]
+    basemode: str
+    basetype: str
+    typestr: str
 
     def __str__(self) -> str:
         return self.mode
@@ -42,7 +37,6 @@ def __str__(self) -> str:
 @lru_cache
 def getmode(mode: str) -> ModeDescriptor:
     """Gets a mode descriptor for the given mode."""
-    # initialize mode cache
     endian = "<" if sys.byteorder == "little" else ">"
 
     modes = {
@@ -50,8 +44,8 @@ def getmode(mode: str) -> ModeDescriptor:
         # Bits need to be extended to bytes
         "1": ("L", "L", ("1",), "|b1"),
         "L": ("L", "L", ("L",), "|u1"),
-        "I": ("L", "I", ("I",), endian + "i4"),
-        "F": ("L", "F", ("F",), endian + "f4"),
+        "I": ("L", "I", ("I",), f"{endian}i4"),
+        "F": ("L", "F", ("F",), f"{endian}f4"),
         "P": ("P", "L", ("P",), "|u1"),
         "RGB": ("RGB", "L", ("R", "G", "B"), "|u1"),
         "RGBX": ("RGB", "L", ("R", "G", "B", "X"), "|u1"),
@@ -71,6 +65,8 @@ def getmode(mode: str) -> ModeDescriptor:
         "PA": ("RGB", "L", ("P", "A"), "|u1"),
     }
     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]
         return ModeDescriptor(mode, bands, base_mode, base_type, type_str)
 
@@ -82,8 +78,8 @@ def getmode(mode: str) -> ModeDescriptor:
         "I;16LS": "<i2",
         "I;16B": ">u2",
         "I;16BS": ">i2",
-        "I;16N": endian + "u2",
-        "I;16NS": endian + "i2",
+        "I;16N": f"{endian}u2",
+        "I;16NS": f"{endian}i2",
         "I;32": "<u4",
         "I;32B": ">u4",
         "I;32L": "<u4",
diff --git a/src/PIL/ImageMorph.py b/src/PIL/ImageMorph.py
index 282e7d2a54e..f0a066b5bd8 100644
--- a/src/PIL/ImageMorph.py
+++ b/src/PIL/ImageMorph.py
@@ -62,12 +62,14 @@ class LutBuilder:
 
     """
 
-    def __init__(self, patterns=None, op_name=None):
+    def __init__(
+        self, patterns: list[str] | None = None, op_name: str | None = None
+    ) -> None:
         if patterns is not None:
             self.patterns = patterns
         else:
             self.patterns = []
-        self.lut = None
+        self.lut: bytearray | None = None
         if op_name is not None:
             known_patterns = {
                 "corner": ["1:(... ... ...)->0", "4:(00. 01. ...)->1"],
@@ -82,30 +84,32 @@ def __init__(self, patterns=None, op_name=None):
                 ],
             }
             if op_name not in known_patterns:
-                msg = "Unknown pattern " + op_name + "!"
+                msg = f"Unknown pattern {op_name}!"
                 raise Exception(msg)
 
             self.patterns = known_patterns[op_name]
 
-    def add_patterns(self, patterns):
+    def add_patterns(self, patterns: list[str]) -> None:
         self.patterns += patterns
 
-    def build_default_lut(self):
+    def build_default_lut(self) -> None:
         symbols = [0, 1]
         m = 1 << 4  # pos of current pixel
         self.lut = bytearray(symbols[(i & m) > 0] for i in range(LUT_SIZE))
 
-    def get_lut(self):
+    def get_lut(self) -> bytearray | None:
         return self.lut
 
-    def _string_permute(self, pattern, permutation):
+    def _string_permute(self, pattern: str, permutation: list[int]) -> str:
         """string_permute takes a pattern and a permutation and returns the
         string permuted according to the permutation list.
         """
         assert len(permutation) == 9
         return "".join(pattern[p] for p in permutation)
 
-    def _pattern_permute(self, basic_pattern, options, basic_result):
+    def _pattern_permute(
+        self, basic_pattern: str, options: str, basic_result: int
+    ) -> list[tuple[str, int]]:
         """pattern_permute takes a basic pattern and its result and clones
         the pattern according to the modifications described in the $options
         parameter. It returns a list of all cloned patterns."""
@@ -135,12 +139,13 @@ def _pattern_permute(self, basic_pattern, options, basic_result):
 
         return patterns
 
-    def build_lut(self):
+    def build_lut(self) -> bytearray:
         """Compile all patterns into a morphology lut.
 
         TBD :Build based on (file) morphlut:modify_lut
         """
         self.build_default_lut()
+        assert self.lut is not None
         patterns = []
 
         # Parse and create symmetries of the patterns strings
@@ -159,10 +164,10 @@ def build_lut(self):
             patterns += self._pattern_permute(pattern, options, result)
 
         # compile the patterns into regular expressions for speed
-        for i, pattern in enumerate(patterns):
+        compiled_patterns = []
+        for pattern in patterns:
             p = pattern[0].replace(".", "X").replace("X", "[01]")
-            p = re.compile(p)
-            patterns[i] = (p, pattern[1])
+            compiled_patterns.append((re.compile(p), pattern[1]))
 
         # Step through table and find patterns that match.
         # Note that all the patterns are searched. The last one
@@ -172,8 +177,8 @@ def build_lut(self):
             bitpattern = bin(i)[2:]
             bitpattern = ("0" * (9 - len(bitpattern)) + bitpattern)[::-1]
 
-            for p, r in patterns:
-                if p.match(bitpattern):
+            for pattern, r in compiled_patterns:
+                if pattern.match(bitpattern):
                     self.lut[i] = [0, 1][r]
 
         return self.lut
@@ -182,7 +187,12 @@ def build_lut(self):
 class MorphOp:
     """A class for binary morphological operators"""
 
-    def __init__(self, lut=None, op_name=None, patterns=None):
+    def __init__(
+        self,
+        lut: bytearray | None = None,
+        op_name: str | None = None,
+        patterns: list[str] | None = None,
+    ) -> None:
         """Create a binary morphological operator"""
         self.lut = lut
         if op_name is not None:
@@ -190,7 +200,7 @@ def __init__(self, lut=None, op_name=None, patterns=None):
         elif patterns is not None:
             self.lut = LutBuilder(patterns=patterns).build_lut()
 
-    def apply(self, image):
+    def apply(self, image: Image.Image) -> tuple[int, Image.Image]:
         """Run a single morphological operation on an image
 
         Returns a tuple of the number of changed pixels and the
@@ -203,10 +213,10 @@ def apply(self, image):
             msg = "Image mode must be L"
             raise ValueError(msg)
         outimage = Image.new(image.mode, image.size, None)
-        count = _imagingmorph.apply(bytes(self.lut), image.im.id, outimage.im.id)
+        count = _imagingmorph.apply(bytes(self.lut), image.getim(), outimage.getim())
         return count, outimage
 
-    def match(self, image):
+    def match(self, image: Image.Image) -> list[tuple[int, int]]:
         """Get a list of coordinates matching the morphological operation on
         an image.
 
@@ -219,9 +229,9 @@ def match(self, image):
         if image.mode != "L":
             msg = "Image mode must be L"
             raise ValueError(msg)
-        return _imagingmorph.match(bytes(self.lut), image.im.id)
+        return _imagingmorph.match(bytes(self.lut), image.getim())
 
-    def get_on_pixels(self, image):
+    def get_on_pixels(self, image: Image.Image) -> list[tuple[int, int]]:
         """Get a list of all turned on pixels in a binary image
 
         Returns a list of tuples of (x,y) coordinates
@@ -230,9 +240,9 @@ def get_on_pixels(self, image):
         if image.mode != "L":
             msg = "Image mode must be L"
             raise ValueError(msg)
-        return _imagingmorph.get_on_pixels(image.im.id)
+        return _imagingmorph.get_on_pixels(image.getim())
 
-    def load_lut(self, filename):
+    def load_lut(self, filename: str) -> None:
         """Load an operator from an mrl file"""
         with open(filename, "rb") as f:
             self.lut = bytearray(f.read())
@@ -242,7 +252,7 @@ def load_lut(self, filename):
             msg = "Wrong size operator file!"
             raise Exception(msg)
 
-    def save_lut(self, filename):
+    def save_lut(self, filename: str) -> None:
         """Save an operator to an mrl file"""
         if self.lut is None:
             msg = "No operator loaded"
@@ -250,6 +260,6 @@ def save_lut(self, filename):
         with open(filename, "wb") as f:
             f.write(self.lut)
 
-    def set_lut(self, lut):
+    def set_lut(self, lut: bytearray | None) -> None:
         """Set the lut from an external source"""
         self.lut = lut
diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py
index a9e626b2b2a..44aad0c3ca1 100644
--- a/src/PIL/ImageOps.py
+++ b/src/PIL/ImageOps.py
@@ -21,6 +21,8 @@
 import functools
 import operator
 import re
+from collections.abc import Sequence
+from typing import Protocol, cast
 
 from . import ExifTags, Image, ImagePalette
 
@@ -28,7 +30,7 @@
 # helpers
 
 
-def _border(border):
+def _border(border: int | tuple[int, ...]) -> tuple[int, int, int, int]:
     if isinstance(border, tuple):
         if len(border) == 2:
             left, top = right, bottom = border
@@ -39,7 +41,7 @@ def _border(border):
     return left, top, right, bottom
 
 
-def _color(color, mode):
+def _color(color: str | int | tuple[int, ...], mode: str) -> int | tuple[int, ...]:
     if isinstance(color, str):
         from . import ImageColor
 
@@ -47,7 +49,7 @@ def _color(color, mode):
     return color
 
 
-def _lut(image, lut):
+def _lut(image: Image.Image, lut: list[int]) -> Image.Image:
     if image.mode == "P":
         # FIXME: apply to lookup table, not image data
         msg = "mode P support coming soon"
@@ -65,7 +67,13 @@ def _lut(image, lut):
 # actions
 
 
-def autocontrast(image, cutoff=0, ignore=None, mask=None, preserve_tone=False):
+def autocontrast(
+    image: Image.Image,
+    cutoff: float | tuple[float, float] = 0,
+    ignore: int | Sequence[int] | None = None,
+    mask: Image.Image | None = None,
+    preserve_tone: bool = False,
+) -> Image.Image:
     """
     Maximize (normalize) image contrast. This function calculates a
     histogram of the input image (or mask region), removes ``cutoff`` percent of the
@@ -97,10 +105,9 @@ def autocontrast(image, cutoff=0, ignore=None, mask=None, preserve_tone=False):
         h = histogram[layer : layer + 256]
         if ignore is not None:
             # get rid of outliers
-            try:
+            if isinstance(ignore, int):
                 h[ignore] = 0
-            except TypeError:
-                # assume sequence
+            else:
                 for ix in ignore:
                     h[ix] = 0
         if cutoff:
@@ -112,7 +119,7 @@ def autocontrast(image, cutoff=0, ignore=None, mask=None, preserve_tone=False):
             for ix in range(256):
                 n = n + h[ix]
             # remove cutoff% pixels from the low end
-            cut = n * cutoff[0] // 100
+            cut = int(n * cutoff[0] // 100)
             for lo in range(256):
                 if cut > h[lo]:
                     cut = cut - h[lo]
@@ -123,7 +130,7 @@ def autocontrast(image, cutoff=0, ignore=None, mask=None, preserve_tone=False):
                 if cut <= 0:
                     break
             # remove cutoff% samples from the high end
-            cut = n * cutoff[1] // 100
+            cut = int(n * cutoff[1] // 100)
             for hi in range(255, -1, -1):
                 if cut > h[hi]:
                     cut = cut - h[hi]
@@ -156,7 +163,15 @@ def autocontrast(image, cutoff=0, ignore=None, mask=None, preserve_tone=False):
     return _lut(image, lut)
 
 
-def colorize(image, black, white, mid=None, blackpoint=0, whitepoint=255, midpoint=127):
+def colorize(
+    image: Image.Image,
+    black: str | tuple[int, ...],
+    white: str | tuple[int, ...],
+    mid: str | int | tuple[int, ...] | None = None,
+    blackpoint: int = 0,
+    whitepoint: int = 255,
+    midpoint: int = 127,
+) -> Image.Image:
     """
     Colorize grayscale image.
     This function calculates a color wedge which maps all black pixels in
@@ -188,10 +203,9 @@ def colorize(image, black, white, mid=None, blackpoint=0, whitepoint=255, midpoi
         assert 0 <= blackpoint <= midpoint <= whitepoint <= 255
 
     # Define colors from arguments
-    black = _color(black, "RGB")
-    white = _color(white, "RGB")
-    if mid is not None:
-        mid = _color(mid, "RGB")
+    rgb_black = cast(Sequence[int], _color(black, "RGB"))
+    rgb_white = cast(Sequence[int], _color(white, "RGB"))
+    rgb_mid = cast(Sequence[int], _color(mid, "RGB")) if mid is not None else None
 
     # Empty lists for the mapping
     red = []
@@ -200,18 +214,24 @@ def colorize(image, black, white, mid=None, blackpoint=0, whitepoint=255, midpoi
 
     # Create the low-end values
     for i in range(0, blackpoint):
-        red.append(black[0])
-        green.append(black[1])
-        blue.append(black[2])
+        red.append(rgb_black[0])
+        green.append(rgb_black[1])
+        blue.append(rgb_black[2])
 
     # Create the mapping (2-color)
-    if mid is None:
+    if rgb_mid is None:
         range_map = range(0, whitepoint - blackpoint)
 
         for i in range_map:
-            red.append(black[0] + i * (white[0] - black[0]) // len(range_map))
-            green.append(black[1] + i * (white[1] - black[1]) // len(range_map))
-            blue.append(black[2] + i * (white[2] - black[2]) // len(range_map))
+            red.append(
+                rgb_black[0] + i * (rgb_white[0] - rgb_black[0]) // len(range_map)
+            )
+            green.append(
+                rgb_black[1] + i * (rgb_white[1] - rgb_black[1]) // len(range_map)
+            )
+            blue.append(
+                rgb_black[2] + i * (rgb_white[2] - rgb_black[2]) // len(range_map)
+            )
 
     # Create the mapping (3-color)
     else:
@@ -219,26 +239,36 @@ def colorize(image, black, white, mid=None, blackpoint=0, whitepoint=255, midpoi
         range_map2 = range(0, whitepoint - midpoint)
 
         for i in range_map1:
-            red.append(black[0] + i * (mid[0] - black[0]) // len(range_map1))
-            green.append(black[1] + i * (mid[1] - black[1]) // len(range_map1))
-            blue.append(black[2] + i * (mid[2] - black[2]) // len(range_map1))
+            red.append(
+                rgb_black[0] + i * (rgb_mid[0] - rgb_black[0]) // len(range_map1)
+            )
+            green.append(
+                rgb_black[1] + i * (rgb_mid[1] - rgb_black[1]) // len(range_map1)
+            )
+            blue.append(
+                rgb_black[2] + i * (rgb_mid[2] - rgb_black[2]) // len(range_map1)
+            )
         for i in range_map2:
-            red.append(mid[0] + i * (white[0] - mid[0]) // len(range_map2))
-            green.append(mid[1] + i * (white[1] - mid[1]) // len(range_map2))
-            blue.append(mid[2] + i * (white[2] - mid[2]) // len(range_map2))
+            red.append(rgb_mid[0] + i * (rgb_white[0] - rgb_mid[0]) // len(range_map2))
+            green.append(
+                rgb_mid[1] + i * (rgb_white[1] - rgb_mid[1]) // len(range_map2)
+            )
+            blue.append(rgb_mid[2] + i * (rgb_white[2] - rgb_mid[2]) // len(range_map2))
 
     # Create the high-end values
     for i in range(0, 256 - whitepoint):
-        red.append(white[0])
-        green.append(white[1])
-        blue.append(white[2])
+        red.append(rgb_white[0])
+        green.append(rgb_white[1])
+        blue.append(rgb_white[2])
 
     # Return converted image
     image = image.convert("RGB")
     return _lut(image, red + green + blue)
 
 
-def contain(image, size, method=Image.Resampling.BICUBIC):
+def contain(
+    image: Image.Image, size: tuple[int, int], method: int = Image.Resampling.BICUBIC
+) -> Image.Image:
     """
     Returns a resized version of the image, set to the maximum width and height
     within the requested size, while maintaining the original aspect ratio.
@@ -267,7 +297,9 @@ def contain(image, size, method=Image.Resampling.BICUBIC):
     return image.resize(size, resample=method)
 
 
-def cover(image, size, method=Image.Resampling.BICUBIC):
+def cover(
+    image: Image.Image, size: tuple[int, int], method: int = Image.Resampling.BICUBIC
+) -> Image.Image:
     """
     Returns a resized version of the image, so that the requested size is
     covered, while maintaining the original aspect ratio.
@@ -296,7 +328,13 @@ def cover(image, size, method=Image.Resampling.BICUBIC):
     return image.resize(size, resample=method)
 
 
-def pad(image, size, method=Image.Resampling.BICUBIC, color=None, centering=(0.5, 0.5)):
+def pad(
+    image: Image.Image,
+    size: tuple[int, int],
+    method: int = Image.Resampling.BICUBIC,
+    color: str | int | tuple[int, ...] | None = None,
+    centering: tuple[float, float] = (0.5, 0.5),
+) -> Image.Image:
     """
     Returns a resized and padded version of the image, expanded to fill the
     requested aspect ratio and size.
@@ -324,7 +362,9 @@ def pad(image, size, method=Image.Resampling.BICUBIC, color=None, centering=(0.5
     else:
         out = Image.new(image.mode, size, color)
         if resized.palette:
-            out.putpalette(resized.getpalette())
+            palette = resized.getpalette()
+            if palette is not None:
+                out.putpalette(palette)
         if resized.width != size[0]:
             x = round((size[0] - resized.width) * max(0, min(centering[0], 1)))
             out.paste(resized, (x, 0))
@@ -334,7 +374,7 @@ def pad(image, size, method=Image.Resampling.BICUBIC, color=None, centering=(0.5
     return out
 
 
-def crop(image, border=0):
+def crop(image: Image.Image, border: int = 0) -> Image.Image:
     """
     Remove border from image.  The same amount of pixels are removed
     from all four sides.  This function works on all image modes.
@@ -349,7 +389,9 @@ def crop(image, border=0):
     return image.crop((left, top, image.size[0] - right, image.size[1] - bottom))
 
 
-def scale(image, factor, resample=Image.Resampling.BICUBIC):
+def scale(
+    image: Image.Image, factor: float, resample: int = Image.Resampling.BICUBIC
+) -> Image.Image:
     """
     Returns a rescaled image by a specific factor given in parameter.
     A factor greater than 1 expands the image, between 0 and 1 contracts the
@@ -372,7 +414,27 @@ def scale(image, factor, resample=Image.Resampling.BICUBIC):
         return image.resize(size, resample)
 
 
-def deform(image, deformer, resample=Image.Resampling.BILINEAR):
+class SupportsGetMesh(Protocol):
+    """
+    An object that supports the ``getmesh`` method, taking an image as an
+    argument, and returning a list of tuples. Each tuple contains two tuples,
+    the source box as a tuple of 4 integers, and a tuple of 8 integers for the
+    final quadrilateral, in order of top left, bottom left, bottom right, top
+    right.
+    """
+
+    def getmesh(
+        self, image: Image.Image
+    ) -> list[
+        tuple[tuple[int, int, int, int], tuple[int, int, int, int, int, int, int, int]]
+    ]: ...
+
+
+def deform(
+    image: Image.Image,
+    deformer: SupportsGetMesh,
+    resample: int = Image.Resampling.BILINEAR,
+) -> Image.Image:
     """
     Deform the image.
 
@@ -388,7 +450,7 @@ def deform(image, deformer, resample=Image.Resampling.BILINEAR):
     )
 
 
-def equalize(image, mask=None):
+def equalize(image: Image.Image, mask: Image.Image | None = None) -> Image.Image:
     """
     Equalize the image histogram. This function applies a non-linear
     mapping to the input image, in order to create a uniform
@@ -419,7 +481,11 @@ def equalize(image, mask=None):
     return _lut(image, lut)
 
 
-def expand(image, border=0, fill=0):
+def expand(
+    image: Image.Image,
+    border: int | tuple[int, ...] = 0,
+    fill: str | int | tuple[int, ...] = 0,
+) -> Image.Image:
     """
     Add border to the image
 
@@ -434,7 +500,7 @@ def expand(image, border=0, fill=0):
     color = _color(fill, image.mode)
     if image.palette:
         palette = ImagePalette.ImagePalette(palette=image.getpalette())
-        if isinstance(color, tuple):
+        if isinstance(color, tuple) and (len(color) == 3 or len(color) == 4):
             color = palette.getcolor(color)
     else:
         palette = None
@@ -445,7 +511,13 @@ def expand(image, border=0, fill=0):
     return out
 
 
-def fit(image, size, method=Image.Resampling.BICUBIC, bleed=0.0, centering=(0.5, 0.5)):
+def fit(
+    image: Image.Image,
+    size: tuple[int, int],
+    method: int = Image.Resampling.BICUBIC,
+    bleed: float = 0.0,
+    centering: tuple[float, float] = (0.5, 0.5),
+) -> Image.Image:
     """
     Returns a resized and cropped version of the image, cropped to the
     requested aspect ratio and size.
@@ -479,13 +551,12 @@ def fit(image, size, method=Image.Resampling.BICUBIC, bleed=0.0, centering=(0.5,
     # kevin@cazabon.com
     # https://www.cazabon.com
 
-    # ensure centering is mutable
-    centering = list(centering)
+    centering_x, centering_y = centering
 
-    if not 0.0 <= centering[0] <= 1.0:
-        centering[0] = 0.5
-    if not 0.0 <= centering[1] <= 1.0:
-        centering[1] = 0.5
+    if not 0.0 <= centering_x <= 1.0:
+        centering_x = 0.5
+    if not 0.0 <= centering_y <= 1.0:
+        centering_y = 0.5
 
     if not 0.0 <= bleed < 0.5:
         bleed = 0.0
@@ -522,8 +593,8 @@ def fit(image, size, method=Image.Resampling.BICUBIC, bleed=0.0, centering=(0.5,
         crop_height = live_size[0] / output_ratio
 
     # make the crop
-    crop_left = bleed_pixels[0] + (live_size[0] - crop_width) * centering[0]
-    crop_top = bleed_pixels[1] + (live_size[1] - crop_height) * centering[1]
+    crop_left = bleed_pixels[0] + (live_size[0] - crop_width) * centering_x
+    crop_top = bleed_pixels[1] + (live_size[1] - crop_height) * centering_y
 
     crop = (crop_left, crop_top, crop_left + crop_width, crop_top + crop_height)
 
@@ -531,7 +602,7 @@ def fit(image, size, method=Image.Resampling.BICUBIC, bleed=0.0, centering=(0.5,
     return image.resize(size, method, box=crop)
 
 
-def flip(image):
+def flip(image: Image.Image) -> Image.Image:
     """
     Flip the image vertically (top to bottom).
 
@@ -541,7 +612,7 @@ def flip(image):
     return image.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
 
 
-def grayscale(image):
+def grayscale(image: Image.Image) -> Image.Image:
     """
     Convert the image to grayscale.
 
@@ -551,7 +622,7 @@ def grayscale(image):
     return image.convert("L")
 
 
-def invert(image):
+def invert(image: Image.Image) -> Image.Image:
     """
     Invert (negate) the image.
 
@@ -562,7 +633,7 @@ def invert(image):
     return image.point(lut) if image.mode == "1" else _lut(image, lut)
 
 
-def mirror(image):
+def mirror(image: Image.Image) -> Image.Image:
     """
     Flip image horizontally (left to right).
 
@@ -572,7 +643,7 @@ def mirror(image):
     return image.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
 
 
-def posterize(image, bits):
+def posterize(image: Image.Image, bits: int) -> Image.Image:
     """
     Reduce the number of bits for each color channel.
 
@@ -585,7 +656,7 @@ def posterize(image, bits):
     return _lut(image, lut)
 
 
-def solarize(image, threshold=128):
+def solarize(image: Image.Image, threshold: int = 128) -> Image.Image:
     """
     Invert all pixel values above a threshold.
 
@@ -602,7 +673,7 @@ def solarize(image, threshold=128):
     return _lut(image, lut)
 
 
-def exif_transpose(image, *, in_place=False):
+def exif_transpose(image: Image.Image, *, in_place: bool = False) -> Image.Image | None:
     """
     If an image has an EXIF Orientation tag, other than 1, transpose the image
     accordingly, and remove the orientation data.
@@ -616,7 +687,7 @@ def exif_transpose(image, *, in_place=False):
     """
     image.load()
     image_exif = image.getexif()
-    orientation = image_exif.get(ExifTags.Base.Orientation)
+    orientation = image_exif.get(ExifTags.Base.Orientation, 1)
     method = {
         2: Image.Transpose.FLIP_LEFT_RIGHT,
         3: Image.Transpose.ROTATE_180,
@@ -630,7 +701,6 @@ def exif_transpose(image, *, in_place=False):
         transposed_image = image.transpose(method)
         if in_place:
             image.im = transposed_image.im
-            image.pyaccess = None
             image._size = transposed_image._size
         exif_image = image if in_place else transposed_image
 
@@ -641,15 +711,20 @@ def exif_transpose(image, *, in_place=False):
                 exif_image.info["exif"] = exif.tobytes()
             elif "Raw profile type exif" in exif_image.info:
                 exif_image.info["Raw profile type exif"] = exif.tobytes().hex()
-            elif "XML:com.adobe.xmp" in exif_image.info:
-                for pattern in (
-                    r'tiff:Orientation="([0-9])"',
-                    r"<tiff:Orientation>([0-9])</tiff:Orientation>",
-                ):
-                    exif_image.info["XML:com.adobe.xmp"] = re.sub(
-                        pattern, "", exif_image.info["XML:com.adobe.xmp"]
-                    )
+            for key in ("XML:com.adobe.xmp", "xmp"):
+                if key in exif_image.info:
+                    for pattern in (
+                        r'tiff:Orientation="([0-9])"',
+                        r"<tiff:Orientation>([0-9])</tiff:Orientation>",
+                    ):
+                        value = exif_image.info[key]
+                        exif_image.info[key] = (
+                            re.sub(pattern, "", value)
+                            if isinstance(value, str)
+                            else re.sub(pattern.encode(), b"", value)
+                        )
         if not in_place:
             return transposed_image
     elif not in_place:
         return image.copy()
+    return None
diff --git a/src/PIL/ImagePalette.py b/src/PIL/ImagePalette.py
index fbcfa309d29..183f85526d2 100644
--- a/src/PIL/ImagePalette.py
+++ b/src/PIL/ImagePalette.py
@@ -18,9 +18,14 @@
 from __future__ import annotations
 
 import array
+from collections.abc import Sequence
+from typing import IO, TYPE_CHECKING
 
 from . import GimpGradientFile, GimpPaletteFile, ImageColor, PaletteFile
 
+if TYPE_CHECKING:
+    from . import Image
+
 
 class ImagePalette:
     """
@@ -34,23 +39,27 @@ class ImagePalette:
         Defaults to an empty palette.
     """
 
-    def __init__(self, mode="RGB", palette=None):
+    def __init__(
+        self,
+        mode: str = "RGB",
+        palette: Sequence[int] | bytes | bytearray | None = None,
+    ) -> None:
         self.mode = mode
-        self.rawmode = None  # if set, palette contains raw data
+        self.rawmode: str | None = None  # if set, palette contains raw data
         self.palette = palette or bytearray()
-        self.dirty = None
+        self.dirty: int | None = None
 
     @property
-    def palette(self):
+    def palette(self) -> Sequence[int] | bytes | bytearray:
         return self._palette
 
     @palette.setter
-    def palette(self, palette):
-        self._colors = None
+    def palette(self, palette: Sequence[int] | bytes | bytearray) -> None:
+        self._colors: dict[tuple[int, ...], int] | None = None
         self._palette = palette
 
     @property
-    def colors(self):
+    def colors(self) -> dict[tuple[int, ...], int]:
         if self._colors is None:
             mode_len = len(self.mode)
             self._colors = {}
@@ -62,10 +71,10 @@ def colors(self):
         return self._colors
 
     @colors.setter
-    def colors(self, colors):
+    def colors(self, colors: dict[tuple[int, ...], int]) -> None:
         self._colors = colors
 
-    def copy(self):
+    def copy(self) -> ImagePalette:
         new = ImagePalette()
 
         new.mode = self.mode
@@ -76,7 +85,7 @@ def copy(self):
 
         return new
 
-    def getdata(self):
+    def getdata(self) -> tuple[str, Sequence[int] | bytes | bytearray]:
         """
         Get palette contents in format suitable for the low-level
         ``im.putpalette`` primitive.
@@ -87,7 +96,7 @@ def getdata(self):
             return self.rawmode, self.palette
         return self.mode, self.tobytes()
 
-    def tobytes(self):
+    def tobytes(self) -> bytes:
         """Convert palette to bytes.
 
         .. warning:: This method is experimental.
@@ -103,11 +112,13 @@ def tobytes(self):
     # Declare tostring as an alias for tobytes
     tostring = tobytes
 
-    def _new_color_index(self, image=None, e=None):
+    def _new_color_index(
+        self, image: Image.Image | None = None, e: Exception | None = None
+    ) -> int:
         if not isinstance(self.palette, bytearray):
             self._palette = bytearray(self.palette)
         index = len(self.palette) // 3
-        special_colors = ()
+        special_colors: tuple[int | tuple[int, ...] | None, ...] = ()
         if image:
             special_colors = (
                 image.info.get("background"),
@@ -127,7 +138,11 @@ def _new_color_index(self, image=None, e=None):
                 raise ValueError(msg) from e
         return index
 
-    def getcolor(self, color, image=None):
+    def getcolor(
+        self,
+        color: tuple[int, ...],
+        image: Image.Image | None = None,
+    ) -> int:
         """Given an rgb tuple, allocate palette entry.
 
         .. warning:: This method is experimental.
@@ -150,22 +165,23 @@ def getcolor(self, color, image=None):
             except KeyError as e:
                 # allocate new color slot
                 index = self._new_color_index(image, e)
+                assert isinstance(self._palette, bytearray)
                 self.colors[color] = index
                 if index * 3 < len(self.palette):
                     self._palette = (
-                        self.palette[: index * 3]
+                        self._palette[: index * 3]
                         + bytes(color)
-                        + self.palette[index * 3 + 3 :]
+                        + self._palette[index * 3 + 3 :]
                     )
                 else:
                     self._palette += bytes(color)
                 self.dirty = 1
                 return index
         else:
-            msg = f"unknown color specifier: {repr(color)}"
+            msg = f"unknown color specifier: {repr(color)}"  # type: ignore[unreachable]
             raise ValueError(msg)
 
-    def save(self, fp):
+    def save(self, fp: str | IO[str]) -> None:
         """Save palette to text file.
 
         .. warning:: This method is experimental.
@@ -192,7 +208,7 @@ def save(self, fp):
 # Internal
 
 
-def raw(rawmode, data):
+def raw(rawmode: str, data: Sequence[int] | bytes | bytearray) -> ImagePalette:
     palette = ImagePalette()
     palette.rawmode = rawmode
     palette.palette = data
@@ -204,50 +220,57 @@ def raw(rawmode, data):
 # Factories
 
 
-def make_linear_lut(black, white):
+def make_linear_lut(black: int, white: float) -> list[int]:
     if black == 0:
-        return [white * i // 255 for i in range(256)]
+        return [int(white * i // 255) for i in range(256)]
 
     msg = "unavailable when black is non-zero"
     raise NotImplementedError(msg)  # FIXME
 
 
-def make_gamma_lut(exp):
+def make_gamma_lut(exp: float) -> list[int]:
     return [int(((i / 255.0) ** exp) * 255.0 + 0.5) for i in range(256)]
 
 
-def negative(mode="RGB"):
+def negative(mode: str = "RGB") -> ImagePalette:
     palette = list(range(256 * len(mode)))
     palette.reverse()
     return ImagePalette(mode, [i // len(mode) for i in palette])
 
 
-def random(mode="RGB"):
+def random(mode: str = "RGB") -> ImagePalette:
     from random import randint
 
     palette = [randint(0, 255) for _ in range(256 * len(mode))]
     return ImagePalette(mode, palette)
 
 
-def sepia(white="#fff0c0"):
+def sepia(white: str = "#fff0c0") -> ImagePalette:
     bands = [make_linear_lut(0, band) for band in ImageColor.getrgb(white)]
     return ImagePalette("RGB", [bands[i % 3][i // 3] for i in range(256 * 3)])
 
 
-def wedge(mode="RGB"):
+def wedge(mode: str = "RGB") -> ImagePalette:
     palette = list(range(256 * len(mode)))
     return ImagePalette(mode, [i // len(mode) for i in palette])
 
 
-def load(filename):
+def load(filename: str) -> tuple[bytes, str]:
     # FIXME: supports GIMP gradients only
 
     with open(filename, "rb") as fp:
-        for paletteHandler in [
+        paletteHandlers: list[
+            type[
+                GimpPaletteFile.GimpPaletteFile
+                | GimpGradientFile.GimpGradientFile
+                | PaletteFile.PaletteFile
+            ]
+        ] = [
             GimpPaletteFile.GimpPaletteFile,
             GimpGradientFile.GimpGradientFile,
             PaletteFile.PaletteFile,
-        ]:
+        ]
+        for paletteHandler in paletteHandlers:
             try:
                 fp.seek(0)
                 lut = paletteHandler(fp).getpalette()
diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py
index 6377c750105..a3d647138df 100644
--- a/src/PIL/ImageQt.py
+++ b/src/PIL/ImageQt.py
@@ -19,19 +19,34 @@
 
 import sys
 from io import BytesIO
+from typing import TYPE_CHECKING, Any, Callable, Union
 
 from . import Image
 from ._util import is_path
 
+if TYPE_CHECKING:
+    import PyQt6
+    import PySide6
+
+    from . import ImageFile
+
+    QBuffer: type
+    QByteArray = Union[PyQt6.QtCore.QByteArray, PySide6.QtCore.QByteArray]
+    QIODevice = Union[PyQt6.QtCore.QIODevice, PySide6.QtCore.QIODevice]
+    QImage = Union[PyQt6.QtGui.QImage, PySide6.QtGui.QImage]
+    QPixmap = Union[PyQt6.QtGui.QPixmap, PySide6.QtGui.QPixmap]
+
+qt_version: str | None
 qt_versions = [
     ["6", "PyQt6"],
     ["side6", "PySide6"],
 ]
 
 # If a version has already been imported, attempt it first
-qt_versions.sort(key=lambda qt_version: qt_version[1] in sys.modules, reverse=True)
-for qt_version, qt_module in qt_versions:
+qt_versions.sort(key=lambda version: version[1] in sys.modules, reverse=True)
+for version, qt_module in qt_versions:
     try:
+        qRgba: Callable[[int, int, int, int], int]
         if qt_module == "PyQt6":
             from PyQt6.QtCore import QBuffer, QIODevice
             from PyQt6.QtGui import QImage, QPixmap, qRgba
@@ -41,32 +56,34 @@
     except (ImportError, RuntimeError):
         continue
     qt_is_installed = True
+    qt_version = version
     break
 else:
     qt_is_installed = False
     qt_version = None
 
 
-def rgb(r, g, b, a=255):
+def rgb(r: int, g: int, b: int, a: int = 255) -> int:
     """(Internal) Turns an RGB color into a Qt compatible color integer."""
     # use qRgb to pack the colors, and then turn the resulting long
     # into a negative integer with the same bitpattern.
     return qRgba(r, g, b, a) & 0xFFFFFFFF
 
 
-def fromqimage(im):
+def fromqimage(im: QImage | QPixmap) -> ImageFile.ImageFile:
     """
     :param im: QImage or PIL ImageQt object
     """
     buffer = QBuffer()
+    qt_openmode: object
     if qt_version == "6":
         try:
-            qt_openmode = QIODevice.OpenModeFlag
+            qt_openmode = getattr(QIODevice, "OpenModeFlag")
         except AttributeError:
-            qt_openmode = QIODevice.OpenMode
+            qt_openmode = getattr(QIODevice, "OpenMode")
     else:
         qt_openmode = QIODevice
-    buffer.open(qt_openmode.ReadWrite)
+    buffer.open(getattr(qt_openmode, "ReadWrite"))
     # preserve alpha channel with png
     # otherwise ppm is more friendly with Image.open
     if im.hasAlphaChannel():
@@ -82,11 +99,11 @@ def fromqimage(im):
     return Image.open(b)
 
 
-def fromqpixmap(im):
+def fromqpixmap(im: QPixmap) -> ImageFile.ImageFile:
     return fromqimage(im)
 
 
-def align8to32(bytes, width, mode):
+def align8to32(bytes: bytes, width: int, mode: str) -> bytes:
     """
     converts each scanline of data from 8 bit to 32 bit aligned
     """
@@ -112,7 +129,7 @@ def align8to32(bytes, width, mode):
     return b"".join(new_data)
 
 
-def _toqclass_helper(im):
+def _toqclass_helper(im: Image.Image | str | QByteArray) -> dict[str, Any]:
     data = None
     colortable = None
     exclusive_fp = False
@@ -124,30 +141,32 @@ def _toqclass_helper(im):
     if is_path(im):
         im = Image.open(im)
         exclusive_fp = True
+    assert isinstance(im, Image.Image)
 
-    qt_format = QImage.Format if qt_version == "6" else QImage
+    qt_format = getattr(QImage, "Format") if qt_version == "6" else QImage
     if im.mode == "1":
-        format = qt_format.Format_Mono
+        format = getattr(qt_format, "Format_Mono")
     elif im.mode == "L":
-        format = qt_format.Format_Indexed8
+        format = getattr(qt_format, "Format_Indexed8")
         colortable = [rgb(i, i, i) for i in range(256)]
     elif im.mode == "P":
-        format = qt_format.Format_Indexed8
+        format = getattr(qt_format, "Format_Indexed8")
         palette = im.getpalette()
+        assert palette is not None
         colortable = [rgb(*palette[i : i + 3]) for i in range(0, len(palette), 3)]
     elif im.mode == "RGB":
         # Populate the 4th channel with 255
         im = im.convert("RGBA")
 
         data = im.tobytes("raw", "BGRA")
-        format = qt_format.Format_RGB32
+        format = getattr(qt_format, "Format_RGB32")
     elif im.mode == "RGBA":
         data = im.tobytes("raw", "BGRA")
-        format = qt_format.Format_ARGB32
-    elif im.mode == "I;16" and hasattr(qt_format, "Format_Grayscale16"):  # Qt 5.13+
+        format = getattr(qt_format, "Format_ARGB32")
+    elif im.mode == "I;16":
         im = im.point(lambda i: i * 256)
 
-        format = qt_format.Format_Grayscale16
+        format = getattr(qt_format, "Format_Grayscale16")
     else:
         if exclusive_fp:
             im.close()
@@ -163,8 +182,8 @@ def _toqclass_helper(im):
 
 if qt_is_installed:
 
-    class ImageQt(QImage):
-        def __init__(self, im):
+    class ImageQt(QImage):  # type: ignore[misc]
+        def __init__(self, im: Image.Image | str | QByteArray) -> None:
             """
             An PIL image wrapper for Qt.  This is a subclass of PyQt's QImage
             class.
@@ -188,10 +207,10 @@ def __init__(self, im):
                 self.setColorTable(im_data["colortable"])
 
 
-def toqimage(im):
+def toqimage(im: Image.Image | str | QByteArray) -> ImageQt:
     return ImageQt(im)
 
 
-def toqpixmap(im):
+def toqpixmap(im: Image.Image | str | QByteArray) -> QPixmap:
     qimage = toqimage(im)
-    return QPixmap.fromImage(qimage)
+    return getattr(QPixmap, "fromImage")(qimage)
diff --git a/src/PIL/ImageSequence.py b/src/PIL/ImageSequence.py
index 2c185027630..a6fc340d55f 100644
--- a/src/PIL/ImageSequence.py
+++ b/src/PIL/ImageSequence.py
@@ -33,7 +33,7 @@ class Iterator:
     :param im: An image object.
     """
 
-    def __init__(self, im: Image.Image):
+    def __init__(self, im: Image.Image) -> None:
         if not hasattr(im, "seek"):
             msg = "im must have seek method"
             raise AttributeError(msg)
diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py
index fad3e098003..d62893d9c8b 100644
--- a/src/PIL/ImageShow.py
+++ b/src/PIL/ImageShow.py
@@ -13,18 +13,20 @@
 #
 from __future__ import annotations
 
+import abc
 import os
 import shutil
 import subprocess
 import sys
 from shlex import quote
+from typing import Any
 
 from . import Image
 
 _viewers = []
 
 
-def register(viewer, order=1):
+def register(viewer: type[Viewer] | Viewer, order: int = 1) -> None:
     """
     The :py:func:`register` function is used to register additional viewers::
 
@@ -38,18 +40,15 @@ def register(viewer, order=1):
         Zero or a negative integer to prepend this viewer to the list,
         a positive integer to append it.
     """
-    try:
-        if issubclass(viewer, Viewer):
-            viewer = viewer()
-    except TypeError:
-        pass  # raised if viewer wasn't a class
+    if isinstance(viewer, type) and issubclass(viewer, Viewer):
+        viewer = viewer()
     if order > 0:
         _viewers.append(viewer)
     else:
         _viewers.insert(0, viewer)
 
 
-def show(image, title=None, **options):
+def show(image: Image.Image, title: str | None = None, **options: Any) -> bool:
     r"""
     Display a given image.
 
@@ -69,7 +68,7 @@ class Viewer:
 
     # main api
 
-    def show(self, image, **options):
+    def show(self, image: Image.Image, **options: Any) -> int:
         """
         The main function for displaying an image.
         Converts the given image to the target format and displays it.
@@ -87,16 +86,16 @@ def show(self, image, **options):
 
     # hook methods
 
-    format = None
+    format: str | None = None
     """The format to convert the image into."""
-    options = {}
+    options: dict[str, Any] = {}
     """Additional options used to convert the image."""
 
-    def get_format(self, image):
+    def get_format(self, image: Image.Image) -> str | None:
         """Return format name, or ``None`` to save as PGM/PPM."""
         return self.format
 
-    def get_command(self, file, **options):
+    def get_command(self, file: str, **options: Any) -> str:
         """
         Returns the command used to display the file.
         Not implemented in the base class.
@@ -104,18 +103,20 @@ def get_command(self, file, **options):
         msg = "unavailable in base viewer"
         raise NotImplementedError(msg)
 
-    def save_image(self, image):
+    def save_image(self, image: Image.Image) -> str:
         """Save to temporary file and return filename."""
         return image._dump(format=self.get_format(image), **self.options)
 
-    def show_image(self, image, **options):
+    def show_image(self, image: Image.Image, **options: Any) -> int:
         """Display the given image."""
         return self.show_file(self.save_image(image), **options)
 
-    def show_file(self, path, **options):
+    def show_file(self, path: str, **options: Any) -> int:
         """
         Display given file.
         """
+        if not os.path.exists(path):
+            raise FileNotFoundError
         os.system(self.get_command(path, **options))  # nosec
         return 1
 
@@ -129,13 +130,26 @@ class WindowsViewer(Viewer):
     format = "PNG"
     options = {"compress_level": 1, "save_all": True}
 
-    def get_command(self, file, **options):
+    def get_command(self, file: str, **options: Any) -> str:
         return (
             f'start "Pillow" /WAIT "{file}" '
             "&& ping -n 4 127.0.0.1 >NUL "
             f'&& del /f "{file}"'
         )
 
+    def show_file(self, path: str, **options: Any) -> int:
+        """
+        Display given file.
+        """
+        if not os.path.exists(path):
+            raise FileNotFoundError
+        subprocess.Popen(
+            self.get_command(path, **options),
+            shell=True,
+            creationflags=getattr(subprocess, "CREATE_NO_WINDOW"),
+        )  # nosec
+        return 1
+
 
 if sys.platform == "win32":
     register(WindowsViewer)
@@ -147,17 +161,19 @@ class MacViewer(Viewer):
     format = "PNG"
     options = {"compress_level": 1, "save_all": True}
 
-    def get_command(self, file, **options):
+    def get_command(self, file: str, **options: Any) -> str:
         # on darwin open returns immediately resulting in the temp
         # file removal while app is opening
         command = "open -a Preview.app"
         command = f"({command} {quote(file)}; sleep 20; rm -f {quote(file)})&"
         return command
 
-    def show_file(self, path, **options):
+    def show_file(self, path: str, **options: Any) -> int:
         """
         Display given file.
         """
+        if not os.path.exists(path):
+            raise FileNotFoundError
         subprocess.call(["open", "-a", "Preview.app", path])
         executable = sys.executable or shutil.which("python3")
         if executable:
@@ -180,9 +196,13 @@ class UnixViewer(Viewer):
     format = "PNG"
     options = {"compress_level": 1, "save_all": True}
 
-    def get_command(self, file, **options):
+    @abc.abstractmethod
+    def get_command_ex(self, file: str, **options: Any) -> tuple[str, str]:
+        pass
+
+    def get_command(self, file: str, **options: Any) -> str:
         command = self.get_command_ex(file, **options)[0]
-        return f"({command} {quote(file)}"
+        return f"{command} {quote(file)}"
 
 
 class XDGViewer(UnixViewer):
@@ -190,14 +210,16 @@ class XDGViewer(UnixViewer):
     The freedesktop.org ``xdg-open`` command.
     """
 
-    def get_command_ex(self, file, **options):
+    def get_command_ex(self, file: str, **options: Any) -> tuple[str, str]:
         command = executable = "xdg-open"
         return command, executable
 
-    def show_file(self, path, **options):
+    def show_file(self, path: str, **options: Any) -> int:
         """
         Display given file.
         """
+        if not os.path.exists(path):
+            raise FileNotFoundError
         subprocess.Popen(["xdg-open", path])
         return 1
 
@@ -208,16 +230,20 @@ class DisplayViewer(UnixViewer):
     This viewer supports the ``title`` parameter.
     """
 
-    def get_command_ex(self, file, title=None, **options):
+    def get_command_ex(
+        self, file: str, title: str | None = None, **options: Any
+    ) -> tuple[str, str]:
         command = executable = "display"
         if title:
             command += f" -title {quote(title)}"
         return command, executable
 
-    def show_file(self, path, **options):
+    def show_file(self, path: str, **options: Any) -> int:
         """
         Display given file.
         """
+        if not os.path.exists(path):
+            raise FileNotFoundError
         args = ["display"]
         title = options.get("title")
         if title:
@@ -231,15 +257,17 @@ def show_file(self, path, **options):
 class GmDisplayViewer(UnixViewer):
     """The GraphicsMagick ``gm display`` command."""
 
-    def get_command_ex(self, file, **options):
+    def get_command_ex(self, file: str, **options: Any) -> tuple[str, str]:
         executable = "gm"
         command = "gm display"
         return command, executable
 
-    def show_file(self, path, **options):
+    def show_file(self, path: str, **options: Any) -> int:
         """
         Display given file.
         """
+        if not os.path.exists(path):
+            raise FileNotFoundError
         subprocess.Popen(["gm", "display", path])
         return 1
 
@@ -247,15 +275,17 @@ def show_file(self, path, **options):
 class EogViewer(UnixViewer):
     """The GNOME Image Viewer ``eog`` command."""
 
-    def get_command_ex(self, file, **options):
+    def get_command_ex(self, file: str, **options: Any) -> tuple[str, str]:
         executable = "eog"
         command = "eog -n"
         return command, executable
 
-    def show_file(self, path, **options):
+    def show_file(self, path: str, **options: Any) -> int:
         """
         Display given file.
         """
+        if not os.path.exists(path):
+            raise FileNotFoundError
         subprocess.Popen(["eog", "-n", path])
         return 1
 
@@ -266,7 +296,9 @@ class XVViewer(UnixViewer):
     This viewer supports the ``title`` parameter.
     """
 
-    def get_command_ex(self, file, title=None, **options):
+    def get_command_ex(
+        self, file: str, title: str | None = None, **options: Any
+    ) -> tuple[str, str]:
         # note: xv is pretty outdated.  most modern systems have
         # imagemagick's display command instead.
         command = executable = "xv"
@@ -274,10 +306,12 @@ def get_command_ex(self, file, title=None, **options):
             command += f" -name {quote(title)}"
         return command, executable
 
-    def show_file(self, path, **options):
+    def show_file(self, path: str, **options: Any) -> int:
         """
         Display given file.
         """
+        if not os.path.exists(path):
+            raise FileNotFoundError
         args = ["xv"]
         title = options.get("title")
         if title:
@@ -304,7 +338,7 @@ def show_file(self, path, **options):
 class IPythonViewer(Viewer):
     """The viewer for IPython frontends."""
 
-    def show_image(self, image, **options):
+    def show_image(self, image: Image.Image, **options: Any) -> int:
         ipython_display(image)
         return 1
 
diff --git a/src/PIL/ImageStat.py b/src/PIL/ImageStat.py
index 13864e59cfc..8bc504526f0 100644
--- a/src/PIL/ImageStat.py
+++ b/src/PIL/ImageStat.py
@@ -23,35 +23,58 @@
 from __future__ import annotations
 
 import math
+from functools import cached_property
+
+from . import Image
 
 
 class Stat:
-    def __init__(self, image_or_list, mask=None):
-        try:
-            if mask:
-                self.h = image_or_list.histogram(mask)
-            else:
-                self.h = image_or_list.histogram()
-        except AttributeError:
-            self.h = image_or_list  # assume it to be a histogram list
-        if not isinstance(self.h, list):
-            msg = "first argument must be image or list"
+    def __init__(
+        self, image_or_list: Image.Image | list[int], mask: Image.Image | None = None
+    ) -> None:
+        """
+        Calculate statistics for the given image. If a mask is included,
+        only the regions covered by that mask are included in the
+        statistics. You can also pass in a previously calculated histogram.
+
+        :param image: A PIL image, or a precalculated histogram.
+
+            .. note::
+
+                For a PIL image, calculations rely on the
+                :py:meth:`~PIL.Image.Image.histogram` method. The pixel counts are
+                grouped into 256 bins, even if the image has more than 8 bits per
+                channel. So ``I`` and ``F`` mode images have a maximum ``mean``,
+                ``median`` and ``rms`` of 255, and cannot have an ``extrema`` maximum
+                of more than 255.
+
+        :param mask: An optional mask.
+        """
+        if isinstance(image_or_list, Image.Image):
+            self.h = image_or_list.histogram(mask)
+        elif isinstance(image_or_list, list):
+            self.h = image_or_list
+        else:
+            msg = "first argument must be image or list"  # type: ignore[unreachable]
             raise TypeError(msg)
         self.bands = list(range(len(self.h) // 256))
 
-    def __getattr__(self, id):
-        """Calculate missing attribute"""
-        if id[:4] == "_get":
-            raise AttributeError(id)
-        # calculate missing attribute
-        v = getattr(self, "_get" + id)()
-        setattr(self, id, v)
-        return v
-
-    def _getextrema(self):
-        """Get min/max values for each band in the image"""
-
-        def minmax(histogram):
+    @cached_property
+    def extrema(self) -> list[tuple[int, int]]:
+        """
+        Min/max values for each band in the image.
+
+        .. note::
+            This relies on the :py:meth:`~PIL.Image.Image.histogram` method, and
+            simply returns the low and high bins used. This is correct for
+            images with 8 bits per channel, but fails for other modes such as
+            ``I`` or ``F``. Instead, use :py:meth:`~PIL.Image.Image.getextrema` to
+            return per-band extrema for the image. This is more correct and
+            efficient because, for non-8-bit modes, the histogram method uses
+            :py:meth:`~PIL.Image.Image.getextrema` to determine the bins used.
+        """
+
+        def minmax(histogram: list[int]) -> tuple[int, int]:
             res_min, res_max = 255, 0
             for i in range(256):
                 if histogram[i]:
@@ -65,12 +88,14 @@ def minmax(histogram):
 
         return [minmax(self.h[i:]) for i in range(0, len(self.h), 256)]
 
-    def _getcount(self):
-        """Get total number of pixels in each layer"""
+    @cached_property
+    def count(self) -> list[int]:
+        """Total number of pixels for each band in the image."""
         return [sum(self.h[i : i + 256]) for i in range(0, len(self.h), 256)]
 
-    def _getsum(self):
-        """Get sum of all pixels in each layer"""
+    @cached_property
+    def sum(self) -> list[float]:
+        """Sum of all pixels for each band in the image."""
 
         v = []
         for i in range(0, len(self.h), 256):
@@ -80,8 +105,9 @@ def _getsum(self):
             v.append(layer_sum)
         return v
 
-    def _getsum2(self):
-        """Get squared sum of all pixels in each layer"""
+    @cached_property
+    def sum2(self) -> list[float]:
+        """Squared sum of all pixels for each band in the image."""
 
         v = []
         for i in range(0, len(self.h), 256):
@@ -91,12 +117,14 @@ def _getsum2(self):
             v.append(sum2)
         return v
 
-    def _getmean(self):
-        """Get average pixel level for each layer"""
+    @cached_property
+    def mean(self) -> list[float]:
+        """Average (arithmetic mean) pixel level for each band in the image."""
         return [self.sum[i] / self.count[i] for i in self.bands]
 
-    def _getmedian(self):
-        """Get median pixel level for each layer"""
+    @cached_property
+    def median(self) -> list[int]:
+        """Median pixel level for each band in the image."""
 
         v = []
         for i in self.bands:
@@ -110,19 +138,22 @@ def _getmedian(self):
             v.append(j)
         return v
 
-    def _getrms(self):
-        """Get RMS for each layer"""
+    @cached_property
+    def rms(self) -> list[float]:
+        """RMS (root-mean-square) for each band in the image."""
         return [math.sqrt(self.sum2[i] / self.count[i]) for i in self.bands]
 
-    def _getvar(self):
-        """Get variance for each layer"""
+    @cached_property
+    def var(self) -> list[float]:
+        """Variance for each band in the image."""
         return [
             (self.sum2[i] - (self.sum[i] ** 2.0) / self.count[i]) / self.count[i]
             for i in self.bands
         ]
 
-    def _getstddev(self):
-        """Get standard deviation for each layer"""
+    @cached_property
+    def stddev(self) -> list[float]:
+        """Standard deviation for each band in the image."""
         return [math.sqrt(self.var[i]) for i in self.bands]
 
 
diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py
index 10b2cc69a1e..bf29fdba54c 100644
--- a/src/PIL/ImageTk.py
+++ b/src/PIL/ImageTk.py
@@ -28,48 +28,41 @@
 
 import tkinter
 from io import BytesIO
+from typing import TYPE_CHECKING, Any, cast
 
-from . import Image
+from . import Image, ImageFile
+
+if TYPE_CHECKING:
+    from ._typing import CapsuleType
 
 # --------------------------------------------------------------------
 # Check for Tkinter interface hooks
 
-_pilbitmap_ok = None
-
-
-def _pilbitmap_check():
-    global _pilbitmap_ok
-    if _pilbitmap_ok is None:
-        try:
-            im = Image.new("1", (1, 1))
-            tkinter.BitmapImage(data=f"PIL:{im.im.id}")
-            _pilbitmap_ok = 1
-        except tkinter.TclError:
-            _pilbitmap_ok = 0
-    return _pilbitmap_ok
-
 
-def _get_image_from_kw(kw):
+def _get_image_from_kw(kw: dict[str, Any]) -> ImageFile.ImageFile | None:
     source = None
     if "file" in kw:
         source = kw.pop("file")
     elif "data" in kw:
         source = BytesIO(kw.pop("data"))
-    if source:
-        return Image.open(source)
+    if not source:
+        return None
+    return Image.open(source)
 
 
-def _pyimagingtkcall(command, photo, id):
+def _pyimagingtkcall(
+    command: str, photo: PhotoImage | tkinter.PhotoImage, ptr: CapsuleType
+) -> None:
     tk = photo.tk
     try:
-        tk.call(command, photo, id)
+        tk.call(command, photo, repr(ptr))
     except tkinter.TclError:
         # activate Tkinter hook
         # may raise an error if it cannot attach to Tkinter
         from . import _imagingtk
 
         _imagingtk.tkinit(tk.interpaddr())
-        tk.call(command, photo, id)
+        tk.call(command, photo, repr(ptr))
 
 
 # --------------------------------------------------------------------
@@ -96,27 +89,36 @@ class PhotoImage:
                    image file).
     """
 
-    def __init__(self, image=None, size=None, **kw):
+    def __init__(
+        self,
+        image: Image.Image | str | None = None,
+        size: tuple[int, int] | None = None,
+        **kw: Any,
+    ) -> None:
         # Tk compatibility: file or data
         if image is None:
             image = _get_image_from_kw(kw)
 
-        if hasattr(image, "mode") and hasattr(image, "size"):
+        if image is None:
+            msg = "Image is required"
+            raise ValueError(msg)
+        elif isinstance(image, str):
+            mode = image
+            image = None
+
+            if size is None:
+                msg = "If first argument is mode, size is required"
+                raise ValueError(msg)
+        else:
             # got an image instead of a mode
             mode = image.mode
             if mode == "P":
                 # palette mapped data
                 image.apply_transparency()
                 image.load()
-                try:
-                    mode = image.palette.mode
-                except AttributeError:
-                    mode = "RGB"  # default
+                mode = image.palette.mode if image.palette else "RGB"
             size = image.size
             kw["width"], kw["height"] = size
-        else:
-            mode = image
-            image = None
 
         if mode not in ["1", "L", "RGB", "RGBA"]:
             mode = Image.getmodebase(mode)
@@ -128,15 +130,18 @@ def __init__(self, image=None, size=None, **kw):
         if image:
             self.paste(image)
 
-    def __del__(self):
-        name = self.__photo.name
+    def __del__(self) -> None:
+        try:
+            name = self.__photo.name
+        except AttributeError:
+            return
         self.__photo.name = None
         try:
             self.__photo.tk.call("image", "delete", name)
         except Exception:
             pass  # ignore internal errors
 
-    def __str__(self):
+    def __str__(self) -> str:
         """
         Get the Tkinter photo image identifier.  This method is automatically
         called by Tkinter whenever a PhotoImage object is passed to a Tkinter
@@ -146,7 +151,7 @@ def __str__(self):
         """
         return str(self.__photo)
 
-    def width(self):
+    def width(self) -> int:
         """
         Get the width of the image.
 
@@ -154,7 +159,7 @@ def width(self):
         """
         return self.__size[0]
 
-    def height(self):
+    def height(self) -> int:
         """
         Get the height of the image.
 
@@ -162,7 +167,7 @@ def height(self):
         """
         return self.__size[1]
 
-    def paste(self, im):
+    def paste(self, im: Image.Image) -> None:
         """
         Paste a PIL image into the photo image.  Note that this can
         be very slow if the photo image is displayed.
@@ -172,15 +177,14 @@ def paste(self, im):
                    the bitmap image.
         """
         # convert to blittable
-        im.load()
+        ptr = im.getim()
         image = im.im
-        if image.isblock() and im.mode == self.__mode:
-            block = image
-        else:
-            block = image.new_block(self.__mode, im.size)
+        if not image.isblock() or im.mode != self.__mode:
+            block = Image.core.new_block(self.__mode, im.size)
             image.convert2(block, image)  # convert directly between buffers
+            ptr = block.ptr
 
-        _pyimagingtkcall("PyImagingPhoto", self.__photo, block.id)
+        _pyimagingtkcall("PyImagingPhoto", self.__photo, ptr)
 
 
 # --------------------------------------------------------------------
@@ -201,33 +205,31 @@ class BitmapImage:
     :param image: A PIL image.
     """
 
-    def __init__(self, image=None, **kw):
+    def __init__(self, image: Image.Image | None = None, **kw: Any) -> None:
         # Tk compatibility: file or data
         if image is None:
             image = _get_image_from_kw(kw)
 
+        if image is None:
+            msg = "Image is required"
+            raise ValueError(msg)
         self.__mode = image.mode
         self.__size = image.size
 
-        if _pilbitmap_check():
-            # fast way (requires the pilbitmap booster patch)
-            image.load()
-            kw["data"] = f"PIL:{image.im.id}"
-            self.__im = image  # must keep a reference
-        else:
-            # slow but safe way
-            kw["data"] = image.tobitmap()
-        self.__photo = tkinter.BitmapImage(**kw)
+        self.__photo = tkinter.BitmapImage(data=image.tobitmap(), **kw)
 
-    def __del__(self):
-        name = self.__photo.name
+    def __del__(self) -> None:
+        try:
+            name = self.__photo.name
+        except AttributeError:
+            return
         self.__photo.name = None
         try:
             self.__photo.tk.call("image", "delete", name)
         except Exception:
             pass  # ignore internal errors
 
-    def width(self):
+    def width(self) -> int:
         """
         Get the width of the image.
 
@@ -235,7 +237,7 @@ def width(self):
         """
         return self.__size[0]
 
-    def height(self):
+    def height(self) -> int:
         """
         Get the height of the image.
 
@@ -243,7 +245,7 @@ def height(self):
         """
         return self.__size[1]
 
-    def __str__(self):
+    def __str__(self) -> str:
         """
         Get the Tkinter bitmap image identifier.  This method is automatically
         called by Tkinter whenever a BitmapImage object is passed to a Tkinter
@@ -254,28 +256,32 @@ def __str__(self):
         return str(self.__photo)
 
 
-def getimage(photo):
+def getimage(photo: PhotoImage) -> Image.Image:
     """Copies the contents of a PhotoImage to a PIL image memory."""
     im = Image.new("RGBA", (photo.width(), photo.height()))
-    block = im.im
 
-    _pyimagingtkcall("PyImagingPhotoGet", photo, block.id)
+    _pyimagingtkcall("PyImagingPhotoGet", photo, im.getim())
 
     return im
 
 
-def _show(image, title):
+def _show(image: Image.Image, title: str | None) -> None:
     """Helper for the Image.show method."""
 
     class UI(tkinter.Label):
-        def __init__(self, master, im):
+        def __init__(self, master: tkinter.Toplevel, im: Image.Image) -> None:
+            self.image: BitmapImage | PhotoImage
             if im.mode == "1":
                 self.image = BitmapImage(im, foreground="white", master=master)
             else:
                 self.image = PhotoImage(im, master=master)
-            super().__init__(master, image=self.image, bg="black", bd=0)
+            if TYPE_CHECKING:
+                image = cast(tkinter._Image, self.image)
+            else:
+                image = self.image
+            super().__init__(master, image=image, bg="black", bd=0)
 
-    if not tkinter._default_root:
+    if not getattr(tkinter, "_default_root"):
         msg = "tkinter not initialized"
         raise OSError(msg)
     top = tkinter.Toplevel()
diff --git a/src/PIL/ImageTransform.py b/src/PIL/ImageTransform.py
index 84c81f1844f..a3d8f441a9f 100644
--- a/src/PIL/ImageTransform.py
+++ b/src/PIL/ImageTransform.py
@@ -14,26 +14,30 @@
 #
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from . import Image
 
 
 class Transform(Image.ImageTransformHandler):
+    """Base class for other transforms defined in :py:mod:`~PIL.ImageTransform`."""
+
     method: Image.Transform
 
-    def __init__(self, data: Sequence[int]) -> None:
+    def __init__(self, data: Sequence[Any]) -> None:
         self.data = data
 
-    def getdata(self) -> tuple[int, Sequence[int]]:
+    def getdata(self) -> tuple[Image.Transform, Sequence[int]]:
         return self.method, self.data
 
     def transform(
         self,
         size: tuple[int, int],
         image: Image.Image,
-        **options: dict[str, str | int | tuple[int, ...] | list[int]],
+        **options: Any,
     ) -> Image.Image:
+        """Perform the transform. Called from :py:meth:`.Image.transform`."""
         # can be overridden
         method, data = self.getdata()
         return image.transform(size, method, data, **options)
@@ -51,7 +55,7 @@ class AffineTransform(Transform):
     This function can be used to scale, translate, rotate, and shear the
     original image.
 
-    See :py:meth:`~PIL.Image.Image.transform`
+    See :py:meth:`.Image.transform`
 
     :param matrix: A 6-tuple (a, b, c, d, e, f) containing the first two rows
         from an affine transform matrix.
@@ -60,6 +64,26 @@ class AffineTransform(Transform):
     method = Image.Transform.AFFINE
 
 
+class PerspectiveTransform(Transform):
+    """
+    Define a perspective image transform.
+
+    This function takes an 8-tuple (a, b, c, d, e, f, g, h). For each pixel
+    (x, y) in the output image, the new value is taken from a position
+    ((a x + b y + c) / (g x + h y + 1), (d x + e y + f) / (g x + h y + 1)) in
+    the input image, rounded to nearest pixel.
+
+    This function can be used to scale, translate, rotate, and shear the
+    original image.
+
+    See :py:meth:`.Image.transform`
+
+    :param matrix: An 8-tuple (a, b, c, d, e, f, g, h).
+    """
+
+    method = Image.Transform.PERSPECTIVE
+
+
 class ExtentTransform(Transform):
     """
     Define a transform to extract a subregion from an image.
@@ -73,7 +97,7 @@ class ExtentTransform(Transform):
     rectangle in the current image. It is slightly slower than crop, but about
     as fast as a corresponding resize operation.
 
-    See :py:meth:`~PIL.Image.Image.transform`
+    See :py:meth:`.Image.transform`
 
     :param bbox: A 4-tuple (x0, y0, x1, y1) which specifies two points in the
         input image's coordinate system. See :ref:`coordinate-system`.
@@ -89,7 +113,7 @@ class QuadTransform(Transform):
     Maps a quadrilateral (a region defined by four corners) from the image to a
     rectangle of the given size.
 
-    See :py:meth:`~PIL.Image.Image.transform`
+    See :py:meth:`.Image.transform`
 
     :param xy: An 8-tuple (x0, y0, x1, y1, x2, y2, x3, y3) which contain the
         upper left, lower left, lower right, and upper right corner of the
@@ -104,7 +128,7 @@ class MeshTransform(Transform):
     Define a mesh image transform.  A mesh transform consists of one or more
     individual quad transforms.
 
-    See :py:meth:`~PIL.Image.Image.transform`
+    See :py:meth:`.Image.transform`
 
     :param data: A list of (bbox, quad) tuples.
     """
diff --git a/src/PIL/ImageWin.py b/src/PIL/ImageWin.py
index 75910d2d9ab..98c28f29f1d 100644
--- a/src/PIL/ImageWin.py
+++ b/src/PIL/ImageWin.py
@@ -28,10 +28,10 @@ class HDC:
     methods.
     """
 
-    def __init__(self, dc):
+    def __init__(self, dc: int) -> None:
         self.dc = dc
 
-    def __int__(self):
+    def __int__(self) -> int:
         return self.dc
 
 
@@ -42,10 +42,10 @@ class HWND:
     methods, instead of a DC.
     """
 
-    def __init__(self, wnd):
+    def __init__(self, wnd: int) -> None:
         self.wnd = wnd
 
-    def __int__(self):
+    def __int__(self) -> int:
         return self.wnd
 
 
@@ -69,22 +69,28 @@ class Dib:
                  defines the size of the image.
     """
 
-    def __init__(self, image, size=None):
-        if hasattr(image, "mode") and hasattr(image, "size"):
+    def __init__(
+        self, image: Image.Image | str, size: tuple[int, int] | None = None
+    ) -> None:
+        if isinstance(image, str):
+            mode = image
+            image = ""
+            if size is None:
+                msg = "If first argument is mode, size is required"
+                raise ValueError(msg)
+        else:
             mode = image.mode
             size = image.size
-        else:
-            mode = image
-            image = None
         if mode not in ["1", "L", "P", "RGB"]:
             mode = Image.getmodebase(mode)
         self.image = Image.core.display(mode, size)
         self.mode = mode
         self.size = size
         if image:
+            assert not isinstance(image, str)
             self.paste(image)
 
-    def expose(self, handle):
+    def expose(self, handle: int | HDC | HWND) -> None:
         """
         Copy the bitmap contents to a device context.
 
@@ -92,17 +98,22 @@ def expose(self, handle):
                        HDC or HWND instance.  In PythonWin, you can use
                        ``CDC.GetHandleAttrib()`` to get a suitable handle.
         """
+        handle_int = int(handle)
         if isinstance(handle, HWND):
-            dc = self.image.getdc(handle)
+            dc = self.image.getdc(handle_int)
             try:
-                result = self.image.expose(dc)
+                self.image.expose(dc)
             finally:
-                self.image.releasedc(handle, dc)
+                self.image.releasedc(handle_int, dc)
         else:
-            result = self.image.expose(handle)
-        return result
-
-    def draw(self, handle, dst, src=None):
+            self.image.expose(handle_int)
+
+    def draw(
+        self,
+        handle: int | HDC | HWND,
+        dst: tuple[int, int, int, int],
+        src: tuple[int, int, int, int] | None = None,
+    ) -> None:
         """
         Same as expose, but allows you to specify where to draw the image, and
         what part of it to draw.
@@ -112,19 +123,19 @@ def draw(self, handle, dst, src=None):
         the destination have different sizes, the image is resized as
         necessary.
         """
-        if not src:
+        if src is None:
             src = (0, 0) + self.size
+        handle_int = int(handle)
         if isinstance(handle, HWND):
-            dc = self.image.getdc(handle)
+            dc = self.image.getdc(handle_int)
             try:
-                result = self.image.draw(dc, dst, src)
+                self.image.draw(dc, dst, src)
             finally:
-                self.image.releasedc(handle, dc)
+                self.image.releasedc(handle_int, dc)
         else:
-            result = self.image.draw(handle, dst, src)
-        return result
+            self.image.draw(handle_int, dst, src)
 
-    def query_palette(self, handle):
+    def query_palette(self, handle: int | HDC | HWND) -> int:
         """
         Installs the palette associated with the image in the given device
         context.
@@ -136,20 +147,23 @@ def query_palette(self, handle):
 
         :param handle: Device context (HDC), cast to a Python integer, or an
                        HDC or HWND instance.
-        :return: A true value if one or more entries were changed (this
-                 indicates that the image should be redrawn).
+        :return: The number of entries that were changed (if one or more entries,
+                 this indicates that the image should be redrawn).
         """
+        handle_int = int(handle)
         if isinstance(handle, HWND):
-            handle = self.image.getdc(handle)
+            handle = self.image.getdc(handle_int)
             try:
                 result = self.image.query_palette(handle)
             finally:
                 self.image.releasedc(handle, handle)
         else:
-            result = self.image.query_palette(handle)
+            result = self.image.query_palette(handle_int)
         return result
 
-    def paste(self, im, box=None):
+    def paste(
+        self, im: Image.Image, box: tuple[int, int, int, int] | None = None
+    ) -> None:
         """
         Paste a PIL image into the bitmap image.
 
@@ -169,16 +183,16 @@ def paste(self, im, box=None):
         else:
             self.image.paste(im.im)
 
-    def frombytes(self, buffer):
+    def frombytes(self, buffer: bytes) -> None:
         """
         Load display memory contents from byte data.
 
         :param buffer: A buffer containing display data (usually
                        data returned from :py:func:`~PIL.ImageWin.Dib.tobytes`)
         """
-        return self.image.frombytes(buffer)
+        self.image.frombytes(buffer)
 
-    def tobytes(self):
+    def tobytes(self) -> bytes:
         """
         Copy display memory contents to bytes object.
 
@@ -190,42 +204,44 @@ def tobytes(self):
 class Window:
     """Create a Window with the given title size."""
 
-    def __init__(self, title="PIL", width=None, height=None):
+    def __init__(
+        self, title: str = "PIL", width: int | None = None, height: int | None = None
+    ) -> None:
         self.hwnd = Image.core.createwindow(
             title, self.__dispatcher, width or 0, height or 0
         )
 
-    def __dispatcher(self, action, *args):
-        return getattr(self, "ui_handle_" + action)(*args)
+    def __dispatcher(self, action: str, *args: int) -> None:
+        getattr(self, f"ui_handle_{action}")(*args)
 
-    def ui_handle_clear(self, dc, x0, y0, x1, y1):
+    def ui_handle_clear(self, dc: int, x0: int, y0: int, x1: int, y1: int) -> None:
         pass
 
-    def ui_handle_damage(self, x0, y0, x1, y1):
+    def ui_handle_damage(self, x0: int, y0: int, x1: int, y1: int) -> None:
         pass
 
-    def ui_handle_destroy(self):
+    def ui_handle_destroy(self) -> None:
         pass
 
-    def ui_handle_repair(self, dc, x0, y0, x1, y1):
+    def ui_handle_repair(self, dc: int, x0: int, y0: int, x1: int, y1: int) -> None:
         pass
 
-    def ui_handle_resize(self, width, height):
+    def ui_handle_resize(self, width: int, height: int) -> None:
         pass
 
-    def mainloop(self):
+    def mainloop(self) -> None:
         Image.core.eventloop()
 
 
 class ImageWindow(Window):
     """Create an image window which displays the given image."""
 
-    def __init__(self, image, title="PIL"):
+    def __init__(self, image: Image.Image | Dib, title: str = "PIL") -> None:
         if not isinstance(image, Dib):
             image = Dib(image)
         self.image = image
         width, height = image.size
         super().__init__(title, width=width, height=height)
 
-    def ui_handle_repair(self, dc, x0, y0, x1, y1):
+    def ui_handle_repair(self, dc: int, x0: int, y0: int, x1: int, y1: int) -> None:
         self.image.draw(dc, (x0, y0, x1, y1))
diff --git a/src/PIL/ImtImagePlugin.py b/src/PIL/ImtImagePlugin.py
index 7469c592dd2..594c56513cd 100644
--- a/src/PIL/ImtImagePlugin.py
+++ b/src/PIL/ImtImagePlugin.py
@@ -33,10 +33,12 @@ class ImtImageFile(ImageFile.ImageFile):
     format = "IMT"
     format_description = "IM Tools"
 
-    def _open(self):
+    def _open(self) -> None:
         # Quick rejection: if there's not a LF among the first
         # 100 bytes, this is (probably) not a text header.
 
+        assert self.fp is not None
+
         buffer = self.fp.read(100)
         if b"\n" not in buffer:
             msg = "not an IM file"
@@ -56,7 +58,7 @@ def _open(self):
             if s == b"\x0C":
                 # image data begins
                 self.tile = [
-                    (
+                    ImageFile._Tile(
                         "raw",
                         (0, 0) + self.size,
                         self.fp.tell() - len(buffer),
diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py
index 4096094348a..60ab7c83f37 100644
--- a/src/PIL/IptcImagePlugin.py
+++ b/src/PIL/IptcImagePlugin.py
@@ -16,8 +16,9 @@
 #
 from __future__ import annotations
 
+from collections.abc import Sequence
 from io import BytesIO
-from typing import Sequence
+from typing import cast
 
 from . import Image, ImageFile
 from ._binary import i16be as i16
@@ -57,7 +58,7 @@ def dump(c: Sequence[int | bytes]) -> None:
     """.. deprecated:: 10.2.0"""
     deprecate("IptcImagePlugin.dump", 12)
     for i in c:
-        print("%02x" % _i8(i), end=" ")
+        print(f"{_i8(i):02x}", end=" ")
     print()
 
 
@@ -146,9 +147,11 @@ def _open(self) -> None:
 
         # tile
         if tag == (8, 10):
-            self.tile = [("iptc", (0, 0) + self.size, offset, compression)]
+            self.tile = [
+                ImageFile._Tile("iptc", (0, 0) + self.size, offset, compression)
+            ]
 
-    def load(self):
+    def load(self) -> Image.core.PixelAccess | None:
         if len(self.tile) != 1 or self.tile[0][0] != "iptc":
             return ImageFile.ImageFile.load(self)
 
@@ -176,6 +179,7 @@ def load(self):
         with Image.open(o) as _im:
             _im.load()
             self.im = _im.im
+        return None
 
 
 Image.register_open(IptcImageFile.format, IptcImageFile)
@@ -183,7 +187,9 @@ def load(self):
 Image.register_extension(IptcImageFile.format, ".iim")
 
 
-def getiptcinfo(im):
+def getiptcinfo(
+    im: ImageFile.ImageFile,
+) -> dict[tuple[int, int], bytes | list[bytes]] | None:
     """
     Get IPTC information from TIFF, JPEG, or IPTC file.
 
@@ -195,9 +201,13 @@ def getiptcinfo(im):
 
     data = None
 
+    info: dict[tuple[int, int], bytes | list[bytes]] = {}
     if isinstance(im, IptcImageFile):
         # return info dictionary right away
-        return im.info
+        for k, v in im.info.items():
+            if isinstance(k, tuple):
+                info[k] = v
+        return info
 
     elif isinstance(im, JpegImagePlugin.JpegImageFile):
         # extract the IPTC/NAA resource
@@ -209,8 +219,8 @@ def getiptcinfo(im):
         # get raw data from the IPTC/NAA tag (PhotoShop tags the data
         # as 4-byte integers, so we cannot use the get method...)
         try:
-            data = im.tag.tagdata[TiffImagePlugin.IPTC_NAA_CHUNK]
-        except (AttributeError, KeyError):
+            data = im.tag_v2[TiffImagePlugin.IPTC_NAA_CHUNK]
+        except KeyError:
             pass
 
     if data is None:
@@ -220,16 +230,20 @@ def getiptcinfo(im):
     class FakeImage:
         pass
 
-    im = FakeImage()
-    im.__class__ = IptcImageFile
+    fake_im = FakeImage()
+    fake_im.__class__ = IptcImageFile  # type: ignore[assignment]
+    iptc_im = cast(IptcImageFile, fake_im)
 
     # parse the IPTC information chunk
-    im.info = {}
-    im.fp = BytesIO(data)
+    iptc_im.info = {}
+    iptc_im.fp = BytesIO(data)
 
     try:
-        im._open()
+        iptc_im._open()
     except (IndexError, KeyError):
         pass  # expected failure
 
-    return im.info
+    for k, v in iptc_im.info.items():
+        if isinstance(k, tuple):
+            info[k] = v
+    return info
diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py
index 4b778a0d33a..b6ebd562be6 100644
--- a/src/PIL/Jpeg2KImagePlugin.py
+++ b/src/PIL/Jpeg2KImagePlugin.py
@@ -18,8 +18,10 @@
 import io
 import os
 import struct
+from collections.abc import Callable
+from typing import IO, cast
 
-from . import Image, ImageFile, _binary
+from . import Image, ImageFile, ImagePalette, _binary
 
 
 class BoxReader:
@@ -28,13 +30,13 @@ class BoxReader:
     and to easily step into and read sub-boxes.
     """
 
-    def __init__(self, fp, length=-1):
+    def __init__(self, fp: IO[bytes], length: int = -1) -> None:
         self.fp = fp
         self.has_length = length >= 0
         self.length = length
         self.remaining_in_box = -1
 
-    def _can_read(self, num_bytes):
+    def _can_read(self, num_bytes: int) -> bool:
         if self.has_length and self.fp.tell() + num_bytes > self.length:
             # Outside box: ensure we don't read past the known file length
             return False
@@ -44,7 +46,7 @@ def _can_read(self, num_bytes):
         else:
             return True  # No length known, just read
 
-    def _read_bytes(self, num_bytes):
+    def _read_bytes(self, num_bytes: int) -> bytes:
         if not self._can_read(num_bytes):
             msg = "Not enough data in header"
             raise SyntaxError(msg)
@@ -58,32 +60,32 @@ def _read_bytes(self, num_bytes):
             self.remaining_in_box -= num_bytes
         return data
 
-    def read_fields(self, field_format):
+    def read_fields(self, field_format: str) -> tuple[int | bytes, ...]:
         size = struct.calcsize(field_format)
         data = self._read_bytes(size)
         return struct.unpack(field_format, data)
 
-    def read_boxes(self):
+    def read_boxes(self) -> BoxReader:
         size = self.remaining_in_box
         data = self._read_bytes(size)
         return BoxReader(io.BytesIO(data), size)
 
-    def has_next_box(self):
+    def has_next_box(self) -> bool:
         if self.has_length:
             return self.fp.tell() + self.remaining_in_box < self.length
         else:
             return True
 
-    def next_box_type(self):
+    def next_box_type(self) -> bytes:
         # Skip the rest of the box if it has not been read
         if self.remaining_in_box > 0:
             self.fp.seek(self.remaining_in_box, os.SEEK_CUR)
         self.remaining_in_box = -1
 
         # Read the length and type of the next box
-        lbox, tbox = self.read_fields(">I4s")
+        lbox, tbox = cast(tuple[int, bytes], self.read_fields(">I4s"))
         if lbox == 1:
-            lbox = self.read_fields(">Q")[0]
+            lbox = cast(int, self.read_fields(">Q")[0])
             hlen = 16
         else:
             hlen = 8
@@ -96,7 +98,7 @@ def next_box_type(self):
         return tbox
 
 
-def _parse_codestream(fp):
+def _parse_codestream(fp: IO[bytes]) -> tuple[tuple[int, int], str]:
     """Parse the JPEG 2000 codestream to extract the size and component
     count from the SIZ marker segment, returning a PIL (size, mode) tuple."""
 
@@ -106,15 +108,11 @@ def _parse_codestream(fp):
     lsiz, rsiz, xsiz, ysiz, xosiz, yosiz, _, _, _, _, csiz = struct.unpack_from(
         ">HHIIIIIIIIH", siz
     )
-    ssiz = [None] * csiz
-    xrsiz = [None] * csiz
-    yrsiz = [None] * csiz
-    for i in range(csiz):
-        ssiz[i], xrsiz[i], yrsiz[i] = struct.unpack_from(">BBB", siz, 36 + 3 * i)
 
     size = (xsiz - xosiz, ysiz - yosiz)
     if csiz == 1:
-        if (yrsiz[0] & 0x7F) > 8:
+        ssiz = struct.unpack_from(">B", siz, 38)
+        if (ssiz[0] & 0x7F) + 1 > 8:
             mode = "I;16"
         else:
             mode = "L"
@@ -125,20 +123,30 @@ def _parse_codestream(fp):
     elif csiz == 4:
         mode = "RGBA"
     else:
-        mode = None
+        msg = "unable to determine J2K image mode"
+        raise SyntaxError(msg)
 
     return size, mode
 
 
-def _res_to_dpi(num, denom, exp):
+def _res_to_dpi(num: int, denom: int, exp: int) -> float | None:
     """Convert JPEG2000's (numerator, denominator, exponent-base-10) resolution,
     calculated as (num / denom) * 10^exp and stored in dots per meter,
     to floating-point dots per inch."""
-    if denom != 0:
-        return (254 * num * (10**exp)) / (10000 * denom)
-
-
-def _parse_jp2_header(fp):
+    if denom == 0:
+        return None
+    return (254 * num * (10**exp)) / (10000 * denom)
+
+
+def _parse_jp2_header(
+    fp: IO[bytes],
+) -> tuple[
+    tuple[int, int],
+    str,
+    str | None,
+    tuple[float, float] | None,
+    ImagePalette.ImagePalette | None,
+]:
     """Parse the JP2 header box to extract size, component count,
     color space information, and optionally DPI information,
     returning a (size, mode, mimetype, dpi) tuple."""
@@ -156,18 +164,23 @@ def _parse_jp2_header(fp):
         elif tbox == b"ftyp":
             if reader.read_fields(">4s")[0] == b"jpx ":
                 mimetype = "image/jpx"
+    assert header is not None
 
     size = None
     mode = None
     bpc = None
     nc = None
     dpi = None  # 2-tuple of DPI info, or None
+    palette = None
 
     while header.has_next_box():
         tbox = header.next_box_type()
 
         if tbox == b"ihdr":
             height, width, nc, bpc = header.read_fields(">IIHB")
+            assert isinstance(height, int)
+            assert isinstance(width, int)
+            assert isinstance(bpc, int)
             size = (width, height)
             if nc == 1 and (bpc & 0x7F) > 8:
                 mode = "I;16"
@@ -179,12 +192,40 @@ def _parse_jp2_header(fp):
                 mode = "RGB"
             elif nc == 4:
                 mode = "RGBA"
+        elif tbox == b"colr" and nc == 4:
+            meth, _, _, enumcs = header.read_fields(">BBBI")
+            if meth == 1 and enumcs == 12:
+                mode = "CMYK"
+        elif tbox == b"pclr" and mode in ("L", "LA"):
+            ne, npc = header.read_fields(">HB")
+            assert isinstance(ne, int)
+            assert isinstance(npc, int)
+            max_bitdepth = 0
+            for bitdepth in header.read_fields(">" + ("B" * npc)):
+                assert isinstance(bitdepth, int)
+                if bitdepth > max_bitdepth:
+                    max_bitdepth = bitdepth
+            if max_bitdepth <= 8:
+                palette = ImagePalette.ImagePalette("RGBA" if npc == 4 else "RGB")
+                for i in range(ne):
+                    color: list[int] = []
+                    for value in header.read_fields(">" + ("B" * npc)):
+                        assert isinstance(value, int)
+                        color.append(value)
+                    palette.getcolor(tuple(color))
+                mode = "P" if mode == "L" else "PA"
         elif tbox == b"res ":
             res = header.read_boxes()
             while res.has_next_box():
                 tres = res.next_box_type()
                 if tres == b"resc":
                     vrcn, vrcd, hrcn, hrcd, vrce, hrce = res.read_fields(">HHHHBB")
+                    assert isinstance(vrcn, int)
+                    assert isinstance(vrcd, int)
+                    assert isinstance(hrcn, int)
+                    assert isinstance(hrcd, int)
+                    assert isinstance(vrce, int)
+                    assert isinstance(hrce, int)
                     hres = _res_to_dpi(hrcn, hrcd, hrce)
                     vres = _res_to_dpi(vrcn, vrcd, vrce)
                     if hres is not None and vres is not None:
@@ -195,7 +236,7 @@ def _parse_jp2_header(fp):
         msg = "Malformed JP2 header"
         raise SyntaxError(msg)
 
-    return size, mode, mimetype, dpi
+    return size, mode, mimetype, dpi, palette
 
 
 ##
@@ -206,7 +247,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile):
     format = "JPEG2000"
     format_description = "JPEG 2000 (ISO 15444)"
 
-    def _open(self):
+    def _open(self) -> None:
         sig = self.fp.read(4)
         if sig == b"\xff\x4f\xff\x51":
             self.codec = "j2k"
@@ -217,7 +258,7 @@ def _open(self):
             if sig == b"\x00\x00\x00\x0cjP  \x0d\x0a\x87\x0a":
                 self.codec = "jp2"
                 header = _parse_jp2_header(self.fp)
-                self._size, self._mode, self.custom_mimetype, dpi = header
+                self._size, self._mode, self.custom_mimetype, dpi, self.palette = header
                 if dpi is not None:
                     self.info["dpi"] = dpi
                 if self.fp.read(12).endswith(b"jp2c\xff\x4f\xff\x51"):
@@ -226,10 +267,6 @@ def _open(self):
                 msg = "not a JPEG 2000 file"
                 raise SyntaxError(msg)
 
-        if self.size is None or self.mode is None:
-            msg = "unable to determine size/mode"
-            raise SyntaxError(msg)
-
         self._reduce = 0
         self.layers = 0
 
@@ -250,7 +287,7 @@ def _open(self):
                 length = -1
 
         self.tile = [
-            (
+            ImageFile._Tile(
                 "jpeg2k",
                 (0, 0) + self.size,
                 0,
@@ -258,7 +295,7 @@ def _open(self):
             )
         ]
 
-    def _parse_comment(self):
+    def _parse_comment(self) -> None:
         hdr = self.fp.read(2)
         length = _binary.i16be(hdr)
         self.fp.seek(length - 2, os.SEEK_CUR)
@@ -280,18 +317,23 @@ def _parse_comment(self):
             else:
                 self.fp.seek(length - 2, os.SEEK_CUR)
 
-    @property
-    def reduce(self):
+    @property  # type: ignore[override]
+    def reduce(
+        self,
+    ) -> (
+        Callable[[int | tuple[int, int], tuple[int, int, int, int] | None], Image.Image]
+        | int
+    ):
         # https://github.com/python-pillow/Pillow/issues/4343 found that the
         # new Image 'reduce' method was shadowed by this plugin's 'reduce'
         # property. This attempts to allow for both scenarios
         return self._reduce or super().reduce
 
     @reduce.setter
-    def reduce(self, value):
+    def reduce(self, value: int) -> None:
         self._reduce = value
 
-    def load(self):
+    def load(self) -> Image.core.PixelAccess | None:
         if self.tile and self._reduce:
             power = 1 << self._reduce
             adjust = power >> 1
@@ -302,13 +344,14 @@ def load(self):
 
             # Update the reduce and layers settings
             t = self.tile[0]
+            assert isinstance(t[3], tuple)
             t3 = (t[3][0], self._reduce, self.layers, t[3][3], t[3][4])
-            self.tile = [(t[0], (0, 0) + self.size, t[2], t3)]
+            self.tile = [ImageFile._Tile(t[0], (0, 0) + self.size, t[2], t3)]
 
         return ImageFile.ImageFile.load(self)
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return (
         prefix[:4] == b"\xff\x4f\xff\x51"
         or prefix[:12] == b"\x00\x00\x00\x0cjP  \x0d\x0a\x87\x0a"
@@ -319,11 +362,13 @@ def _accept(prefix):
 # Save support
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     # Get the keyword arguments
     info = im.encoderinfo
 
-    if filename.endswith(".j2k") or info.get("no_jp2", False):
+    if isinstance(filename, str):
+        filename = filename.encode()
+    if filename.endswith(b".j2k") or info.get("no_jp2", False):
         kind = "j2k"
     else:
         kind = "jp2"
@@ -381,7 +426,7 @@ def _save(im, fp, filename):
         plt,
     )
 
-    ImageFile._save(im, fp, [("jpeg2k", (0, 0) + im.size, 0, kind)])
+    ImageFile._save(im, fp, [ImageFile._Tile("jpeg2k", (0, 0) + im.size, 0, kind)])
 
 
 # ------------------------------------------------------------
diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
index 81b8749a332..6510e072e5e 100644
--- a/src/PIL/JpegImagePlugin.py
+++ b/src/PIL/JpegImagePlugin.py
@@ -42,24 +42,29 @@
 import sys
 import tempfile
 import warnings
+from typing import IO, TYPE_CHECKING, Any
 
 from . import Image, ImageFile
 from ._binary import i16be as i16
 from ._binary import i32be as i32
 from ._binary import o8
 from ._binary import o16be as o16
+from ._deprecate import deprecate
 from .JpegPresets import presets
 
+if TYPE_CHECKING:
+    from .MpoImagePlugin import MpoImageFile
+
 #
 # Parser
 
 
-def Skip(self, marker):
+def Skip(self: JpegImageFile, marker: int) -> None:
     n = i16(self.fp.read(2)) - 2
     ImageFile._safe_read(self.fp, n)
 
 
-def APP(self, marker):
+def APP(self: JpegImageFile, marker: int) -> None:
     #
     # Application marker.  Store these in the APP dictionary.
     # Also look for well-known application markers.
@@ -94,6 +99,8 @@ def APP(self, marker):
         else:
             self.info["exif"] = s
             self._exif_offset = self.fp.tell() - n + 6
+    elif marker == 0xFFE1 and s[:29] == b"http://ns.adobe.com/xap/1.0/\x00":
+        self.info["xmp"] = s.split(b"\x00", 1)[1]
     elif marker == 0xFFE2 and s[:5] == b"FPXR\0":
         # extract FlashPix information (incomplete)
         self.info["flashpix"] = s  # FIXME: value will change
@@ -130,13 +137,14 @@ def APP(self, marker):
                 offset += 4
                 data = s[offset : offset + size]
                 if code == 0x03ED:  # ResolutionInfo
-                    data = {
+                    photoshop[code] = {
                         "XResolution": i32(data, 0) / 65536,
                         "DisplayedUnitsX": i16(data, 4),
                         "YResolution": i32(data, 8) / 65536,
                         "DisplayedUnitsY": i16(data, 12),
                     }
-                photoshop[code] = data
+                else:
+                    photoshop[code] = data
                 offset += size
                 offset += offset & 1  # align
             except struct.error:
@@ -158,40 +166,8 @@ def APP(self, marker):
         # plus constant header size
         self.info["mpoffset"] = self.fp.tell() - n + 4
 
-    # If DPI isn't in JPEG header, fetch from EXIF
-    if "dpi" not in self.info and "exif" in self.info:
-        try:
-            exif = self.getexif()
-            resolution_unit = exif[0x0128]
-            x_resolution = exif[0x011A]
-            try:
-                dpi = float(x_resolution[0]) / x_resolution[1]
-            except TypeError:
-                dpi = x_resolution
-            if math.isnan(dpi):
-                msg = "DPI is not a number"
-                raise ValueError(msg)
-            if resolution_unit == 3:  # cm
-                # 1 dpcm = 2.54 dpi
-                dpi *= 2.54
-            self.info["dpi"] = dpi, dpi
-        except (
-            struct.error,
-            KeyError,
-            SyntaxError,
-            TypeError,
-            ValueError,
-            ZeroDivisionError,
-        ):
-            # struct.error for truncated EXIF
-            # KeyError for dpi not included
-            # SyntaxError for invalid/unreadable EXIF
-            # ValueError or TypeError for dpi being an invalid float
-            # ZeroDivisionError for invalid dpi rational value
-            self.info["dpi"] = 72, 72
-
 
-def COM(self, marker):
+def COM(self: JpegImageFile, marker: int) -> None:
     #
     # Comment marker.  Store these in the APP dictionary.
     n = i16(self.fp.read(2)) - 2
@@ -202,7 +178,7 @@ def COM(self, marker):
     self.applist.append(("COM", s))
 
 
-def SOF(self, marker):
+def SOF(self: JpegImageFile, marker: int) -> None:
     #
     # Start of frame marker.  Defines the size and mode of the
     # image.  JPEG is colour blind, so we use some simple
@@ -250,7 +226,7 @@ def SOF(self, marker):
         self.layer.append((t[0], t[1] // 16, t[1] & 15, t[2]))
 
 
-def DQT(self, marker):
+def DQT(self: JpegImageFile, marker: int) -> None:
     #
     # Define quantization table.  Note that there might be more
     # than one table in each marker.
@@ -344,7 +320,7 @@ def DQT(self, marker):
 }
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     # Magic number was taken from https://en.wikipedia.org/wiki/JPEG
     return prefix[:3] == b"\xFF\xD8\xFF"
 
@@ -357,7 +333,7 @@ class JpegImageFile(ImageFile.ImageFile):
     format = "JPEG"
     format_description = "JPEG (ISO 10918)"
 
-    def _open(self):
+    def _open(self) -> None:
         s = self.fp.read(3)
 
         if not _accept(s):
@@ -367,15 +343,16 @@ def _open(self):
 
         # Create attributes
         self.bits = self.layers = 0
+        self._exif_offset = 0
 
         # JPEG specifics (internal)
-        self.layer = []
-        self.huffman_dc = {}
-        self.huffman_ac = {}
-        self.quantization = {}
-        self.app = {}  # compatibility
-        self.applist = []
-        self.icclist = []
+        self.layer: list[tuple[int, int, int, int]] = []
+        self._huffman_dc: dict[Any, Any] = {}
+        self._huffman_ac: dict[Any, Any] = {}
+        self.quantization: dict[int, list[int]] = {}
+        self.app: dict[str, bytes] = {}  # compatibility
+        self.applist: list[tuple[str, bytes]] = []
+        self.icclist: list[bytes] = []
 
         while True:
             i = s[0]
@@ -395,7 +372,9 @@ def _open(self):
                     rawmode = self.mode
                     if self.mode == "CMYK":
                         rawmode = "CMYK;I"  # assume adobe conventions
-                    self.tile = [("jpeg", (0, 0) + self.size, 0, (rawmode, ""))]
+                    self.tile = [
+                        ImageFile._Tile("jpeg", (0, 0) + self.size, 0, (rawmode, ""))
+                    ]
                     # self.__offset = self.fp.tell()
                     break
                 s = self.fp.read(1)
@@ -408,7 +387,15 @@ def _open(self):
                 msg = "no marker found"
                 raise SyntaxError(msg)
 
-    def load_read(self, read_bytes):
+        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 load_read(self, read_bytes: int) -> bytes:
         """
         internal: read more image data
         For premature EOF and LOAD_TRUNCATED_IMAGES adds EOI marker
@@ -424,18 +411,21 @@ def load_read(self, read_bytes):
 
         return s
 
-    def draft(self, mode, size):
+    def draft(
+        self, mode: str | None, size: tuple[int, int] | None
+    ) -> tuple[str, tuple[int, int, float, float]] | None:
         if len(self.tile) != 1:
-            return
+            return None
 
         # Protect from second call
         if self.decoderconfig:
-            return
+            return None
 
         d, e, o, a = self.tile[0]
         scale = 1
         original_size = self.size
 
+        assert isinstance(a, tuple)
         if a[0] == "RGB" and mode in ["L", "YCbCr"]:
             self._mode = mode
             a = mode, ""
@@ -445,6 +435,7 @@ def draft(self, mode, size):
             for s in [8, 4, 2, 1]:
                 if scale >= s:
                     break
+            assert e is not None
             e = (
                 e[0],
                 e[1],
@@ -454,13 +445,13 @@ def draft(self, mode, size):
             self._size = ((self.size[0] + s - 1) // s, (self.size[1] + s - 1) // s)
             scale = s
 
-        self.tile = [(d, e, o, a)]
+        self.tile = [ImageFile._Tile(d, e, o, a)]
         self.decoderconfig = (scale, 0)
 
         box = (0, 0, original_size[0] / scale, original_size[1] / scale)
         return self.mode, box
 
-    def load_djpeg(self):
+    def load_djpeg(self) -> None:
         # ALTERNATIVE: handle JPEGs via the IJG command line utilities
 
         f, path = tempfile.mkstemp()
@@ -491,35 +482,49 @@ def load_djpeg(self):
 
         self.tile = []
 
-    def _getexif(self):
+    def _getexif(self) -> dict[int, Any] | None:
         return _getexif(self)
 
-    def _getmp(self):
-        return _getmp(self)
-
-    def getxmp(self):
-        """
-        Returns a dictionary containing the XMP tags.
-        Requires defusedxml to be installed.
-
-        :returns: XMP tags in a dictionary.
-        """
+    def _read_dpi_from_exif(self) -> None:
+        # If DPI isn't in JPEG header, fetch from EXIF
+        if "dpi" in self.info or "exif" not in self.info:
+            return
+        try:
+            exif = self.getexif()
+            resolution_unit = exif[0x0128]
+            x_resolution = exif[0x011A]
+            try:
+                dpi = float(x_resolution[0]) / x_resolution[1]
+            except TypeError:
+                dpi = x_resolution
+            if math.isnan(dpi):
+                msg = "DPI is not a number"
+                raise ValueError(msg)
+            if resolution_unit == 3:  # cm
+                # 1 dpcm = 2.54 dpi
+                dpi *= 2.54
+            self.info["dpi"] = dpi, dpi
+        except (
+            struct.error,  # truncated EXIF
+            KeyError,  # dpi not included
+            SyntaxError,  # invalid/unreadable EXIF
+            TypeError,  # dpi is an invalid float
+            ValueError,  # dpi is an invalid float
+            ZeroDivisionError,  # invalid dpi rational value
+        ):
+            self.info["dpi"] = 72, 72
 
-        for segment, content in self.applist:
-            if segment == "APP1":
-                marker, xmp_tags = content.split(b"\x00")[:2]
-                if marker == b"http://ns.adobe.com/xap/1.0/":
-                    return self._getxmp(xmp_tags)
-        return {}
+    def _getmp(self) -> dict[int, Any] | None:
+        return _getmp(self)
 
 
-def _getexif(self):
+def _getexif(self: JpegImageFile) -> dict[int, Any] | None:
     if "exif" not in self.info:
         return None
     return self.getexif()._get_merged_dict()
 
 
-def _getmp(self):
+def _getmp(self: JpegImageFile) -> dict[int, Any] | None:
     # Extract MP information.  This method was inspired by the "highly
     # experimental" _getexif version that's been in use for years now,
     # itself based on the ImageFileDirectory class in the TIFF plugin.
@@ -627,7 +632,7 @@ def _getmp(self):
 # fmt: on
 
 
-def get_sampling(im):
+def get_sampling(im: Image.Image) -> int:
     # There's no subsampling when images have only 1 layer
     # (grayscale images) or when they are CMYK (4 layers),
     # so set subsampling to the default value.
@@ -635,13 +640,13 @@ def get_sampling(im):
     # NOTE: currently Pillow can't encode JPEG to YCCK format.
     # If YCCK support is added in the future, subsampling code will have
     # to be updated (here and in JpegEncode.c) to deal with 4 layers.
-    if not hasattr(im, "layers") or im.layers in (1, 4):
+    if not isinstance(im, JpegImageFile) or im.layers in (1, 4):
         return -1
     sampling = im.layer[0][1:3] + im.layer[1][1:3] + im.layer[2][1:3]
     return samplings.get(sampling, -1)
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.width == 0 or im.height == 0:
         msg = "cannot write empty image as JPEG"
         raise ValueError(msg)
@@ -694,7 +699,11 @@ def _save(im, fp, filename):
             raise ValueError(msg)
         subsampling = get_sampling(im)
 
-    def validate_qtables(qtables):
+    def validate_qtables(
+        qtables: (
+            str | tuple[list[int], ...] | list[list[int]] | dict[int, list[int]] | None
+        )
+    ) -> list[list[int]] | None:
         if qtables is None:
             return qtables
         if isinstance(qtables, str):
@@ -724,12 +733,12 @@ def validate_qtables(qtables):
                     if len(table) != 64:
                         msg = "Invalid quantization table"
                         raise TypeError(msg)
-                    table = array.array("H", table)
+                    table_array = array.array("H", table)
                 except TypeError as e:
                     msg = "Invalid quantization table"
                     raise ValueError(msg) from e
                 else:
-                    qtables[idx] = list(table)
+                    qtables[idx] = list(table_array)
             return qtables
 
     if qtables == "keep":
@@ -742,17 +751,27 @@ def validate_qtables(qtables):
     extra = info.get("extra", b"")
 
     MAX_BYTES_IN_MARKER = 65533
+    xmp = info.get("xmp", im.info.get("xmp"))
+    if xmp:
+        overhead_len = 29  # b"http://ns.adobe.com/xap/1.0/\x00"
+        max_data_bytes_in_marker = MAX_BYTES_IN_MARKER - overhead_len
+        if len(xmp) > max_data_bytes_in_marker:
+            msg = "XMP data is too long"
+            raise ValueError(msg)
+        size = o16(2 + overhead_len + len(xmp))
+        extra += b"\xFF\xE1" + size + b"http://ns.adobe.com/xap/1.0/\x00" + xmp
+
     icc_profile = info.get("icc_profile")
     if icc_profile:
-        ICC_OVERHEAD_LEN = 14
-        MAX_DATA_BYTES_IN_MARKER = MAX_BYTES_IN_MARKER - ICC_OVERHEAD_LEN
+        overhead_len = 14  # b"ICC_PROFILE\0" + o8(i) + o8(len(markers))
+        max_data_bytes_in_marker = MAX_BYTES_IN_MARKER - overhead_len
         markers = []
         while icc_profile:
-            markers.append(icc_profile[:MAX_DATA_BYTES_IN_MARKER])
-            icc_profile = icc_profile[MAX_DATA_BYTES_IN_MARKER:]
+            markers.append(icc_profile[:max_data_bytes_in_marker])
+            icc_profile = icc_profile[max_data_bytes_in_marker:]
         i = 1
         for marker in markers:
-            size = o16(2 + ICC_OVERHEAD_LEN + len(marker))
+            size = o16(2 + overhead_len + len(marker))
             extra += (
                 b"\xFF\xE2"
                 + size
@@ -821,10 +840,12 @@ def validate_qtables(qtables):
         # Ensure that our buffer is big enough. Same with the icc_profile block.
         bufsize = max(bufsize, len(exif) + 5, len(extra) + 1)
 
-    ImageFile._save(im, fp, [("jpeg", (0, 0) + im.size, 0, rawmode)], bufsize)
+    ImageFile._save(
+        im, fp, [ImageFile._Tile("jpeg", (0, 0) + im.size, 0, rawmode)], bufsize
+    )
 
 
-def _save_cjpeg(im, fp, filename):
+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])
@@ -836,11 +857,17 @@ def _save_cjpeg(im, fp, filename):
 
 ##
 # Factory for making JPEG and MPO instances
-def jpeg_factory(fp=None, filename=None):
+def jpeg_factory(
+    fp: IO[bytes], filename: str | bytes | None = None
+) -> JpegImageFile | MpoImageFile:
     im = JpegImageFile(fp, filename)
     try:
         mpheader = im._getmp()
-        if mpheader[45057] > 1:
+        if mpheader is not None and mpheader[45057] > 1:
+            for segment, content in im.applist:
+                if segment == "APP1" and b' hdrgm:Version="' in content:
+                    # Ultra HDR images are not yet supported
+                    return im
             # It's actually an MPO
             from .MpoImagePlugin import MpoImageFile
 
diff --git a/src/PIL/JpegPresets.py b/src/PIL/JpegPresets.py
index 9ecfdb2599a..d0e64a35ee1 100644
--- a/src/PIL/JpegPresets.py
+++ b/src/PIL/JpegPresets.py
@@ -62,6 +62,7 @@
 https://web.archive.org/web/20120328125543/http://www.jpegcameras.com/libjpeg/libjpeg-3.html
 
 """
+
 from __future__ import annotations
 
 # fmt: off
diff --git a/src/PIL/McIdasImagePlugin.py b/src/PIL/McIdasImagePlugin.py
index 9a85c0d15b0..5dd031be369 100644
--- a/src/PIL/McIdasImagePlugin.py
+++ b/src/PIL/McIdasImagePlugin.py
@@ -22,8 +22,8 @@
 from . import Image, ImageFile
 
 
-def _accept(s):
-    return s[:8] == b"\x00\x00\x00\x00\x00\x00\x00\x04"
+def _accept(prefix: bytes) -> bool:
+    return prefix[:8] == b"\x00\x00\x00\x00\x00\x00\x00\x04"
 
 
 ##
@@ -34,8 +34,10 @@ class McIdasImageFile(ImageFile.ImageFile):
     format = "MCIDAS"
     format_description = "McIdas area file"
 
-    def _open(self):
+    def _open(self) -> None:
         # parse area file directory
+        assert self.fp is not None
+
         s = self.fp.read(256)
         if not _accept(s) or len(s) != 256:
             msg = "not an McIdas area file"
@@ -65,7 +67,9 @@ def _open(self):
         offset = w[34] + w[15]
         stride = w[15] + w[10] * w[11] * w[14]
 
-        self.tile = [("raw", (0, 0) + self.size, offset, (rawmode, stride, 1))]
+        self.tile = [
+            ImageFile._Tile("raw", (0, 0) + self.size, offset, (rawmode, stride, 1))
+        ]
 
 
 # --------------------------------------------------------------------
diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py
index f4529d9ae74..5f23a34b99c 100644
--- a/src/PIL/MicImagePlugin.py
+++ b/src/PIL/MicImagePlugin.py
@@ -25,7 +25,7 @@
 # --------------------------------------------------------------------
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:8] == olefile.MAGIC
 
 
@@ -38,7 +38,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
     format_description = "Microsoft Image Composer"
     _close_exclusive_fp_after_loading = False
 
-    def _open(self):
+    def _open(self) -> None:
         # read the OLE directory and see if this is a likely
         # to be a Microsoft Image Composer file
 
@@ -63,14 +63,14 @@ def _open(self):
             msg = "not an MIC file; no image entries"
             raise SyntaxError(msg)
 
-        self.frame = None
+        self.frame = -1
         self._n_frames = len(self.images)
         self.is_animated = self._n_frames > 1
 
         self.__fp = self.fp
         self.seek(0)
 
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         if not self._seek_check(frame):
             return
         try:
@@ -85,15 +85,15 @@ def seek(self, frame):
 
         self.frame = frame
 
-    def tell(self):
+    def tell(self) -> int:
         return self.frame
 
-    def close(self):
+    def close(self) -> None:
         self.__fp.close()
         self.ole.close()
         super().close()
 
-    def __exit__(self, *args):
+    def __exit__(self, *args: object) -> None:
         self.__fp.close()
         self.ole.close()
         super().__exit__()
diff --git a/src/PIL/MpegImagePlugin.py b/src/PIL/MpegImagePlugin.py
index f4e598ca3a0..ad4d3e93768 100644
--- a/src/PIL/MpegImagePlugin.py
+++ b/src/PIL/MpegImagePlugin.py
@@ -16,21 +16,22 @@
 
 from . import Image, ImageFile
 from ._binary import i8
+from ._typing import SupportsRead
 
 #
 # Bitstream parser
 
 
 class BitStream:
-    def __init__(self, fp):
+    def __init__(self, fp: SupportsRead[bytes]) -> None:
         self.fp = fp
         self.bits = 0
         self.bitbuffer = 0
 
-    def next(self):
+    def next(self) -> int:
         return i8(self.fp.read(1))
 
-    def peek(self, bits):
+    def peek(self, bits: int) -> int:
         while self.bits < bits:
             c = self.next()
             if c < 0:
@@ -40,18 +41,22 @@ def peek(self, bits):
             self.bits += 8
         return self.bitbuffer >> (self.bits - bits) & (1 << bits) - 1
 
-    def skip(self, bits):
+    def skip(self, bits: int) -> None:
         while self.bits < bits:
             self.bitbuffer = (self.bitbuffer << 8) + i8(self.fp.read(1))
             self.bits += 8
         self.bits = self.bits - bits
 
-    def read(self, bits):
+    def read(self, bits: int) -> int:
         v = self.peek(bits)
         self.bits = self.bits - bits
         return v
 
 
+def _accept(prefix: bytes) -> bool:
+    return prefix[:4] == b"\x00\x00\x01\xb3"
+
+
 ##
 # Image plugin for MPEG streams.  This plugin can identify a stream,
 # but it cannot read it.
@@ -61,9 +66,10 @@ class MpegImageFile(ImageFile.ImageFile):
     format = "MPEG"
     format_description = "MPEG"
 
-    def _open(self):
-        s = BitStream(self.fp)
+    def _open(self) -> None:
+        assert self.fp is not None
 
+        s = BitStream(self.fp)
         if s.read(32) != 0x1B3:
             msg = "not an MPEG file"
             raise SyntaxError(msg)
@@ -75,7 +81,7 @@ def _open(self):
 # --------------------------------------------------------------------
 # Registry stuff
 
-Image.register_open(MpegImageFile.format, MpegImageFile)
+Image.register_open(MpegImageFile.format, MpegImageFile, _accept)
 
 Image.register_extensions(MpegImageFile.format, [".mpg", ".mpeg"])
 
diff --git a/src/PIL/MpoImagePlugin.py b/src/PIL/MpoImagePlugin.py
index 199a100904c..71f89a09a85 100644
--- a/src/PIL/MpoImagePlugin.py
+++ b/src/PIL/MpoImagePlugin.py
@@ -22,36 +22,30 @@
 import itertools
 import os
 import struct
+from typing import IO, Any, cast
 
 from . import (
-    ExifTags,
     Image,
     ImageFile,
     ImageSequence,
     JpegImagePlugin,
     TiffImagePlugin,
 )
-from ._binary import i16be as i16
 from ._binary import o32le
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     JpegImagePlugin._save(im, fp, filename)
 
 
-def _save_all(im, fp, filename):
+def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     append_images = im.encoderinfo.get("append_images", [])
-    if not append_images:
-        try:
-            animated = im.is_animated
-        except AttributeError:
-            animated = False
-        if not animated:
-            _save(im, fp, filename)
-            return
+    if not append_images and not getattr(im, "is_animated", False):
+        _save(im, fp, filename)
+        return
 
     mpf_offset = 28
-    offsets = []
+    offsets: list[int] = []
     for imSequence in itertools.chain([im], append_images):
         for im_frame in ImageSequence.Iterator(imSequence):
             if not offsets:
@@ -103,14 +97,16 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile):
     format_description = "MPO (CIPA DC-007)"
     _close_exclusive_fp_after_loading = False
 
-    def _open(self):
+    def _open(self) -> None:
         self.fp.seek(0)  # prep the fp in order to pass the JPEG test
         JpegImagePlugin.JpegImageFile._open(self)
         self._after_jpeg_open()
 
-    def _after_jpeg_open(self, mpheader=None):
-        self._initial_size = self.size
+    def _after_jpeg_open(self, mpheader: dict[int, Any] | None = None) -> None:
         self.mpinfo = mpheader if mpheader is not None else self._getmp()
+        if self.mpinfo is None:
+            msg = "Image appears to be a malformed MPO file"
+            raise ValueError(msg)
         self.n_frames = self.mpinfo[0xB001]
         self.__mpoffsets = [
             mpent["DataOffset"] + self.info["mpoffset"] for mpent in self.mpinfo[0xB002]
@@ -128,43 +124,41 @@ def _after_jpeg_open(self, mpheader=None):
         # for now we can only handle reading and individual frame extraction
         self.readonly = 1
 
-    def load_seek(self, pos):
+    def load_seek(self, pos: int) -> None:
         self._fp.seek(pos)
 
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         if not self._seek_check(frame):
             return
         self.fp = self._fp
         self.offset = self.__mpoffsets[frame]
 
+        original_exif = self.info.get("exif")
+        if "exif" in self.info:
+            del self.info["exif"]
+
         self.fp.seek(self.offset + 2)  # skip SOI marker
-        segment = self.fp.read(2)
-        if not segment:
+        if not self.fp.read(2):
             msg = "No data found for frame"
             raise ValueError(msg)
-        self._size = self._initial_size
-        if i16(segment) == 0xFFE1:  # APP1
-            n = i16(self.fp.read(2)) - 2
-            self.info["exif"] = ImageFile._safe_read(self.fp, n)
-            self._reload_exif()
-
-            mptype = self.mpinfo[0xB002][frame]["Attribute"]["MPType"]
-            if mptype.startswith("Large Thumbnail"):
-                exif = self.getexif().get_ifd(ExifTags.IFD.Exif)
-                if 40962 in exif and 40963 in exif:
-                    self._size = (exif[40962], exif[40963])
-        elif "exif" in self.info:
-            del self.info["exif"]
+        self.fp.seek(self.offset)
+        JpegImagePlugin.JpegImageFile._open(self)
+        if self.info.get("exif") != original_exif:
             self._reload_exif()
 
-        self.tile = [("jpeg", (0, 0) + self.size, self.offset, (self.mode, ""))]
+        self.tile = [
+            ImageFile._Tile("jpeg", (0, 0) + self.size, self.offset, self.tile[0][-1])
+        ]
         self.__frame = frame
 
-    def tell(self):
+    def tell(self) -> int:
         return self.__frame
 
     @staticmethod
-    def adopt(jpeg_instance, mpheader=None):
+    def adopt(
+        jpeg_instance: JpegImagePlugin.JpegImageFile,
+        mpheader: dict[int, Any] | None = None,
+    ) -> MpoImageFile:
         """
         Transform the instance of JpegImageFile into
         an instance of MpoImageFile.
@@ -176,8 +170,9 @@ def adopt(jpeg_instance, mpheader=None):
         double call to _open.
         """
         jpeg_instance.__class__ = MpoImageFile
-        jpeg_instance._after_jpeg_open(mpheader)
-        return jpeg_instance
+        mpo_instance = cast(MpoImageFile, jpeg_instance)
+        mpo_instance._after_jpeg_open(mpheader)
+        return mpo_instance
 
 
 # ---------------------------------------------------------------------
diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py
index 77dac65b6b3..f3460a78730 100644
--- a/src/PIL/MspImagePlugin.py
+++ b/src/PIL/MspImagePlugin.py
@@ -26,6 +26,7 @@
 
 import io
 import struct
+from typing import IO
 
 from . import Image, ImageFile
 from ._binary import i16le as i16
@@ -35,7 +36,7 @@
 # read MSP files
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] in [b"DanM", b"LinS"]
 
 
@@ -48,8 +49,10 @@ class MspImageFile(ImageFile.ImageFile):
     format = "MSP"
     format_description = "Windows Paint"
 
-    def _open(self):
+    def _open(self) -> None:
         # Header
+        assert self.fp is not None
+
         s = self.fp.read(32)
         if not _accept(s):
             msg = "not an MSP file"
@@ -67,9 +70,9 @@ def _open(self):
         self._size = i16(s, 4), i16(s, 6)
 
         if s[:4] == b"DanM":
-            self.tile = [("raw", (0, 0) + self.size, 32, ("1", 0, 1))]
+            self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 32, ("1", 0, 1))]
         else:
-            self.tile = [("MSP", (0, 0) + self.size, 32, None)]
+            self.tile = [ImageFile._Tile("MSP", (0, 0) + self.size, 32, None)]
 
 
 class MspDecoder(ImageFile.PyDecoder):
@@ -109,7 +112,9 @@ class MspDecoder(ImageFile.PyDecoder):
 
     _pulls_fd = True
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
+
         img = io.BytesIO()
         blank_line = bytearray((0xFF,) * ((self.state.xsize + 7) // 8))
         try:
@@ -147,7 +152,7 @@ def decode(self, buffer):
                 msg = f"Corrupted MSP file in row {x}"
                 raise OSError(msg) from e
 
-        self.set_as_raw(img.getvalue(), ("1", 0, 1))
+        self.set_as_raw(img.getvalue(), "1")
 
         return -1, 0
 
@@ -159,7 +164,7 @@ def decode(self, buffer):
 # write MSP files (uncompressed only)
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.mode != "1":
         msg = f"cannot write mode {im.mode} as MSP"
         raise OSError(msg)
@@ -183,7 +188,7 @@ def _save(im, fp, filename):
         fp.write(o16(h))
 
     # image body
-    ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 32, ("1", 0, 1))])
+    ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 32, ("1", 0, 1))])
 
 
 #
diff --git a/src/PIL/PSDraw.py b/src/PIL/PSDraw.py
index 848fc2f716a..02939d26b5f 100644
--- a/src/PIL/PSDraw.py
+++ b/src/PIL/PSDraw.py
@@ -17,6 +17,7 @@
 from __future__ import annotations
 
 import sys
+from typing import IO, TYPE_CHECKING
 
 from . import EpsImagePlugin
 
@@ -27,18 +28,15 @@
 class PSDraw:
     """
     Sets up printing to the given file. If ``fp`` is omitted,
-    ``sys.stdout.buffer`` or ``sys.stdout`` is assumed.
+    ``sys.stdout.buffer`` is assumed.
     """
 
-    def __init__(self, fp=None):
+    def __init__(self, fp: IO[bytes] | None = None) -> None:
         if not fp:
-            try:
-                fp = sys.stdout.buffer
-            except AttributeError:
-                fp = sys.stdout
+            fp = sys.stdout.buffer
         self.fp = fp
 
-    def begin_document(self, id=None):
+    def begin_document(self, id: str | None = None) -> None:
         """Set up printing of a document. (Write PostScript DSC header.)"""
         # FIXME: incomplete
         self.fp.write(
@@ -52,30 +50,32 @@ def begin_document(self, id=None):
         self.fp.write(EDROFF_PS)
         self.fp.write(VDI_PS)
         self.fp.write(b"%%EndProlog\n")
-        self.isofont = {}
+        self.isofont: dict[bytes, int] = {}
 
-    def end_document(self):
+    def end_document(self) -> None:
         """Ends printing. (Write PostScript DSC footer.)"""
         self.fp.write(b"%%EndDocument\nrestore showpage\n%%End\n")
         if hasattr(self.fp, "flush"):
             self.fp.flush()
 
-    def setfont(self, font, size):
+    def setfont(self, font: str, size: int) -> None:
         """
         Selects which font to use.
 
         :param font: A PostScript font name
         :param size: Size in points.
         """
-        font = bytes(font, "UTF-8")
-        if font not in self.isofont:
+        font_bytes = bytes(font, "UTF-8")
+        if font_bytes not in self.isofont:
             # reencode font
-            self.fp.write(b"/PSDraw-%s ISOLatin1Encoding /%s E\n" % (font, font))
-            self.isofont[font] = 1
+            self.fp.write(
+                b"/PSDraw-%s ISOLatin1Encoding /%s E\n" % (font_bytes, font_bytes)
+            )
+            self.isofont[font_bytes] = 1
         # rough
-        self.fp.write(b"/F0 %d /PSDraw-%s F\n" % (size, font))
+        self.fp.write(b"/F0 %d /PSDraw-%s F\n" % (size, font_bytes))
 
-    def line(self, xy0, xy1):
+    def line(self, xy0: tuple[int, int], xy1: tuple[int, int]) -> None:
         """
         Draws a line between the two points. Coordinates are given in
         PostScript point coordinates (72 points per inch, (0, 0) is the lower
@@ -83,7 +83,7 @@ def line(self, xy0, xy1):
         """
         self.fp.write(b"%d %d %d %d Vl\n" % (*xy0, *xy1))
 
-    def rectangle(self, box):
+    def rectangle(self, box: tuple[int, int, int, int]) -> None:
         """
         Draws a rectangle.
 
@@ -92,18 +92,22 @@ def rectangle(self, box):
         """
         self.fp.write(b"%d %d M 0 %d %d Vr\n" % box)
 
-    def text(self, xy, text):
+    def text(self, xy: tuple[int, int], text: str) -> None:
         """
         Draws text at the given position. You must use
         :py:meth:`~PIL.PSDraw.PSDraw.setfont` before calling this method.
         """
-        text = bytes(text, "UTF-8")
-        text = b"\\(".join(text.split(b"("))
-        text = b"\\)".join(text.split(b")"))
-        xy += (text,)
-        self.fp.write(b"%d %d M (%s) S\n" % xy)
+        text_bytes = bytes(text, "UTF-8")
+        text_bytes = b"\\(".join(text_bytes.split(b"("))
+        text_bytes = b"\\)".join(text_bytes.split(b")"))
+        self.fp.write(b"%d %d M (%s) S\n" % (xy + (text_bytes,)))
 
-    def image(self, box, im, dpi=None):
+    if TYPE_CHECKING:
+        from . import Image
+
+    def image(
+        self, box: tuple[int, int, int, int], im: Image.Image, dpi: int | None = None
+    ) -> None:
         """Draw a PIL image, centered in the given box."""
         # default resolution depends on mode
         if not dpi:
@@ -131,7 +135,7 @@ def image(self, box, im, dpi=None):
             sx = x / im.size[0]
             sy = y / im.size[1]
             self.fp.write(b"%f %f scale\n" % (sx, sy))
-        EpsImagePlugin._save(im, self.fp, None, 0)
+        EpsImagePlugin._save(im, self.fp, "", 0)
         self.fp.write(b"\ngrestore\n")
 
 
diff --git a/src/PIL/PaletteFile.py b/src/PIL/PaletteFile.py
index dc31754020e..81652e5eec2 100644
--- a/src/PIL/PaletteFile.py
+++ b/src/PIL/PaletteFile.py
@@ -14,6 +14,8 @@
 #
 from __future__ import annotations
 
+from typing import IO
+
 from ._binary import o8
 
 
@@ -22,8 +24,8 @@ class PaletteFile:
 
     rawmode = "RGB"
 
-    def __init__(self, fp):
-        self.palette = [(i, i, i) for i in range(256)]
+    def __init__(self, fp: IO[bytes]) -> None:
+        palette = [o8(i) * 3 for i in range(256)]
 
         while True:
             s = fp.readline()
@@ -44,9 +46,9 @@ def __init__(self, fp):
                 g = b = r
 
             if 0 <= i <= 255:
-                self.palette[i] = o8(r) + o8(g) + o8(b)
+                palette[i] = o8(r) + o8(g) + o8(b)
 
-        self.palette = b"".join(self.palette)
+        self.palette = b"".join(palette)
 
-    def getpalette(self):
+    def getpalette(self) -> tuple[bytes, str]:
         return self.palette, self.rawmode
diff --git a/src/PIL/PalmImagePlugin.py b/src/PIL/PalmImagePlugin.py
index 65be7fef7b1..b33245376dc 100644
--- a/src/PIL/PalmImagePlugin.py
+++ b/src/PIL/PalmImagePlugin.py
@@ -8,6 +8,8 @@
 ##
 from __future__ import annotations
 
+from typing import IO
+
 from . import Image, ImageFile
 from ._binary import o8
 from ._binary import o16be as o16b
@@ -82,10 +84,10 @@
 
 
 # so build a prototype image to be used for palette resampling
-def build_prototype_image():
+def build_prototype_image() -> Image.Image:
     image = Image.new("L", (1, len(_Palm8BitColormapValues)))
     image.putdata(list(range(len(_Palm8BitColormapValues))))
-    palettedata = ()
+    palettedata: tuple[int, ...] = ()
     for colormapValue in _Palm8BitColormapValues:
         palettedata += colormapValue
     palettedata += (0, 0, 0) * (256 - len(_Palm8BitColormapValues))
@@ -112,7 +114,7 @@ def build_prototype_image():
 # (Internal) Image save plugin for the Palm format.
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.mode == "P":
         # we assume this is a color Palm image with the standard colormap,
         # unless the "info" dict has a "custom-colormap" field
@@ -127,22 +129,23 @@ def _save(im, fp, filename):
             # and invert it because
             # Palm does grayscale from white (0) to black (1)
             bpp = im.encoderinfo["bpp"]
-            im = im.point(
-                lambda x, shift=8 - bpp, maxval=(1 << bpp) - 1: maxval - (x >> shift)
-            )
+            maxval = (1 << bpp) - 1
+            shift = 8 - bpp
+            im = im.point(lambda x: maxval - (x >> shift))
         elif im.info.get("bpp") in (1, 2, 4):
             # here we assume that even though the inherent mode is 8-bit grayscale,
             # only the lower bpp bits are significant.
             # We invert them to match the Palm.
             bpp = im.info["bpp"]
-            im = im.point(lambda x, maxval=(1 << bpp) - 1: maxval - (x & maxval))
+            maxval = (1 << bpp) - 1
+            im = im.point(lambda x: maxval - (x & maxval))
         else:
             msg = f"cannot write mode {im.mode} as Palm"
             raise OSError(msg)
 
         # we ignore the palette here
-        im.mode = "P"
-        rawmode = "P;" + str(bpp)
+        im._mode = "P"
+        rawmode = f"P;{bpp}"
         version = 1
 
     elif im.mode == "1":
@@ -170,6 +173,7 @@ def _save(im, fp, filename):
 
     flags = 0
     if im.mode == "P" and "custom-colormap" in im.info:
+        assert im.palette is not None
         flags = flags & _FLAGS["custom-colormap"]
         colormapsize = 4 * 256 + 2
         colormapmode = im.palette.mode
@@ -210,7 +214,9 @@ def _save(im, fp, filename):
                 )
 
     # now convert data to raw form
-    ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, rowbytes, 1))])
+    ImageFile._save(
+        im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, rowbytes, 1))]
+    )
 
     if hasattr(fp, "flush"):
         fp.flush()
diff --git a/src/PIL/PcdImagePlugin.py b/src/PIL/PcdImagePlugin.py
index a0515b302eb..e8ea800a42c 100644
--- a/src/PIL/PcdImagePlugin.py
+++ b/src/PIL/PcdImagePlugin.py
@@ -27,8 +27,10 @@ class PcdImageFile(ImageFile.ImageFile):
     format = "PCD"
     format_description = "Kodak PhotoCD"
 
-    def _open(self):
+    def _open(self) -> None:
         # rough
+        assert self.fp is not None
+
         self.fp.seek(2048)
         s = self.fp.read(2048)
 
@@ -45,9 +47,9 @@ def _open(self):
 
         self._mode = "RGB"
         self._size = 768, 512  # FIXME: not correct for rotated images!
-        self.tile = [("pcd", (0, 0) + self.size, 96 * 2048, None)]
+        self.tile = [ImageFile._Tile("pcd", (0, 0) + self.size, 96 * 2048, None)]
 
-    def load_end(self):
+    def load_end(self) -> None:
         if self.tile_post_rotate:
             # Handle rotated PCDs
             self.im = self.im.rotate(self.tile_post_rotate)
diff --git a/src/PIL/PcxImagePlugin.py b/src/PIL/PcxImagePlugin.py
index 98ecefd0514..8445d5cc740 100644
--- a/src/PIL/PcxImagePlugin.py
+++ b/src/PIL/PcxImagePlugin.py
@@ -28,6 +28,7 @@
 
 import io
 import logging
+from typing import IO
 
 from . import Image, ImageFile, ImagePalette
 from ._binary import i16le as i16
@@ -37,7 +38,7 @@
 logger = logging.getLogger(__name__)
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[0] == 10 and prefix[1] in [0, 2, 3, 5]
 
 
@@ -49,8 +50,10 @@ class PcxImageFile(ImageFile.ImageFile):
     format = "PCX"
     format_description = "Paintbrush"
 
-    def _open(self):
+    def _open(self) -> None:
         # header
+        assert self.fp is not None
+
         s = self.fp.read(128)
         if not _accept(s):
             msg = "not a PCX file"
@@ -125,7 +128,9 @@ def _open(self):
         bbox = (0, 0) + self.size
         logger.debug("size: %sx%s", *self.size)
 
-        self.tile = [("pcx", bbox, self.fp.tell(), (rawmode, planes * stride))]
+        self.tile = [
+            ImageFile._Tile("pcx", bbox, self.fp.tell(), (rawmode, planes * stride))
+        ]
 
 
 # --------------------------------------------------------------------
@@ -141,7 +146,7 @@ def _open(self):
 }
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     try:
         version, bits, planes, rawmode = SAVE[im.mode]
     except KeyError as e:
@@ -195,7 +200,9 @@ def _save(im, fp, filename):
 
     assert fp.tell() == 128
 
-    ImageFile._save(im, fp, [("pcx", (0, 0) + im.size, 0, (rawmode, bits * planes))])
+    ImageFile._save(
+        im, fp, [ImageFile._Tile("pcx", (0, 0) + im.size, 0, (rawmode, bits * planes))]
+    )
 
     if im.mode == "P":
         # colour palette
diff --git a/src/PIL/PdfImagePlugin.py b/src/PIL/PdfImagePlugin.py
index 3506aadce83..e9c20ddc159 100644
--- a/src/PIL/PdfImagePlugin.py
+++ b/src/PIL/PdfImagePlugin.py
@@ -25,6 +25,7 @@
 import math
 import os
 import time
+from typing import IO, Any
 
 from . import Image, ImageFile, ImageSequence, PdfParser, __version__, features
 
@@ -39,7 +40,7 @@
 #  5. page contents
 
 
-def _save_all(im, fp, filename):
+def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     _save(im, fp, filename, save_all=True)
 
 
@@ -47,7 +48,12 @@ def _save_all(im, fp, filename):
 # (Internal) Image save plugin for the PDF format.
 
 
-def _write_image(im, filename, existing_pdf, image_refs):
+def _write_image(
+    im: Image.Image,
+    filename: str | bytes,
+    existing_pdf: PdfParser.PdfParser,
+    image_refs: list[PdfParser.IndirectReference],
+) -> tuple[PdfParser.IndirectReference, str]:
     # FIXME: Should replace ASCIIHexDecode with RunLengthDecode
     # (packbits) or LZWDecode (tiff/lzw compression).  Note that
     # PDF 1.2 also supports Flatedecode (zip compression).
@@ -60,10 +66,10 @@ def _write_image(im, filename, existing_pdf, image_refs):
 
     width, height = im.size
 
-    dict_obj = {"BitsPerComponent": 8}
+    dict_obj: dict[str, Any] = {"BitsPerComponent": 8}
     if im.mode == "1":
         if features.check("libtiff"):
-            filter = "CCITTFaxDecode"
+            decode_filter = "CCITTFaxDecode"
             dict_obj["BitsPerComponent"] = 1
             params = PdfParser.PdfArray(
                 [
@@ -78,22 +84,23 @@ def _write_image(im, filename, existing_pdf, image_refs):
                 ]
             )
         else:
-            filter = "DCTDecode"
+            decode_filter = "DCTDecode"
         dict_obj["ColorSpace"] = PdfParser.PdfName("DeviceGray")
         procset = "ImageB"  # grayscale
     elif im.mode == "L":
-        filter = "DCTDecode"
+        decode_filter = "DCTDecode"
         # params = f"<< /Predictor 15 /Columns {width-2} >>"
         dict_obj["ColorSpace"] = PdfParser.PdfName("DeviceGray")
         procset = "ImageB"  # grayscale
     elif im.mode == "LA":
-        filter = "JPXDecode"
+        decode_filter = "JPXDecode"
         # params = f"<< /Predictor 15 /Columns {width-2} >>"
         procset = "ImageB"  # grayscale
         dict_obj["SMaskInData"] = 1
     elif im.mode == "P":
-        filter = "ASCIIHexDecode"
+        decode_filter = "ASCIIHexDecode"
         palette = im.getpalette()
+        assert palette is not None
         dict_obj["ColorSpace"] = [
             PdfParser.PdfName("Indexed"),
             PdfParser.PdfName("DeviceRGB"),
@@ -109,15 +116,15 @@ def _write_image(im, filename, existing_pdf, image_refs):
             image_ref = _write_image(smask, filename, existing_pdf, image_refs)[0]
             dict_obj["SMask"] = image_ref
     elif im.mode == "RGB":
-        filter = "DCTDecode"
+        decode_filter = "DCTDecode"
         dict_obj["ColorSpace"] = PdfParser.PdfName("DeviceRGB")
         procset = "ImageC"  # color images
     elif im.mode == "RGBA":
-        filter = "JPXDecode"
+        decode_filter = "JPXDecode"
         procset = "ImageC"  # color images
         dict_obj["SMaskInData"] = 1
     elif im.mode == "CMYK":
-        filter = "DCTDecode"
+        decode_filter = "DCTDecode"
         dict_obj["ColorSpace"] = PdfParser.PdfName("DeviceCMYK")
         procset = "ImageC"  # color images
         decode = [1, 0, 1, 0, 1, 0, 1, 0]
@@ -130,9 +137,9 @@ def _write_image(im, filename, existing_pdf, image_refs):
 
     op = io.BytesIO()
 
-    if filter == "ASCIIHexDecode":
-        ImageFile._save(im, op, [("hex", (0, 0) + im.size, 0, im.mode)])
-    elif filter == "CCITTFaxDecode":
+    if decode_filter == "ASCIIHexDecode":
+        ImageFile._save(im, op, [ImageFile._Tile("hex", (0, 0) + im.size, 0, im.mode)])
+    elif decode_filter == "CCITTFaxDecode":
         im.save(
             op,
             "TIFF",
@@ -140,21 +147,22 @@ def _write_image(im, filename, existing_pdf, image_refs):
             # use a single strip
             strip_size=math.ceil(width / 8) * height,
         )
-    elif filter == "DCTDecode":
+    elif decode_filter == "DCTDecode":
         Image.SAVE["JPEG"](im, op, filename)
-    elif filter == "JPXDecode":
+    elif decode_filter == "JPXDecode":
         del dict_obj["BitsPerComponent"]
         Image.SAVE["JPEG2000"](im, op, filename)
     else:
-        msg = f"unsupported PDF filter ({filter})"
+        msg = f"unsupported PDF filter ({decode_filter})"
         raise ValueError(msg)
 
     stream = op.getvalue()
-    if filter == "CCITTFaxDecode":
+    filter: PdfParser.PdfArray | PdfParser.PdfName
+    if decode_filter == "CCITTFaxDecode":
         stream = stream[8:]
-        filter = PdfParser.PdfArray([PdfParser.PdfName(filter)])
+        filter = PdfParser.PdfArray([PdfParser.PdfName(decode_filter)])
     else:
-        filter = PdfParser.PdfName(filter)
+        filter = PdfParser.PdfName(decode_filter)
 
     image_ref = image_refs.pop(0)
     existing_pdf.write_obj(
@@ -173,12 +181,15 @@ def _write_image(im, filename, existing_pdf, image_refs):
     return image_ref, procset
 
 
-def _save(im, fp, filename, save_all=False):
+def _save(
+    im: Image.Image, fp: IO[bytes], filename: str | bytes, save_all: bool = False
+) -> None:
     is_appending = im.encoderinfo.get("append", False)
+    filename_str = filename.decode() if isinstance(filename, bytes) else filename
     if is_appending:
-        existing_pdf = PdfParser.PdfParser(f=fp, filename=filename, mode="r+b")
+        existing_pdf = PdfParser.PdfParser(f=fp, filename=filename_str, mode="r+b")
     else:
-        existing_pdf = PdfParser.PdfParser(f=fp, filename=filename, mode="w+b")
+        existing_pdf = PdfParser.PdfParser(f=fp, filename=filename_str, mode="w+b")
 
     dpi = im.encoderinfo.get("dpi")
     if dpi:
@@ -188,9 +199,9 @@ def _save(im, fp, filename, save_all=False):
         x_resolution = y_resolution = im.encoderinfo.get("resolution", 72.0)
 
     info = {
-        "title": None
-        if is_appending
-        else os.path.splitext(os.path.basename(filename))[0],
+        "title": (
+            None if is_appending else os.path.splitext(os.path.basename(filename))[0]
+        ),
         "author": None,
         "subject": None,
         "keywords": None,
@@ -227,12 +238,7 @@ def _save(im, fp, filename, save_all=False):
     for im in ims:
         im_number_of_pages = 1
         if save_all:
-            try:
-                im_number_of_pages = im.n_frames
-            except AttributeError:
-                # Image format does not have n_frames.
-                # It is a single frame image
-                pass
+            im_number_of_pages = getattr(im, "n_frames", 1)
         number_of_pages += im_number_of_pages
         for i in range(im_number_of_pages):
             image_refs.append(existing_pdf.next_object_id(0))
@@ -249,7 +255,9 @@ def _save(im, fp, filename, save_all=False):
 
     page_number = 0
     for im_sequence in ims:
-        im_pages = ImageSequence.Iterator(im_sequence) if save_all else [im_sequence]
+        im_pages: ImageSequence.Iterator | list[Image.Image] = (
+            ImageSequence.Iterator(im_sequence) if save_all else [im_sequence]
+        )
         for im in im_pages:
             image_ref, procset = _write_image(im, filename, existing_pdf, image_refs)
 
diff --git a/src/PIL/PdfParser.py b/src/PIL/PdfParser.py
index 0144600066f..7cb2d241bc2 100644
--- a/src/PIL/PdfParser.py
+++ b/src/PIL/PdfParser.py
@@ -8,11 +8,12 @@
 import re
 import time
 import zlib
+from typing import IO, TYPE_CHECKING, Any, NamedTuple, Union
 
 
 # see 7.9.2.2 Text String Type on page 86 and D.3 PDFDocEncoding Character Set
 # on page 656
-def encode_text(s):
+def encode_text(s: str) -> bytes:
     return codecs.BOM_UTF16_BE + s.encode("utf_16_be")
 
 
@@ -61,7 +62,7 @@ def encode_text(s):
 }
 
 
-def decode_text(b):
+def decode_text(b: bytes) -> str:
     if b[: len(codecs.BOM_UTF16_BE)] == codecs.BOM_UTF16_BE:
         return b[len(codecs.BOM_UTF16_BE) :].decode("utf_16_be")
     else:
@@ -75,47 +76,53 @@ class PdfFormatError(RuntimeError):
     pass
 
 
-def check_format_condition(condition, error_message):
+def check_format_condition(condition: bool, error_message: str) -> None:
     if not condition:
         raise PdfFormatError(error_message)
 
 
-class IndirectReference(
-    collections.namedtuple("IndirectReferenceTuple", ["object_id", "generation"])
-):
-    def __str__(self):
+class IndirectReferenceTuple(NamedTuple):
+    object_id: int
+    generation: int
+
+
+class IndirectReference(IndirectReferenceTuple):
+    def __str__(self) -> str:
         return f"{self.object_id} {self.generation} R"
 
-    def __bytes__(self):
+    def __bytes__(self) -> bytes:
         return self.__str__().encode("us-ascii")
 
-    def __eq__(self, other):
-        return (
-            other.__class__ is self.__class__
-            and other.object_id == self.object_id
-            and other.generation == self.generation
-        )
+    def __eq__(self, other: object) -> bool:
+        if self.__class__ is not other.__class__:
+            return False
+        assert isinstance(other, IndirectReference)
+        return other.object_id == self.object_id and other.generation == self.generation
 
-    def __ne__(self, other):
+    def __ne__(self, other: object) -> bool:
         return not (self == other)
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return hash((self.object_id, self.generation))
 
 
 class IndirectObjectDef(IndirectReference):
-    def __str__(self):
+    def __str__(self) -> str:
         return f"{self.object_id} {self.generation} obj"
 
 
 class XrefTable:
-    def __init__(self):
-        self.existing_entries = {}  # object ID => (offset, generation)
-        self.new_entries = {}  # object ID => (offset, generation)
+    def __init__(self) -> None:
+        self.existing_entries: dict[int, tuple[int, int]] = (
+            {}
+        )  # object ID => (offset, generation)
+        self.new_entries: dict[int, tuple[int, int]] = (
+            {}
+        )  # object ID => (offset, generation)
         self.deleted_entries = {0: 65536}  # object ID => generation
         self.reading_finished = False
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: int, value: tuple[int, int]) -> None:
         if self.reading_finished:
             self.new_entries[key] = value
         else:
@@ -123,13 +130,13 @@ def __setitem__(self, key, value):
         if key in self.deleted_entries:
             del self.deleted_entries[key]
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: int) -> tuple[int, int]:
         try:
             return self.new_entries[key]
         except KeyError:
             return self.existing_entries[key]
 
-    def __delitem__(self, key):
+    def __delitem__(self, key: int) -> None:
         if key in self.new_entries:
             generation = self.new_entries[key][1] + 1
             del self.new_entries[key]
@@ -140,34 +147,32 @@ def __delitem__(self, key):
         elif key in self.deleted_entries:
             generation = self.deleted_entries[key]
         else:
-            msg = (
-                "object ID " + str(key) + " cannot be deleted because it doesn't exist"
-            )
+            msg = f"object ID {key} cannot be deleted because it doesn't exist"
             raise IndexError(msg)
 
-    def __contains__(self, key):
+    def __contains__(self, key: int) -> bool:
         return key in self.existing_entries or key in self.new_entries
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(
             set(self.existing_entries.keys())
             | set(self.new_entries.keys())
             | set(self.deleted_entries.keys())
         )
 
-    def keys(self):
+    def keys(self) -> set[int]:
         return (
             set(self.existing_entries.keys()) - set(self.deleted_entries.keys())
         ) | set(self.new_entries.keys())
 
-    def write(self, f):
+    def write(self, f: IO[bytes]) -> int:
         keys = sorted(set(self.new_entries.keys()) | set(self.deleted_entries.keys()))
         deleted_keys = sorted(set(self.deleted_entries.keys()))
         startxref = f.tell()
         f.write(b"xref\n")
         while keys:
             # find a contiguous sequence of object IDs
-            prev = None
+            prev: int | None = None
             for index, key in enumerate(keys):
                 if prev is None or prev + 1 == key:
                     prev = key
@@ -177,7 +182,7 @@ def write(self, f):
                     break
             else:
                 contiguous_keys = keys
-                keys = None
+                keys = []
             f.write(b"%d %d\n" % (contiguous_keys[0], len(contiguous_keys)))
             for object_id in contiguous_keys:
                 if object_id in self.new_entries:
@@ -201,7 +206,9 @@ def write(self, f):
 
 
 class PdfName:
-    def __init__(self, name):
+    name: bytes
+
+    def __init__(self, name: PdfName | bytes | str) -> None:
         if isinstance(name, PdfName):
             self.name = name.name
         elif isinstance(name, bytes):
@@ -209,27 +216,27 @@ def __init__(self, name):
         else:
             self.name = name.encode("us-ascii")
 
-    def name_as_str(self):
+    def name_as_str(self) -> str:
         return self.name.decode("us-ascii")
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
         return (
             isinstance(other, PdfName) and other.name == self.name
         ) or other == self.name
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return hash(self.name)
 
-    def __repr__(self):
-        return f"PdfName({repr(self.name)})"
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({repr(self.name)})"
 
     @classmethod
-    def from_pdf_stream(cls, data):
+    def from_pdf_stream(cls, data: bytes) -> PdfName:
         return cls(PdfParser.interpret_name(data))
 
     allowed_chars = set(range(33, 127)) - {ord(c) for c in "#%/()<>[]{}"}
 
-    def __bytes__(self):
+    def __bytes__(self) -> bytes:
         result = bytearray(b"/")
         for b in self.name:
             if b in self.allowed_chars:
@@ -239,19 +246,25 @@ def __bytes__(self):
         return bytes(result)
 
 
-class PdfArray(list):
-    def __bytes__(self):
+class PdfArray(list[Any]):
+    def __bytes__(self) -> bytes:
         return b"[ " + b" ".join(pdf_repr(x) for x in self) + b" ]"
 
 
-class PdfDict(collections.UserDict):
-    def __setattr__(self, key, value):
+if TYPE_CHECKING:
+    _DictBase = collections.UserDict[Union[str, bytes], Any]
+else:
+    _DictBase = collections.UserDict
+
+
+class PdfDict(_DictBase):
+    def __setattr__(self, key: str, value: Any) -> None:
         if key == "data":
             collections.UserDict.__setattr__(self, key, value)
         else:
             self[key.encode("us-ascii")] = value
 
-    def __getattr__(self, key):
+    def __getattr__(self, key: str) -> str | time.struct_time:
         try:
             value = self[key.encode("us-ascii")]
         except KeyError as e:
@@ -278,7 +291,7 @@ def __getattr__(self, key):
                 value = time.gmtime(calendar.timegm(value) + offset)
         return value
 
-    def __bytes__(self):
+    def __bytes__(self) -> bytes:
         out = bytearray(b"<<")
         for key, value in self.items():
             if value is None:
@@ -293,35 +306,35 @@ def __bytes__(self):
 
 
 class PdfBinary:
-    def __init__(self, data):
+    def __init__(self, data: list[int] | bytes) -> None:
         self.data = data
 
-    def __bytes__(self):
+    def __bytes__(self) -> bytes:
         return b"<%s>" % b"".join(b"%02X" % b for b in self.data)
 
 
 class PdfStream:
-    def __init__(self, dictionary, buf):
+    def __init__(self, dictionary: PdfDict, buf: bytes) -> None:
         self.dictionary = dictionary
         self.buf = buf
 
-    def decode(self):
+    def decode(self) -> bytes:
         try:
-            filter = self.dictionary.Filter
-        except AttributeError:
+            filter = self.dictionary[b"Filter"]
+        except KeyError:
             return self.buf
         if filter == b"FlateDecode":
             try:
-                expected_length = self.dictionary.DL
-            except AttributeError:
-                expected_length = self.dictionary.Length
+                expected_length = self.dictionary[b"DL"]
+            except KeyError:
+                expected_length = self.dictionary[b"Length"]
             return zlib.decompress(self.buf, bufsize=int(expected_length))
         else:
-            msg = f"stream filter {repr(self.dictionary.Filter)} unknown/unsupported"
+            msg = f"stream filter {repr(filter)} unknown/unsupported"
             raise NotImplementedError(msg)
 
 
-def pdf_repr(x):
+def pdf_repr(x: Any) -> bytes:
     if x is True:
         return b"true"
     elif x is False:
@@ -356,12 +369,19 @@ class PdfParser:
     Supports PDF up to 1.4
     """
 
-    def __init__(self, filename=None, f=None, buf=None, start_offset=0, mode="rb"):
+    def __init__(
+        self,
+        filename: str | None = None,
+        f: IO[bytes] | None = None,
+        buf: bytes | bytearray | None = None,
+        start_offset: int = 0,
+        mode: str = "rb",
+    ) -> None:
         if buf and f:
             msg = "specify buf or f or filename, but not both buf and f"
             raise RuntimeError(msg)
         self.filename = filename
-        self.buf = buf
+        self.buf: bytes | bytearray | mmap.mmap | None = buf
         self.f = f
         self.start_offset = start_offset
         self.should_close_buf = False
@@ -370,12 +390,16 @@ def __init__(self, filename=None, f=None, buf=None, start_offset=0, mode="rb"):
             self.f = f = open(filename, mode)
             self.should_close_file = True
         if f is not None:
-            self.buf = buf = self.get_buf_from_file(f)
+            self.buf = self.get_buf_from_file(f)
             self.should_close_buf = True
             if not filename and hasattr(f, "name"):
                 self.filename = f.name
-        self.cached_objects = {}
-        if buf:
+        self.cached_objects: dict[IndirectReference, Any] = {}
+        self.root_ref: IndirectReference | None
+        self.info_ref: IndirectReference | None
+        self.pages_ref: IndirectReference | None
+        self.last_xref_section_offset: int | None
+        if self.buf:
             self.read_pdf_info()
         else:
             self.file_size_total = self.file_size_this = 0
@@ -383,52 +407,53 @@ def __init__(self, filename=None, f=None, buf=None, start_offset=0, mode="rb"):
             self.root_ref = None
             self.info = PdfDict()
             self.info_ref = None
-            self.page_tree_root = {}
-            self.pages = []
-            self.orig_pages = []
+            self.page_tree_root = PdfDict()
+            self.pages: list[IndirectReference] = []
+            self.orig_pages: list[IndirectReference] = []
             self.pages_ref = None
             self.last_xref_section_offset = None
-            self.trailer_dict = {}
+            self.trailer_dict: dict[bytes, Any] = {}
             self.xref_table = XrefTable()
         self.xref_table.reading_finished = True
         if f:
             self.seek_end()
 
-    def __enter__(self):
+    def __enter__(self) -> PdfParser:
         return self
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    def __exit__(self, *args: object) -> None:
         self.close()
-        return False  # do not suppress exceptions
 
-    def start_writing(self):
+    def start_writing(self) -> None:
         self.close_buf()
         self.seek_end()
 
-    def close_buf(self):
-        try:
+    def close_buf(self) -> None:
+        if isinstance(self.buf, mmap.mmap):
             self.buf.close()
-        except AttributeError:
-            pass
         self.buf = None
 
-    def close(self):
+    def close(self) -> None:
         if self.should_close_buf:
             self.close_buf()
         if self.f is not None and self.should_close_file:
             self.f.close()
             self.f = None
 
-    def seek_end(self):
+    def seek_end(self) -> None:
+        assert self.f is not None
         self.f.seek(0, os.SEEK_END)
 
-    def write_header(self):
+    def write_header(self) -> None:
+        assert self.f is not None
         self.f.write(b"%PDF-1.4\n")
 
-    def write_comment(self, s):
+    def write_comment(self, s: str) -> None:
+        assert self.f is not None
         self.f.write(f"% {s}\n".encode())
 
-    def write_catalog(self):
+    def write_catalog(self) -> IndirectReference:
+        assert self.f is not None
         self.del_root()
         self.root_ref = self.next_object_id(self.f.tell())
         self.pages_ref = self.next_object_id(0)
@@ -442,7 +467,7 @@ def write_catalog(self):
         )
         return self.root_ref
 
-    def rewrite_pages(self):
+    def rewrite_pages(self) -> None:
         pages_tree_nodes_to_delete = []
         for i, page_ref in enumerate(self.orig_pages):
             page_info = self.cached_objects[page_ref]
@@ -471,7 +496,10 @@ def rewrite_pages(self):
                 pages_tree_node_ref = pages_tree_node.get(b"Parent", None)
         self.orig_pages = []
 
-    def write_xref_and_trailer(self, new_root_ref=None):
+    def write_xref_and_trailer(
+        self, new_root_ref: IndirectReference | None = None
+    ) -> None:
+        assert self.f is not None
         if new_root_ref:
             self.del_root()
             self.root_ref = new_root_ref
@@ -479,7 +507,10 @@ def write_xref_and_trailer(self, new_root_ref=None):
             self.info_ref = self.write_obj(None, self.info)
         start_xref = self.xref_table.write(self.f)
         num_entries = len(self.xref_table)
-        trailer_dict = {b"Root": self.root_ref, b"Size": num_entries}
+        trailer_dict: dict[str | bytes, Any] = {
+            b"Root": self.root_ref,
+            b"Size": num_entries,
+        }
         if self.last_xref_section_offset is not None:
             trailer_dict[b"Prev"] = self.last_xref_section_offset
         if self.info:
@@ -491,16 +522,20 @@ def write_xref_and_trailer(self, new_root_ref=None):
             + b"\nstartxref\n%d\n%%%%EOF" % start_xref
         )
 
-    def write_page(self, ref, *objs, **dict_obj):
-        if isinstance(ref, int):
-            ref = self.pages[ref]
+    def write_page(
+        self, ref: int | IndirectReference | None, *objs: Any, **dict_obj: Any
+    ) -> IndirectReference:
+        obj_ref = self.pages[ref] if isinstance(ref, int) else ref
         if "Type" not in dict_obj:
             dict_obj["Type"] = PdfName(b"Page")
         if "Parent" not in dict_obj:
             dict_obj["Parent"] = self.pages_ref
-        return self.write_obj(ref, *objs, **dict_obj)
+        return self.write_obj(obj_ref, *objs, **dict_obj)
 
-    def write_obj(self, ref, *objs, **dict_obj):
+    def write_obj(
+        self, ref: IndirectReference | None, *objs: Any, **dict_obj: Any
+    ) -> IndirectReference:
+        assert self.f is not None
         f = self.f
         if ref is None:
             ref = self.next_object_id(f.tell())
@@ -521,14 +556,14 @@ def write_obj(self, ref, *objs, **dict_obj):
         f.write(b"endobj\n")
         return ref
 
-    def del_root(self):
+    def del_root(self) -> None:
         if self.root_ref is None:
             return
         del self.xref_table[self.root_ref.object_id]
         del self.xref_table[self.root[b"Pages"].object_id]
 
     @staticmethod
-    def get_buf_from_file(f):
+    def get_buf_from_file(f: IO[bytes]) -> bytes | mmap.mmap:
         if hasattr(f, "getbuffer"):
             return f.getbuffer()
         elif hasattr(f, "getvalue"):
@@ -539,11 +574,16 @@ def get_buf_from_file(f):
             except ValueError:  # cannot mmap an empty file
                 return b""
 
-    def read_pdf_info(self):
+    def read_pdf_info(self) -> None:
+        assert self.buf is not None
         self.file_size_total = len(self.buf)
         self.file_size_this = self.file_size_total - self.start_offset
         self.read_trailer()
+        check_format_condition(
+            self.trailer_dict.get(b"Root") is not None, "Root is missing"
+        )
         self.root_ref = self.trailer_dict[b"Root"]
+        assert self.root_ref is not None
         self.info_ref = self.trailer_dict.get(b"Info", None)
         self.root = PdfDict(self.read_indirect(self.root_ref))
         if self.info_ref is None:
@@ -554,12 +594,15 @@ def read_pdf_info(self):
         check_format_condition(
             self.root[b"Type"] == b"Catalog", "/Type in Root is not /Catalog"
         )
-        check_format_condition(b"Pages" in self.root, "/Pages missing in Root")
+        check_format_condition(
+            self.root.get(b"Pages") is not None, "/Pages missing in Root"
+        )
         check_format_condition(
             isinstance(self.root[b"Pages"], IndirectReference),
             "/Pages in Root is not an indirect reference",
         )
         self.pages_ref = self.root[b"Pages"]
+        assert self.pages_ref is not None
         self.page_tree_root = self.read_indirect(self.pages_ref)
         self.pages = self.linearize_page_tree(self.page_tree_root)
         # save the original list of page references
@@ -567,7 +610,7 @@ def read_pdf_info(self):
         # and we need to rewrite the pages and their list
         self.orig_pages = self.pages[:]
 
-    def next_object_id(self, offset=None):
+    def next_object_id(self, offset: int | None = None) -> IndirectReference:
         try:
             # TODO: support reuse of deleted objects
             reference = IndirectReference(max(self.xref_table.keys()) + 1, 0)
@@ -617,12 +660,13 @@ def next_object_id(self, offset=None):
         re.DOTALL,
     )
 
-    def read_trailer(self):
+    def read_trailer(self) -> None:
+        assert self.buf is not None
         search_start_offset = len(self.buf) - 16384
         if search_start_offset < self.start_offset:
             search_start_offset = self.start_offset
         m = self.re_trailer_end.search(self.buf, search_start_offset)
-        check_format_condition(m, "trailer end not found")
+        check_format_condition(m is not None, "trailer end not found")
         # make sure we found the LAST trailer
         last_match = m
         while m:
@@ -630,6 +674,7 @@ def read_trailer(self):
             m = self.re_trailer_end.search(self.buf, m.start() + 16)
         if not m:
             m = last_match
+        assert m is not None
         trailer_data = m.group(1)
         self.last_xref_section_offset = int(m.group(2))
         self.trailer_dict = self.interpret_trailer(trailer_data)
@@ -638,12 +683,14 @@ def read_trailer(self):
         if b"Prev" in self.trailer_dict:
             self.read_prev_trailer(self.trailer_dict[b"Prev"])
 
-    def read_prev_trailer(self, xref_section_offset):
+    def read_prev_trailer(self, xref_section_offset: int) -> None:
+        assert self.buf is not None
         trailer_offset = self.read_xref_table(xref_section_offset=xref_section_offset)
         m = self.re_trailer_prev.search(
             self.buf[trailer_offset : trailer_offset + 16384]
         )
-        check_format_condition(m, "previous trailer not found")
+        check_format_condition(m is not None, "previous trailer not found")
+        assert m is not None
         trailer_data = m.group(1)
         check_format_condition(
             int(m.group(2)) == xref_section_offset,
@@ -664,7 +711,7 @@ def read_prev_trailer(self, xref_section_offset):
     re_dict_end = re.compile(whitespace_optional + rb">>" + whitespace_optional)
 
     @classmethod
-    def interpret_trailer(cls, trailer_data):
+    def interpret_trailer(cls, trailer_data: bytes) -> dict[bytes, Any]:
         trailer = {}
         offset = 0
         while True:
@@ -672,14 +719,18 @@ def interpret_trailer(cls, trailer_data):
             if not m:
                 m = cls.re_dict_end.match(trailer_data, offset)
                 check_format_condition(
-                    m and m.end() == len(trailer_data),
+                    m is not None and m.end() == len(trailer_data),
                     "name not found in trailer, remaining data: "
                     + repr(trailer_data[offset:]),
                 )
                 break
             key = cls.interpret_name(m.group(1))
-            value, offset = cls.get_value(trailer_data, m.end())
+            assert isinstance(key, bytes)
+            value, value_offset = cls.get_value(trailer_data, m.end())
             trailer[key] = value
+            if value_offset is None:
+                break
+            offset = value_offset
         check_format_condition(
             b"Size" in trailer and isinstance(trailer[b"Size"], int),
             "/Size not in trailer or not an integer",
@@ -693,7 +744,7 @@ def interpret_trailer(cls, trailer_data):
     re_hashes_in_name = re.compile(rb"([^#]*)(#([0-9a-fA-F]{2}))?")
 
     @classmethod
-    def interpret_name(cls, raw, as_text=False):
+    def interpret_name(cls, raw: bytes, as_text: bool = False) -> str | bytes:
         name = b""
         for m in cls.re_hashes_in_name.finditer(raw):
             if m.group(3):
@@ -755,7 +806,13 @@ def interpret_name(cls, raw, as_text=False):
     )
 
     @classmethod
-    def get_value(cls, data, offset, expect_indirect=None, max_nesting=-1):
+    def get_value(
+        cls,
+        data: bytes | bytearray | mmap.mmap,
+        offset: int,
+        expect_indirect: IndirectReference | None = None,
+        max_nesting: int = -1,
+    ) -> tuple[Any, int | None]:
         if max_nesting == 0:
             return None, None
         m = cls.re_comment.match(data, offset)
@@ -777,11 +834,16 @@ def get_value(cls, data, offset, expect_indirect=None, max_nesting=-1):
                 == IndirectReference(int(m.group(1)), int(m.group(2))),
                 "indirect object definition different than expected",
             )
-            object, offset = cls.get_value(data, m.end(), max_nesting=max_nesting - 1)
-            if offset is None:
+            object, object_offset = cls.get_value(
+                data, m.end(), max_nesting=max_nesting - 1
+            )
+            if object_offset is None:
                 return object, None
-            m = cls.re_indirect_def_end.match(data, offset)
-            check_format_condition(m, "indirect object definition end not found")
+            m = cls.re_indirect_def_end.match(data, object_offset)
+            check_format_condition(
+                m is not None, "indirect object definition end not found"
+            )
+            assert m is not None
             return object, m.end()
         check_format_condition(
             not expect_indirect, "indirect object definition not found"
@@ -800,47 +862,53 @@ def get_value(cls, data, offset, expect_indirect=None, max_nesting=-1):
         m = cls.re_dict_start.match(data, offset)
         if m:
             offset = m.end()
-            result = {}
+            result: dict[Any, Any] = {}
             m = cls.re_dict_end.match(data, offset)
+            current_offset: int | None = offset
             while not m:
-                key, offset = cls.get_value(data, offset, max_nesting=max_nesting - 1)
-                if offset is None:
+                assert current_offset is not None
+                key, current_offset = cls.get_value(
+                    data, current_offset, max_nesting=max_nesting - 1
+                )
+                if current_offset is None:
                     return result, None
-                value, offset = cls.get_value(data, offset, max_nesting=max_nesting - 1)
+                value, current_offset = cls.get_value(
+                    data, current_offset, max_nesting=max_nesting - 1
+                )
                 result[key] = value
-                if offset is None:
+                if current_offset is None:
                     return result, None
-                m = cls.re_dict_end.match(data, offset)
-            offset = m.end()
-            m = cls.re_stream_start.match(data, offset)
+                m = cls.re_dict_end.match(data, current_offset)
+            current_offset = m.end()
+            m = cls.re_stream_start.match(data, current_offset)
             if m:
-                try:
-                    stream_len = int(result[b"Length"])
-                except (TypeError, KeyError, ValueError) as e:
-                    msg = "bad or missing Length in stream dict (%r)" % result.get(
-                        b"Length", None
-                    )
-                    raise PdfFormatError(msg) from e
+                stream_len = result.get(b"Length")
+                if stream_len is None or not isinstance(stream_len, int):
+                    msg = f"bad or missing Length in stream dict ({stream_len})"
+                    raise PdfFormatError(msg)
                 stream_data = data[m.end() : m.end() + stream_len]
                 m = cls.re_stream_end.match(data, m.end() + stream_len)
-                check_format_condition(m, "stream end not found")
-                offset = m.end()
-                result = PdfStream(PdfDict(result), stream_data)
-            else:
-                result = PdfDict(result)
-            return result, offset
+                check_format_condition(m is not None, "stream end not found")
+                assert m is not None
+                current_offset = m.end()
+                return PdfStream(PdfDict(result), stream_data), current_offset
+            return PdfDict(result), current_offset
         m = cls.re_array_start.match(data, offset)
         if m:
             offset = m.end()
-            result = []
+            results = []
             m = cls.re_array_end.match(data, offset)
+            current_offset = offset
             while not m:
-                value, offset = cls.get_value(data, offset, max_nesting=max_nesting - 1)
-                result.append(value)
-                if offset is None:
-                    return result, None
-                m = cls.re_array_end.match(data, offset)
-            return result, m.end()
+                assert current_offset is not None
+                value, current_offset = cls.get_value(
+                    data, current_offset, max_nesting=max_nesting - 1
+                )
+                results.append(value)
+                if current_offset is None:
+                    return results, None
+                m = cls.re_array_end.match(data, current_offset)
+            return results, m.end()
         m = cls.re_null.match(data, offset)
         if m:
             return None, m.end()
@@ -874,7 +942,7 @@ def get_value(cls, data, offset, expect_indirect=None, max_nesting=-1):
         if m:
             return cls.get_literal_string(data, m.end())
         # return None, offset  # fallback (only for debugging)
-        msg = "unrecognized object: " + repr(data[offset : offset + 32])
+        msg = f"unrecognized object: {repr(data[offset : offset + 32])}"
         raise PdfFormatError(msg)
 
     re_lit_str_token = re.compile(
@@ -900,7 +968,9 @@ def get_value(cls, data, offset, expect_indirect=None, max_nesting=-1):
     }
 
     @classmethod
-    def get_literal_string(cls, data, offset):
+    def get_literal_string(
+        cls, data: bytes | bytearray | mmap.mmap, offset: int
+    ) -> tuple[bytes, int]:
         nesting_depth = 0
         result = bytearray()
         for m in cls.re_lit_str_token.finditer(data, offset):
@@ -936,12 +1006,14 @@ def get_literal_string(cls, data, offset):
     )
     re_xref_entry = re.compile(rb"([0-9]{10}) ([0-9]{5}) ([fn])( \r| \n|\r\n)")
 
-    def read_xref_table(self, xref_section_offset):
+    def read_xref_table(self, xref_section_offset: int) -> int:
+        assert self.buf is not None
         subsection_found = False
         m = self.re_xref_section_start.match(
             self.buf, xref_section_offset + self.start_offset
         )
-        check_format_condition(m, "xref section start not found")
+        check_format_condition(m is not None, "xref section start not found")
+        assert m is not None
         offset = m.end()
         while True:
             m = self.re_xref_subsection_start.match(self.buf, offset)
@@ -956,7 +1028,8 @@ def read_xref_table(self, xref_section_offset):
             num_objects = int(m.group(2))
             for i in range(first_object, first_object + num_objects):
                 m = self.re_xref_entry.match(self.buf, offset)
-                check_format_condition(m, "xref entry not found")
+                check_format_condition(m is not None, "xref entry not found")
+                assert m is not None
                 offset = m.end()
                 is_free = m.group(3) == b"f"
                 if not is_free:
@@ -966,13 +1039,14 @@ def read_xref_table(self, xref_section_offset):
                         self.xref_table[i] = new_entry
         return offset
 
-    def read_indirect(self, ref, max_nesting=-1):
+    def read_indirect(self, ref: IndirectReference, max_nesting: int = -1) -> Any:
         offset, generation = self.xref_table[ref[0]]
         check_format_condition(
             generation == ref[1],
             f"expected to find generation {ref[1]} for object ID {ref[0]} in xref "
             f"table, instead found generation {generation} at offset {offset}",
         )
+        assert self.buf is not None
         value = self.get_value(
             self.buf,
             offset + self.start_offset,
@@ -982,14 +1056,15 @@ def read_indirect(self, ref, max_nesting=-1):
         self.cached_objects[ref] = value
         return value
 
-    def linearize_page_tree(self, node=None):
-        if node is None:
-            node = self.page_tree_root
+    def linearize_page_tree(
+        self, node: PdfDict | None = None
+    ) -> list[IndirectReference]:
+        page_node = node if node is not None else self.page_tree_root
         check_format_condition(
-            node[b"Type"] == b"Pages", "/Type of page tree node is not /Pages"
+            page_node[b"Type"] == b"Pages", "/Type of page tree node is not /Pages"
         )
         pages = []
-        for kid in node[b"Kids"]:
+        for kid in page_node[b"Kids"]:
             kid_object = self.read_indirect(kid)
             if kid_object[b"Type"] == b"Page":
                 pages.append(kid)
diff --git a/src/PIL/PixarImagePlugin.py b/src/PIL/PixarImagePlugin.py
index af866feb362..36f565f1c20 100644
--- a/src/PIL/PixarImagePlugin.py
+++ b/src/PIL/PixarImagePlugin.py
@@ -27,7 +27,7 @@
 # helpers
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"\200\350\000\000"
 
 
@@ -39,8 +39,10 @@ class PixarImageFile(ImageFile.ImageFile):
     format = "PIXAR"
     format_description = "PIXAR raster image"
 
-    def _open(self):
+    def _open(self) -> None:
         # assuming a 4-byte magic label
+        assert self.fp is not None
+
         s = self.fp.read(4)
         if not _accept(s):
             msg = "not a PIXAR file"
@@ -59,7 +61,9 @@ def _open(self):
         # FIXME: to be continued...
 
         # create tile descriptor (assuming "dumped")
-        self.tile = [("raw", (0, 0) + self.size, 1024, (self.mode, 0, 1))]
+        self.tile = [
+            ImageFile._Tile("raw", (0, 0) + self.size, 1024, (self.mode, 0, 1))
+        ]
 
 
 #
diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py
index e4ed9388011..4e12272041d 100644
--- a/src/PIL/PngImagePlugin.py
+++ b/src/PIL/PngImagePlugin.py
@@ -38,7 +38,9 @@
 import struct
 import warnings
 import zlib
+from collections.abc import Callable
 from enum import IntEnum
+from typing import IO, TYPE_CHECKING, Any, NamedTuple, NoReturn, cast
 
 from . import Image, ImageChops, ImageFile, ImagePalette, ImageSequence
 from ._binary import i16be as i16
@@ -47,6 +49,9 @@
 from ._binary import o16be as o16
 from ._binary import o32be as o32
 
+if TYPE_CHECKING:
+    from . import _imaging
+
 logger = logging.getLogger(__name__)
 
 is_cid = re.compile(rb"\w\w\w\w").match
@@ -62,7 +67,7 @@
     (2, 0): ("L", "L;2"),
     (4, 0): ("L", "L;4"),
     (8, 0): ("L", "L"),
-    (16, 0): ("I", "I;16B"),
+    (16, 0): ("I;16", "I;16B"),
     # Truecolour
     (8, 2): ("RGB", "RGB"),
     (16, 2): ("RGB", "RGB;16B"),
@@ -131,16 +136,16 @@ class Blend(IntEnum):
     """
 
 
-def _safe_zlib_decompress(s):
+def _safe_zlib_decompress(s: bytes) -> bytes:
     dobj = zlib.decompressobj()
     plaintext = dobj.decompress(s, MAX_TEXT_CHUNK)
     if dobj.unconsumed_tail:
-        msg = "Decompressed Data Too Large"
+        msg = "Decompressed data too large for PngImagePlugin.MAX_TEXT_CHUNK"
         raise ValueError(msg)
     return plaintext
 
 
-def _crc32(data, seed=0):
+def _crc32(data: bytes, seed: int = 0) -> int:
     return zlib.crc32(data, seed) & 0xFFFFFFFF
 
 
@@ -149,14 +154,15 @@ def _crc32(data, seed=0):
 
 
 class ChunkStream:
-    def __init__(self, fp):
-        self.fp = fp
-        self.queue = []
+    def __init__(self, fp: IO[bytes]) -> None:
+        self.fp: IO[bytes] | None = fp
+        self.queue: list[tuple[bytes, int, int]] | None = []
 
-    def read(self):
+    def read(self) -> tuple[bytes, int, int]:
         """Fetch a new chunk. Returns header information."""
         cid = None
 
+        assert self.fp is not None
         if self.queue:
             cid, pos, length = self.queue.pop()
             self.fp.seek(pos)
@@ -173,25 +179,26 @@ def read(self):
 
         return cid, pos, length
 
-    def __enter__(self):
+    def __enter__(self) -> ChunkStream:
         return self
 
-    def __exit__(self, *args):
+    def __exit__(self, *args: object) -> None:
         self.close()
 
-    def close(self):
+    def close(self) -> None:
         self.queue = self.fp = None
 
-    def push(self, cid, pos, length):
+    def push(self, cid: bytes, pos: int, length: int) -> None:
+        assert self.queue is not None
         self.queue.append((cid, pos, length))
 
-    def call(self, cid, pos, length):
+    def call(self, cid: bytes, pos: int, length: int) -> bytes:
         """Call the appropriate chunk handler"""
 
         logger.debug("STREAM %r %s %s", cid, pos, length)
-        return getattr(self, "chunk_" + cid.decode("ascii"))(pos, length)
+        return getattr(self, f"chunk_{cid.decode('ascii')}")(pos, length)
 
-    def crc(self, cid, data):
+    def crc(self, cid: bytes, data: bytes) -> None:
         """Read and verify checksum"""
 
         # Skip CRC checks for ancillary chunks if allowed to load truncated
@@ -201,6 +208,7 @@ def crc(self, cid, data):
             self.crc_skip(cid, data)
             return
 
+        assert self.fp is not None
         try:
             crc1 = _crc32(data, _crc32(cid))
             crc2 = i32(self.fp.read(4))
@@ -211,17 +219,19 @@ def crc(self, cid, data):
             msg = f"broken PNG file (incomplete checksum in {repr(cid)})"
             raise SyntaxError(msg) from e
 
-    def crc_skip(self, cid, data):
+    def crc_skip(self, cid: bytes, data: bytes) -> None:
         """Read checksum"""
 
+        assert self.fp is not None
         self.fp.read(4)
 
-    def verify(self, endchunk=b"IEND"):
+    def verify(self, endchunk: bytes = b"IEND") -> list[bytes]:
         # Simple approach; just calculate checksum for all remaining
         # blocks.  Must be called directly after open.
 
         cids = []
 
+        assert self.fp is not None
         while True:
             try:
                 cid, pos, length = self.read()
@@ -244,8 +254,13 @@ class iTXt(str):
 
     """
 
+    lang: str | bytes | None
+    tkey: str | bytes | None
+
     @staticmethod
-    def __new__(cls, text, lang=None, tkey=None):
+    def __new__(
+        cls, text: str, lang: str | None = None, tkey: str | None = None
+    ) -> iTXt:
         """
         :param cls: the class to use when creating the instance
         :param text: value for this key
@@ -265,10 +280,10 @@ class PngInfo:
 
     """
 
-    def __init__(self):
-        self.chunks = []
+    def __init__(self) -> None:
+        self.chunks: list[tuple[bytes, bytes, bool]] = []
 
-    def add(self, cid, data, after_idat=False):
+    def add(self, cid: bytes, data: bytes, after_idat: bool = False) -> None:
         """Appends an arbitrary chunk. Use with caution.
 
         :param cid: a byte string, 4 bytes long.
@@ -278,12 +293,16 @@ def add(self, cid, data, after_idat=False):
 
         """
 
-        chunk = [cid, data]
-        if after_idat:
-            chunk.append(True)
-        self.chunks.append(tuple(chunk))
+        self.chunks.append((cid, data, after_idat))
 
-    def add_itxt(self, key, value, lang="", tkey="", zip=False):
+    def add_itxt(
+        self,
+        key: str | bytes,
+        value: str | bytes,
+        lang: str | bytes = "",
+        tkey: str | bytes = "",
+        zip: bool = False,
+    ) -> None:
         """Appends an iTXt chunk.
 
         :param key: latin-1 encodable text key name
@@ -311,7 +330,9 @@ def add_itxt(self, key, value, lang="", tkey="", zip=False):
         else:
             self.add(b"iTXt", key + b"\0\0\0" + lang + b"\0" + tkey + b"\0" + value)
 
-    def add_text(self, key, value, zip=False):
+    def add_text(
+        self, key: str | bytes, value: str | bytes | iTXt, zip: bool = False
+    ) -> None:
         """Appends a text chunk.
 
         :param key: latin-1 encodable text key name
@@ -321,7 +342,13 @@ def add_text(self, key, value, zip=False):
 
         """
         if isinstance(value, iTXt):
-            return self.add_itxt(key, value, value.lang, value.tkey, zip=zip)
+            return self.add_itxt(
+                key,
+                value,
+                value.lang if value.lang is not None else b"",
+                value.tkey if value.tkey is not None else b"",
+                zip=zip,
+            )
 
         # The tEXt chunk stores latin-1 text
         if not isinstance(value, bytes):
@@ -343,25 +370,31 @@ def add_text(self, key, value, zip=False):
 # PNG image stream (IHDR/IEND)
 
 
+class _RewindState(NamedTuple):
+    info: dict[str | tuple[int, int], Any]
+    tile: list[ImageFile._Tile]
+    seq_num: int | None
+
+
 class PngStream(ChunkStream):
-    def __init__(self, fp):
+    def __init__(self, fp: IO[bytes]) -> None:
         super().__init__(fp)
 
         # local copies of Image attributes
-        self.im_info = {}
-        self.im_text = {}
+        self.im_info: dict[str | tuple[int, int], Any] = {}
+        self.im_text: dict[str, str | iTXt] = {}
         self.im_size = (0, 0)
-        self.im_mode = None
-        self.im_tile = None
-        self.im_palette = None
-        self.im_custom_mimetype = None
-        self.im_n_frames = None
-        self._seq_num = None
-        self.rewind_state = None
+        self.im_mode = ""
+        self.im_tile: list[ImageFile._Tile] = []
+        self.im_palette: tuple[str, bytes] | None = None
+        self.im_custom_mimetype: str | None = None
+        self.im_n_frames: int | None = None
+        self._seq_num: int | None = None
+        self.rewind_state = _RewindState({}, [], None)
 
         self.text_memory = 0
 
-    def check_text_memory(self, chunklen):
+    def check_text_memory(self, chunklen: int) -> None:
         self.text_memory += chunklen
         if self.text_memory > MAX_TEXT_MEMORY:
             msg = (
@@ -370,20 +403,21 @@ def check_text_memory(self, chunklen):
             )
             raise ValueError(msg)
 
-    def save_rewind(self):
-        self.rewind_state = {
-            "info": self.im_info.copy(),
-            "tile": self.im_tile,
-            "seq_num": self._seq_num,
-        }
+    def save_rewind(self) -> None:
+        self.rewind_state = _RewindState(
+            self.im_info.copy(),
+            self.im_tile,
+            self._seq_num,
+        )
 
-    def rewind(self):
-        self.im_info = self.rewind_state["info"]
-        self.im_tile = self.rewind_state["tile"]
-        self._seq_num = self.rewind_state["seq_num"]
+    def rewind(self) -> None:
+        self.im_info = self.rewind_state.info.copy()
+        self.im_tile = self.rewind_state.tile
+        self._seq_num = self.rewind_state.seq_num
 
-    def chunk_iCCP(self, pos, length):
+    def chunk_iCCP(self, pos: int, length: int) -> bytes:
         # ICC profile
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         # according to PNG spec, the iCCP chunk contains:
         # Profile name  1-79 bytes (character string)
@@ -392,8 +426,8 @@ def chunk_iCCP(self, pos, length):
         # Compressed profile    n bytes (zlib with deflate compression)
         i = s.find(b"\0")
         logger.debug("iCCP profile name %r", s[:i])
-        logger.debug("Compression method %s", s[i])
-        comp_method = s[i]
+        comp_method = s[i + 1]
+        logger.debug("Compression method %s", comp_method)
         if comp_method != 0:
             msg = f"Unknown compression method {comp_method} in iCCP chunk"
             raise SyntaxError(msg)
@@ -409,8 +443,9 @@ def chunk_iCCP(self, pos, length):
         self.im_info["icc_profile"] = icc_profile
         return s
 
-    def chunk_IHDR(self, pos, length):
+    def chunk_IHDR(self, pos: int, length: int) -> bytes:
         # image header
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         if length < 13:
             if ImageFile.LOAD_TRUNCATED_IMAGES:
@@ -429,32 +464,34 @@ def chunk_IHDR(self, pos, length):
             raise SyntaxError(msg)
         return s
 
-    def chunk_IDAT(self, pos, length):
+    def chunk_IDAT(self, pos: int, length: int) -> NoReturn:
         # image data
         if "bbox" in self.im_info:
-            tile = [("zip", self.im_info["bbox"], pos, self.im_rawmode)]
+            tile = [ImageFile._Tile("zip", self.im_info["bbox"], pos, self.im_rawmode)]
         else:
             if self.im_n_frames is not None:
                 self.im_info["default_image"] = True
-            tile = [("zip", (0, 0) + self.im_size, pos, self.im_rawmode)]
+            tile = [ImageFile._Tile("zip", (0, 0) + self.im_size, pos, self.im_rawmode)]
         self.im_tile = tile
         self.im_idat = length
         msg = "image data found"
         raise EOFError(msg)
 
-    def chunk_IEND(self, pos, length):
+    def chunk_IEND(self, pos: int, length: int) -> NoReturn:
         msg = "end of PNG image"
         raise EOFError(msg)
 
-    def chunk_PLTE(self, pos, length):
+    def chunk_PLTE(self, pos: int, length: int) -> bytes:
         # palette
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         if self.im_mode == "P":
             self.im_palette = "RGB", s
         return s
 
-    def chunk_tRNS(self, pos, length):
+    def chunk_tRNS(self, pos: int, length: int) -> bytes:
         # transparency
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         if self.im_mode == "P":
             if _simple_palette.match(s):
@@ -467,34 +504,37 @@ def chunk_tRNS(self, pos, length):
                 # otherwise, we have a byte string with one alpha value
                 # for each palette entry
                 self.im_info["transparency"] = s
-        elif self.im_mode in ("1", "L", "I"):
+        elif self.im_mode in ("1", "L", "I;16"):
             self.im_info["transparency"] = i16(s)
         elif self.im_mode == "RGB":
             self.im_info["transparency"] = i16(s), i16(s, 2), i16(s, 4)
         return s
 
-    def chunk_gAMA(self, pos, length):
+    def chunk_gAMA(self, pos: int, length: int) -> bytes:
         # gamma setting
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         self.im_info["gamma"] = i32(s) / 100000.0
         return s
 
-    def chunk_cHRM(self, pos, length):
+    def chunk_cHRM(self, pos: int, length: int) -> bytes:
         # chromaticity, 8 unsigned ints, actual value is scaled by 100,000
         # WP x,y, Red x,y, Green x,y Blue x,y
 
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         raw_vals = struct.unpack(">%dI" % (len(s) // 4), s)
         self.im_info["chromaticity"] = tuple(elt / 100000.0 for elt in raw_vals)
         return s
 
-    def chunk_sRGB(self, pos, length):
+    def chunk_sRGB(self, pos: int, length: int) -> bytes:
         # srgb rendering intent, 1 byte
         # 0 perceptual
         # 1 relative colorimetric
         # 2 saturation
         # 3 absolute colorimetric
 
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         if length < 1:
             if ImageFile.LOAD_TRUNCATED_IMAGES:
@@ -504,8 +544,9 @@ def chunk_sRGB(self, pos, length):
         self.im_info["srgb"] = s[0]
         return s
 
-    def chunk_pHYs(self, pos, length):
+    def chunk_pHYs(self, pos: int, length: int) -> bytes:
         # pixels per unit
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         if length < 9:
             if ImageFile.LOAD_TRUNCATED_IMAGES:
@@ -521,8 +562,9 @@ def chunk_pHYs(self, pos, length):
             self.im_info["aspect"] = px, py
         return s
 
-    def chunk_tEXt(self, pos, length):
+    def chunk_tEXt(self, pos: int, length: int) -> bytes:
         # text
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         try:
             k, v = s.split(b"\0", 1)
@@ -531,17 +573,18 @@ def chunk_tEXt(self, pos, length):
             k = s
             v = b""
         if k:
-            k = k.decode("latin-1", "strict")
+            k_str = k.decode("latin-1", "strict")
             v_str = v.decode("latin-1", "replace")
 
-            self.im_info[k] = v if k == "exif" else v_str
-            self.im_text[k] = v_str
+            self.im_info[k_str] = v if k == b"exif" else v_str
+            self.im_text[k_str] = v_str
             self.check_text_memory(len(v_str))
 
         return s
 
-    def chunk_zTXt(self, pos, length):
+    def chunk_zTXt(self, pos: int, length: int) -> bytes:
         # compressed text
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         try:
             k, v = s.split(b"\0", 1)
@@ -566,16 +609,17 @@ def chunk_zTXt(self, pos, length):
             v = b""
 
         if k:
-            k = k.decode("latin-1", "strict")
-            v = v.decode("latin-1", "replace")
+            k_str = k.decode("latin-1", "strict")
+            v_str = v.decode("latin-1", "replace")
 
-            self.im_info[k] = self.im_text[k] = v
-            self.check_text_memory(len(v))
+            self.im_info[k_str] = self.im_text[k_str] = v_str
+            self.check_text_memory(len(v_str))
 
         return s
 
-    def chunk_iTXt(self, pos, length):
+    def chunk_iTXt(self, pos: int, length: int) -> bytes:
         # international text
+        assert self.fp is not None
         r = s = ImageFile._safe_read(self.fp, length)
         try:
             k, r = r.split(b"\0", 1)
@@ -601,26 +645,30 @@ def chunk_iTXt(self, pos, length):
                     return s
             else:
                 return s
+        if k == b"XML:com.adobe.xmp":
+            self.im_info["xmp"] = v
         try:
-            k = k.decode("latin-1", "strict")
-            lang = lang.decode("utf-8", "strict")
-            tk = tk.decode("utf-8", "strict")
-            v = v.decode("utf-8", "strict")
+            k_str = k.decode("latin-1", "strict")
+            lang_str = lang.decode("utf-8", "strict")
+            tk_str = tk.decode("utf-8", "strict")
+            v_str = v.decode("utf-8", "strict")
         except UnicodeError:
             return s
 
-        self.im_info[k] = self.im_text[k] = iTXt(v, lang, tk)
-        self.check_text_memory(len(v))
+        self.im_info[k_str] = self.im_text[k_str] = iTXt(v_str, lang_str, tk_str)
+        self.check_text_memory(len(v_str))
 
         return s
 
-    def chunk_eXIf(self, pos, length):
+    def chunk_eXIf(self, pos: int, length: int) -> bytes:
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         self.im_info["exif"] = b"Exif\x00\x00" + s
         return s
 
     # APNG chunks
-    def chunk_acTL(self, pos, length):
+    def chunk_acTL(self, pos: int, length: int) -> bytes:
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         if length < 8:
             if ImageFile.LOAD_TRUNCATED_IMAGES:
@@ -640,7 +688,8 @@ def chunk_acTL(self, pos, length):
         self.im_custom_mimetype = "image/apng"
         return s
 
-    def chunk_fcTL(self, pos, length):
+    def chunk_fcTL(self, pos: int, length: int) -> bytes:
+        assert self.fp is not None
         s = ImageFile._safe_read(self.fp, length)
         if length < 26:
             if ImageFile.LOAD_TRUNCATED_IMAGES:
@@ -669,7 +718,8 @@ def chunk_fcTL(self, pos, length):
         self.im_info["blend"] = s[25]
         return s
 
-    def chunk_fdAT(self, pos, length):
+    def chunk_fdAT(self, pos: int, length: int) -> bytes:
+        assert self.fp is not None
         if length < 4:
             if ImageFile.LOAD_TRUNCATED_IMAGES:
                 s = ImageFile._safe_read(self.fp, length)
@@ -689,7 +739,7 @@ def chunk_fdAT(self, pos, length):
 # PNG reader
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:8] == _MAGIC
 
 
@@ -701,7 +751,7 @@ class PngImageFile(ImageFile.ImageFile):
     format = "PNG"
     format_description = "Portable network graphics"
 
-    def _open(self):
+    def _open(self) -> None:
         if not _accept(self.fp.read(8)):
             msg = "not a PNG file"
             raise SyntaxError(msg)
@@ -711,8 +761,8 @@ def _open(self):
         #
         # Parse headers up to the first IDAT or fDAT chunk
 
-        self.private_chunks = []
-        self.png = PngStream(self.fp)
+        self.private_chunks: list[tuple[bytes, bytes] | tuple[bytes, bytes, bool]] = []
+        self.png: PngStream | None = PngStream(self.fp)
 
         while True:
             #
@@ -742,7 +792,7 @@ def _open(self):
         self._mode = self.png.im_mode
         self._size = self.png.im_size
         self.info = self.png.im_info
-        self._text = None
+        self._text: dict[str, str | iTXt] | None = None
         self.tile = self.png.im_tile
         self.custom_mimetype = self.png.im_custom_mimetype
         self.n_frames = self.png.im_n_frames or 1
@@ -769,7 +819,7 @@ def _open(self):
         self.is_animated = self.n_frames > 1
 
     @property
-    def text(self):
+    def text(self) -> dict[str, str | iTXt]:
         # experimental
         if self._text is None:
             # iTxt, tEXt and zTXt chunks may appear at the end of the file
@@ -781,9 +831,10 @@ def text(self):
             self.load()
             if self.is_animated:
                 self.seek(frame)
+        assert self._text is not None
         return self._text
 
-    def verify(self):
+    def verify(self) -> None:
         """Verify PNG file"""
 
         if self.fp is None:
@@ -793,6 +844,7 @@ def verify(self):
         # back up to beginning of IDAT block
         self.fp.seek(self.tile[0][2] - 8)
 
+        assert self.png is not None
         self.png.verify()
         self.png.close()
 
@@ -800,7 +852,7 @@ def verify(self):
             self.fp.close()
         self.fp = None
 
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         if not self._seek_check(frame):
             return
         if frame < self.__frame:
@@ -815,15 +867,17 @@ def seek(self, frame):
                 msg = "no more images in APNG file"
                 raise EOFError(msg) from e
 
-    def _seek(self, frame, rewind=False):
+    def _seek(self, frame: int, rewind: bool = False) -> None:
+        assert self.png is not None
+
+        self.dispose: _imaging.ImagingCore | None
+        dispose_extent = None
         if frame == 0:
             if rewind:
                 self._fp.seek(self.__rewind)
                 self.png.rewind()
                 self.__prepare_idat = self.__rewind_idat
-                self.im = None
-                if self.pyaccess:
-                    self.pyaccess = None
+                self._im = None
                 self.info = self.png.im_info
                 self.tile = self.png.im_tile
                 self.fp = self._fp
@@ -832,7 +886,7 @@ def _seek(self, frame, rewind=False):
             self.default_image = self.info.get("default_image", False)
             self.dispose_op = self.info.get("disposal")
             self.blend_op = self.info.get("blend")
-            self.dispose_extent = self.info.get("bbox")
+            dispose_extent = self.info.get("bbox")
             self.__frame = 0
         else:
             if frame != self.__frame + 1:
@@ -890,29 +944,31 @@ def _seek(self, frame, rewind=False):
             self.tile = self.png.im_tile
             self.dispose_op = self.info.get("disposal")
             self.blend_op = self.info.get("blend")
-            self.dispose_extent = self.info.get("bbox")
+            dispose_extent = self.info.get("bbox")
 
             if not self.tile:
                 msg = "image not found in APNG frame"
                 raise EOFError(msg)
+        if dispose_extent:
+            self.dispose_extent: tuple[float, float, float, float] = dispose_extent
 
         # setup frame disposal (actual disposal done when needed in the next _seek())
         if self._prev_im is None and self.dispose_op == Disposal.OP_PREVIOUS:
             self.dispose_op = Disposal.OP_BACKGROUND
 
+        self.dispose = None
         if self.dispose_op == Disposal.OP_PREVIOUS:
-            self.dispose = self._prev_im.copy()
-            self.dispose = self._crop(self.dispose, self.dispose_extent)
+            if self._prev_im:
+                self.dispose = self._prev_im.copy()
+                self.dispose = self._crop(self.dispose, self.dispose_extent)
         elif self.dispose_op == Disposal.OP_BACKGROUND:
             self.dispose = Image.core.fill(self.mode, self.size)
             self.dispose = self._crop(self.dispose, self.dispose_extent)
-        else:
-            self.dispose = None
 
-    def tell(self):
+    def tell(self) -> int:
         return self.__frame
 
-    def load_prepare(self):
+    def load_prepare(self) -> None:
         """internal: prepare to read PNG file"""
 
         if self.info.get("interlace"):
@@ -921,9 +977,10 @@ def load_prepare(self):
         self.__idat = self.__prepare_idat  # used by load_read()
         ImageFile.ImageFile.load_prepare(self)
 
-    def load_read(self, read_bytes):
+    def load_read(self, read_bytes: int) -> bytes:
         """internal: read more image data"""
 
+        assert self.png is not None
         while self.__idat == 0:
             # end of chunk, skip forward to next one
 
@@ -954,8 +1011,9 @@ def load_read(self, read_bytes):
 
         return self.fp.read(read_bytes)
 
-    def load_end(self):
+    def load_end(self) -> None:
         """internal: finished reading image data"""
+        assert self.png is not None
         if self.__idat != 0:
             self.fp.read(self.__idat)
         while True:
@@ -981,7 +1039,13 @@ def load_end(self):
             except EOFError:
                 if cid == b"fdAT":
                     length -= 4
-                ImageFile._safe_read(self.fp, length)
+                try:
+                    ImageFile._safe_read(self.fp, length)
+                except OSError as e:
+                    if ImageFile.LOAD_TRUNCATED_IMAGES:
+                        break
+                    else:
+                        raise e
             except AttributeError:
                 logger.debug("%r %s %s (unknown)", cid, pos, length)
                 s = ImageFile._safe_read(self.fp, length)
@@ -999,99 +1063,104 @@ def load_end(self):
                         "RGBA", self.info["transparency"]
                     )
                 else:
+                    if self.im.mode == "P" and "transparency" in self.info:
+                        t = self.info["transparency"]
+                        if isinstance(t, bytes):
+                            updated.putpalettealphas(t)
+                        elif isinstance(t, int):
+                            updated.putpalettealpha(t)
                     mask = updated.convert("RGBA")
                 self._prev_im.paste(updated, self.dispose_extent, mask)
                 self.im = self._prev_im
-                if self.pyaccess:
-                    self.pyaccess = None
 
-    def _getexif(self):
+    def _getexif(self) -> dict[int, Any] | None:
         if "exif" not in self.info:
             self.load()
         if "exif" not in self.info and "Raw profile type exif" not in self.info:
             return None
         return self.getexif()._get_merged_dict()
 
-    def getexif(self):
+    def getexif(self) -> Image.Exif:
         if "exif" not in self.info:
             self.load()
 
         return super().getexif()
 
-    def getxmp(self):
-        """
-        Returns a dictionary containing the XMP tags.
-        Requires defusedxml to be installed.
-
-        :returns: XMP tags in a dictionary.
-        """
-        return (
-            self._getxmp(self.info["XML:com.adobe.xmp"])
-            if "XML:com.adobe.xmp" in self.info
-            else {}
-        )
-
 
 # --------------------------------------------------------------------
 # PNG writer
 
 _OUTMODES = {
-    # supported PIL modes, and corresponding rawmodes/bits/color combinations
-    "1": ("1", b"\x01\x00"),
-    "L;1": ("L;1", b"\x01\x00"),
-    "L;2": ("L;2", b"\x02\x00"),
-    "L;4": ("L;4", b"\x04\x00"),
-    "L": ("L", b"\x08\x00"),
-    "LA": ("LA", b"\x08\x04"),
-    "I": ("I;16B", b"\x10\x00"),
-    "I;16": ("I;16B", b"\x10\x00"),
-    "I;16B": ("I;16B", b"\x10\x00"),
-    "P;1": ("P;1", b"\x01\x03"),
-    "P;2": ("P;2", b"\x02\x03"),
-    "P;4": ("P;4", b"\x04\x03"),
-    "P": ("P", b"\x08\x03"),
-    "RGB": ("RGB", b"\x08\x02"),
-    "RGBA": ("RGBA", b"\x08\x06"),
+    # supported PIL modes, and corresponding rawmode, bit depth and color type
+    "1": ("1", b"\x01", b"\x00"),
+    "L;1": ("L;1", b"\x01", b"\x00"),
+    "L;2": ("L;2", b"\x02", b"\x00"),
+    "L;4": ("L;4", b"\x04", b"\x00"),
+    "L": ("L", b"\x08", b"\x00"),
+    "LA": ("LA", b"\x08", b"\x04"),
+    "I": ("I;16B", b"\x10", b"\x00"),
+    "I;16": ("I;16B", b"\x10", b"\x00"),
+    "I;16B": ("I;16B", b"\x10", b"\x00"),
+    "P;1": ("P;1", b"\x01", b"\x03"),
+    "P;2": ("P;2", b"\x02", b"\x03"),
+    "P;4": ("P;4", b"\x04", b"\x03"),
+    "P": ("P", b"\x08", b"\x03"),
+    "RGB": ("RGB", b"\x08", b"\x02"),
+    "RGBA": ("RGBA", b"\x08", b"\x06"),
 }
 
 
-def putchunk(fp, cid, *data):
+def putchunk(fp: IO[bytes], cid: bytes, *data: bytes) -> None:
     """Write a PNG chunk (including CRC field)"""
 
-    data = b"".join(data)
+    byte_data = b"".join(data)
 
-    fp.write(o32(len(data)) + cid)
-    fp.write(data)
-    crc = _crc32(data, _crc32(cid))
+    fp.write(o32(len(byte_data)) + cid)
+    fp.write(byte_data)
+    crc = _crc32(byte_data, _crc32(cid))
     fp.write(o32(crc))
 
 
 class _idat:
     # wrap output from the encoder in IDAT chunks
 
-    def __init__(self, fp, chunk):
+    def __init__(self, fp: IO[bytes], chunk: Callable[..., None]) -> None:
         self.fp = fp
         self.chunk = chunk
 
-    def write(self, data):
+    def write(self, data: bytes) -> None:
         self.chunk(self.fp, b"IDAT", data)
 
 
 class _fdat:
     # wrap encoder output in fdAT chunks
 
-    def __init__(self, fp, chunk, seq_num):
+    def __init__(self, fp: IO[bytes], chunk: Callable[..., None], seq_num: int) -> None:
         self.fp = fp
         self.chunk = chunk
         self.seq_num = seq_num
 
-    def write(self, data):
+    def write(self, data: bytes) -> None:
         self.chunk(self.fp, b"fdAT", o32(self.seq_num), data)
         self.seq_num += 1
 
 
-def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images):
-    duration = im.encoderinfo.get("duration", im.info.get("duration", 0))
+class _Frame(NamedTuple):
+    im: Image.Image
+    bbox: tuple[int, int, int, int] | None
+    encoderinfo: dict[str, Any]
+
+
+def _write_multiple_frames(
+    im: Image.Image,
+    fp: IO[bytes],
+    chunk: Callable[..., None],
+    mode: str,
+    rawmode: str,
+    default_image: Image.Image | None,
+    append_images: list[Image.Image],
+) -> Image.Image | None:
+    duration = im.encoderinfo.get("duration")
     loop = im.encoderinfo.get("loop", im.info.get("loop", 0))
     disposal = im.encoderinfo.get("disposal", im.info.get("disposal", Disposal.OP_NONE))
     blend = im.encoderinfo.get("blend", im.info.get("blend", Blend.OP_SOURCE))
@@ -1101,17 +1170,19 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images)
     else:
         chain = itertools.chain([im], append_images)
 
-    im_frames = []
+    im_frames: list[_Frame] = []
     frame_count = 0
     for im_seq in chain:
         for im_frame in ImageSequence.Iterator(im_seq):
-            if im_frame.mode == rawmode:
+            if im_frame.mode == mode:
                 im_frame = im_frame.copy()
             else:
-                im_frame = im_frame.convert(rawmode)
+                im_frame = im_frame.convert(mode)
             encoderinfo = im.encoderinfo.copy()
             if isinstance(duration, (list, tuple)):
                 encoderinfo["duration"] = duration[frame_count]
+            elif duration is None and "duration" in im_frame.info:
+                encoderinfo["duration"] = im_frame.info["duration"]
             if isinstance(disposal, (list, tuple)):
                 encoderinfo["disposal"] = disposal[frame_count]
             if isinstance(blend, (list, tuple)):
@@ -1120,24 +1191,24 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images)
 
             if im_frames:
                 previous = im_frames[-1]
-                prev_disposal = previous["encoderinfo"].get("disposal")
-                prev_blend = previous["encoderinfo"].get("blend")
+                prev_disposal = previous.encoderinfo.get("disposal")
+                prev_blend = previous.encoderinfo.get("blend")
                 if prev_disposal == Disposal.OP_PREVIOUS and len(im_frames) < 2:
                     prev_disposal = Disposal.OP_BACKGROUND
 
                 if prev_disposal == Disposal.OP_BACKGROUND:
-                    base_im = previous["im"].copy()
+                    base_im = previous.im.copy()
                     dispose = Image.core.fill("RGBA", im.size, (0, 0, 0, 0))
-                    bbox = previous["bbox"]
+                    bbox = previous.bbox
                     if bbox:
                         dispose = dispose.crop(bbox)
                     else:
                         bbox = (0, 0) + im.size
                     base_im.paste(dispose, bbox)
                 elif prev_disposal == Disposal.OP_PREVIOUS:
-                    base_im = im_frames[-2]["im"]
+                    base_im = im_frames[-2].im
                 else:
-                    base_im = previous["im"]
+                    base_im = previous.im
                 delta = ImageChops.subtract_modulo(
                     im_frame.convert("RGBA"), base_im.convert("RGBA")
                 )
@@ -1146,19 +1217,16 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images)
                     not bbox
                     and prev_disposal == encoderinfo.get("disposal")
                     and prev_blend == encoderinfo.get("blend")
+                    and "duration" in encoderinfo
                 ):
-                    previous["encoderinfo"]["duration"] += encoderinfo.get(
-                        "duration", duration
-                    )
+                    previous.encoderinfo["duration"] += encoderinfo["duration"]
                     continue
             else:
                 bbox = None
-            if "duration" not in encoderinfo:
-                encoderinfo["duration"] = duration
-            im_frames.append({"im": im_frame, "bbox": bbox, "encoderinfo": encoderinfo})
+            im_frames.append(_Frame(im_frame, bbox, encoderinfo))
 
     if len(im_frames) == 1 and not default_image:
-        return im_frames[0]["im"]
+        return im_frames[0].im
 
     # animation control
     chunk(
@@ -1170,21 +1238,25 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images)
 
     # default image IDAT (if it exists)
     if default_image:
-        if im.mode != rawmode:
-            im = im.convert(rawmode)
-        ImageFile._save(im, _idat(fp, chunk), [("zip", (0, 0) + im.size, 0, rawmode)])
+        if im.mode != mode:
+            im = im.convert(mode)
+        ImageFile._save(
+            im,
+            cast(IO[bytes], _idat(fp, chunk)),
+            [ImageFile._Tile("zip", (0, 0) + im.size, 0, rawmode)],
+        )
 
     seq_num = 0
     for frame, frame_data in enumerate(im_frames):
-        im_frame = frame_data["im"]
-        if not frame_data["bbox"]:
+        im_frame = frame_data.im
+        if not frame_data.bbox:
             bbox = (0, 0) + im_frame.size
         else:
-            bbox = frame_data["bbox"]
+            bbox = frame_data.bbox
             im_frame = im_frame.crop(bbox)
         size = im_frame.size
-        encoderinfo = frame_data["encoderinfo"]
-        frame_duration = int(round(encoderinfo["duration"]))
+        encoderinfo = frame_data.encoderinfo
+        frame_duration = int(round(encoderinfo.get("duration", 0)))
         frame_disposal = encoderinfo.get("disposal", disposal)
         frame_blend = encoderinfo.get("blend", blend)
         # frame control
@@ -1207,24 +1279,31 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images)
             # first frame must be in IDAT chunks for backwards compatibility
             ImageFile._save(
                 im_frame,
-                _idat(fp, chunk),
-                [("zip", (0, 0) + im_frame.size, 0, rawmode)],
+                cast(IO[bytes], _idat(fp, chunk)),
+                [ImageFile._Tile("zip", (0, 0) + im_frame.size, 0, rawmode)],
             )
         else:
             fdat_chunks = _fdat(fp, chunk, seq_num)
             ImageFile._save(
                 im_frame,
-                fdat_chunks,
-                [("zip", (0, 0) + im_frame.size, 0, rawmode)],
+                cast(IO[bytes], fdat_chunks),
+                [ImageFile._Tile("zip", (0, 0) + im_frame.size, 0, rawmode)],
             )
             seq_num = fdat_chunks.seq_num
+    return None
 
 
-def _save_all(im, fp, filename):
+def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     _save(im, fp, filename, save_all=True)
 
 
-def _save(im, fp, filename, chunk=putchunk, save_all=False):
+def _save(
+    im: Image.Image,
+    fp: IO[bytes],
+    filename: str | bytes,
+    chunk: Callable[..., None] = putchunk,
+    save_all: bool = False,
+) -> None:
     # save an image to disk (called by the save method)
 
     if save_all:
@@ -1232,18 +1311,23 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
             "default_image", im.info.get("default_image")
         )
         modes = set()
+        sizes = set()
         append_images = im.encoderinfo.get("append_images", [])
         for im_seq in itertools.chain([im], append_images):
             for im_frame in ImageSequence.Iterator(im_seq):
                 modes.add(im_frame.mode)
+                sizes.add(im_frame.size)
         for mode in ("RGBA", "RGB", "P"):
             if mode in modes:
                 break
         else:
             mode = modes.pop()
+        size = tuple(max(frame_size[i] for frame_size in sizes) for i in range(2))
     else:
+        size = im.size
         mode = im.mode
 
+    outmode = mode
     if mode == "P":
         #
         # attempt to minimize storage requirements for palette images
@@ -1264,7 +1348,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
                 bits = 2
             else:
                 bits = 4
-            mode = f"{mode};{bits}"
+            outmode += f";{bits}"
 
     # encoder options
     im.encoderconfig = (
@@ -1276,7 +1360,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
 
     # get the corresponding PNG mode
     try:
-        rawmode, mode = _OUTMODES[mode]
+        rawmode, bit_depth, color_type = _OUTMODES[outmode]
     except KeyError as e:
         msg = f"cannot write mode {mode} as PNG"
         raise OSError(msg) from e
@@ -1289,9 +1373,10 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
     chunk(
         fp,
         b"IHDR",
-        o32(im.size[0]),  # 0: size
-        o32(im.size[1]),
-        mode,  # 8: depth/type
+        o32(size[0]),  # 0: size
+        o32(size[1]),
+        bit_depth,
+        color_type,
         b"\0",  # 10: compression
         b"\0",  # 11: filter category
         b"\0",  # 12: interlace flag
@@ -1327,7 +1412,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
                 chunk(fp, cid, data)
             elif cid[1:2].islower():
                 # Private chunk
-                after_idat = info_chunk[2:3]
+                after_idat = len(info_chunk) == 3 and info_chunk[2]
                 if not after_idat:
                     chunk(fp, cid, data)
 
@@ -1350,7 +1435,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
                 transparency = max(0, min(255, transparency))
                 alpha = b"\xFF" * transparency + b"\0"
                 chunk(fp, b"tRNS", alpha[:alpha_bytes])
-        elif im.mode in ("1", "L", "I"):
+        elif im.mode in ("1", "L", "I", "I;16"):
             transparency = max(0, min(65535, transparency))
             chunk(fp, b"tRNS", o16(transparency))
         elif im.mode == "RGB":
@@ -1394,19 +1479,24 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
             exif = exif[6:]
         chunk(fp, b"eXIf", exif)
 
+    single_im: Image.Image | None = im
     if save_all:
-        im = _write_multiple_frames(
-            im, fp, chunk, rawmode, default_image, append_images
+        single_im = _write_multiple_frames(
+            im, fp, chunk, mode, rawmode, default_image, append_images
+        )
+    if single_im:
+        ImageFile._save(
+            single_im,
+            cast(IO[bytes], _idat(fp, chunk)),
+            [ImageFile._Tile("zip", (0, 0) + single_im.size, 0, rawmode)],
         )
-    if im:
-        ImageFile._save(im, _idat(fp, chunk), [("zip", (0, 0) + im.size, 0, rawmode)])
 
     if info:
         for info_chunk in info.chunks:
             cid, data = info_chunk[:2]
             if cid[1:2].islower():
                 # Private chunk
-                after_idat = info_chunk[2:3]
+                after_idat = len(info_chunk) == 3 and info_chunk[2]
                 if after_idat:
                     chunk(fp, cid, data)
 
@@ -1420,32 +1510,26 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
 # PNG chunk converter
 
 
-def getchunks(im, **params):
+def getchunks(im: Image.Image, **params: Any) -> list[tuple[bytes, bytes, bytes]]:
     """Return a list of PNG chunks representing this image."""
+    from io import BytesIO
 
-    class collector:
-        data = []
-
-        def write(self, data):
-            pass
-
-        def append(self, chunk):
-            self.data.append(chunk)
+    chunks = []
 
-    def append(fp, cid, *data):
-        data = b"".join(data)
-        crc = o32(_crc32(data, _crc32(cid)))
-        fp.append((cid, data, crc))
+    def append(fp: IO[bytes], cid: bytes, *data: bytes) -> None:
+        byte_data = b"".join(data)
+        crc = o32(_crc32(byte_data, _crc32(cid)))
+        chunks.append((cid, byte_data, crc))
 
-    fp = collector()
+    fp = BytesIO()
 
     try:
         im.encoderinfo = params
-        _save(im, fp, None, append)
+        _save(im, fp, "", append)
     finally:
         del im.encoderinfo
 
-    return fp.data
+    return chunks
 
 
 # --------------------------------------------------------------------
diff --git a/src/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py
index 25dbfa5b0bc..4e779df177e 100644
--- a/src/PIL/PpmImagePlugin.py
+++ b/src/PIL/PpmImagePlugin.py
@@ -15,6 +15,9 @@
 #
 from __future__ import annotations
 
+import math
+from typing import IO
+
 from . import Image, ImageFile
 from ._binary import i16be as i16
 from ._binary import o8
@@ -35,6 +38,7 @@
     b"P6": "RGB",
     # extensions
     b"P0CMYK": "CMYK",
+    b"Pf": "F",
     # PIL extensions (for test purposes only)
     b"PyP": "P",
     b"PyRGBA": "RGBA",
@@ -42,8 +46,8 @@
 }
 
 
-def _accept(prefix):
-    return prefix[0:1] == b"P" and prefix[1] in b"0123456y"
+def _accept(prefix: bytes) -> bool:
+    return prefix[0:1] == b"P" and prefix[1] in b"0123456fy"
 
 
 ##
@@ -54,7 +58,9 @@ class PpmImageFile(ImageFile.ImageFile):
     format = "PPM"
     format_description = "Pbmplus image"
 
-    def _read_magic(self):
+    def _read_magic(self) -> bytes:
+        assert self.fp is not None
+
         magic = b""
         # read until whitespace or longest available magic number
         for _ in range(6):
@@ -64,7 +70,9 @@ def _read_magic(self):
             magic += c
         return magic
 
-    def _read_token(self):
+    def _read_token(self) -> bytes:
+        assert self.fp is not None
+
         token = b""
         while len(token) <= 10:  # read until next whitespace or limit of 10 characters
             c = self.fp.read(1)
@@ -90,13 +98,16 @@ def _read_token(self):
             raise ValueError(msg)
         return token
 
-    def _open(self):
+    def _open(self) -> None:
+        assert self.fp is not None
+
         magic_number = self._read_magic()
         try:
             mode = MODES[magic_number]
         except KeyError:
             msg = "not a PPM file"
             raise SyntaxError(msg)
+        self._mode = mode
 
         if magic_number in (b"P1", b"P4"):
             self.custom_mimetype = "image/x-portable-bitmap"
@@ -105,40 +116,44 @@ def _open(self):
         elif magic_number in (b"P3", b"P6"):
             self.custom_mimetype = "image/x-portable-pixmap"
 
-        maxval = None
+        self._size = int(self._read_token()), int(self._read_token())
+
         decoder_name = "raw"
         if magic_number in (b"P1", b"P2", b"P3"):
             decoder_name = "ppm_plain"
-        for ix in range(3):
-            token = int(self._read_token())
-            if ix == 0:  # token is the x size
-                xsize = token
-            elif ix == 1:  # token is the y size
-                ysize = token
-                if mode == "1":
-                    self._mode = "1"
-                    rawmode = "1;I"
-                    break
-                else:
-                    self._mode = rawmode = mode
-            elif ix == 2:  # token is maxval
-                maxval = token
-                if not 0 < maxval < 65536:
-                    msg = "maxval must be greater than 0 and less than 65536"
-                    raise ValueError(msg)
-                if maxval > 255 and mode == "L":
-                    self._mode = "I"
-
-                if decoder_name != "ppm_plain":
-                    # If maxval matches a bit depth, use the raw decoder directly
-                    if maxval == 65535 and mode == "L":
-                        rawmode = "I;16B"
-                    elif maxval != 255:
-                        decoder_name = "ppm"
 
-        args = (rawmode, 0, 1) if decoder_name == "raw" else (rawmode, maxval)
-        self._size = xsize, ysize
-        self.tile = [(decoder_name, (0, 0, xsize, ysize), self.fp.tell(), args)]
+        args: str | tuple[str | int, ...]
+        if mode == "1":
+            args = "1;I"
+        elif mode == "F":
+            scale = float(self._read_token())
+            if scale == 0.0 or not math.isfinite(scale):
+                msg = "scale must be finite and non-zero"
+                raise ValueError(msg)
+            self.info["scale"] = abs(scale)
+
+            rawmode = "F;32F" if scale < 0 else "F;32BF"
+            args = (rawmode, 0, -1)
+        else:
+            maxval = int(self._read_token())
+            if not 0 < maxval < 65536:
+                msg = "maxval must be greater than 0 and less than 65536"
+                raise ValueError(msg)
+            if maxval > 255 and mode == "L":
+                self._mode = "I"
+
+            rawmode = mode
+            if decoder_name != "ppm_plain":
+                # If maxval matches a bit depth, use the raw decoder directly
+                if maxval == 65535 and mode == "L":
+                    rawmode = "I;16B"
+                elif maxval != 255:
+                    decoder_name = "ppm"
+
+            args = rawmode if decoder_name == "raw" else (rawmode, maxval)
+        self.tile = [
+            ImageFile._Tile(decoder_name, (0, 0) + self.size, self.fp.tell(), args)
+        ]
 
 
 #
@@ -147,16 +162,19 @@ def _open(self):
 
 class PpmPlainDecoder(ImageFile.PyDecoder):
     _pulls_fd = True
+    _comment_spans: bool
+
+    def _read_block(self) -> bytes:
+        assert self.fd is not None
 
-    def _read_block(self):
         return self.fd.read(ImageFile.SAFEBLOCK)
 
-    def _find_comment_end(self, block, start=0):
+    def _find_comment_end(self, block: bytes, start: int = 0) -> int:
         a = block.find(b"\n", start)
         b = block.find(b"\r", start)
         return min(a, b) if a * b > 0 else max(a, b)  # lowest nonnegative index (or -1)
 
-    def _ignore_comments(self, block):
+    def _ignore_comments(self, block: bytes) -> bytes:
         if self._comment_spans:
             # Finish current comment
             while block:
@@ -190,7 +208,7 @@ def _ignore_comments(self, block):
                 break
         return block
 
-    def _decode_bitonal(self):
+    def _decode_bitonal(self) -> bytearray:
         """
         This is a separate method because in the plain PBM format, all data tokens are
         exactly one byte, so the inter-token whitespace is optional.
@@ -215,7 +233,7 @@ def _decode_bitonal(self):
         invert = bytes.maketrans(b"01", b"\xFF\x00")
         return data.translate(invert)
 
-    def _decode_blocks(self, maxval):
+    def _decode_blocks(self, maxval: int) -> bytearray:
         data = bytearray()
         max_len = 10
         out_byte_count = 4 if self.mode == "I" else 1
@@ -223,7 +241,7 @@ def _decode_blocks(self, maxval):
         bands = Image.getmodebands(self.mode)
         total_bytes = self.state.xsize * self.state.ysize * bands * out_byte_count
 
-        half_token = False
+        half_token = b""
         while len(data) != total_bytes:
             block = self._read_block()  # read next block
             if not block:
@@ -237,7 +255,7 @@ def _decode_blocks(self, maxval):
 
             if half_token:
                 block = half_token + block  # stitch half_token to new block
-                half_token = False
+                half_token = b""
 
             tokens = block.split()
 
@@ -254,16 +272,19 @@ def _decode_blocks(self, maxval):
                     msg = b"Token too long found in data: %s" % token[: max_len + 1]
                     raise ValueError(msg)
                 value = int(token)
+                if value < 0:
+                    msg_str = f"Channel value is negative: {value}"
+                    raise ValueError(msg_str)
                 if value > maxval:
-                    msg = f"Channel value too large for this mode: {value}"
-                    raise ValueError(msg)
+                    msg_str = f"Channel value too large for this mode: {value}"
+                    raise ValueError(msg_str)
                 value = round(value / maxval * out_max)
                 data += o32(value) if self.mode == "I" else o8(value)
                 if len(data) == total_bytes:  # finished!
                     break
         return data
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
         self._comment_spans = False
         if self.mode == "1":
             data = self._decode_bitonal()
@@ -279,14 +300,17 @@ def decode(self, buffer):
 class PpmDecoder(ImageFile.PyDecoder):
     _pulls_fd = True
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
+
         data = bytearray()
         maxval = self.args[-1]
         in_byte_count = 1 if maxval < 256 else 2
         out_byte_count = 4 if self.mode == "I" else 1
         out_max = 65535 if self.mode == "I" else 255
         bands = Image.getmodebands(self.mode)
-        while len(data) < self.state.xsize * self.state.ysize * bands * out_byte_count:
+        dest_length = self.state.xsize * self.state.ysize * bands * out_byte_count
+        while len(data) < dest_length:
             pixels = self.fd.read(in_byte_count * bands)
             if len(pixels) < in_byte_count * bands:
                 # eof
@@ -306,15 +330,17 @@ def decode(self, buffer):
 # --------------------------------------------------------------------
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.mode == "1":
         rawmode, head = "1;I", b"P4"
     elif im.mode == "L":
         rawmode, head = "L", b"P5"
-    elif im.mode == "I":
+    elif im.mode in ("I", "I;16"):
         rawmode, head = "I;16B", b"P5"
     elif im.mode in ("RGB", "RGBA"):
         rawmode, head = "RGB", b"P6"
+    elif im.mode == "F":
+        rawmode, head = "F;32F", b"Pf"
     else:
         msg = f"cannot write mode {im.mode} as PPM"
         raise OSError(msg)
@@ -326,7 +352,12 @@ def _save(im, fp, filename):
             fp.write(b"255\n")
         else:
             fp.write(b"65535\n")
-    ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))])
+    elif head == b"Pf":
+        fp.write(b"-1.0\n")
+    row_order = -1 if im.mode == "F" else 1
+    ImageFile._save(
+        im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, row_order))]
+    )
 
 
 #
@@ -339,6 +370,6 @@ def _save(im, fp, filename):
 Image.register_decoder("ppm", PpmDecoder)
 Image.register_decoder("ppm_plain", PpmPlainDecoder)
 
-Image.register_extensions(PpmImageFile.format, [".pbm", ".pgm", ".ppm", ".pnm"])
+Image.register_extensions(PpmImageFile.format, [".pbm", ".pgm", ".ppm", ".pnm", ".pfm"])
 
 Image.register_mime(PpmImageFile.format, "image/x-portable-anymap")
diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py
index 5cff564137d..8ff5e39088a 100644
--- a/src/PIL/PsdImagePlugin.py
+++ b/src/PIL/PsdImagePlugin.py
@@ -18,12 +18,15 @@
 from __future__ import annotations
 
 import io
+from functools import cached_property
+from typing import IO
 
 from . import Image, ImageFile, ImagePalette
 from ._binary import i8
 from ._binary import i16be as i16
 from ._binary import i32be as i32
 from ._binary import si16be as si16
+from ._binary import si32be as si32
 
 MODES = {
     # (photoshop mode, bits) -> (pil mode, required channels)
@@ -43,7 +46,7 @@
 # read PSD images
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"8BPS"
 
 
@@ -56,7 +59,7 @@ class PsdImageFile(ImageFile.ImageFile):
     format_description = "Adobe Photoshop"
     _close_exclusive_fp_after_loading = False
 
-    def _open(self):
+    def _open(self) -> None:
         read = self.fp.read
 
         #
@@ -117,18 +120,17 @@ def _open(self):
         #
         # layer and mask information
 
-        self.layers = []
+        self._layers_position = None
 
         size = i32(read(4))
         if size:
             end = self.fp.tell() + size
             size = i32(read(4))
             if size:
-                _layer_data = io.BytesIO(ImageFile._safe_read(self.fp, size))
-                self.layers = _layerinfo(_layer_data, size)
+                self._layers_position = self.fp.tell()
+                self._layers_size = size
             self.fp.seek(end)
-        self.n_frames = len(self.layers)
-        self.is_animated = self.n_frames > 1
+        self._n_frames: int | None = None
 
         #
         # image descriptor
@@ -140,32 +142,55 @@ def _open(self):
         self.frame = 1
         self._min_frame = 1
 
-    def seek(self, layer):
+    @cached_property
+    def layers(
+        self,
+    ) -> list[tuple[str, str, tuple[int, int, int, int], list[ImageFile._Tile]]]:
+        layers = []
+        if self._layers_position is not None:
+            self._fp.seek(self._layers_position)
+            _layer_data = io.BytesIO(ImageFile._safe_read(self._fp, self._layers_size))
+            layers = _layerinfo(_layer_data, self._layers_size)
+        self._n_frames = len(layers)
+        return layers
+
+    @property
+    def n_frames(self) -> int:
+        if self._n_frames is None:
+            self._n_frames = len(self.layers)
+        return self._n_frames
+
+    @property
+    def is_animated(self) -> bool:
+        return len(self.layers) > 1
+
+    def seek(self, layer: int) -> None:
         if not self._seek_check(layer):
             return
 
         # seek to given layer (1..max)
         try:
-            name, mode, bbox, tile = self.layers[layer - 1]
+            _, mode, _, tile = self.layers[layer - 1]
             self._mode = mode
             self.tile = tile
             self.frame = layer
             self.fp = self._fp
-            return name, bbox
         except IndexError as e:
             msg = "no such layer"
             raise EOFError(msg) from e
 
-    def tell(self):
+    def tell(self) -> int:
         # return layer number (0=image, 1..max=layers)
         return self.frame
 
 
-def _layerinfo(fp, ct_bytes):
+def _layerinfo(
+    fp: IO[bytes], ct_bytes: int
+) -> list[tuple[str, str, tuple[int, int, int, int], list[ImageFile._Tile]]]:
     # read layerinfo block
     layers = []
 
-    def read(size):
+    def read(size: int) -> bytes:
         return ImageFile._safe_read(fp, size)
 
     ct = si16(read(2))
@@ -177,42 +202,41 @@ def read(size):
 
     for _ in range(abs(ct)):
         # bounding box
-        y0 = i32(read(4))
-        x0 = i32(read(4))
-        y1 = i32(read(4))
-        x1 = i32(read(4))
+        y0 = si32(read(4))
+        x0 = si32(read(4))
+        y1 = si32(read(4))
+        x1 = si32(read(4))
 
         # image info
-        mode = []
+        bands = []
         ct_types = i16(read(2))
-        types = list(range(ct_types))
-        if len(types) > 4:
-            fp.seek(len(types) * 6 + 12, io.SEEK_CUR)
+        if ct_types > 4:
+            fp.seek(ct_types * 6 + 12, io.SEEK_CUR)
             size = i32(read(4))
             fp.seek(size, io.SEEK_CUR)
             continue
 
-        for _ in types:
+        for _ in range(ct_types):
             type = i16(read(2))
 
             if type == 65535:
-                m = "A"
+                b = "A"
             else:
-                m = "RGBA"[type]
+                b = "RGBA"[type]
 
-            mode.append(m)
+            bands.append(b)
             read(4)  # size
 
         # figure out the image mode
-        mode.sort()
-        if mode == ["R"]:
+        bands.sort()
+        if bands == ["R"]:
             mode = "L"
-        elif mode == ["B", "G", "R"]:
+        elif bands == ["B", "G", "R"]:
             mode = "RGB"
-        elif mode == ["A", "B", "G", "R"]:
+        elif bands == ["A", "B", "G", "R"]:
             mode = "RGBA"
         else:
-            mode = None  # unknown
+            mode = ""  # unknown
 
         # skip over blend flags and extra information
         read(12)  # filler
@@ -239,19 +263,22 @@ def read(size):
         layers.append((name, mode, (x0, y0, x1, y1)))
 
     # get tiles
+    layerinfo = []
     for i, (name, mode, bbox) in enumerate(layers):
         tile = []
         for m in mode:
             t = _maketile(fp, m, bbox, 1)
             if t:
                 tile.extend(t)
-        layers[i] = name, mode, bbox, tile
+        layerinfo.append((name, mode, bbox, tile))
 
-    return layers
+    return layerinfo
 
 
-def _maketile(file, mode, bbox, channels):
-    tile = None
+def _maketile(
+    file: IO[bytes], mode: str, bbox: tuple[int, int, int, int], channels: int
+) -> list[ImageFile._Tile]:
+    tiles = []
     read = file.read
 
     compression = i16(read(2))
@@ -264,26 +291,24 @@ def _maketile(file, mode, bbox, channels):
     if compression == 0:
         #
         # raw compression
-        tile = []
         for channel in range(channels):
             layer = mode[channel]
             if mode == "CMYK":
                 layer += ";I"
-            tile.append(("raw", bbox, offset, layer))
+            tiles.append(ImageFile._Tile("raw", bbox, offset, layer))
             offset = offset + xsize * ysize
 
     elif compression == 1:
         #
         # packbits compression
         i = 0
-        tile = []
         bytecount = read(channels * ysize * 2)
         offset = file.tell()
         for channel in range(channels):
             layer = mode[channel]
             if mode == "CMYK":
                 layer += ";I"
-            tile.append(("packbits", bbox, offset, layer))
+            tiles.append(ImageFile._Tile("packbits", bbox, offset, layer))
             for y in range(ysize):
                 offset = offset + i16(bytecount, i)
                 i += 2
@@ -293,7 +318,7 @@ def _maketile(file, mode, bbox, channels):
     if offset & 1:
         read(1)  # padding
 
-    return tile
+    return tiles
 
 
 # --------------------------------------------------------------------
diff --git a/src/PIL/PyAccess.py b/src/PIL/PyAccess.py
deleted file mode 100644
index 07bb712d83e..00000000000
--- a/src/PIL/PyAccess.py
+++ /dev/null
@@ -1,364 +0,0 @@
-#
-# The Python Imaging Library
-# Pillow fork
-#
-# Python implementation of the PixelAccess Object
-#
-# Copyright (c) 1997-2009 by Secret Labs AB.  All rights reserved.
-# Copyright (c) 1995-2009 by Fredrik Lundh.
-# Copyright (c) 2013 Eric Soroos
-#
-# See the README file for information on usage and redistribution
-#
-
-# Notes:
-#
-#  * Implements the pixel access object following Access.c
-#  * Taking only the tuple form, which is used from python.
-#    * Fill.c uses the integer form, but it's still going to use the old
-#      Access.c implementation.
-#
-from __future__ import annotations
-
-import logging
-import sys
-
-from ._deprecate import deprecate
-
-try:
-    from cffi import FFI
-
-    defs = """
-    struct Pixel_RGBA {
-        unsigned char r,g,b,a;
-    };
-    struct Pixel_I16 {
-        unsigned char l,r;
-    };
-    """
-    ffi = FFI()
-    ffi.cdef(defs)
-except ImportError as ex:
-    # Allow error import for doc purposes, but error out when accessing
-    # anything in core.
-    from ._util import DeferredError
-
-    FFI = ffi = DeferredError.new(ex)
-
-logger = logging.getLogger(__name__)
-
-
-class PyAccess:
-    def __init__(self, img, readonly=False):
-        deprecate("PyAccess", 11)
-        vals = dict(img.im.unsafe_ptrs)
-        self.readonly = readonly
-        self.image8 = ffi.cast("unsigned char **", vals["image8"])
-        self.image32 = ffi.cast("int **", vals["image32"])
-        self.image = ffi.cast("unsigned char **", vals["image"])
-        self.xsize, self.ysize = img.im.size
-        self._img = img
-
-        # Keep pointer to im object to prevent dereferencing.
-        self._im = img.im
-        if self._im.mode in ("P", "PA"):
-            self._palette = img.palette
-
-        # Debugging is polluting test traces, only useful here
-        # when hacking on PyAccess
-        # logger.debug("%s", vals)
-        self._post_init()
-
-    def _post_init(self):
-        pass
-
-    def __setitem__(self, xy, color):
-        """
-        Modifies the pixel at x,y. The color is given as a single
-        numerical value for single band images, and a tuple for
-        multi-band images
-
-        :param xy: The pixel coordinate, given as (x, y). See
-           :ref:`coordinate-system`.
-        :param color: The pixel value.
-        """
-        if self.readonly:
-            msg = "Attempt to putpixel a read only image"
-            raise ValueError(msg)
-        (x, y) = xy
-        if x < 0:
-            x = self.xsize + x
-        if y < 0:
-            y = self.ysize + y
-        (x, y) = self.check_xy((x, y))
-
-        if (
-            self._im.mode in ("P", "PA")
-            and isinstance(color, (list, tuple))
-            and len(color) in [3, 4]
-        ):
-            # RGB or RGBA value for a P or PA image
-            if self._im.mode == "PA":
-                alpha = color[3] if len(color) == 4 else 255
-                color = color[:3]
-            color = self._palette.getcolor(color, self._img)
-            if self._im.mode == "PA":
-                color = (color, alpha)
-
-        return self.set_pixel(x, y, color)
-
-    def __getitem__(self, xy):
-        """
-        Returns the pixel at x,y. The pixel is returned as a single
-        value for single band images or a tuple for multiple band
-        images
-
-        :param xy: The pixel coordinate, given as (x, y). See
-          :ref:`coordinate-system`.
-        :returns: a pixel value for single band images, a tuple of
-          pixel values for multiband images.
-        """
-        (x, y) = xy
-        if x < 0:
-            x = self.xsize + x
-        if y < 0:
-            y = self.ysize + y
-        (x, y) = self.check_xy((x, y))
-        return self.get_pixel(x, y)
-
-    putpixel = __setitem__
-    getpixel = __getitem__
-
-    def check_xy(self, xy):
-        (x, y) = xy
-        if not (0 <= x < self.xsize and 0 <= y < self.ysize):
-            msg = "pixel location out of range"
-            raise ValueError(msg)
-        return xy
-
-
-class _PyAccess32_2(PyAccess):
-    """PA, LA, stored in first and last bytes of a 32 bit word"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32)
-
-    def get_pixel(self, x, y):
-        pixel = self.pixels[y][x]
-        return pixel.r, pixel.a
-
-    def set_pixel(self, x, y, color):
-        pixel = self.pixels[y][x]
-        # tuple
-        pixel.r = min(color[0], 255)
-        pixel.a = min(color[1], 255)
-
-
-class _PyAccess32_3(PyAccess):
-    """RGB and friends, stored in the first three bytes of a 32 bit word"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32)
-
-    def get_pixel(self, x, y):
-        pixel = self.pixels[y][x]
-        return pixel.r, pixel.g, pixel.b
-
-    def set_pixel(self, x, y, color):
-        pixel = self.pixels[y][x]
-        # tuple
-        pixel.r = min(color[0], 255)
-        pixel.g = min(color[1], 255)
-        pixel.b = min(color[2], 255)
-        pixel.a = 255
-
-
-class _PyAccess32_4(PyAccess):
-    """RGBA etc, all 4 bytes of a 32 bit word"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32)
-
-    def get_pixel(self, x, y):
-        pixel = self.pixels[y][x]
-        return pixel.r, pixel.g, pixel.b, pixel.a
-
-    def set_pixel(self, x, y, color):
-        pixel = self.pixels[y][x]
-        # tuple
-        pixel.r = min(color[0], 255)
-        pixel.g = min(color[1], 255)
-        pixel.b = min(color[2], 255)
-        pixel.a = min(color[3], 255)
-
-
-class _PyAccess8(PyAccess):
-    """1, L, P, 8 bit images stored as uint8"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = self.image8
-
-    def get_pixel(self, x, y):
-        return self.pixels[y][x]
-
-    def set_pixel(self, x, y, color):
-        try:
-            # integer
-            self.pixels[y][x] = min(color, 255)
-        except TypeError:
-            # tuple
-            self.pixels[y][x] = min(color[0], 255)
-
-
-class _PyAccessI16_N(PyAccess):
-    """I;16 access, native bitendian without conversion"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = ffi.cast("unsigned short **", self.image)
-
-    def get_pixel(self, x, y):
-        return self.pixels[y][x]
-
-    def set_pixel(self, x, y, color):
-        try:
-            # integer
-            self.pixels[y][x] = min(color, 65535)
-        except TypeError:
-            # tuple
-            self.pixels[y][x] = min(color[0], 65535)
-
-
-class _PyAccessI16_L(PyAccess):
-    """I;16L access, with conversion"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = ffi.cast("struct Pixel_I16 **", self.image)
-
-    def get_pixel(self, x, y):
-        pixel = self.pixels[y][x]
-        return pixel.l + pixel.r * 256
-
-    def set_pixel(self, x, y, color):
-        pixel = self.pixels[y][x]
-        try:
-            color = min(color, 65535)
-        except TypeError:
-            color = min(color[0], 65535)
-
-        pixel.l = color & 0xFF
-        pixel.r = color >> 8
-
-
-class _PyAccessI16_B(PyAccess):
-    """I;16B access, with conversion"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = ffi.cast("struct Pixel_I16 **", self.image)
-
-    def get_pixel(self, x, y):
-        pixel = self.pixels[y][x]
-        return pixel.l * 256 + pixel.r
-
-    def set_pixel(self, x, y, color):
-        pixel = self.pixels[y][x]
-        try:
-            color = min(color, 65535)
-        except Exception:
-            color = min(color[0], 65535)
-
-        pixel.l = color >> 8
-        pixel.r = color & 0xFF
-
-
-class _PyAccessI32_N(PyAccess):
-    """Signed Int32 access, native endian"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = self.image32
-
-    def get_pixel(self, x, y):
-        return self.pixels[y][x]
-
-    def set_pixel(self, x, y, color):
-        self.pixels[y][x] = color
-
-
-class _PyAccessI32_Swap(PyAccess):
-    """I;32L/B access, with byteswapping conversion"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = self.image32
-
-    def reverse(self, i):
-        orig = ffi.new("int *", i)
-        chars = ffi.cast("unsigned char *", orig)
-        chars[0], chars[1], chars[2], chars[3] = chars[3], chars[2], chars[1], chars[0]
-        return ffi.cast("int *", chars)[0]
-
-    def get_pixel(self, x, y):
-        return self.reverse(self.pixels[y][x])
-
-    def set_pixel(self, x, y, color):
-        self.pixels[y][x] = self.reverse(color)
-
-
-class _PyAccessF(PyAccess):
-    """32 bit float access"""
-
-    def _post_init(self, *args, **kwargs):
-        self.pixels = ffi.cast("float **", self.image32)
-
-    def get_pixel(self, x, y):
-        return self.pixels[y][x]
-
-    def set_pixel(self, x, y, color):
-        try:
-            # not a tuple
-            self.pixels[y][x] = color
-        except TypeError:
-            # tuple
-            self.pixels[y][x] = color[0]
-
-
-mode_map = {
-    "1": _PyAccess8,
-    "L": _PyAccess8,
-    "P": _PyAccess8,
-    "I;16N": _PyAccessI16_N,
-    "LA": _PyAccess32_2,
-    "La": _PyAccess32_2,
-    "PA": _PyAccess32_2,
-    "RGB": _PyAccess32_3,
-    "LAB": _PyAccess32_3,
-    "HSV": _PyAccess32_3,
-    "YCbCr": _PyAccess32_3,
-    "RGBA": _PyAccess32_4,
-    "RGBa": _PyAccess32_4,
-    "RGBX": _PyAccess32_4,
-    "CMYK": _PyAccess32_4,
-    "F": _PyAccessF,
-    "I": _PyAccessI32_N,
-}
-
-if sys.byteorder == "little":
-    mode_map["I;16"] = _PyAccessI16_N
-    mode_map["I;16L"] = _PyAccessI16_N
-    mode_map["I;16B"] = _PyAccessI16_B
-
-    mode_map["I;32L"] = _PyAccessI32_N
-    mode_map["I;32B"] = _PyAccessI32_Swap
-else:
-    mode_map["I;16"] = _PyAccessI16_L
-    mode_map["I;16L"] = _PyAccessI16_L
-    mode_map["I;16B"] = _PyAccessI16_N
-
-    mode_map["I;32L"] = _PyAccessI32_Swap
-    mode_map["I;32B"] = _PyAccessI32_N
-
-
-def new(img, readonly=False):
-    access_type = mode_map.get(img.mode, None)
-    if not access_type:
-        logger.debug("PyAccess Not Implemented: %s", img.mode)
-        return None
-    return access_type(img, readonly)
diff --git a/src/PIL/QoiImagePlugin.py b/src/PIL/QoiImagePlugin.py
index a7b9d4a9e3a..010d3f941e1 100644
--- a/src/PIL/QoiImagePlugin.py
+++ b/src/PIL/QoiImagePlugin.py
@@ -11,10 +11,9 @@
 
 from . import Image, ImageFile
 from ._binary import i32be as i32
-from ._binary import o8
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"qoif"
 
 
@@ -22,82 +21,92 @@ class QoiImageFile(ImageFile.ImageFile):
     format = "QOI"
     format_description = "Quite OK Image"
 
-    def _open(self):
+    def _open(self) -> None:
         if not _accept(self.fp.read(4)):
             msg = "not a QOI file"
             raise SyntaxError(msg)
 
-        self._size = tuple(i32(self.fp.read(4)) for i in range(2))
+        self._size = i32(self.fp.read(4)), i32(self.fp.read(4))
 
         channels = self.fp.read(1)[0]
         self._mode = "RGB" if channels == 3 else "RGBA"
 
         self.fp.seek(1, os.SEEK_CUR)  # colorspace
-        self.tile = [("qoi", (0, 0) + self._size, self.fp.tell(), None)]
+        self.tile = [ImageFile._Tile("qoi", (0, 0) + self._size, self.fp.tell(), None)]
 
 
 class QoiDecoder(ImageFile.PyDecoder):
     _pulls_fd = True
+    _previous_pixel: bytes | bytearray | None = None
+    _previously_seen_pixels: dict[int, bytes | bytearray] = {}
 
-    def _add_to_previous_pixels(self, value):
+    def _add_to_previous_pixels(self, value: bytes | bytearray) -> None:
         self._previous_pixel = value
 
         r, g, b, a = value
         hash_value = (r * 3 + g * 5 + b * 7 + a * 11) % 64
         self._previously_seen_pixels[hash_value] = value
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
+
         self._previously_seen_pixels = {}
-        self._previous_pixel = None
-        self._add_to_previous_pixels(b"".join(o8(i) for i in (0, 0, 0, 255)))
+        self._add_to_previous_pixels(bytearray((0, 0, 0, 255)))
 
         data = bytearray()
         bands = Image.getmodebands(self.mode)
-        while len(data) < self.state.xsize * self.state.ysize * bands:
+        dest_length = self.state.xsize * self.state.ysize * bands
+        while len(data) < dest_length:
             byte = self.fd.read(1)[0]
-            if byte == 0b11111110:  # QOI_OP_RGB
-                value = self.fd.read(3) + self._previous_pixel[3:]
+            value: bytes | bytearray
+            if byte == 0b11111110 and self._previous_pixel:  # QOI_OP_RGB
+                value = bytearray(self.fd.read(3)) + self._previous_pixel[3:]
             elif byte == 0b11111111:  # QOI_OP_RGBA
                 value = self.fd.read(4)
             else:
                 op = byte >> 6
                 if op == 0:  # QOI_OP_INDEX
                     op_index = byte & 0b00111111
-                    value = self._previously_seen_pixels.get(op_index, (0, 0, 0, 0))
-                elif op == 1:  # QOI_OP_DIFF
-                    value = (
-                        (self._previous_pixel[0] + ((byte & 0b00110000) >> 4) - 2)
-                        % 256,
-                        (self._previous_pixel[1] + ((byte & 0b00001100) >> 2) - 2)
-                        % 256,
-                        (self._previous_pixel[2] + (byte & 0b00000011) - 2) % 256,
+                    value = self._previously_seen_pixels.get(
+                        op_index, bytearray((0, 0, 0, 0))
+                    )
+                elif op == 1 and self._previous_pixel:  # QOI_OP_DIFF
+                    value = bytearray(
+                        (
+                            (self._previous_pixel[0] + ((byte & 0b00110000) >> 4) - 2)
+                            % 256,
+                            (self._previous_pixel[1] + ((byte & 0b00001100) >> 2) - 2)
+                            % 256,
+                            (self._previous_pixel[2] + (byte & 0b00000011) - 2) % 256,
+                            self._previous_pixel[3],
+                        )
                     )
-                    value += (self._previous_pixel[3],)
-                elif op == 2:  # QOI_OP_LUMA
+                elif op == 2 and self._previous_pixel:  # QOI_OP_LUMA
                     second_byte = self.fd.read(1)[0]
                     diff_green = (byte & 0b00111111) - 32
                     diff_red = ((second_byte & 0b11110000) >> 4) - 8
                     diff_blue = (second_byte & 0b00001111) - 8
 
-                    value = tuple(
-                        (self._previous_pixel[i] + diff_green + diff) % 256
-                        for i, diff in enumerate((diff_red, 0, diff_blue))
+                    value = bytearray(
+                        tuple(
+                            (self._previous_pixel[i] + diff_green + diff) % 256
+                            for i, diff in enumerate((diff_red, 0, diff_blue))
+                        )
                     )
-                    value += (self._previous_pixel[3],)
-                elif op == 3:  # QOI_OP_RUN
+                    value += self._previous_pixel[3:]
+                elif op == 3 and self._previous_pixel:  # QOI_OP_RUN
                     run_length = (byte & 0b00111111) + 1
                     value = self._previous_pixel
                     if bands == 3:
                         value = value[:3]
                     data += value * run_length
                     continue
-                value = b"".join(o8(i) for i in value)
             self._add_to_previous_pixels(value)
 
             if bands == 3:
                 value = value[:3]
             data += value
-        self.set_as_raw(bytes(data))
+        self.set_as_raw(data)
         return -1, 0
 
 
diff --git a/src/PIL/SgiImagePlugin.py b/src/PIL/SgiImagePlugin.py
index f9a10f6109c..44254b7a4b4 100644
--- a/src/PIL/SgiImagePlugin.py
+++ b/src/PIL/SgiImagePlugin.py
@@ -24,13 +24,14 @@
 
 import os
 import struct
+from typing import IO
 
 from . import Image, ImageFile
 from ._binary import i16be as i16
 from ._binary import o8
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return len(prefix) >= 2 and i16(prefix) == 474
 
 
@@ -52,8 +53,10 @@ class SgiImageFile(ImageFile.ImageFile):
     format = "SGI"
     format_description = "SGI Image File Format"
 
-    def _open(self):
+    def _open(self) -> None:
         # HEAD
+        assert self.fp is not None
+
         headlen = 512
         s = self.fp.read(headlen)
 
@@ -106,23 +109,32 @@ def _open(self):
             pagesize = xsize * ysize * bpc
             if bpc == 2:
                 self.tile = [
-                    ("SGI16", (0, 0) + self.size, headlen, (self.mode, 0, orientation))
+                    ImageFile._Tile(
+                        "SGI16",
+                        (0, 0) + self.size,
+                        headlen,
+                        (self.mode, 0, orientation),
+                    )
                 ]
             else:
                 self.tile = []
                 offset = headlen
                 for layer in self.mode:
                     self.tile.append(
-                        ("raw", (0, 0) + self.size, offset, (layer, 0, orientation))
+                        ImageFile._Tile(
+                            "raw", (0, 0) + self.size, offset, (layer, 0, orientation)
+                        )
                     )
                     offset += pagesize
         elif compression == 1:
             self.tile = [
-                ("sgi_rle", (0, 0) + self.size, headlen, (rawmode, orientation, bpc))
+                ImageFile._Tile(
+                    "sgi_rle", (0, 0) + self.size, headlen, (rawmode, orientation, bpc)
+                )
             ]
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.mode not in {"RGB", "RGBA", "L"}:
         msg = "Unsupported SGI image mode"
         raise ValueError(msg)
@@ -169,7 +181,8 @@ def _save(im, fp, filename):
     pinmax = 255
     # Image name (79 characters max, truncated below in write)
     img_name = os.path.splitext(os.path.basename(filename))[0]
-    img_name = img_name.encode("ascii", "ignore")
+    if isinstance(img_name, str):
+        img_name = img_name.encode("ascii", "ignore")
     # Standard representation of pixel in the file
     colormap = 0
     fp.write(struct.pack(">h", magic_number))
@@ -201,7 +214,10 @@ def _save(im, fp, filename):
 class SGI16Decoder(ImageFile.PyDecoder):
     _pulls_fd = True
 
-    def decode(self, buffer):
+    def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]:
+        assert self.fd is not None
+        assert self.im is not None
+
         rawmode, stride, orientation = self.args
         pagesize = self.state.xsize * self.state.ysize
         zsize = len(self.mode)
diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py
index 86582fb128c..075073f9fe3 100644
--- a/src/PIL/SpiderImagePlugin.py
+++ b/src/PIL/SpiderImagePlugin.py
@@ -37,11 +37,12 @@
 import os
 import struct
 import sys
+from typing import IO, TYPE_CHECKING, Any, cast
 
 from . import Image, ImageFile
 
 
-def isInt(f):
+def isInt(f: Any) -> int:
     try:
         i = int(f)
         if f - i == 0:
@@ -61,7 +62,7 @@ def isInt(f):
 # otherwise returns 0
 
 
-def isSpiderHeader(t):
+def isSpiderHeader(t: tuple[float, ...]) -> int:
     h = (99,) + t  # add 1 value so can use spider header index start=1
     # header values 1,2,5,12,13,22,23 should be integers
     for i in [1, 2, 5, 12, 13, 22, 23]:
@@ -81,7 +82,7 @@ def isSpiderHeader(t):
     return labbyt
 
 
-def isSpiderImage(filename):
+def isSpiderImage(filename: str) -> int:
     with open(filename, "rb") as fp:
         f = fp.read(92)  # read 23 * 4 bytes
     t = struct.unpack(">23f", f)  # try big-endian first
@@ -97,7 +98,7 @@ class SpiderImageFile(ImageFile.ImageFile):
     format_description = "Spider 2D image"
     _close_exclusive_fp_after_loading = False
 
-    def _open(self):
+    def _open(self) -> None:
         # check header
         n = 27 * 4  # read 27 float values
         f = self.fp.read(n)
@@ -153,25 +154,27 @@ def _open(self):
             self.rawmode = "F;32F"
         self._mode = "F"
 
-        self.tile = [("raw", (0, 0) + self.size, offset, (self.rawmode, 0, 1))]
+        self.tile = [
+            ImageFile._Tile("raw", (0, 0) + self.size, offset, (self.rawmode, 0, 1))
+        ]
         self._fp = self.fp  # FIXME: hack
 
     @property
-    def n_frames(self):
+    def n_frames(self) -> int:
         return self._nimages
 
     @property
-    def is_animated(self):
+    def is_animated(self) -> bool:
         return self._nimages > 1
 
     # 1st image index is zero (although SPIDER imgnumber starts at 1)
-    def tell(self):
+    def tell(self) -> int:
         if self.imgnumber < 1:
             return 0
         else:
             return self.imgnumber - 1
 
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         if self.istack == 0:
             msg = "attempt to seek in a non-stack file"
             raise EOFError(msg)
@@ -183,16 +186,21 @@ def seek(self, frame):
         self._open()
 
     # returns a byte image after rescaling to 0..255
-    def convert2byte(self, depth=255):
-        (minimum, maximum) = self.getextrema()
-        m = 1
+    def convert2byte(self, depth: int = 255) -> Image.Image:
+        extrema = self.getextrema()
+        assert isinstance(extrema[0], float)
+        minimum, maximum = cast(tuple[float, float], extrema)
+        m: float = 1
         if maximum != minimum:
             m = depth / (maximum - minimum)
         b = -m * minimum
-        return self.point(lambda i, m=m, b=b: i * m + b).convert("L")
+        return self.point(lambda i: i * m + b).convert("L")
+
+    if TYPE_CHECKING:
+        from . import ImageTk
 
     # returns a ImageTk.PhotoImage object, after rescaling to 0..255
-    def tkPhotoImage(self):
+    def tkPhotoImage(self) -> ImageTk.PhotoImage:
         from . import ImageTk
 
         return ImageTk.PhotoImage(self.convert2byte(), palette=256)
@@ -203,10 +211,10 @@ def tkPhotoImage(self):
 
 
 # given a list of filenames, return a list of images
-def loadImageSeries(filelist=None):
+def loadImageSeries(filelist: list[str] | None = None) -> list[SpiderImageFile] | None:
     """create a list of :py:class:`~PIL.Image.Image` objects for use in a montage"""
     if filelist is None or len(filelist) < 1:
-        return
+        return None
 
     imglist = []
     for img in filelist:
@@ -218,7 +226,7 @@ def loadImageSeries(filelist=None):
                 im = im.convert2byte()
         except Exception:
             if not isSpiderImage(img):
-                print(img + " is not a Spider image file")
+                print(f"{img} is not a Spider image file")
             continue
         im.info["filename"] = img
         imglist.append(im)
@@ -229,7 +237,7 @@ def loadImageSeries(filelist=None):
 # For saving images in Spider format
 
 
-def makeSpiderHeader(im):
+def makeSpiderHeader(im: Image.Image) -> list[bytes]:
     nsam, nrow = im.size
     lenbyt = nsam * 4  # There are labrec records in the header
     labrec = int(1024 / lenbyt)
@@ -259,7 +267,7 @@ def makeSpiderHeader(im):
     return [struct.pack("f", v) for v in hdr]
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.mode[0] != "F":
         im = im.convert("F")
 
@@ -272,12 +280,15 @@ def _save(im, fp, filename):
     fp.writelines(hdr)
 
     rawmode = "F;32NF"  # 32-bit native floating point
-    ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))])
+    ImageFile._save(
+        im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))]
+    )
 
 
-def _save_spider(im, fp, filename):
+def _save_spider(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     # get the filename extension and register it with Image
-    ext = os.path.splitext(filename)[1]
+    filename_ext = os.path.splitext(filename)[1]
+    ext = filename_ext.decode() if isinstance(filename_ext, bytes) else filename_ext
     Image.register_extension(SpiderImageFile.format, ext)
     _save(im, fp, filename)
 
@@ -299,10 +310,10 @@ def _save_spider(im, fp, filename):
         sys.exit()
 
     with Image.open(filename) as im:
-        print("image: " + str(im))
-        print("format: " + str(im.format))
-        print("size: " + str(im.size))
-        print("mode: " + str(im.mode))
+        print(f"image: {im}")
+        print(f"format: {im.format}")
+        print(f"size: {im.size}")
+        print(f"mode: {im.mode}")
         print("max, min: ", end=" ")
         print(im.getextrema())
 
diff --git a/src/PIL/SunImagePlugin.py b/src/PIL/SunImagePlugin.py
index 11ce3dfefd0..8912379ea3e 100644
--- a/src/PIL/SunImagePlugin.py
+++ b/src/PIL/SunImagePlugin.py
@@ -21,7 +21,7 @@
 from ._binary import i32be as i32
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return len(prefix) >= 4 and i32(prefix) == 0x59A66A95
 
 
@@ -33,7 +33,7 @@ class SunImageFile(ImageFile.ImageFile):
     format = "SUN"
     format_description = "Sun Raster File"
 
-    def _open(self):
+    def _open(self) -> None:
         # The Sun Raster file header is 32 bytes in length
         # and has the following format:
 
@@ -49,6 +49,8 @@ def _open(self):
         #         DWORD ColorMapLength;   /* Size of the color map in bytes */
         #     } SUNRASTER;
 
+        assert self.fp is not None
+
         # HEAD
         s = self.fp.read(32)
         if not _accept(s):
@@ -122,9 +124,13 @@ def _open(self):
         # (https://www.fileformat.info/format/sunraster/egff.htm)
 
         if file_type in (0, 1, 3, 4, 5):
-            self.tile = [("raw", (0, 0) + self.size, offset, (rawmode, stride))]
+            self.tile = [
+                ImageFile._Tile("raw", (0, 0) + self.size, offset, (rawmode, stride))
+            ]
         elif file_type == 2:
-            self.tile = [("sun_rle", (0, 0) + self.size, offset, rawmode)]
+            self.tile = [
+                ImageFile._Tile("sun_rle", (0, 0) + self.size, offset, rawmode)
+            ]
         else:
             msg = "Unsupported Sun Raster file type"
             raise SyntaxError(msg)
diff --git a/src/PIL/TarIO.py b/src/PIL/TarIO.py
index 7470663b4a1..779288b1ce3 100644
--- a/src/PIL/TarIO.py
+++ b/src/PIL/TarIO.py
@@ -16,7 +16,6 @@
 from __future__ import annotations
 
 import io
-from types import TracebackType
 
 from . import ContainerIO
 
@@ -56,18 +55,3 @@ def __init__(self, tarfile: str, file: str) -> None:
 
         # Open region
         super().__init__(self.fh, self.fh.tell(), size)
-
-    # Context manager support
-    def __enter__(self) -> TarIO:
-        return self
-
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_val: BaseException | None,
-        exc_tb: TracebackType | None,
-    ) -> None:
-        self.close()
-
-    def close(self) -> None:
-        self.fh.close()
diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py
index 65c7484f756..90d5b5cf4ee 100644
--- a/src/PIL/TgaImagePlugin.py
+++ b/src/PIL/TgaImagePlugin.py
@@ -18,6 +18,7 @@
 from __future__ import annotations
 
 import warnings
+from typing import IO
 
 from . import Image, ImageFile, ImagePalette
 from ._binary import i16le as i16
@@ -35,7 +36,7 @@
     (3, 1): "1",
     (3, 8): "L",
     (3, 16): "LA",
-    (2, 16): "BGR;5",
+    (2, 16): "BGRA;15Z",
     (2, 24): "BGR",
     (2, 32): "BGRA",
 }
@@ -49,8 +50,10 @@ class TgaImageFile(ImageFile.ImageFile):
     format = "TGA"
     format_description = "Targa"
 
-    def _open(self):
+    def _open(self) -> None:
         # process header
+        assert self.fp is not None
+
         s = self.fp.read(18)
 
         id_len = s[0]
@@ -82,11 +85,9 @@ def _open(self):
             elif depth == 16:
                 self._mode = "LA"
         elif imagetype in (1, 9):
-            self._mode = "P"
+            self._mode = "P" if colormaptype else "L"
         elif imagetype in (2, 10):
-            self._mode = "RGB"
-            if depth == 32:
-                self._mode = "RGBA"
+            self._mode = "RGB" if depth == 24 else "RGBA"
         else:
             msg = "unknown TGA mode"
             raise SyntaxError(msg)
@@ -115,16 +116,20 @@ def _open(self):
             start, size, mapdepth = i16(s, 3), i16(s, 5), s[7]
             if mapdepth == 16:
                 self.palette = ImagePalette.raw(
-                    "BGR;15", b"\0" * 2 * start + self.fp.read(2 * size)
+                    "BGRA;15Z", bytes(2 * start) + self.fp.read(2 * size)
                 )
+                self.palette.mode = "RGBA"
             elif mapdepth == 24:
                 self.palette = ImagePalette.raw(
-                    "BGR", b"\0" * 3 * start + self.fp.read(3 * size)
+                    "BGR", bytes(3 * start) + self.fp.read(3 * size)
                 )
             elif mapdepth == 32:
                 self.palette = ImagePalette.raw(
-                    "BGRA", b"\0" * 4 * start + self.fp.read(4 * size)
+                    "BGRA", bytes(4 * start) + self.fp.read(4 * size)
                 )
+            else:
+                msg = "unknown TGA map depth"
+                raise SyntaxError(msg)
 
         # setup tile descriptor
         try:
@@ -132,7 +137,7 @@ def _open(self):
             if imagetype & 8:
                 # compressed
                 self.tile = [
-                    (
+                    ImageFile._Tile(
                         "tga_rle",
                         (0, 0) + self.size,
                         self.fp.tell(),
@@ -141,7 +146,7 @@ def _open(self):
                 ]
             else:
                 self.tile = [
-                    (
+                    ImageFile._Tile(
                         "raw",
                         (0, 0) + self.size,
                         self.fp.tell(),
@@ -151,7 +156,7 @@ def _open(self):
         except KeyError:
             pass  # cannot decode
 
-    def load_end(self):
+    def load_end(self) -> None:
         if self._flip_horizontally:
             self.im = self.im.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
 
@@ -171,7 +176,7 @@ def load_end(self):
 }
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     try:
         rawmode, bits, colormaptype, imagetype = SAVE[im.mode]
     except KeyError as e:
@@ -231,11 +236,15 @@ def _save(im, fp, filename):
 
     if rle:
         ImageFile._save(
-            im, fp, [("tga_rle", (0, 0) + im.size, 0, (rawmode, orientation))]
+            im,
+            fp,
+            [ImageFile._Tile("tga_rle", (0, 0) + im.size, 0, (rawmode, orientation))],
         )
     else:
         ImageFile._save(
-            im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, orientation))]
+            im,
+            fp,
+            [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, orientation))],
         )
 
     # write targa version 2 footer
diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
index e20d4d5ea81..ff5a6f9e91b 100644
--- a/src/PIL/TiffImagePlugin.py
+++ b/src/PIL/TiffImagePlugin.py
@@ -47,22 +47,28 @@
 import os
 import struct
 import warnings
-from collections.abc import MutableMapping
+from collections.abc import Iterator, MutableMapping
 from fractions import Fraction
 from numbers import Number, Rational
+from typing import IO, TYPE_CHECKING, Any, Callable, NoReturn, cast
 
 from . import ExifTags, Image, ImageFile, ImageOps, ImagePalette, TiffTags
 from ._binary import i16be as i16
 from ._binary import i32be as i32
 from ._binary import o8
+from ._deprecate import deprecate
+from ._typing import StrOrBytesPath
+from ._util import is_path
 from .TiffTags import TYPES
 
+if TYPE_CHECKING:
+    from ._typing import Buffer, IntegralLike
+
 logger = logging.getLogger(__name__)
 
 # Set these to true to force use of libtiff for reading or writing.
 READ_LIBTIFF = False
 WRITE_LIBTIFF = False
-IFD_LEGACY_API = True
 STRIP_SIZE = 65536
 
 II = b"II"  # little-endian (Intel style)
@@ -73,6 +79,7 @@
 # Read TIFF files
 
 # a few tag names, just to make the code below a bit more readable
+OSUBFILETYPE = 255
 IMAGEWIDTH = 256
 IMAGELENGTH = 257
 BITSPERSAMPLE = 258
@@ -198,12 +205,12 @@
     (MM, 2, (1,), 2, (8, 8, 8), ()): ("RGB", "RGB;R"),
     (II, 2, (1,), 1, (8, 8, 8, 8), ()): ("RGBA", "RGBA"),  # missing ExtraSamples
     (MM, 2, (1,), 1, (8, 8, 8, 8), ()): ("RGBA", "RGBA"),  # missing ExtraSamples
-    (II, 2, (1,), 1, (8, 8, 8, 8), (0,)): ("RGBX", "RGBX"),
-    (MM, 2, (1,), 1, (8, 8, 8, 8), (0,)): ("RGBX", "RGBX"),
-    (II, 2, (1,), 1, (8, 8, 8, 8, 8), (0, 0)): ("RGBX", "RGBXX"),
-    (MM, 2, (1,), 1, (8, 8, 8, 8, 8), (0, 0)): ("RGBX", "RGBXX"),
-    (II, 2, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0, 0)): ("RGBX", "RGBXXX"),
-    (MM, 2, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0, 0)): ("RGBX", "RGBXXX"),
+    (II, 2, (1,), 1, (8, 8, 8, 8), (0,)): ("RGB", "RGBX"),
+    (MM, 2, (1,), 1, (8, 8, 8, 8), (0,)): ("RGB", "RGBX"),
+    (II, 2, (1,), 1, (8, 8, 8, 8, 8), (0, 0)): ("RGB", "RGBXX"),
+    (MM, 2, (1,), 1, (8, 8, 8, 8, 8), (0, 0)): ("RGB", "RGBXX"),
+    (II, 2, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0, 0)): ("RGB", "RGBXXX"),
+    (MM, 2, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0, 0)): ("RGB", "RGBXXX"),
     (II, 2, (1,), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBa"),
     (MM, 2, (1,), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBa"),
     (II, 2, (1,), 1, (8, 8, 8, 8, 8), (1, 0)): ("RGBA", "RGBaX"),
@@ -222,8 +229,8 @@
     (MM, 2, (1,), 1, (16, 16, 16), ()): ("RGB", "RGB;16B"),
     (II, 2, (1,), 1, (16, 16, 16, 16), ()): ("RGBA", "RGBA;16L"),
     (MM, 2, (1,), 1, (16, 16, 16, 16), ()): ("RGBA", "RGBA;16B"),
-    (II, 2, (1,), 1, (16, 16, 16, 16), (0,)): ("RGBX", "RGBX;16L"),
-    (MM, 2, (1,), 1, (16, 16, 16, 16), (0,)): ("RGBX", "RGBX;16B"),
+    (II, 2, (1,), 1, (16, 16, 16, 16), (0,)): ("RGB", "RGBX;16L"),
+    (MM, 2, (1,), 1, (16, 16, 16, 16), (0,)): ("RGB", "RGBX;16B"),
     (II, 2, (1,), 1, (16, 16, 16, 16), (1,)): ("RGBA", "RGBa;16L"),
     (MM, 2, (1,), 1, (16, 16, 16, 16), (1,)): ("RGBA", "RGBa;16B"),
     (II, 2, (1,), 1, (16, 16, 16, 16), (2,)): ("RGBA", "RGBA;16L"),
@@ -242,6 +249,7 @@
     (MM, 3, (1,), 2, (4,), ()): ("P", "P;4R"),
     (II, 3, (1,), 1, (8,), ()): ("P", "P"),
     (MM, 3, (1,), 1, (8,), ()): ("P", "P"),
+    (II, 3, (1,), 1, (8, 8), (0,)): ("P", "PX"),
     (II, 3, (1,), 1, (8, 8), (2,)): ("PA", "PA"),
     (MM, 3, (1,), 1, (8, 8), (2,)): ("PA", "PA"),
     (II, 3, (1,), 2, (8,), ()): ("P", "P;R"),
@@ -253,6 +261,7 @@
     (II, 5, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0)): ("CMYK", "CMYKXX"),
     (MM, 5, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0)): ("CMYK", "CMYKXX"),
     (II, 5, (1,), 1, (16, 16, 16, 16), ()): ("CMYK", "CMYK;16L"),
+    (MM, 5, (1,), 1, (16, 16, 16, 16), ()): ("CMYK", "CMYK;16B"),
     (II, 6, (1,), 1, (8,), ()): ("L", "L"),
     (MM, 6, (1,), 1, (8,), ()): ("L", "L"),
     # JPEG compressed images handled by LibTiff and auto-converted to RGBX
@@ -274,27 +283,34 @@
     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):
+def _accept(prefix: bytes) -> bool:
     return prefix[:4] in PREFIXES
 
 
-def _limit_rational(val, max_val):
-    inv = abs(val) > 1
+def _limit_rational(
+    val: float | Fraction | IFDRational, max_val: int
+) -> tuple[IntegralLike, IntegralLike]:
+    inv = abs(float(val)) > 1
     n_d = IFDRational(1 / val if inv else val).limit_rational(max_val)
     return n_d[::-1] if inv else n_d
 
 
-def _limit_signed_rational(val, max_val, min_val):
+def _limit_signed_rational(
+    val: IFDRational, max_val: int, min_val: int
+) -> tuple[IntegralLike, IntegralLike]:
     frac = Fraction(val)
-    n_d = frac.numerator, frac.denominator
+    n_d: tuple[IntegralLike, IntegralLike] = frac.numerator, frac.denominator
 
-    if min(n_d) < min_val:
+    if min(float(i) for i in n_d) < min_val:
         n_d = _limit_rational(val, abs(min_val))
 
-    if max(n_d) > max_val:
-        val = Fraction(*n_d)
-        n_d = _limit_rational(val, max_val)
+    n_d_float = tuple(float(i) for i in n_d)
+    if max(n_d_float) > max_val:
+        n_d = _limit_rational(n_d_float[0] / n_d_float[1], max_val)
 
     return n_d
 
@@ -306,6 +322,15 @@ def _limit_signed_rational(val, max_val, min_val):
 _write_dispatch = {}
 
 
+def _delegate(op: str) -> Any:
+    def delegate(
+        self: IFDRational, *args: tuple[float, ...]
+    ) -> bool | float | Fraction:
+        return getattr(self._val, op)(*args)
+
+    return delegate
+
+
 class IFDRational(Rational):
     """Implements a rational class where 0/0 is a legal value to match
     the in the wild use of exif rationals.
@@ -320,12 +345,15 @@ class IFDRational(Rational):
 
     __slots__ = ("_numerator", "_denominator", "_val")
 
-    def __init__(self, value, denominator=1):
+    def __init__(
+        self, value: float | Fraction | IFDRational, denominator: int = 1
+    ) -> None:
         """
         :param value: either an integer numerator, a
         float/rational/other number, or an IFDRational
         :param denominator: Optional integer denominator
         """
+        self._val: Fraction | float
         if isinstance(value, IFDRational):
             self._numerator = value.numerator
             self._denominator = value.denominator
@@ -336,25 +364,30 @@ def __init__(self, value, denominator=1):
             self._numerator = value.numerator
             self._denominator = value.denominator
         else:
-            self._numerator = value
+            if TYPE_CHECKING:
+                self._numerator = cast(IntegralLike, value)
+            else:
+                self._numerator = value
             self._denominator = denominator
 
         if denominator == 0:
             self._val = float("nan")
         elif denominator == 1:
             self._val = Fraction(value)
+        elif int(value) == value:
+            self._val = Fraction(int(value), denominator)
         else:
-            self._val = Fraction(value, denominator)
+            self._val = Fraction(value / denominator)
 
     @property
-    def numerator(self):
+    def numerator(self) -> IntegralLike:
         return self._numerator
 
     @property
-    def denominator(self):
+    def denominator(self) -> int:
         return self._denominator
 
-    def limit_rational(self, max_denominator):
+    def limit_rational(self, max_denominator: int) -> tuple[IntegralLike, int]:
         """
 
         :param max_denominator: Integer, the maximum denominator value
@@ -364,16 +397,17 @@ def limit_rational(self, max_denominator):
         if self.denominator == 0:
             return self.numerator, self.denominator
 
+        assert isinstance(self._val, Fraction)
         f = self._val.limit_denominator(max_denominator)
         return f.numerator, f.denominator
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return str(float(self._val))
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return self._val.__hash__()
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
         val = self._val
         if isinstance(other, IFDRational):
             other = other._val
@@ -381,22 +415,21 @@ def __eq__(self, other):
             val = float(val)
         return val == other
 
-    def __getstate__(self):
+    def __getstate__(self) -> list[float | Fraction | IntegralLike]:
         return [self._val, self._numerator, self._denominator]
 
-    def __setstate__(self, state):
+    def __setstate__(self, state: list[float | Fraction | IntegralLike]) -> None:
         IFDRational.__init__(self, 0)
         _val, _numerator, _denominator = state
+        assert isinstance(_val, (float, Fraction))
         self._val = _val
-        self._numerator = _numerator
+        if TYPE_CHECKING:
+            self._numerator = cast(IntegralLike, _numerator)
+        else:
+            self._numerator = _numerator
+        assert isinstance(_denominator, int)
         self._denominator = _denominator
 
-    def _delegate(op):
-        def delegate(self, *args):
-            return getattr(self._val, op)(*args)
-
-        return delegate
-
     """ a = ['add','radd', 'sub', 'rsub', 'mul', 'rmul',
              'truediv', 'rtruediv', 'floordiv', 'rfloordiv',
              'mod','rmod', 'pow','rpow', 'pos', 'neg',
@@ -436,7 +469,54 @@ def delegate(self, *args):
         __int__ = _delegate("__int__")
 
 
-class ImageFileDirectory_v2(MutableMapping):
+_LoaderFunc = Callable[["ImageFileDirectory_v2", bytes, bool], Any]
+
+
+def _register_loader(idx: int, size: int) -> Callable[[_LoaderFunc], _LoaderFunc]:
+    def decorator(func: _LoaderFunc) -> _LoaderFunc:
+        from .TiffTags import TYPES
+
+        if func.__name__.startswith("load_"):
+            TYPES[idx] = func.__name__[5:].replace("_", " ")
+        _load_dispatch[idx] = size, func  # noqa: F821
+        return func
+
+    return decorator
+
+
+def _register_writer(idx: int) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
+    def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
+        _write_dispatch[idx] = func  # noqa: F821
+        return func
+
+    return decorator
+
+
+def _register_basic(idx_fmt_name: tuple[int, str, str]) -> None:
+    from .TiffTags import TYPES
+
+    idx, fmt, name = idx_fmt_name
+    TYPES[idx] = name
+    size = struct.calcsize(f"={fmt}")
+
+    def basic_handler(
+        self: ImageFileDirectory_v2, data: bytes, legacy_api: bool = True
+    ) -> tuple[Any, ...]:
+        return self._unpack(f"{len(data) // size}{fmt}", data)
+
+    _load_dispatch[idx] = size, basic_handler  # noqa: F821
+    _write_dispatch[idx] = lambda self, *values: (  # noqa: F821
+        b"".join(self._pack(fmt, value) for value in values)
+    )
+
+
+if TYPE_CHECKING:
+    _IFDv2Base = MutableMapping[int, Any]
+else:
+    _IFDv2Base = MutableMapping
+
+
+class ImageFileDirectory_v2(_IFDv2Base):
     """This class represents a TIFF tag directory.  To speed things up, we
     don't decode tags unless they're asked for.
 
@@ -497,7 +577,15 @@ class ImageFileDirectory_v2(MutableMapping):
 
     """
 
-    def __init__(self, ifh=b"II\052\0\0\0\0\0", prefix=None, group=None):
+    _load_dispatch: dict[int, tuple[int, _LoaderFunc]] = {}
+    _write_dispatch: dict[int, Callable[..., Any]] = {}
+
+    def __init__(
+        self,
+        ifh: bytes = b"II\052\0\0\0\0\0",
+        prefix: bytes | None = None,
+        group: int | None = None,
+    ) -> None:
         """Initialize an ImageFileDirectory.
 
         To construct an ImageFileDirectory from a real file, pass the 8-byte
@@ -521,35 +609,40 @@ def __init__(self, ifh=b"II\052\0\0\0\0\0", prefix=None, group=None):
             raise SyntaxError(msg)
         self._bigtiff = ifh[2] == 43
         self.group = group
-        self.tagtype = {}
+        self.tagtype: dict[int, int] = {}
         """ Dictionary of tag types """
         self.reset()
-        (self.next,) = (
-            self._unpack("Q", ifh[8:]) if self._bigtiff else self._unpack("L", ifh[4:])
+        self.next = (
+            self._unpack("Q", ifh[8:])[0]
+            if self._bigtiff
+            else self._unpack("L", ifh[4:])[0]
         )
         self._legacy_api = False
 
     prefix = property(lambda self: self._prefix)
     offset = property(lambda self: self._offset)
-    legacy_api = property(lambda self: self._legacy_api)
+
+    @property
+    def legacy_api(self) -> bool:
+        return self._legacy_api
 
     @legacy_api.setter
-    def legacy_api(self, value):
+    def legacy_api(self, value: bool) -> NoReturn:
         msg = "Not allowing setting of legacy api"
         raise Exception(msg)
 
-    def reset(self):
-        self._tags_v1 = {}  # will remain empty if legacy_api is false
-        self._tags_v2 = {}  # main tag storage
-        self._tagdata = {}
+    def reset(self) -> None:
+        self._tags_v1: dict[int, Any] = {}  # will remain empty if legacy_api is false
+        self._tags_v2: dict[int, Any] = {}  # main tag storage
+        self._tagdata: dict[int, bytes] = {}
         self.tagtype = {}  # added 2008-06-05 by Florian Hoech
         self._next = None
-        self._offset = None
+        self._offset: int | None = None
 
-    def __str__(self):
+    def __str__(self) -> str:
         return str(dict(self))
 
-    def named(self):
+    def named(self) -> dict[str, Any]:
         """
         :returns: dict of name|key: value
 
@@ -560,10 +653,10 @@ def named(self):
             for code, value in self.items()
         }
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(set(self._tagdata) | set(self._tags_v2))
 
-    def __getitem__(self, tag):
+    def __getitem__(self, tag: int) -> Any:
         if tag not in self._tags_v2:  # unpack on the fly
             data = self._tagdata[tag]
             typ = self.tagtype[tag]
@@ -574,13 +667,13 @@ def __getitem__(self, tag):
             val = (val,)
         return val
 
-    def __contains__(self, tag):
+    def __contains__(self, tag: object) -> bool:
         return tag in self._tags_v2 or tag in self._tagdata
 
-    def __setitem__(self, tag, value):
+    def __setitem__(self, tag: int, value: Any) -> None:
         self._setitem(tag, value, self.legacy_api)
 
-    def _setitem(self, tag, value, legacy_api):
+    def _setitem(self, tag: int, value: Any, legacy_api: bool) -> None:
         basetypes = (Number, bytes, str)
 
         info = TiffTags.lookup(tag, self.group)
@@ -660,54 +753,20 @@ def _setitem(self, tag, value, legacy_api):
             # Unspec'd, and length > 1
             dest[tag] = values
 
-    def __delitem__(self, tag):
+    def __delitem__(self, tag: int) -> None:
         self._tags_v2.pop(tag, None)
         self._tags_v1.pop(tag, None)
         self._tagdata.pop(tag, None)
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[int]:
         return iter(set(self._tagdata) | set(self._tags_v2))
 
-    def _unpack(self, fmt, data):
+    def _unpack(self, fmt: str, data: bytes) -> tuple[Any, ...]:
         return struct.unpack(self._endian + fmt, data)
 
-    def _pack(self, fmt, *values):
+    def _pack(self, fmt: str, *values: Any) -> bytes:
         return struct.pack(self._endian + fmt, *values)
 
-    def _register_loader(idx, size):
-        def decorator(func):
-            from .TiffTags import TYPES
-
-            if func.__name__.startswith("load_"):
-                TYPES[idx] = func.__name__[5:].replace("_", " ")
-            _load_dispatch[idx] = size, func  # noqa: F821
-            return func
-
-        return decorator
-
-    def _register_writer(idx):
-        def decorator(func):
-            _write_dispatch[idx] = func  # noqa: F821
-            return func
-
-        return decorator
-
-    def _register_basic(idx_fmt_name):
-        from .TiffTags import TYPES
-
-        idx, fmt, name = idx_fmt_name
-        TYPES[idx] = name
-        size = struct.calcsize("=" + fmt)
-        _load_dispatch[idx] = (  # noqa: F821
-            size,
-            lambda self, data, legacy_api=True: (
-                self._unpack(f"{len(data) // size}{fmt}", data)
-            ),
-        )
-        _write_dispatch[idx] = lambda self, *values: (  # noqa: F821
-            b"".join(self._pack(fmt, value) for value in values)
-        )
-
     list(
         map(
             _register_basic,
@@ -726,11 +785,11 @@ def _register_basic(idx_fmt_name):
     )
 
     @_register_loader(1, 1)  # Basic type, except for the legacy API.
-    def load_byte(self, data, legacy_api=True):
+    def load_byte(self, data: bytes, legacy_api: bool = True) -> bytes:
         return data
 
     @_register_writer(1)  # Basic type, except for the legacy API.
-    def write_byte(self, data):
+    def write_byte(self, data: bytes | int | IFDRational) -> bytes:
         if isinstance(data, IFDRational):
             data = int(data)
         if isinstance(data, int):
@@ -738,13 +797,13 @@ def write_byte(self, data):
         return data
 
     @_register_loader(2, 1)
-    def load_string(self, data, legacy_api=True):
+    def load_string(self, data: bytes, legacy_api: bool = True) -> str:
         if data.endswith(b"\0"):
             data = data[:-1]
         return data.decode("latin-1", "replace")
 
     @_register_writer(2)
-    def write_string(self, value):
+    def write_string(self, value: str | bytes | int) -> bytes:
         # remerge of https://github.com/python-pillow/Pillow/pull/1416
         if isinstance(value, int):
             value = str(value)
@@ -753,47 +812,53 @@ def write_string(self, value):
         return value + b"\0"
 
     @_register_loader(5, 8)
-    def load_rational(self, data, legacy_api=True):
+    def load_rational(
+        self, data: bytes, legacy_api: bool = True
+    ) -> tuple[tuple[int, int] | IFDRational, ...]:
         vals = self._unpack(f"{len(data) // 4}L", data)
 
-        def combine(a, b):
+        def combine(a: int, b: int) -> tuple[int, int] | IFDRational:
             return (a, b) if legacy_api else IFDRational(a, b)
 
         return tuple(combine(num, denom) for num, denom in zip(vals[::2], vals[1::2]))
 
     @_register_writer(5)
-    def write_rational(self, *values):
+    def write_rational(self, *values: IFDRational) -> bytes:
         return b"".join(
             self._pack("2L", *_limit_rational(frac, 2**32 - 1)) for frac in values
         )
 
     @_register_loader(7, 1)
-    def load_undefined(self, data, legacy_api=True):
+    def load_undefined(self, data: bytes, legacy_api: bool = True) -> bytes:
         return data
 
     @_register_writer(7)
-    def write_undefined(self, value):
+    def write_undefined(self, value: bytes | int | IFDRational) -> bytes:
+        if isinstance(value, IFDRational):
+            value = int(value)
         if isinstance(value, int):
             value = str(value).encode("ascii", "replace")
         return value
 
     @_register_loader(10, 8)
-    def load_signed_rational(self, data, legacy_api=True):
+    def load_signed_rational(
+        self, data: bytes, legacy_api: bool = True
+    ) -> tuple[tuple[int, int] | IFDRational, ...]:
         vals = self._unpack(f"{len(data) // 4}l", data)
 
-        def combine(a, b):
+        def combine(a: int, b: int) -> tuple[int, int] | IFDRational:
             return (a, b) if legacy_api else IFDRational(a, b)
 
         return tuple(combine(num, denom) for num, denom in zip(vals[::2], vals[1::2]))
 
     @_register_writer(10)
-    def write_signed_rational(self, *values):
+    def write_signed_rational(self, *values: IFDRational) -> bytes:
         return b"".join(
             self._pack("2l", *_limit_signed_rational(frac, 2**31 - 1, -(2**31)))
             for frac in values
         )
 
-    def _ensure_read(self, fp, size):
+    def _ensure_read(self, fp: IO[bytes], size: int) -> bytes:
         ret = fp.read(size)
         if len(ret) != size:
             msg = (
@@ -803,7 +868,7 @@ def _ensure_read(self, fp, size):
             raise OSError(msg)
         return ret
 
-    def load(self, fp):
+    def load(self, fp: IO[bytes]) -> None:
         self.reset()
         self._offset = fp.tell()
 
@@ -870,11 +935,11 @@ def load(self, fp):
             warnings.warn(str(msg))
             return
 
-    def tobytes(self, offset=0):
+    def tobytes(self, offset: int = 0) -> bytes:
         # FIXME What about tagdata?
         result = self._pack("H", len(self._tags_v2))
 
-        entries = []
+        entries: list[tuple[int, int, int, bytes, bytes]] = []
         offset = offset + len(result) + len(self._tags_v2) * 12 + 4
         stripoffsets = None
 
@@ -883,7 +948,7 @@ def tobytes(self, offset=0):
         for tag, value in sorted(self._tags_v2.items()):
             if tag == STRIPOFFSETS:
                 stripoffsets = len(entries)
-            typ = self.tagtype.get(tag)
+            typ = self.tagtype[tag]
             logger.debug("Tag %s, Type: %s, Value: %s", tag, typ, repr(value))
             is_ifd = typ == TiffTags.LONG and isinstance(value, dict)
             if is_ifd:
@@ -926,9 +991,11 @@ def tobytes(self, offset=0):
         if stripoffsets is not None:
             tag, typ, count, value, data = entries[stripoffsets]
             if data:
-                msg = "multistrip support not yet implemented"
-                raise NotImplementedError(msg)
-            value = self._pack("L", self._unpack("L", value)[0] + offset)
+                size, handler = self._load_dispatch[typ]
+                values = [val + offset for val in handler(self, data, self.legacy_api)]
+                data = self._write_dispatch[typ](self, *values)
+            else:
+                value = self._pack("L", self._unpack("L", value)[0] + offset)
             entries[stripoffsets] = tag, typ, count, value, data
 
         # pass 2: write entries to file
@@ -947,7 +1014,7 @@ def tobytes(self, offset=0):
 
         return result
 
-    def save(self, fp):
+    def save(self, fp: IO[bytes]) -> int:
         if fp.tell() == 0:  # skip TIFF header on subsequent pages
             # tiff header -- PIL always starts the first IFD at offset 8
             fp.write(self._prefix + self._pack("HL", 42, 8))
@@ -962,8 +1029,8 @@ def save(self, fp):
 ImageFileDirectory_v2._write_dispatch = _write_dispatch
 for idx, name in TYPES.items():
     name = name.replace(" ", "_")
-    setattr(ImageFileDirectory_v2, "load_" + name, _load_dispatch[idx][1])
-    setattr(ImageFileDirectory_v2, "write_" + name, _write_dispatch[idx])
+    setattr(ImageFileDirectory_v2, f"load_{name}", _load_dispatch[idx][1])
+    setattr(ImageFileDirectory_v2, f"write_{name}", _write_dispatch[idx])
 del _load_dispatch, _write_dispatch, idx, name
 
 
@@ -987,7 +1054,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
     ..  deprecated:: 3.0.0
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
         self._legacy_api = True
 
@@ -995,11 +1062,11 @@ def __init__(self, *args, **kwargs):
     tagdata = property(lambda self: self._tagdata)
 
     # defined in ImageFileDirectory_v2
-    tagtype: dict
+    tagtype: dict[int, int]
     """Dictionary of tag types"""
 
     @classmethod
-    def from_v2(cls, original):
+    def from_v2(cls, original: ImageFileDirectory_v2) -> ImageFileDirectory_v1:
         """Returns an
         :py:class:`~PIL.TiffImagePlugin.ImageFileDirectory_v1`
         instance with the same data as is contained in the original
@@ -1016,7 +1083,7 @@ def from_v2(cls, original):
         ifd.next = original.next  # an indicator for multipage tiffs
         return ifd
 
-    def to_v2(self):
+    def to_v2(self) -> ImageFileDirectory_v2:
         """Returns an
         :py:class:`~PIL.TiffImagePlugin.ImageFileDirectory_v2`
         instance with the same data as is contained in the original
@@ -1033,20 +1100,20 @@ def to_v2(self):
         ifd._tags_v2 = dict(self._tags_v2)
         return ifd
 
-    def __contains__(self, tag):
+    def __contains__(self, tag: object) -> bool:
         return tag in self._tags_v1 or tag in self._tagdata
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(set(self._tagdata) | set(self._tags_v1))
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[int]:
         return iter(set(self._tagdata) | set(self._tags_v1))
 
-    def __setitem__(self, tag, value):
+    def __setitem__(self, tag: int, value: Any) -> None:
         for legacy_api in (False, True):
             self._setitem(tag, value, legacy_api)
 
-    def __getitem__(self, tag):
+    def __getitem__(self, tag: int) -> Any:
         if tag not in self._tags_v1:  # unpack on the fly
             data = self._tagdata[tag]
             typ = self.tagtype[tag]
@@ -1059,7 +1126,7 @@ def __getitem__(self, tag):
         return val
 
 
-# undone -- switch this pointer when IFD_LEGACY_API == False
+# undone -- switch this pointer
 ImageFileDirectory = ImageFileDirectory_v1
 
 
@@ -1072,16 +1139,20 @@ class TiffImageFile(ImageFile.ImageFile):
     format_description = "Adobe TIFF"
     _close_exclusive_fp_after_loading = False
 
-    def __init__(self, fp=None, filename=None):
-        self.tag_v2 = None
+    def __init__(
+        self,
+        fp: StrOrBytesPath | IO[bytes],
+        filename: str | bytes | None = None,
+    ) -> None:
+        self.tag_v2: ImageFileDirectory_v2
         """ Image file directory (tag dictionary) """
 
-        self.tag = None
+        self.tag: ImageFileDirectory_v1
         """ Legacy tag entries """
 
         super().__init__(fp, filename)
 
-    def _open(self):
+    def _open(self) -> None:
         """Open the first image in a TIFF file"""
 
         # Header
@@ -1091,15 +1162,12 @@ def _open(self):
 
         self.tag_v2 = ImageFileDirectory_v2(ifh)
 
-        # legacy IFD entries will be filled in later
-        self.ifd = None
-
         # setup frame pointers
         self.__first = self.__next = self.tag_v2.next
         self.__frame = -1
         self._fp = self.fp
-        self._frame_pos = []
-        self._n_frames = None
+        self._frame_pos: list[int] = []
+        self._n_frames: int | None = None
 
         logger.debug("*** TiffImageFile._open ***")
         logger.debug("- __first: %s", self.__first)
@@ -1109,27 +1177,29 @@ def _open(self):
         self._seek(0)
 
     @property
-    def n_frames(self):
-        if self._n_frames is None:
+    def n_frames(self) -> int:
+        current_n_frames = self._n_frames
+        if current_n_frames is None:
             current = self.tell()
             self._seek(len(self._frame_pos))
             while self._n_frames is None:
                 self._seek(self.tell() + 1)
             self.seek(current)
+        assert self._n_frames is not None
         return self._n_frames
 
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         """Select a given frame as current image"""
         if not self._seek_check(frame):
             return
         self._seek(frame)
-        # Create a new core image object on second and
-        # subsequent frames in the image. Image may be
-        # different size/mode.
-        Image._decompression_bomb_check(self.size)
-        self.im = Image.core.new(self.mode, self.size)
+        if self._im is not None and (
+            self.im.size != self._tile_size or self.im.mode != self.mode
+        ):
+            # The core image will no longer be used
+            self._im = None
 
-    def _seek(self, frame):
+    def _seek(self, frame: int) -> None:
         self.fp = self._fp
 
         # reset buffered io handle in case fp
@@ -1147,6 +1217,9 @@ def _seek(self, frame):
                 self.__next,
                 self.fp.tell(),
             )
+            if self.__next >= 2**63:
+                msg = "Unable to seek to frame"
+                raise ValueError(msg)
             self.fp.seek(self.__next)
             self._frame_pos.append(self.__next)
             logger.debug("Loading tags, location: %s", self.fp.tell())
@@ -1164,26 +1237,21 @@ def _seek(self, frame):
             self.__frame += 1
         self.fp.seek(self._frame_pos[frame])
         self.tag_v2.load(self.fp)
+        if XMP in self.tag_v2:
+            self.info["xmp"] = self.tag_v2[XMP]
+        elif "xmp" in self.info:
+            del self.info["xmp"]
         self._reload_exif()
         # fill the legacy tag/ifd entries
         self.tag = self.ifd = ImageFileDirectory_v1.from_v2(self.tag_v2)
         self.__frame = frame
         self._setup()
 
-    def tell(self):
+    def tell(self) -> int:
         """Return the current frame number"""
         return self.__frame
 
-    def getxmp(self):
-        """
-        Returns a dictionary containing the XMP tags.
-        Requires defusedxml to be installed.
-
-        :returns: XMP tags in a dictionary.
-        """
-        return self._getxmp(self.tag_v2[XMP]) if XMP in self.tag_v2 else {}
-
-    def get_photoshop_blocks(self):
+    def get_photoshop_blocks(self) -> dict[int, dict[str, bytes]]:
         """
         Returns a dictionary of Photoshop "Image Resource Blocks".
         The keys are the image resource ID. For more information, see
@@ -1204,12 +1272,18 @@ def get_photoshop_blocks(self):
                 val = val[math.ceil((10 + n + size) / 2) * 2 :]
         return blocks
 
-    def load(self):
+    def load(self) -> Image.core.PixelAccess | None:
         if self.tile and self.use_load_libtiff:
             return self._load_libtiff()
         return super().load()
 
-    def load_end(self):
+    def load_prepare(self) -> None:
+        if self._im is None:
+            Image._decompression_bomb_check(self._tile_size)
+            self.im = Image.core.new(self.mode, self._tile_size)
+        ImageFile.ImageFile.load_prepare(self)
+
+    def load_end(self) -> None:
         # allow closing if we're on the first frame, there's no next
         # This is the ImageFile.load path only, libtiff specific below.
         if not self.is_animated:
@@ -1230,7 +1304,7 @@ def load_end(self):
         if ExifTags.Base.Orientation in self.tag_v2:
             del self.tag_v2[ExifTags.Base.Orientation]
 
-    def _load_libtiff(self):
+    def _load_libtiff(self) -> Image.core.PixelAccess | None:
         """Overload method triggered when we detect a compressed tiff
         Calls out to libtiff"""
 
@@ -1245,7 +1319,7 @@ def _load_libtiff(self):
         # (self._compression, (extents tuple),
         #   0, (rawmode, self._compression, fp))
         extents = self.tile[0][1]
-        args = list(self.tile[0][3])
+        args = self.tile[0][3]
 
         # To be nice on memory footprint, if there's a
         # file descriptor, use that instead of reading
@@ -1263,11 +1337,12 @@ def _load_libtiff(self):
             fp = False
 
         if fp:
-            args[2] = fp
+            assert isinstance(args, tuple)
+            args_list = list(args)
+            args_list[2] = fp
+            args = tuple(args_list)
 
-        decoder = Image._getdecoder(
-            self.mode, "libtiff", tuple(args), self.decoderconfig
-        )
+        decoder = Image._getdecoder(self.mode, "libtiff", args, self.decoderconfig)
         try:
             decoder.setimage(self.im, extents)
         except ValueError as e:
@@ -1315,7 +1390,7 @@ def _load_libtiff(self):
 
         return Image.Image.load(self)
 
-    def _setup(self):
+    def _setup(self) -> None:
         """Setup this image object based on current tags"""
 
         if 0xBC01 in self.tag_v2:
@@ -1341,12 +1416,20 @@ def _setup(self):
         logger.debug("- photometric_interpretation: %s", photo)
         logger.debug("- planar_configuration: %s", self._planar_configuration)
         logger.debug("- fill_order: %s", fillorder)
-        logger.debug("- YCbCr subsampling: %s", self.tag.get(YCBCRSUBSAMPLING))
+        logger.debug("- YCbCr subsampling: %s", self.tag_v2.get(YCBCRSUBSAMPLING))
 
         # size
-        xsize = int(self.tag_v2.get(IMAGEWIDTH))
-        ysize = int(self.tag_v2.get(IMAGELENGTH))
-        self._size = xsize, ysize
+        xsize = self.tag_v2.get(IMAGEWIDTH)
+        ysize = self.tag_v2.get(IMAGELENGTH)
+        if not isinstance(xsize, int) or not isinstance(ysize, int):
+            msg = "Invalid dimensions"
+            raise ValueError(msg)
+        self._tile_size = xsize, ysize
+        orientation = self.tag_v2.get(ExifTags.Base.Orientation)
+        if orientation in (5, 6, 7, 8):
+            self._size = ysize, xsize
+        else:
+            self._size = xsize, ysize
 
         logger.debug("- size: %s", self.size)
 
@@ -1482,19 +1565,23 @@ def _setup(self):
             # Offset in the tile tuple is 0, we go from 0,0 to
             # w,h, and we only do this once -- eds
             a = (rawmode, self._compression, False, self.tag_v2.offset)
-            self.tile.append(("libtiff", (0, 0, xsize, ysize), 0, a))
+            self.tile.append(ImageFile._Tile("libtiff", (0, 0, xsize, ysize), 0, a))
 
         elif STRIPOFFSETS in self.tag_v2 or TILEOFFSETS in self.tag_v2:
             # striped image
             if STRIPOFFSETS in self.tag_v2:
                 offsets = self.tag_v2[STRIPOFFSETS]
                 h = self.tag_v2.get(ROWSPERSTRIP, ysize)
-                w = self.size[0]
+                w = xsize
             else:
                 # tiled image
                 offsets = self.tag_v2[TILEOFFSETS]
-                w = self.tag_v2.get(TILEWIDTH)
+                tilewidth = self.tag_v2.get(TILEWIDTH)
                 h = self.tag_v2.get(TILELENGTH)
+                if not isinstance(tilewidth, int) or not isinstance(h, int):
+                    msg = "Invalid tile dimensions"
+                    raise ValueError(msg)
+                w = tilewidth
 
             for offset in offsets:
                 if x + w > xsize:
@@ -1509,19 +1596,19 @@ def _setup(self):
                     # adjust stride width accordingly
                     stride /= bps_count
 
-                a = (tile_rawmode, int(stride), 1)
+                args = (tile_rawmode, int(stride), 1)
                 self.tile.append(
-                    (
+                    ImageFile._Tile(
                         self._compression,
                         (x, y, min(x + w, xsize), min(y + h, ysize)),
                         offset,
-                        a,
+                        args,
                     )
                 )
                 x = x + w
-                if x >= self.size[0]:
+                if x >= xsize:
                     x, y = 0, y + h
-                    if y >= self.size[1]:
+                    if y >= ysize:
                         x = y = 0
                         layer += 1
         else:
@@ -1572,7 +1659,7 @@ def _setup(self):
 }
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     try:
         rawmode, prefix, photo, format, bits, extra = SAVE_INFO[im.mode]
     except KeyError as e:
@@ -1630,6 +1717,20 @@ def _save(im, fp, filename):
         except Exception:
             pass  # might not be an IFD. Might not have populated type
 
+    legacy_ifd = {}
+    if hasattr(im, "tag"):
+        legacy_ifd = im.tag.to_v2()
+
+    supplied_tags = {**legacy_ifd, **getattr(im, "tag_v2", {})}
+    for tag in (
+        # IFD offset that may not be correct in the saved image
+        EXIFIFD,
+        # Determined by the image format and should not be copied from legacy_ifd.
+        SAMPLEFORMAT,
+    ):
+        if tag in supplied_tags:
+            del supplied_tags[tag]
+
     # additions written by Greg Couch, gregc@cgl.ucsf.edu
     # inspired by image-sig posting from Kevin Cazabon, kcazabon@home.com
     if hasattr(im, "tag_v2"):
@@ -1643,8 +1744,14 @@ def _save(im, fp, filename):
             XMP,
         ):
             if key in im.tag_v2:
-                ifd[key] = im.tag_v2[key]
-                ifd.tagtype[key] = im.tag_v2.tagtype[key]
+                if key == IPTC_NAA_CHUNK and im.tag_v2.tagtype[key] not in (
+                    TiffTags.BYTE,
+                    TiffTags.UNDEFINED,
+                ):
+                    del supplied_tags[key]
+                else:
+                    ifd[key] = im.tag_v2[key]
+                    ifd.tagtype[key] = im.tag_v2.tagtype[key]
 
     # preserve ICC profile (should also work when saving other formats
     # which support profiles as TIFF) -- 2008-06-06 Florian Hoech
@@ -1688,10 +1795,11 @@ def _save(im, fp, filename):
         if im.mode == "1":
             inverted_im = im.copy()
             px = inverted_im.load()
-            for y in range(inverted_im.height):
-                for x in range(inverted_im.width):
-                    px[x, y] = 0 if px[x, y] == 255 else 255
-            im = inverted_im
+            if px is not None:
+                for y in range(inverted_im.height):
+                    for x in range(inverted_im.width):
+                        px[x, y] = 0 if px[x, y] == 255 else 255
+                im = inverted_im
         else:
             im = ImageOps.invert(im)
 
@@ -1733,11 +1841,11 @@ def _save(im, fp, filename):
     ifd[COMPRESSION] = COMPRESSION_INFO_REV.get(compression, 1)
 
     if im.mode == "YCbCr":
-        for tag, value in {
+        for tag, default_value in {
             YCBCRSUBSAMPLING: (1, 1),
             REFERENCEBLACKWHITE: (0, 255, 128, 255, 128, 255),
         }.items():
-            ifd.setdefault(tag, value)
+            ifd.setdefault(tag, default_value)
 
     blocklist = [TILEWIDTH, TILELENGTH, TILEOFFSETS, TILEBYTECOUNTS]
     if libtiff:
@@ -1757,7 +1865,7 @@ def _save(im, fp, filename):
         if hasattr(fp, "fileno"):
             try:
                 fp.seek(0)
-                _fp = os.dup(fp.fileno())
+                _fp = fp.fileno()
             except io.UnsupportedOperation:
                 pass
 
@@ -1765,11 +1873,13 @@ def _save(im, fp, filename):
         types = {}
         # STRIPOFFSETS and STRIPBYTECOUNTS are added by the library
         # based on the data in the strip.
+        # OSUBFILETYPE is deprecated.
         # The other tags expect arrays with a certain length (fixed or depending on
         # BITSPERSAMPLE, etc), passing arrays with a different length will result in
         # segfaults. Block these tags until we add extra validation.
         # SUBIFD may also cause a segfault.
         blocklist += [
+            OSUBFILETYPE,
             REFERENCEBLACKWHITE,
             STRIPBYTECOUNTS,
             STRIPOFFSETS,
@@ -1778,20 +1888,10 @@ def _save(im, fp, filename):
         ]
 
         # bits per sample is a single short in the tiff directory, not a list.
-        atts = {BITSPERSAMPLE: bits[0]}
+        atts: dict[int, Any] = {BITSPERSAMPLE: bits[0]}
         # Merge the ones that we have with (optional) more bits from
         # the original file, e.g x,y resolution so that we can
         # save(load('')) == original file.
-        legacy_ifd = {}
-        if hasattr(im, "tag"):
-            legacy_ifd = im.tag.to_v2()
-
-        # SAMPLEFORMAT is determined by the image format and should not be copied
-        # from legacy_ifd.
-        supplied_tags = {**getattr(im, "tag_v2", {}), **legacy_ifd}
-        if SAMPLEFORMAT in supplied_tags:
-            del supplied_tags[SAMPLEFORMAT]
-
         for tag, value in itertools.chain(ifd.items(), supplied_tags.items()):
             # Libtiff can only process certain core items without adding
             # them to the custom dictionary.
@@ -1835,20 +1935,14 @@ def _save(im, fp, filename):
         tags = list(atts.items())
         tags.sort()
         a = (rawmode, compression, _fp, filename, tags, types)
-        e = Image._getencoder(im.mode, "libtiff", a, encoderconfig)
-        e.setimage(im.im, (0, 0) + im.size)
+        encoder = Image._getencoder(im.mode, "libtiff", a, encoderconfig)
+        encoder.setimage(im.im, (0, 0) + im.size)
         while True:
-            # undone, change to self.decodermaxblock:
-            errcode, data = e.encode(16 * 1024)[1:]
+            errcode, data = encoder.encode(ImageFile.MAXBLOCK)[1:]
             if not _fp:
                 fp.write(data)
             if errcode:
                 break
-        if _fp:
-            try:
-                os.close(_fp)
-            except OSError:
-                pass
         if errcode < 0:
             msg = f"encoder error {errcode} when writing image file"
             raise OSError(msg)
@@ -1859,16 +1953,18 @@ def _save(im, fp, filename):
         offset = ifd.save(fp)
 
         ImageFile._save(
-            im, fp, [("raw", (0, 0) + im.size, offset, (rawmode, stride, 1))]
+            im,
+            fp,
+            [ImageFile._Tile("raw", (0, 0) + im.size, offset, (rawmode, stride, 1))],
         )
 
     # -- helper for multi-page save --
     if "_debug_multipage" in encoderinfo:
         # just to access o32 and o16 (using correct byte order)
-        im._debug_multipage = ifd
+        setattr(im, "_debug_multipage", ifd)
 
 
-class AppendingTiffWriter:
+class AppendingTiffWriter(io.BytesIO):
     fieldSizes = [
         0,  # None
         1,  # byte
@@ -1898,25 +1994,26 @@ class AppendingTiffWriter:
         521,  # JPEGACTables
     }
 
-    def __init__(self, fn, new=False):
-        if hasattr(fn, "read"):
-            self.f = fn
-            self.close_fp = False
-        else:
+    def __init__(self, fn: StrOrBytesPath | IO[bytes], new: bool = False) -> None:
+        self.f: IO[bytes]
+        if is_path(fn):
             self.name = fn
             self.close_fp = True
             try:
                 self.f = open(fn, "w+b" if new else "r+b")
             except OSError:
                 self.f = open(fn, "w+b")
+        else:
+            self.f = cast(IO[bytes], fn)
+            self.close_fp = False
         self.beginning = self.f.tell()
         self.setup()
 
-    def setup(self):
+    def setup(self) -> None:
         # Reset everything.
         self.f.seek(self.beginning, os.SEEK_SET)
 
-        self.whereToWriteNewIFDOffset = None
+        self.whereToWriteNewIFDOffset: int | None = None
         self.offsetOfNewPage = 0
 
         self.IIMM = iimm = self.f.read(4)
@@ -1937,7 +2034,7 @@ def setup(self):
         self.skipIFDs()
         self.goToEnd()
 
-    def finalize(self):
+    def finalize(self) -> None:
         if self.isFirst:
             return
 
@@ -1955,35 +2052,41 @@ def finalize(self):
 
         ifd_offset = self.readLong()
         ifd_offset += self.offsetOfNewPage
+        assert self.whereToWriteNewIFDOffset is not None
         self.f.seek(self.whereToWriteNewIFDOffset)
         self.writeLong(ifd_offset)
         self.f.seek(ifd_offset)
         self.fixIFD()
 
-    def newFrame(self):
+    def newFrame(self) -> None:
         # Call this to finish a frame.
         self.finalize()
         self.setup()
 
-    def __enter__(self):
+    def __enter__(self) -> AppendingTiffWriter:
         return self
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    def __exit__(self, *args: object) -> None:
         if self.close_fp:
             self.close()
-        return False
 
-    def tell(self):
+    def tell(self) -> int:
         return self.f.tell() - self.offsetOfNewPage
 
-    def seek(self, offset, whence=io.SEEK_SET):
+    def seek(self, offset: int, whence: int = io.SEEK_SET) -> int:
+        """
+        :param offset: Distance to seek.
+        :param whence: Whether the distance is relative to the start,
+                       end or current position.
+        :returns: The resulting position, relative to the start.
+        """
         if whence == os.SEEK_SET:
             offset += self.offsetOfNewPage
 
         self.f.seek(offset, whence)
         return self.tell()
 
-    def goToEnd(self):
+    def goToEnd(self) -> None:
         self.f.seek(0, os.SEEK_END)
         pos = self.f.tell()
 
@@ -1993,13 +2096,13 @@ def goToEnd(self):
             self.f.write(bytes(pad_bytes))
         self.offsetOfNewPage = self.f.tell()
 
-    def setEndian(self, endian):
+    def setEndian(self, endian: str) -> None:
         self.endian = endian
-        self.longFmt = self.endian + "L"
-        self.shortFmt = self.endian + "H"
-        self.tagFormat = self.endian + "HHL"
+        self.longFmt = f"{self.endian}L"
+        self.shortFmt = f"{self.endian}H"
+        self.tagFormat = f"{self.endian}HHL"
 
-    def skipIFDs(self):
+    def skipIFDs(self) -> None:
         while True:
             ifd_offset = self.readLong()
             if ifd_offset == 0:
@@ -2010,55 +2113,66 @@ def skipIFDs(self):
             num_tags = self.readShort()
             self.f.seek(num_tags * 12, os.SEEK_CUR)
 
-    def write(self, data):
+    def write(self, data: Buffer, /) -> int:
         return self.f.write(data)
 
-    def readShort(self):
-        (value,) = struct.unpack(self.shortFmt, self.f.read(2))
-        return value
+    def _fmt(self, field_size: int) -> str:
+        try:
+            return {2: "H", 4: "L", 8: "Q"}[field_size]
+        except KeyError:
+            msg = "offset is not supported"
+            raise RuntimeError(msg)
 
-    def readLong(self):
-        (value,) = struct.unpack(self.longFmt, self.f.read(4))
+    def _read(self, field_size: int) -> int:
+        (value,) = struct.unpack(
+            self.endian + self._fmt(field_size), self.f.read(field_size)
+        )
         return value
 
-    def rewriteLastShortToLong(self, value):
-        self.f.seek(-2, os.SEEK_CUR)
-        bytes_written = self.f.write(struct.pack(self.longFmt, value))
-        if bytes_written is not None and bytes_written != 4:
-            msg = f"wrote only {bytes_written} bytes but wanted 4"
-            raise RuntimeError(msg)
+    def readShort(self) -> int:
+        return self._read(2)
 
-    def rewriteLastShort(self, value):
-        self.f.seek(-2, os.SEEK_CUR)
-        bytes_written = self.f.write(struct.pack(self.shortFmt, value))
-        if bytes_written is not None and bytes_written != 2:
-            msg = f"wrote only {bytes_written} bytes but wanted 2"
+    def readLong(self) -> int:
+        return self._read(4)
+
+    @staticmethod
+    def _verify_bytes_written(bytes_written: int | None, expected: int) -> None:
+        if bytes_written is not None and bytes_written != expected:
+            msg = f"wrote only {bytes_written} bytes but wanted {expected}"
             raise RuntimeError(msg)
 
-    def rewriteLastLong(self, value):
-        self.f.seek(-4, os.SEEK_CUR)
+    def rewriteLastShortToLong(self, value: int) -> None:
+        self.f.seek(-2, os.SEEK_CUR)
         bytes_written = self.f.write(struct.pack(self.longFmt, value))
-        if bytes_written is not None and bytes_written != 4:
-            msg = f"wrote only {bytes_written} bytes but wanted 4"
-            raise RuntimeError(msg)
+        self._verify_bytes_written(bytes_written, 4)
+
+    def _rewriteLast(self, value: int, field_size: int) -> None:
+        self.f.seek(-field_size, os.SEEK_CUR)
+        bytes_written = self.f.write(
+            struct.pack(self.endian + self._fmt(field_size), value)
+        )
+        self._verify_bytes_written(bytes_written, field_size)
+
+    def rewriteLastShort(self, value: int) -> None:
+        return self._rewriteLast(value, 2)
 
-    def writeShort(self, value):
+    def rewriteLastLong(self, value: int) -> None:
+        return self._rewriteLast(value, 4)
+
+    def writeShort(self, value: int) -> None:
         bytes_written = self.f.write(struct.pack(self.shortFmt, value))
-        if bytes_written is not None and bytes_written != 2:
-            msg = f"wrote only {bytes_written} bytes but wanted 2"
-            raise RuntimeError(msg)
+        self._verify_bytes_written(bytes_written, 2)
 
-    def writeLong(self, value):
+    def writeLong(self, value: int) -> None:
         bytes_written = self.f.write(struct.pack(self.longFmt, value))
-        if bytes_written is not None and bytes_written != 4:
-            msg = f"wrote only {bytes_written} bytes but wanted 4"
-            raise RuntimeError(msg)
+        self._verify_bytes_written(bytes_written, 4)
 
-    def close(self):
+    def close(self) -> None:
         self.finalize()
-        self.f.close()
+        if self.close_fp:
+            self.f.close()
 
-    def fixIFD(self):
+    def fixIFD(self) -> None:
         num_tags = self.readShort()
 
         for i in range(num_tags):
@@ -2068,40 +2182,29 @@ def fixIFD(self):
             total_size = field_size * count
             is_local = total_size <= 4
             if not is_local:
-                offset = self.readLong()
-                offset += self.offsetOfNewPage
+                offset = self.readLong() + self.offsetOfNewPage
                 self.rewriteLastLong(offset)
 
             if tag in self.Tags:
                 cur_pos = self.f.tell()
 
                 if is_local:
-                    self.fixOffsets(
-                        count, isShort=(field_size == 2), isLong=(field_size == 4)
-                    )
+                    self._fixOffsets(count, field_size)
                     self.f.seek(cur_pos + 4)
                 else:
                     self.f.seek(offset)
-                    self.fixOffsets(
-                        count, isShort=(field_size == 2), isLong=(field_size == 4)
-                    )
+                    self._fixOffsets(count, field_size)
                     self.f.seek(cur_pos)
 
-                offset = cur_pos = None
-
             elif is_local:
                 # skip the locally stored value that is not an offset
                 self.f.seek(4, os.SEEK_CUR)
 
-    def fixOffsets(self, count, isShort=False, isLong=False):
-        if not isShort and not isLong:
-            msg = "offset is neither short nor long"
-            raise RuntimeError(msg)
-
+    def _fixOffsets(self, count: int, field_size: int) -> None:
         for i in range(count):
-            offset = self.readShort() if isShort else self.readLong()
+            offset = self._read(field_size)
             offset += self.offsetOfNewPage
-            if isShort and offset >= 65536:
+            if field_size == 2 and offset >= 65536:
                 # offset is now too large - we must convert shorts to longs
                 if count != 1:
                     msg = "not implemented"
@@ -2113,13 +2216,22 @@ def fixOffsets(self, count, isShort=False, isLong=False):
                 self.f.seek(-10, os.SEEK_CUR)
                 self.writeShort(TiffTags.LONG)  # rewrite the type to LONG
                 self.f.seek(8, os.SEEK_CUR)
-            elif isShort:
-                self.rewriteLastShort(offset)
             else:
-                self.rewriteLastLong(offset)
+                self._rewriteLast(offset, field_size)
+
+    def fixOffsets(
+        self, count: int, isShort: bool = False, isLong: bool = False
+    ) -> None:
+        if isShort:
+            field_size = 2
+        elif isLong:
+            field_size = 4
+        else:
+            field_size = 0
+        return self._fixOffsets(count, field_size)
 
 
-def _save_all(im, fp, filename):
+def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     encoderinfo = im.encoderinfo.copy()
     encoderconfig = im.encoderconfig
     append_images = list(encoderinfo.get("append_images", []))
diff --git a/src/PIL/TiffTags.py b/src/PIL/TiffTags.py
index 88ff2f4fcd5..86adaa45857 100644
--- a/src/PIL/TiffTags.py
+++ b/src/PIL/TiffTags.py
@@ -18,23 +18,38 @@
 ##
 from __future__ import annotations
 
-from collections import namedtuple
+from typing import NamedTuple
 
 
-class TagInfo(namedtuple("_TagInfo", "value name type length enum")):
-    __slots__ = []
+class _TagInfo(NamedTuple):
+    value: int | None
+    name: str
+    type: int | None
+    length: int | None
+    enum: dict[str, int]
 
-    def __new__(cls, value=None, name="unknown", type=None, length=None, enum=None):
+
+class TagInfo(_TagInfo):
+    __slots__: list[str] = []
+
+    def __new__(
+        cls,
+        value: int | None = None,
+        name: str = "unknown",
+        type: int | None = None,
+        length: int | None = None,
+        enum: dict[str, int] | None = None,
+    ) -> TagInfo:
         return super().__new__(cls, value, name, type, length, enum or {})
 
-    def cvt_enum(self, value):
+    def cvt_enum(self, value: str) -> int | str:
         # Using get will call hash(value), which can be expensive
         # for some types (e.g. Fraction). Since self.enum is rarely
         # used, it's usually better to test it first.
         return self.enum.get(value, value) if self.enum else value
 
 
-def lookup(tag, group=None):
+def lookup(tag: int, group: int | None = None) -> TagInfo:
     """
     :param tag: Integer tag number
     :param group: Which :py:data:`~PIL.TiffTags.TAGS_V2_GROUPS` to look in
@@ -81,7 +96,7 @@ def lookup(tag, group=None):
 IFD = 13
 LONG8 = 16
 
-TAGS_V2 = {
+_tags_v2: dict[int, tuple[str, int, int] | tuple[str, int, int, dict[str, int]]] = {
     254: ("NewSubfileType", LONG, 1),
     255: ("SubfileType", SHORT, 1),
     256: ("ImageWidth", LONG, 1),
@@ -225,7 +240,7 @@ def lookup(tag, group=None):
     50838: ("ImageJMetaDataByteCounts", LONG, 0),  # Can be more than one
     50839: ("ImageJMetaData", UNDEFINED, 1),  # see Issue #2006
 }
-TAGS_V2_GROUPS = {
+_tags_v2_groups = {
     # ExifIFD
     34665: {
         36864: ("ExifVersion", UNDEFINED, 1),
@@ -273,7 +288,7 @@ def lookup(tag, group=None):
 
 # Legacy Tags structure
 # these tags aren't included above, but were in the previous versions
-TAGS = {
+TAGS: dict[int | tuple[int, int], str] = {
     347: "JPEGTables",
     700: "XMP",
     # Additional Exif Info
@@ -417,9 +432,12 @@ def lookup(tag, group=None):
     50784: "Alias Layer Metadata",
 }
 
+TAGS_V2: dict[int, TagInfo] = {}
+TAGS_V2_GROUPS: dict[int, dict[int, TagInfo]] = {}
+
 
-def _populate():
-    for k, v in TAGS_V2.items():
+def _populate() -> None:
+    for k, v in _tags_v2.items():
         # Populate legacy structure.
         TAGS[k] = v[0]
         if len(v) == 4:
@@ -428,16 +446,15 @@ def _populate():
 
         TAGS_V2[k] = TagInfo(k, *v)
 
-    for tags in TAGS_V2_GROUPS.values():
-        for k, v in tags.items():
-            tags[k] = TagInfo(k, *v)
+    for group, tags in _tags_v2_groups.items():
+        TAGS_V2_GROUPS[group] = {k: TagInfo(k, *v) for k, v in tags.items()}
 
 
 _populate()
 ##
 # Map type numbers to type names -- defined in ImageFileDirectory.
 
-TYPES = {}
+TYPES: dict[int, str] = {}
 
 #
 # These tags are handled by default in libtiff, without
diff --git a/src/PIL/WalImageFile.py b/src/PIL/WalImageFile.py
index c5bf3e04cf7..87e32878b19 100644
--- a/src/PIL/WalImageFile.py
+++ b/src/PIL/WalImageFile.py
@@ -24,15 +24,18 @@
 """
 from __future__ import annotations
 
+from typing import IO
+
 from . import Image, ImageFile
 from ._binary import i32le as i32
+from ._typing import StrOrBytesPath
 
 
 class WalImageFile(ImageFile.ImageFile):
     format = "WAL"
     format_description = "Quake2 Texture"
 
-    def _open(self):
+    def _open(self) -> None:
         self._mode = "P"
 
         # read header fields
@@ -50,15 +53,15 @@ def _open(self):
         if next_name:
             self.info["next_name"] = next_name
 
-    def load(self):
-        if not self.im:
+    def load(self) -> Image.core.PixelAccess | None:
+        if self._im is None:
             self.im = Image.core.new(self.mode, self.size)
             self.frombytes(self.fp.read(self.size[0] * self.size[1]))
             self.putpalette(quake2palette)
         return Image.Image.load(self)
 
 
-def open(filename):
+def open(filename: StrOrBytesPath | IO[bytes]) -> WalImageFile:
     """
     Load texture from a Quake2 WAL texture file.
 
diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
index 59556206a3c..64188f28cb3 100644
--- a/src/PIL/WebPImagePlugin.py
+++ b/src/PIL/WebPImagePlugin.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from io import BytesIO
+from typing import IO, Any
 
 from . import Image, ImageFile
 
@@ -12,10 +13,6 @@
     SUPPORTED = False
 
 
-_VALID_WEBP_MODES = {"RGBX": True, "RGBA": True, "RGB": True}
-
-_VALID_WEBP_LEGACY_MODES = {"RGB": True, "RGBA": True}
-
 _VP8_MODES_BY_IDENTIFIER = {
     b"VP8 ": "RGB",
     b"VP8X": "RGBA",
@@ -23,7 +20,7 @@
 }
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool | str:
     is_riff_file_format = prefix[:4] == b"RIFF"
     is_webp_file = prefix[8:12] == b"WEBP"
     is_valid_vp8_mode = prefix[12:16] in _VP8_MODES_BY_IDENTIFIER
@@ -34,6 +31,7 @@ def _accept(prefix):
                 "image file could not be identified because WEBP support not installed"
             )
         return True
+    return False
 
 
 class WebPImageFile(ImageFile.ImageFile):
@@ -42,23 +40,7 @@ class WebPImageFile(ImageFile.ImageFile):
     __loaded = 0
     __logical_frame = 0
 
-    def _open(self):
-        if not _webp.HAVE_WEBPANIM:
-            # Legacy mode
-            data, width, height, self._mode, icc_profile, exif = _webp.WebPDecode(
-                self.fp.read()
-            )
-            if icc_profile:
-                self.info["icc_profile"] = icc_profile
-            if exif:
-                self.info["exif"] = exif
-            self._size = width, height
-            self.fp = BytesIO(data)
-            self.tile = [("raw", (0, 0) + self.size, 0, self.mode)]
-            self.n_frames = 1
-            self.is_animated = False
-            return
-
+    def _open(self) -> None:
         # Use the newer AnimDecoder API to parse the (possibly) animated file,
         # and access muxed chunks like ICC/EXIF/XMP.
         self._decoder = _webp.WebPAnimDecoder(self.fp.read())
@@ -94,35 +76,26 @@ def _open(self):
         # Initialize seek state
         self._reset(reset=False)
 
-    def _getexif(self):
+    def _getexif(self) -> dict[int, Any] | None:
         if "exif" not in self.info:
             return None
         return self.getexif()._get_merged_dict()
 
-    def getxmp(self):
-        """
-        Returns a dictionary containing the XMP tags.
-        Requires defusedxml to be installed.
-
-        :returns: XMP tags in a dictionary.
-        """
-        return self._getxmp(self.info["xmp"]) if "xmp" in self.info else {}
-
-    def seek(self, frame):
+    def seek(self, frame: int) -> None:
         if not self._seek_check(frame):
             return
 
         # Set logical frame to requested position
         self.__logical_frame = frame
 
-    def _reset(self, reset=True):
+    def _reset(self, reset: bool = True) -> None:
         if reset:
             self._decoder.reset()
         self.__physical_frame = 0
         self.__loaded = -1
         self.__timestamp = 0
 
-    def _get_next(self):
+    def _get_next(self) -> tuple[bytes, int, int]:
         # Get next frame
         ret = self._decoder.get_next()
         self.__physical_frame += 1
@@ -143,7 +116,7 @@ def _get_next(self):
         timestamp -= duration
         return data, timestamp, duration
 
-    def _seek(self, frame):
+    def _seek(self, frame: int) -> None:
         if self.__physical_frame == frame:
             return  # Nothing to do
         if frame < self.__physical_frame:
@@ -151,36 +124,39 @@ def _seek(self, frame):
         while self.__physical_frame < frame:
             self._get_next()  # Advance to the requested frame
 
-    def load(self):
-        if _webp.HAVE_WEBPANIM:
-            if self.__loaded != self.__logical_frame:
-                self._seek(self.__logical_frame)
+    def load(self) -> Image.core.PixelAccess | None:
+        if self.__loaded != self.__logical_frame:
+            self._seek(self.__logical_frame)
 
-                # We need to load the image data for this frame
-                data, timestamp, duration = self._get_next()
-                self.info["timestamp"] = timestamp
-                self.info["duration"] = duration
-                self.__loaded = self.__logical_frame
+            # We need to load the image data for this frame
+            data, timestamp, duration = self._get_next()
+            self.info["timestamp"] = timestamp
+            self.info["duration"] = duration
+            self.__loaded = self.__logical_frame
 
-                # Set tile
-                if self.fp and self._exclusive_fp:
-                    self.fp.close()
-                self.fp = BytesIO(data)
-                self.tile = [("raw", (0, 0) + self.size, 0, self.rawmode)]
+            # Set tile
+            if self.fp and self._exclusive_fp:
+                self.fp.close()
+            self.fp = BytesIO(data)
+            self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 0, self.rawmode)]
 
         return super().load()
 
-    def load_seek(self, pos):
+    def load_seek(self, pos: int) -> None:
         pass
 
-    def tell(self):
-        if not _webp.HAVE_WEBPANIM:
-            return super().tell()
-
+    def tell(self) -> int:
         return self.__logical_frame
 
 
-def _save_all(im, fp, filename):
+def _convert_frame(im: Image.Image) -> Image.Image:
+    # Make sure image mode is supported
+    if im.mode not in ("RGBX", "RGBA", "RGB"):
+        im = im.convert("RGBA" if im.has_transparency_data else "RGB")
+    return im
+
+
+def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     encoderinfo = im.encoderinfo.copy()
     append_images = list(encoderinfo.get("append_images", []))
 
@@ -193,7 +169,7 @@ def _save_all(im, fp, filename):
         _save(im, fp, filename)
         return
 
-    background = (0, 0, 0, 0)
+    background: int | tuple[int, ...] = (0, 0, 0, 0)
     if "background" in encoderinfo:
         background = encoderinfo["background"]
     elif "background" in im.info:
@@ -217,6 +193,7 @@ def _save_all(im, fp, filename):
     verbose = False
     lossless = im.encoderinfo.get("lossless", False)
     quality = im.encoderinfo.get("quality", 80)
+    alpha_quality = im.encoderinfo.get("alpha_quality", 100)
     method = im.encoderinfo.get("method", 0)
     icc_profile = im.encoderinfo.get("icc_profile") or ""
     exif = im.encoderinfo.get("exif", "")
@@ -269,33 +246,16 @@ def _save_all(im, fp, filename):
 
             for idx in range(nfr):
                 ims.seek(idx)
-                ims.load()
-
-                # Make sure image mode is supported
-                frame = ims
-                rawmode = ims.mode
-                if ims.mode not in _VALID_WEBP_MODES:
-                    alpha = (
-                        "A" in ims.mode
-                        or "a" in ims.mode
-                        or (ims.mode == "P" and "A" in ims.im.getpalettemode())
-                    )
-                    rawmode = "RGBA" if alpha else "RGB"
-                    frame = ims.convert(rawmode)
-
-                if rawmode == "RGB":
-                    # For faster conversion, use RGBX
-                    rawmode = "RGBX"
+
+                frame = _convert_frame(ims)
 
                 # Append the frame to the animation encoder
                 enc.add(
-                    frame.tobytes("raw", rawmode),
+                    frame.getim(),
                     round(timestamp),
-                    frame.size[0],
-                    frame.size[1],
-                    rawmode,
                     lossless,
                     quality,
+                    alpha_quality,
                     method,
                 )
 
@@ -310,7 +270,7 @@ def _save_all(im, fp, filename):
         im.seek(cur_idx)
 
     # Force encoder to flush frames
-    enc.add(None, round(timestamp), 0, 0, "", lossless, quality, 0)
+    enc.add(None, round(timestamp), lossless, quality, alpha_quality, 0)
 
     # Get the final output from the encoder
     data = enc.assemble(icc_profile, exif, xmp)
@@ -321,9 +281,10 @@ def _save_all(im, fp, filename):
     fp.write(data)
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     lossless = im.encoderinfo.get("lossless", False)
     quality = im.encoderinfo.get("quality", 80)
+    alpha_quality = im.encoderinfo.get("alpha_quality", 100)
     icc_profile = im.encoderinfo.get("icc_profile") or ""
     exif = im.encoderinfo.get("exif", b"")
     if isinstance(exif, Image.Exif):
@@ -334,16 +295,13 @@ def _save(im, fp, filename):
     method = im.encoderinfo.get("method", 4)
     exact = 1 if im.encoderinfo.get("exact") else 0
 
-    if im.mode not in _VALID_WEBP_LEGACY_MODES:
-        im = im.convert("RGBA" if im.has_transparency_data else "RGB")
+    im = _convert_frame(im)
 
     data = _webp.WebPEncode(
-        im.tobytes(),
-        im.size[0],
-        im.size[1],
+        im.getim(),
         lossless,
         float(quality),
-        im.mode,
+        float(alpha_quality),
         icc_profile,
         method,
         exact,
@@ -360,7 +318,6 @@ def _save(im, fp, filename):
 Image.register_open(WebPImageFile.format, WebPImageFile, _accept)
 if SUPPORTED:
     Image.register_save(WebPImageFile.format, _save)
-    if _webp.HAVE_WEBPANIM:
-        Image.register_save_all(WebPImageFile.format, _save_all)
+    Image.register_save_all(WebPImageFile.format, _save_all)
     Image.register_extension(WebPImageFile.format, ".webp")
     Image.register_mime(WebPImageFile.format, "image/webp")
diff --git a/src/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py
index b5b8c69b171..68f8a74f599 100644
--- a/src/PIL/WmfImagePlugin.py
+++ b/src/PIL/WmfImagePlugin.py
@@ -20,6 +20,8 @@
 # http://wvware.sourceforge.net/caolan/ora-wmf.html
 from __future__ import annotations
 
+from typing import IO
+
 from . import Image, ImageFile
 from ._binary import i16le as word
 from ._binary import si16le as short
@@ -28,7 +30,7 @@
 _handler = None
 
 
-def register_handler(handler):
+def register_handler(handler: ImageFile.StubHandler | None) -> None:
     """
     Install application-specific WMF image handler.
 
@@ -41,12 +43,12 @@ def register_handler(handler):
 if hasattr(Image.core, "drawwmf"):
     # install default handler (windows only)
 
-    class WmfHandler:
-        def open(self, im):
+    class WmfHandler(ImageFile.StubHandler):
+        def open(self, im: ImageFile.StubImageFile) -> None:
             im._mode = "RGB"
             self.bbox = im.info["wmf_bbox"]
 
-        def load(self, im):
+        def load(self, im: ImageFile.StubImageFile) -> Image.Image:
             im.fp.seek(0)  # rewind
             return Image.frombytes(
                 "RGB",
@@ -65,7 +67,7 @@ def load(self, im):
 # Read WMF file
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return (
         prefix[:6] == b"\xd7\xcd\xc6\x9a\x00\x00" or prefix[:4] == b"\x01\x00\x00\x00"
     )
@@ -79,7 +81,7 @@ class WmfStubImageFile(ImageFile.StubImageFile):
     format = "WMF"
     format_description = "Windows Metafile"
 
-    def _open(self):
+    def _open(self) -> None:
         self._inch = None
 
         # check placable header
@@ -147,10 +149,10 @@ def _open(self):
         if loader:
             loader.open(self)
 
-    def _load(self):
+    def _load(self) -> ImageFile.StubHandler | None:
         return _handler
 
-    def load(self, dpi=None):
+    def load(self, dpi: int | None = None) -> Image.core.PixelAccess | None:
         if dpi is not None and self._inch is not None:
             self.info["dpi"] = dpi
             x0, y0, x1, y1 = self.info["wmf_bbox"]
@@ -161,7 +163,7 @@ def load(self, dpi=None):
         return super().load()
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if _handler is None or not hasattr(_handler, "save"):
         msg = "WMF save handler not installed"
         raise OSError(msg)
diff --git a/src/PIL/XVThumbImagePlugin.py b/src/PIL/XVThumbImagePlugin.py
index 47ba1c54803..5d1f201a454 100644
--- a/src/PIL/XVThumbImagePlugin.py
+++ b/src/PIL/XVThumbImagePlugin.py
@@ -33,7 +33,7 @@
             )
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:6] == _MAGIC
 
 
@@ -45,8 +45,10 @@ class XVThumbImageFile(ImageFile.ImageFile):
     format = "XVThumb"
     format_description = "XV thumbnail image"
 
-    def _open(self):
+    def _open(self) -> None:
         # check magic
+        assert self.fp is not None
+
         if not _accept(self.fp.read(6)):
             msg = "not an XV thumbnail file"
             raise SyntaxError(msg)
@@ -71,7 +73,11 @@ def _open(self):
 
         self.palette = ImagePalette.raw("RGB", PALETTE)
 
-        self.tile = [("raw", (0, 0) + self.size, self.fp.tell(), (self.mode, 0, 1))]
+        self.tile = [
+            ImageFile._Tile(
+                "raw", (0, 0) + self.size, self.fp.tell(), (self.mode, 0, 1)
+            )
+        ]
 
 
 # --------------------------------------------------------------------
diff --git a/src/PIL/XbmImagePlugin.py b/src/PIL/XbmImagePlugin.py
index 566acbfe5af..f3d490a840f 100644
--- a/src/PIL/XbmImagePlugin.py
+++ b/src/PIL/XbmImagePlugin.py
@@ -21,6 +21,7 @@
 from __future__ import annotations
 
 import re
+from typing import IO
 
 from . import Image, ImageFile
 
@@ -36,7 +37,7 @@
 )
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix.lstrip()[:7] == b"#define"
 
 
@@ -48,7 +49,9 @@ class XbmImageFile(ImageFile.ImageFile):
     format = "XBM"
     format_description = "X11 Bitmap"
 
-    def _open(self):
+    def _open(self) -> None:
+        assert self.fp is not None
+
         m = xbm_head.match(self.fp.read(512))
 
         if not m:
@@ -64,10 +67,10 @@ def _open(self):
         self._mode = "1"
         self._size = xsize, ysize
 
-        self.tile = [("xbm", (0, 0) + self.size, m.end(), None)]
+        self.tile = [ImageFile._Tile("xbm", (0, 0) + self.size, m.end(), None)]
 
 
-def _save(im, fp, filename):
+def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     if im.mode != "1":
         msg = f"cannot write mode {im.mode} as XBM"
         raise OSError(msg)
@@ -82,7 +85,7 @@ def _save(im, fp, filename):
 
     fp.write(b"static char im_bits[] = {\n")
 
-    ImageFile._save(im, fp, [("xbm", (0, 0) + im.size, 0, None)])
+    ImageFile._save(im, fp, [ImageFile._Tile("xbm", (0, 0) + im.size, 0, None)])
 
     fp.write(b"};\n")
 
diff --git a/src/PIL/XpmImagePlugin.py b/src/PIL/XpmImagePlugin.py
index bf73c9bef06..1fc6c0c39d5 100644
--- a/src/PIL/XpmImagePlugin.py
+++ b/src/PIL/XpmImagePlugin.py
@@ -24,7 +24,7 @@
 xpm_head = re.compile(b'"([0-9]*) ([0-9]*) ([0-9]*) ([0-9]*)')
 
 
-def _accept(prefix):
+def _accept(prefix: bytes) -> bool:
     return prefix[:9] == b"/* XPM */"
 
 
@@ -36,7 +36,7 @@ class XpmImageFile(ImageFile.ImageFile):
     format = "XPM"
     format_description = "X11 Pixel Map"
 
-    def _open(self):
+    def _open(self) -> None:
         if not _accept(self.fp.read(9)):
             msg = "not an XPM file"
             raise SyntaxError(msg)
@@ -101,18 +101,17 @@ def _open(self):
         self._mode = "P"
         self.palette = ImagePalette.raw("RGB", b"".join(palette))
 
-        self.tile = [("raw", (0, 0) + self.size, self.fp.tell(), ("P", 0, 1))]
+        self.tile = [
+            ImageFile._Tile("raw", (0, 0) + self.size, self.fp.tell(), ("P", 0, 1))
+        ]
 
-    def load_read(self, bytes):
+    def load_read(self, read_bytes: int) -> bytes:
         #
         # load all image data in one chunk
 
         xsize, ysize = self.size
 
-        s = [None] * ysize
-
-        for i in range(ysize):
-            s[i] = self.fp.readline()[1 : xsize + 1].ljust(xsize)
+        s = [self.fp.readline()[1 : xsize + 1].ljust(xsize) for i in range(ysize)]
 
         return b"".join(s)
 
diff --git a/src/PIL/__init__.py b/src/PIL/__init__.py
index 3fcac8643cb..09546fe6333 100644
--- a/src/PIL/__init__.py
+++ b/src/PIL/__init__.py
@@ -1,6 +1,6 @@
 """Pillow (Fork of the Python Imaging Library)
 
-Pillow is the friendly PIL fork by Jeffrey A. Clark (Alex) and contributors.
+Pillow is the friendly PIL fork by Jeffrey A. Clark and contributors.
     https://github.com/python-pillow/Pillow/
 
 Pillow is forked from PIL 1.1.7.
@@ -12,6 +12,7 @@
 
 ;-)
 """
+
 from __future__ import annotations
 
 from . import _version
diff --git a/src/PIL/__main__.py b/src/PIL/__main__.py
index 943789923dc..043156e892d 100644
--- a/src/PIL/__main__.py
+++ b/src/PIL/__main__.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import sys
+
 from .features import pilinfo
 
-pilinfo()
+pilinfo(supported_formats="--report" not in sys.argv)
diff --git a/src/PIL/_binary.py b/src/PIL/_binary.py
index 0a07e8d0e12..4594ccce361 100644
--- a/src/PIL/_binary.py
+++ b/src/PIL/_binary.py
@@ -77,6 +77,16 @@ def si32le(c: bytes, o: int = 0) -> int:
     return unpack_from("<i", c, o)[0]
 
 
+def si32be(c: bytes, o: int = 0) -> int:
+    """
+    Converts a 4-bytes (32 bits) string to a signed integer, big endian.
+
+    :param c: string containing bytes to convert
+    :param o: offset of bytes to convert in string
+    """
+    return unpack_from(">i", c, o)[0]
+
+
 def i16be(c: bytes, o: int = 0) -> int:
     return unpack_from(">H", c, o)[0]
 
diff --git a/src/PIL/_deprecate.py b/src/PIL/_deprecate.py
index 33a0e07b3f4..83952b397ff 100644
--- a/src/PIL/_deprecate.py
+++ b/src/PIL/_deprecate.py
@@ -45,8 +45,6 @@ def deprecate(
     elif when <= int(__version__.split(".")[0]):
         msg = f"{deprecated} {is_} deprecated and should be removed."
         raise RuntimeError(msg)
-    elif when == 11:
-        removed = "Pillow 11 (2024-10-15)"
     elif when == 12:
         removed = "Pillow 12 (2025-10-15)"
     else:
diff --git a/src/PIL/_imaging.pyi b/src/PIL/_imaging.pyi
new file mode 100644
index 00000000000..998bc52eb8a
--- /dev/null
+++ b/src/PIL/_imaging.pyi
@@ -0,0 +1,31 @@
+from typing import Any
+
+class ImagingCore:
+    def __getitem__(self, index: int) -> float: ...
+    def __getattr__(self, name: str) -> Any: ...
+
+class ImagingFont:
+    def __getattr__(self, name: str) -> Any: ...
+
+class ImagingDraw:
+    def __getattr__(self, name: str) -> Any: ...
+
+class PixelAccess:
+    def __getitem__(self, xy: tuple[int, int]) -> float | tuple[int, ...]: ...
+    def __setitem__(
+        self, xy: tuple[int, int], color: float | tuple[int, ...]
+    ) -> None: ...
+
+class ImagingDecoder:
+    def __getattr__(self, name: str) -> Any: ...
+
+class ImagingEncoder:
+    def __getattr__(self, name: str) -> Any: ...
+
+class _Outline:
+    def close(self) -> None: ...
+    def __getattr__(self, name: str) -> Any: ...
+
+def font(image: ImagingCore, glyphdata: bytes) -> ImagingFont: ...
+def outline() -> _Outline: ...
+def __getattr__(name: str) -> Any: ...
diff --git a/src/PIL/_imagingcms.pyi b/src/PIL/_imagingcms.pyi
index b0235555dc5..ddcf93ab1eb 100644
--- a/src/PIL/_imagingcms.pyi
+++ b/src/PIL/_imagingcms.pyi
@@ -1,5 +1,143 @@
-from __future__ import annotations
+import datetime
+import sys
+from typing import Literal, SupportsFloat, TypedDict
 
-from typing import Any
+from ._typing import CapsuleType
 
-def __getattr__(name: str) -> Any: ...
+littlecms_version: str | None
+
+_Tuple3f = tuple[float, float, float]
+_Tuple2x3f = tuple[_Tuple3f, _Tuple3f]
+_Tuple3x3f = tuple[_Tuple3f, _Tuple3f, _Tuple3f]
+
+class _IccMeasurementCondition(TypedDict):
+    observer: int
+    backing: _Tuple3f
+    geo: str
+    flare: float
+    illuminant_type: str
+
+class _IccViewingCondition(TypedDict):
+    illuminant: _Tuple3f
+    surround: _Tuple3f
+    illuminant_type: str
+
+class CmsProfile:
+    @property
+    def rendering_intent(self) -> int: ...
+    @property
+    def creation_date(self) -> datetime.datetime | None: ...
+    @property
+    def copyright(self) -> str | None: ...
+    @property
+    def target(self) -> str | None: ...
+    @property
+    def manufacturer(self) -> str | None: ...
+    @property
+    def model(self) -> str | None: ...
+    @property
+    def profile_description(self) -> str | None: ...
+    @property
+    def screening_description(self) -> str | None: ...
+    @property
+    def viewing_condition(self) -> str | None: ...
+    @property
+    def version(self) -> float: ...
+    @property
+    def icc_version(self) -> int: ...
+    @property
+    def attributes(self) -> int: ...
+    @property
+    def header_flags(self) -> int: ...
+    @property
+    def header_manufacturer(self) -> str: ...
+    @property
+    def header_model(self) -> str: ...
+    @property
+    def device_class(self) -> str: ...
+    @property
+    def connection_space(self) -> str: ...
+    @property
+    def xcolor_space(self) -> str: ...
+    @property
+    def profile_id(self) -> bytes: ...
+    @property
+    def is_matrix_shaper(self) -> bool: ...
+    @property
+    def technology(self) -> str | None: ...
+    @property
+    def colorimetric_intent(self) -> str | None: ...
+    @property
+    def perceptual_rendering_intent_gamut(self) -> str | None: ...
+    @property
+    def saturation_rendering_intent_gamut(self) -> str | None: ...
+    @property
+    def red_colorant(self) -> _Tuple2x3f | None: ...
+    @property
+    def green_colorant(self) -> _Tuple2x3f | None: ...
+    @property
+    def blue_colorant(self) -> _Tuple2x3f | None: ...
+    @property
+    def red_primary(self) -> _Tuple2x3f | None: ...
+    @property
+    def green_primary(self) -> _Tuple2x3f | None: ...
+    @property
+    def blue_primary(self) -> _Tuple2x3f | None: ...
+    @property
+    def media_white_point_temperature(self) -> float | None: ...
+    @property
+    def media_white_point(self) -> _Tuple2x3f | None: ...
+    @property
+    def media_black_point(self) -> _Tuple2x3f | None: ...
+    @property
+    def luminance(self) -> _Tuple2x3f | None: ...
+    @property
+    def chromatic_adaptation(self) -> tuple[_Tuple3x3f, _Tuple3x3f] | None: ...
+    @property
+    def chromaticity(self) -> _Tuple3x3f | None: ...
+    @property
+    def colorant_table(self) -> list[str] | None: ...
+    @property
+    def colorant_table_out(self) -> list[str] | None: ...
+    @property
+    def intent_supported(self) -> dict[int, tuple[bool, bool, bool]] | None: ...
+    @property
+    def clut(self) -> dict[int, tuple[bool, bool, bool]] | None: ...
+    @property
+    def icc_measurement_condition(self) -> _IccMeasurementCondition | None: ...
+    @property
+    def icc_viewing_condition(self) -> _IccViewingCondition | None: ...
+    def is_intent_supported(self, intent: int, direction: int, /) -> int: ...
+
+class CmsTransform:
+    def apply(self, id_in: CapsuleType, id_out: CapsuleType) -> int: ...
+
+def profile_open(profile: str, /) -> CmsProfile: ...
+def profile_frombytes(profile: bytes, /) -> CmsProfile: ...
+def profile_tobytes(profile: CmsProfile, /) -> bytes: ...
+def buildTransform(
+    input_profile: CmsProfile,
+    output_profile: CmsProfile,
+    in_mode: str,
+    out_mode: str,
+    rendering_intent: int = 0,
+    cms_flags: int = 0,
+    /,
+) -> CmsTransform: ...
+def buildProofTransform(
+    input_profile: CmsProfile,
+    output_profile: CmsProfile,
+    proof_profile: CmsProfile,
+    in_mode: str,
+    out_mode: str,
+    rendering_intent: int = 0,
+    proof_intent: int = 0,
+    cms_flags: int = 0,
+    /,
+) -> CmsTransform: ...
+def createProfile(
+    color_space: Literal["LAB", "XYZ", "sRGB"], color_temp: SupportsFloat = 0.0, /
+) -> CmsProfile: ...
+
+if sys.platform == "win32":
+    def get_display_profile_win32(handle: int = 0, is_dc: int = 0, /) -> str | None: ...
diff --git a/src/PIL/_imagingft.pyi b/src/PIL/_imagingft.pyi
index b0235555dc5..9cc9822f5b4 100644
--- a/src/PIL/_imagingft.pyi
+++ b/src/PIL/_imagingft.pyi
@@ -1,5 +1,69 @@
-from __future__ import annotations
+from typing import Any, Callable
 
-from typing import Any
+from . import ImageFont, _imaging
 
+class Font:
+    @property
+    def family(self) -> str | None: ...
+    @property
+    def style(self) -> str | None: ...
+    @property
+    def ascent(self) -> int: ...
+    @property
+    def descent(self) -> int: ...
+    @property
+    def height(self) -> int: ...
+    @property
+    def x_ppem(self) -> int: ...
+    @property
+    def y_ppem(self) -> int: ...
+    @property
+    def glyphs(self) -> int: ...
+    def render(
+        self,
+        string: str | bytes,
+        fill: Callable[[int, int], _imaging.ImagingCore],
+        mode: str,
+        dir: str | None,
+        features: list[str] | None,
+        lang: str | None,
+        stroke_width: float,
+        anchor: str | None,
+        foreground_ink_long: int,
+        x_start: float,
+        y_start: float,
+        /,
+    ) -> tuple[_imaging.ImagingCore, tuple[int, int]]: ...
+    def getsize(
+        self,
+        string: str | bytes | bytearray,
+        mode: str,
+        dir: str | None,
+        features: list[str] | None,
+        lang: str | None,
+        anchor: str | None,
+        /,
+    ) -> tuple[tuple[int, int], tuple[int, int]]: ...
+    def getlength(
+        self,
+        string: str | bytes,
+        mode: str,
+        dir: str | None,
+        features: list[str] | None,
+        lang: str | None,
+        /,
+    ) -> float: ...
+    def getvarnames(self) -> list[bytes]: ...
+    def getvaraxes(self) -> list[ImageFont.Axis]: ...
+    def setvarname(self, instance_index: int, /) -> None: ...
+    def setvaraxes(self, axes: list[float], /) -> None: ...
+
+def getfont(
+    filename: str | bytes,
+    size: float,
+    index: int,
+    encoding: str,
+    font_bytes: bytes,
+    layout_engine: int,
+) -> Font: ...
 def __getattr__(name: str) -> Any: ...
diff --git a/src/PIL/_imagingmath.pyi b/src/PIL/_imagingmath.pyi
new file mode 100644
index 00000000000..e27843e5338
--- /dev/null
+++ b/src/PIL/_imagingmath.pyi
@@ -0,0 +1,3 @@
+from typing import Any
+
+def __getattr__(name: str) -> Any: ...
diff --git a/src/PIL/_imagingmorph.pyi b/src/PIL/_imagingmorph.pyi
new file mode 100644
index 00000000000..e27843e5338
--- /dev/null
+++ b/src/PIL/_imagingmorph.pyi
@@ -0,0 +1,3 @@
+from typing import Any
+
+def __getattr__(name: str) -> Any: ...
diff --git a/src/PIL/_imagingtk.pyi b/src/PIL/_imagingtk.pyi
new file mode 100644
index 00000000000..e27843e5338
--- /dev/null
+++ b/src/PIL/_imagingtk.pyi
@@ -0,0 +1,3 @@
+from typing import Any
+
+def __getattr__(name: str) -> Any: ...
diff --git a/src/PIL/_tkinter_finder.py b/src/PIL/_tkinter_finder.py
index 03a6eba44ff..beddfb0628a 100644
--- a/src/PIL/_tkinter_finder.py
+++ b/src/PIL/_tkinter_finder.py
@@ -1,10 +1,12 @@
 """ Find compiled module linking to Tcl / Tk libraries
 """
+
 from __future__ import annotations
 
 import sys
 import tkinter
-from tkinter import _tkinter as tk
+
+tk = getattr(tkinter, "_tkinter")
 
 try:
     if hasattr(sys, "pypy_find_executable"):
diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py
index 608b2b41fa8..0a7d87cc24b 100644
--- a/src/PIL/_typing.py
+++ b/src/PIL/_typing.py
@@ -1,6 +1,29 @@
 from __future__ import annotations
 
+import os
 import sys
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any, Protocol, TypeVar, Union
+
+if TYPE_CHECKING:
+    from numbers import _IntegralLike as IntegralLike
+
+    try:
+        import numpy.typing as npt
+
+        NumpyArray = npt.NDArray[Any]  # requires numpy>=1.21
+    except (ImportError, AttributeError):
+        pass
+
+if sys.version_info >= (3, 13):
+    from types import CapsuleType
+else:
+    CapsuleType = object
+
+if sys.version_info >= (3, 12):
+    from collections.abc import Buffer
+else:
+    Buffer = Any
 
 if sys.version_info >= (3, 10):
     from typing import TypeGuard
@@ -8,11 +31,23 @@
     try:
         from typing_extensions import TypeGuard
     except ImportError:
-        from typing import Any
 
         class TypeGuard:  # type: ignore[no-redef]
             def __class_getitem__(cls, item: Any) -> type[bool]:
                 return bool
 
 
-__all__ = ["TypeGuard"]
+Coords = Union[Sequence[float], Sequence[Sequence[float]]]
+
+
+_T_co = TypeVar("_T_co", covariant=True)
+
+
+class SupportsRead(Protocol[_T_co]):
+    def read(self, __length: int = ...) -> _T_co: ...
+
+
+StrOrBytesPath = Union[str, bytes, "os.PathLike[str]", "os.PathLike[bytes]"]
+
+
+__all__ = ["Buffer", "IntegralLike", "StrOrBytesPath", "SupportsRead", "TypeGuard"]
diff --git a/src/PIL/_util.py b/src/PIL/_util.py
index 13f369cca1d..8ef0d36f754 100644
--- a/src/PIL/_util.py
+++ b/src/PIL/_util.py
@@ -1,19 +1,13 @@
 from __future__ import annotations
 
 import os
-from pathlib import Path
 from typing import Any, NoReturn
 
-from ._typing import TypeGuard
+from ._typing import StrOrBytesPath, TypeGuard
 
 
-def is_path(f: Any) -> TypeGuard[bytes | str | Path]:
-    return isinstance(f, (bytes, str, Path))
-
-
-def is_directory(f: Any) -> TypeGuard[bytes | str | Path]:
-    """Checks if an object is a string, and that it points to a directory."""
-    return is_path(f) and os.path.isdir(f)
+def is_path(f: Any) -> TypeGuard[StrOrBytesPath]:
+    return isinstance(f, (bytes, str, os.PathLike))
 
 
 class DeferredError:
diff --git a/src/PIL/_version.py b/src/PIL/_version.py
index 1018b96b525..963d8c906dc 100644
--- a/src/PIL/_version.py
+++ b/src/PIL/_version.py
@@ -1,4 +1,4 @@
 # Master version for Pillow
 from __future__ import annotations
 
-__version__ = "10.2.0"
+__version__ = "11.0.0"
diff --git a/src/PIL/_webp.pyi b/src/PIL/_webp.pyi
new file mode 100644
index 00000000000..e27843e5338
--- /dev/null
+++ b/src/PIL/_webp.pyi
@@ -0,0 +1,3 @@
+from typing import Any
+
+def __getattr__(name: str) -> Any: ...
diff --git a/src/PIL/features.py b/src/PIL/features.py
index b14d6df13f2..75d59e01c40 100644
--- a/src/PIL/features.py
+++ b/src/PIL/features.py
@@ -4,10 +4,12 @@
 import os
 import sys
 import warnings
+from typing import IO
 
 import PIL
 
 from . import Image
+from ._deprecate import deprecate
 
 modules = {
     "pil": ("PIL._imaging", "PILLOW_VERSION"),
@@ -18,7 +20,7 @@
 }
 
 
-def check_module(feature):
+def check_module(feature: str) -> bool:
     """
     Checks if a module is available.
 
@@ -42,7 +44,7 @@ def check_module(feature):
         return False
 
 
-def version_module(feature):
+def version_module(feature: str) -> str | None:
     """
     :param feature: The module to check for.
     :returns:
@@ -54,13 +56,10 @@ def version_module(feature):
 
     module, ver = modules[feature]
 
-    if ver is None:
-        return None
-
     return getattr(__import__(module, fromlist=[ver]), ver)
 
 
-def get_supported_modules():
+def get_supported_modules() -> list[str]:
     """
     :returns: A list of all supported modules.
     """
@@ -75,7 +74,7 @@ def get_supported_modules():
 }
 
 
-def check_codec(feature):
+def check_codec(feature: str) -> bool:
     """
     Checks if a codec is available.
 
@@ -89,10 +88,10 @@ def check_codec(feature):
 
     codec, lib = codecs[feature]
 
-    return codec + "_encoder" in dir(Image.core)
+    return f"{codec}_encoder" in dir(Image.core)
 
 
-def version_codec(feature):
+def version_codec(feature: str) -> str | None:
     """
     :param feature: The codec to check for.
     :returns:
@@ -105,7 +104,7 @@ def version_codec(feature):
 
     codec, lib = codecs[feature]
 
-    version = getattr(Image.core, lib + "_version")
+    version = getattr(Image.core, f"{lib}_version")
 
     if feature == "libtiff":
         return version.split("\n")[0].split("Version ")[1]
@@ -113,17 +112,17 @@ def version_codec(feature):
     return version
 
 
-def get_supported_codecs():
+def get_supported_codecs() -> list[str]:
     """
     :returns: A list of all supported codecs.
     """
     return [f for f in codecs if check_codec(f)]
 
 
-features = {
-    "webp_anim": ("PIL._webp", "HAVE_WEBPANIM", None),
-    "webp_mux": ("PIL._webp", "HAVE_WEBPMUX", None),
-    "transp_webp": ("PIL._webp", "HAVE_TRANSPARENCY", None),
+features: dict[str, tuple[str, str | bool, 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"),
     "fribidi": ("PIL._imagingft", "HAVE_FRIBIDI", "fribidi_version"),
     "harfbuzz": ("PIL._imagingft", "HAVE_HARFBUZZ", "harfbuzz_version"),
@@ -133,7 +132,7 @@ def get_supported_codecs():
 }
 
 
-def check_feature(feature):
+def check_feature(feature: str) -> bool | None:
     """
     Checks if a feature is available.
 
@@ -147,8 +146,12 @@ def check_feature(feature):
 
     module, flag, ver = features[feature]
 
+    if isinstance(flag, bool):
+        deprecate(f'check_feature("{feature}")', 12)
     try:
         imported_module = __import__(module, fromlist=["PIL"])
+        if isinstance(flag, bool):
+            return flag
         return getattr(imported_module, flag)
     except ModuleNotFoundError:
         return None
@@ -157,7 +160,7 @@ def check_feature(feature):
         return None
 
 
-def version_feature(feature):
+def version_feature(feature: str) -> str | None:
     """
     :param feature: The feature to check for.
     :returns: The version number as a string, or ``None`` if not available.
@@ -174,14 +177,24 @@ def version_feature(feature):
     return getattr(__import__(module, fromlist=[ver]), ver)
 
 
-def get_supported_features():
+def get_supported_features() -> list[str]:
     """
     :returns: A list of all supported features.
     """
-    return [f for f in features if check_feature(f)]
-
-
-def check(feature):
+    supported_features = []
+    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:
     """
     :param feature: A module, codec, or feature name.
     :returns:
@@ -199,7 +212,7 @@ def check(feature):
     return False
 
 
-def version(feature):
+def version(feature: str) -> str | None:
     """
     :param feature:
         The module, codec, or feature to check for.
@@ -215,7 +228,7 @@ def version(feature):
     return None
 
 
-def get_supported():
+def get_supported() -> list[str]:
     """
     :returns: A list of all supported modules, features, and codecs.
     """
@@ -226,10 +239,13 @@ def get_supported():
     return ret
 
 
-def pilinfo(out=None, supported_formats=True):
+def pilinfo(out: IO[str] | None = None, supported_formats: bool = True) -> None:
     """
     Prints information about this installation of Pillow.
     This function can be called with ``python3 -m PIL``.
+    It can also be called with ``python3 -m PIL.report`` or ``python3 -m PIL --report``
+    to have "supported_formats" set to ``False``, omitting the list of all supported
+    image file formats.
 
     :param out:
         The output stream to print to. Defaults to ``sys.stdout`` if ``None``.
@@ -244,17 +260,22 @@ def pilinfo(out=None, supported_formats=True):
 
     print("-" * 68, file=out)
     print(f"Pillow {PIL.__version__}", file=out)
-    py_version = sys.version.splitlines()
-    print(f"Python {py_version[0].strip()}", file=out)
-    for py_version in py_version[1:]:
+    py_version_lines = sys.version.splitlines()
+    print(f"Python {py_version_lines[0].strip()}", file=out)
+    for py_version in py_version_lines[1:]:
         print(f"       {py_version.strip()}", file=out)
     print("-" * 68, file=out)
+    print(f"Python executable is {sys.executable or 'unknown'}", file=out)
+    if sys.prefix != sys.base_prefix:
+        print(f"Environment Python files loaded from {sys.prefix}", file=out)
+    print(f"System Python files loaded from {sys.base_prefix}", file=out)
+    print("-" * 68, file=out)
     print(
-        f"Python modules loaded from {os.path.dirname(Image.__file__)}",
+        f"Python Pillow modules loaded from {os.path.dirname(Image.__file__)}",
         file=out,
     )
     print(
-        f"Binary modules loaded from {os.path.dirname(Image.core.__file__)}",
+        f"Binary Pillow modules loaded from {os.path.dirname(Image.core.__file__)}",
         file=out,
     )
     print("-" * 68, file=out)
@@ -265,9 +286,6 @@ def pilinfo(out=None, supported_formats=True):
         ("freetype2", "FREETYPE2"),
         ("littlecms2", "LITTLECMS2"),
         ("webp", "WEBP"),
-        ("transp_webp", "WEBP Transparency"),
-        ("webp_mux", "WEBPMUX"),
-        ("webp_anim", "WEBP Animation"),
         ("jpg", "JPEG"),
         ("jpg_2000", "OPENJPEG (JPEG2000)"),
         ("zlib", "ZLIB (PNG/ZIP)"),
@@ -277,9 +295,12 @@ def pilinfo(out=None, supported_formats=True):
         ("xcb", "XCB (X protocol)"),
     ]:
         if check(name):
-            if name == "jpg" and check_feature("libjpeg_turbo"):
-                v = "libjpeg-turbo " + version_feature("libjpeg_turbo")
-            else:
+            v: str | None = None
+            if name == "jpg":
+                libjpeg_turbo_version = version_feature("libjpeg_turbo")
+                if libjpeg_turbo_version is not None:
+                    v = "libjpeg-turbo " + libjpeg_turbo_version
+            if v is None:
                 v = version(name)
             if v is not None:
                 version_static = name in ("pil", "jpg")
diff --git a/src/PIL/py.typed b/src/PIL/py.typed
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/PIL/report.py b/src/PIL/report.py
new file mode 100644
index 00000000000..d2815e8455e
--- /dev/null
+++ b/src/PIL/report.py
@@ -0,0 +1,5 @@
+from __future__ import annotations
+
+from .features import pilinfo
+
+pilinfo(supported_formats=False)
diff --git a/src/Tk/_tkmini.h b/src/Tk/_tkmini.h
index 68247bc472d..a260fa0d1dc 100644
--- a/src/Tk/_tkmini.h
+++ b/src/Tk/_tkmini.h
@@ -80,7 +80,8 @@ typedef struct Tcl_Command_ *Tcl_Command;
 typedef void *ClientData;
 
 typedef int(Tcl_CmdProc)(
-    ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[]);
+    ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[]
+);
 typedef void(Tcl_CmdDeleteProc)(ClientData clientData);
 
 /* Typedefs derived from function signatures in Tcl header */
@@ -90,7 +91,8 @@ typedef Tcl_Command (*Tcl_CreateCommand_t)(
     const char *cmdName,
     Tcl_CmdProc *proc,
     ClientData clientData,
-    Tcl_CmdDeleteProc *deleteProc);
+    Tcl_CmdDeleteProc *deleteProc
+);
 /* Tcl_AppendResult */
 typedef void (*Tcl_AppendResult_t)(Tcl_Interp *interp, ...);
 
@@ -127,7 +129,8 @@ typedef int (*Tk_PhotoPutBlock_t)(
     int y,
     int width,
     int height,
-    int compRule);
+    int compRule
+);
 /* Tk_FindPhoto */
 typedef Tk_PhotoHandle (*Tk_FindPhoto_t)(Tcl_Interp *interp, const char *imageName);
 /* Tk_PhotoGetImage */
diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c
index bd3cafe9596..a36c3e0bdc4 100644
--- a/src/Tk/tkImaging.c
+++ b/src/Tk/tkImaging.c
@@ -56,31 +56,48 @@ static Tk_PhotoPutBlock_t TK_PHOTO_PUT_BLOCK;
 
 static Imaging
 ImagingFind(const char *name) {
-    Py_ssize_t id;
+    PyObject *capsule;
+    int direct_pointer = 0;
+    const char *expected = "capsule object \"" IMAGING_MAGIC "\" at 0x";
 
-    /* FIXME: use CObject instead? */
-#if defined(_WIN64)
-    id = _atoi64(name);
-#else
-    id = atol(name);
-#endif
-    if (!id) {
+    if (name[0] == '<') {
+        name++;
+    } else {
+        // Special case for PyPy, where the string representation of a Capsule
+        // refers directly to the pointer itself, not to the PyCapsule object.
+        direct_pointer = 1;
+    }
+
+    if (strncmp(name, expected, strlen(expected))) {
+        return NULL;
+    }
+
+    capsule = (PyObject *)strtoull(name + strlen(expected), NULL, 16);
+
+    if (direct_pointer) {
+        return (Imaging)capsule;
+    }
+
+    if (!PyCapsule_IsValid(capsule, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
 
-    return (Imaging)id;
+    return (Imaging)PyCapsule_GetPointer(capsule, IMAGING_MAGIC);
 }
 
 static int
 PyImagingPhotoPut(
-    ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv) {
+    ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv
+) {
     Imaging im;
     Tk_PhotoHandle photo;
     Tk_PhotoImageBlock block;
 
     if (argc != 3) {
         TCL_APPEND_RESULT(
-            interp, "usage: ", argv[0], " destPhoto srcImage", (char *)NULL);
+            interp, "usage: ", argv[0], " destPhoto srcImage", (char *)NULL
+        );
         return TCL_ERROR;
     }
 
@@ -128,21 +145,16 @@ PyImagingPhotoPut(
     block.pixelPtr = (unsigned char *)im->block;
 
     TK_PHOTO_PUT_BLOCK(
-        interp,
-        photo,
-        &block,
-        0,
-        0,
-        block.width,
-        block.height,
-        TK_PHOTO_COMPOSITE_SET);
+        interp, photo, &block, 0, 0, block.width, block.height, TK_PHOTO_COMPOSITE_SET
+    );
 
     return TCL_OK;
 }
 
 static int
 PyImagingPhotoGet(
-    ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv) {
+    ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv
+) {
     Imaging im;
     Tk_PhotoHandle photo;
     Tk_PhotoImageBlock block;
@@ -150,7 +162,8 @@ PyImagingPhotoGet(
 
     if (argc != 3) {
         TCL_APPEND_RESULT(
-            interp, "usage: ", argv[0], " srcPhoto destImage", (char *)NULL);
+            interp, "usage: ", argv[0], " srcPhoto destImage", (char *)NULL
+        );
         return TCL_ERROR;
     }
 
@@ -190,13 +203,15 @@ TkImaging_Init(Tcl_Interp *interp) {
         "PyImagingPhoto",
         PyImagingPhotoPut,
         (ClientData)0,
-        (Tcl_CmdDeleteProc *)NULL);
+        (Tcl_CmdDeleteProc *)NULL
+    );
     TCL_CREATE_COMMAND(
         interp,
         "PyImagingPhotoGet",
         PyImagingPhotoGet,
         (ClientData)0,
-        (Tcl_CmdDeleteProc *)NULL);
+        (Tcl_CmdDeleteProc *)NULL
+    );
 }
 
 /*
@@ -287,7 +302,7 @@ load_tkinter_funcs(void) {
      * Return 0 for success, non-zero for failure.
      */
 
-    HMODULE* hMods = NULL;
+    HMODULE *hMods = NULL;
     HANDLE hProcess;
     DWORD cbNeeded;
     unsigned int i;
@@ -313,7 +328,7 @@ load_tkinter_funcs(void) {
 #endif
         return 1;
     }
-    if (!(hMods = (HMODULE*) malloc(cbNeeded))) {
+    if (!(hMods = (HMODULE *)malloc(cbNeeded))) {
         PyErr_NoMemory();
         return 1;
     }
@@ -345,7 +360,7 @@ load_tkinter_funcs(void) {
     } else if (found_tk == 0) {
         PyErr_SetString(PyExc_RuntimeError, "Could not find Tk routines");
     }
-    return (int) ((found_tcl != 1) || (found_tk != 1));
+    return (int)((found_tcl != 1) || (found_tk != 1));
 }
 
 #else /* not Windows */
@@ -400,8 +415,9 @@ _func_loader(void *lib) {
         return 1;
     }
     return (
-        (TK_PHOTO_PUT_BLOCK =
-             (Tk_PhotoPutBlock_t)_dfunc(lib, "Tk_PhotoPutBlock")) == NULL);
+        (TK_PHOTO_PUT_BLOCK = (Tk_PhotoPutBlock_t)_dfunc(lib, "Tk_PhotoPutBlock")) ==
+        NULL
+    );
 }
 
 int
diff --git a/src/_imaging.c b/src/_imaging.c
index 59f80a35415..2db4486b23e 100644
--- a/src/_imaging.c
+++ b/src/_imaging.c
@@ -92,25 +92,13 @@
 
 #define _USE_MATH_DEFINES
 #include <math.h>
-
-/* Configuration stuff. Feel free to undef things you don't need. */
-#define WITH_IMAGECHOPS  /* ImageChops support */
-#define WITH_IMAGEDRAW   /* ImageDraw support */
-#define WITH_MAPPING     /* use memory mapping to read some file formats */
-#define WITH_IMAGEPATH   /* ImagePath stuff */
-#define WITH_ARROW       /* arrow graphics stuff (experimental) */
-#define WITH_EFFECTS     /* special effects */
-#define WITH_QUANTIZE    /* quantization support */
-#define WITH_RANKFILTER  /* rank filter */
-#define WITH_MODEFILTER  /* mode filter */
-#define WITH_THREADING   /* "friendly" threading support */
-#define WITH_UNSHARPMASK /* Kevin Cazabon's unsharpmask module */
+#include <stddef.h>
 
 #undef VERBOSE
 
 #define B16(p, i) ((((int)p[(i)]) << 8) + p[(i) + 1])
 #define L16(p, i) ((((int)p[(i) + 1]) << 8) + p[(i)])
-#define S16(v) ((v) < 32768 ? (v) : ((v)-65536))
+#define S16(v) ((v) < 32768 ? (v) : ((v) - 65536))
 
 /* -------------------------------------------------------------------- */
 /* OBJECT ADMINISTRATION                        */
@@ -123,8 +111,6 @@ typedef struct {
 
 static PyTypeObject Imaging_Type;
 
-#ifdef WITH_IMAGEDRAW
-
 typedef struct {
     /* to write a character, cut out sxy from glyph data, place
        at current position plus dxy, and advance by (dx, dy) */
@@ -151,8 +137,6 @@ typedef struct {
 
 static PyTypeObject ImagingDraw_Type;
 
-#endif
-
 typedef struct {
     PyObject_HEAD ImagingObject *image;
     int readonly;
@@ -215,16 +199,12 @@ PyImaging_AsImaging(PyObject *op) {
 
 void
 ImagingSectionEnter(ImagingSectionCookie *cookie) {
-#ifdef WITH_THREADING
     *cookie = (PyThreadState *)PyEval_SaveThread();
-#endif
 }
 
 void
 ImagingSectionLeave(ImagingSectionCookie *cookie) {
-#ifdef WITH_THREADING
     PyEval_RestoreThread((PyThreadState *)*cookie);
-#endif
 }
 
 /* -------------------------------------------------------------------- */
@@ -290,7 +270,8 @@ ImagingError_ModeError(void) {
 void *
 ImagingError_ValueError(const char *message) {
     PyErr_SetString(
-        PyExc_ValueError, (message) ? (char *)message : "unrecognized argument value");
+        PyExc_ValueError, (message) ? (char *)message : "unrecognized argument value"
+    );
     return NULL;
 }
 
@@ -467,7 +448,8 @@ getpixel(Imaging im, ImagingAccess access, int x, int y) {
                     return Py_BuildValue("BBB", pixel.b[0], pixel.b[1], pixel.b[2]);
                 case 4:
                     return Py_BuildValue(
-                        "BBBB", pixel.b[0], pixel.b[1], pixel.b[2], pixel.b[3]);
+                        "BBBB", pixel.b[0], pixel.b[1], pixel.b[2], pixel.b[3]
+                    );
             }
             break;
         case IMAGING_TYPE_INT32:
@@ -518,7 +500,8 @@ getink(PyObject *color, Imaging im, char *ink) {
             rIsInt = 1;
         } else if (im->bands == 1) {
             PyErr_SetString(
-                PyExc_TypeError, "color must be int or single-element tuple");
+                PyExc_TypeError, "color must be int or single-element tuple"
+            );
             return NULL;
         } else if (tupleSize == -1) {
             PyErr_SetString(PyExc_TypeError, "color must be int or tuple");
@@ -533,7 +516,9 @@ getink(PyObject *color, Imaging im, char *ink) {
                 /* unsigned integer, single layer */
                 if (rIsInt != 1) {
                     if (tupleSize != 1) {
-                        PyErr_SetString(PyExc_TypeError, "color must be int or single-element tuple");
+                        PyErr_SetString(
+                            PyExc_TypeError, "color must be int or single-element tuple"
+                        );
                         return NULL;
                     } else if (!PyArg_ParseTuple(color, "L", &r)) {
                         return NULL;
@@ -552,7 +537,10 @@ getink(PyObject *color, Imaging im, char *ink) {
                     a = 255;
                     if (im->bands == 2) {
                         if (tupleSize != 1 && tupleSize != 2) {
-                            PyErr_SetString(PyExc_TypeError, "color must be int, or tuple of one or two elements");
+                            PyErr_SetString(
+                                PyExc_TypeError,
+                                "color must be int, or tuple of one or two elements"
+                            );
                             return NULL;
                         } else if (!PyArg_ParseTuple(color, "L|i", &r, &a)) {
                             return NULL;
@@ -560,7 +548,11 @@ getink(PyObject *color, Imaging im, char *ink) {
                         g = b = r;
                     } else {
                         if (tupleSize != 3 && tupleSize != 4) {
-                            PyErr_SetString(PyExc_TypeError, "color must be int, or tuple of one, three or four elements");
+                            PyErr_SetString(
+                                PyExc_TypeError,
+                                "color must be int, or tuple of one, three or four "
+                                "elements"
+                            );
                             return NULL;
                         } else if (!PyArg_ParseTuple(color, "Lii|i", &r, &g, &b, &a)) {
                             return NULL;
@@ -599,7 +591,10 @@ getink(PyObject *color, Imaging im, char *ink) {
                     g = (UINT8)(r >> 8);
                     r = (UINT8)r;
                 } else if (tupleSize != 3) {
-                    PyErr_SetString(PyExc_TypeError, "color must be int, or tuple of one or three elements");
+                    PyErr_SetString(
+                        PyExc_TypeError,
+                        "color must be int, or tuple of one or three elements"
+                    );
                     return NULL;
                 } else if (!PyArg_ParseTuple(color, "iiL", &b, &g, &r)) {
                     return NULL;
@@ -724,7 +719,8 @@ _alpha_composite(ImagingObject *self, PyObject *args) {
     ImagingObject *imagep2;
 
     if (!PyArg_ParseTuple(
-            args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2)) {
+            args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2
+        )) {
         return NULL;
     }
 
@@ -739,7 +735,8 @@ _blend(ImagingObject *self, PyObject *args) {
 
     alpha = 0.5;
     if (!PyArg_ParseTuple(
-            args, "O!O!|d", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2, &alpha)) {
+            args, "O!O!|d", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2, &alpha
+        )) {
         return NULL;
     }
 
@@ -818,7 +815,8 @@ _prepare_lut_table(PyObject *table, Py_ssize_t table_size) {
                 break;
             case TYPE_FLOAT32:
                 memcpy(
-                    &item, ((char *)table_data) + i * sizeof(FLOAT32), sizeof(FLOAT32));
+                    &item, ((char *)table_data) + i * sizeof(FLOAT32), sizeof(FLOAT32)
+                );
                 break;
             case TYPE_DOUBLE:
                 memcpy(&dtmp, ((char *)table_data) + i * sizeof(dtmp), sizeof(dtmp));
@@ -869,7 +867,8 @@ _color_lut_3d(ImagingObject *self, PyObject *args) {
             &size1D,
             &size2D,
             &size3D,
-            &table)) {
+            &table
+        )) {
         return NULL;
     }
 
@@ -887,7 +886,8 @@ _color_lut_3d(ImagingObject *self, PyObject *args) {
     if (2 > size1D || size1D > 65 || 2 > size2D || size2D > 65 || 2 > size3D ||
         size3D > 65) {
         PyErr_SetString(
-            PyExc_ValueError, "Table size in any dimension should be from 2 to 65");
+            PyExc_ValueError, "Table size in any dimension should be from 2 to 65"
+        );
         return NULL;
     }
 
@@ -904,13 +904,8 @@ _color_lut_3d(ImagingObject *self, PyObject *args) {
     }
 
     if (!ImagingColorLUT3D_linear(
-            imOut,
-            self->image,
-            table_channels,
-            size1D,
-            size2D,
-            size3D,
-            prepared_table)) {
+            imOut, self->image, table_channels, size1D, size2D, size3D, prepared_table
+        )) {
         free(prepared_table);
         ImagingDelete(imOut);
         return NULL;
@@ -934,7 +929,8 @@ _convert(ImagingObject *self, PyObject *args) {
         if (!PyImaging_Check(paletteimage)) {
             PyObject_Print((PyObject *)paletteimage, stderr, 0);
             PyErr_SetString(
-                PyExc_ValueError, "palette argument must be image with mode 'P'");
+                PyExc_ValueError, "palette argument must be image with mode 'P'"
+            );
             return NULL;
         }
         if (paletteimage->image->palette == NULL) {
@@ -944,7 +940,8 @@ _convert(ImagingObject *self, PyObject *args) {
     }
 
     return PyImagingNew(ImagingConvert(
-        self->image, mode, paletteimage ? paletteimage->image->palette : NULL, dither));
+        self->image, mode, paletteimage ? paletteimage->image->palette : NULL, dither
+    ));
 }
 
 static PyObject *
@@ -952,7 +949,8 @@ _convert2(ImagingObject *self, PyObject *args) {
     ImagingObject *imagep1;
     ImagingObject *imagep2;
     if (!PyArg_ParseTuple(
-            args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2)) {
+            args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2
+        )) {
         return NULL;
     }
 
@@ -985,7 +983,8 @@ _convert_matrix(ImagingObject *self, PyObject *args) {
                 m + 8,
                 m + 9,
                 m + 10,
-                m + 11)) {
+                m + 11
+            )) {
             return NULL;
         }
     }
@@ -1046,7 +1045,8 @@ _filter(ImagingObject *self, PyObject *args) {
     float divisor, offset;
     PyObject *kernel = NULL;
     if (!PyArg_ParseTuple(
-            args, "(ii)ffO", &xsize, &ysize, &divisor, &offset, &kernel)) {
+            args, "(ii)ffO", &xsize, &ysize, &divisor, &offset, &kernel
+        )) {
         return NULL;
     }
 
@@ -1071,7 +1071,6 @@ _filter(ImagingObject *self, PyObject *args) {
     return imOut;
 }
 
-#ifdef WITH_UNSHARPMASK
 static PyObject *
 _gaussian_blur(ImagingObject *self, PyObject *args) {
     Imaging imIn;
@@ -1096,7 +1095,6 @@ _gaussian_blur(ImagingObject *self, PyObject *args) {
 
     return PyImagingNew(imOut);
 }
-#endif
 
 static PyObject *
 _getpalette(ImagingObject *self, PyObject *args) {
@@ -1129,7 +1127,8 @@ _getpalette(ImagingObject *self, PyObject *args) {
     }
 
     pack(
-        (UINT8 *)PyBytes_AsString(palette), self->image->palette->palette, palettesize);
+        (UINT8 *)PyBytes_AsString(palette), self->image->palette->palette, palettesize
+    );
 
     return palette;
 }
@@ -1223,7 +1222,8 @@ union hist_extrema {
 
 static union hist_extrema *
 parse_histogram_extremap(
-    ImagingObject *self, PyObject *extremap, union hist_extrema *ep) {
+    ImagingObject *self, PyObject *extremap, union hist_extrema *ep
+) {
     int i0, i1;
     double f0, f1;
 
@@ -1352,7 +1352,6 @@ _entropy(ImagingObject *self, PyObject *args) {
     return PyFloat_FromDouble(-entropy);
 }
 
-#ifdef WITH_MODEFILTER
 static PyObject *
 _modefilter(ImagingObject *self, PyObject *args) {
     int size;
@@ -1362,7 +1361,6 @@ _modefilter(ImagingObject *self, PyObject *args) {
 
     return PyImagingNew(ImagingModeFilter(self->image, size));
 }
-#endif
 
 static PyObject *
 _offset(ImagingObject *self, PyObject *args) {
@@ -1383,7 +1381,8 @@ _paste(ImagingObject *self, PyObject *args) {
     int x0, y0, x1, y1;
     ImagingObject *maskp = NULL;
     if (!PyArg_ParseTuple(
-            args, "O(iiii)|O!", &source, &x0, &y0, &x1, &y1, &Imaging_Type, &maskp)) {
+            args, "O(iiii)|O!", &source, &x0, &y0, &x1, &y1, &Imaging_Type, &maskp
+        )) {
         return NULL;
     }
 
@@ -1395,14 +1394,16 @@ _paste(ImagingObject *self, PyObject *args) {
             x0,
             y0,
             x1,
-            y1);
+            y1
+        );
 
     } else {
         if (!getink(source, self->image, ink)) {
             return NULL;
         }
         status = ImagingFill2(
-            self->image, ink, (maskp) ? maskp->image : NULL, x0, y0, x1, y1);
+            self->image, ink, (maskp) ? maskp->image : NULL, x0, y0, x1, y1
+        );
     }
 
     if (status < 0) {
@@ -1537,14 +1538,14 @@ _putdata(ImagingObject *self, PyObject *args) {
         return NULL;
     }
 
-#define set_value_to_item(seq, i) \
-op = PySequence_Fast_GET_ITEM(seq, i); \
-if (PySequence_Check(op)) { \
-    PyErr_SetString(PyExc_TypeError, "sequence must be flattened"); \
-    return NULL; \
-} else { \
-    value = PyFloat_AsDouble(op); \
-}
+#define set_value_to_item(seq, i)                                       \
+    op = PySequence_Fast_GET_ITEM(seq, i);                              \
+    if (PySequence_Check(op)) {                                         \
+        PyErr_SetString(PyExc_TypeError, "sequence must be flattened"); \
+        return NULL;                                                    \
+    } else {                                                            \
+        value = PyFloat_AsDouble(op);                                   \
+    }
     if (image->image8) {
         if (PyBytes_Check(data)) {
             unsigned char *p;
@@ -1578,7 +1579,13 @@ if (PySequence_Check(op)) { \
                 int bigendian = 0;
                 if (image->type == IMAGING_TYPE_SPECIAL) {
                     // I;16*
-                    bigendian = strcmp(image->mode, "I;16B") == 0;
+                    if (strcmp(image->mode, "I;16B") == 0
+#ifdef WORDS_BIGENDIAN
+                        || strcmp(image->mode, "I;16N") == 0
+#endif
+                    ) {
+                        bigendian = 1;
+                    }
                 }
                 for (i = x = y = 0; i < n; i++) {
                     set_value_to_item(seq, i);
@@ -1586,8 +1593,10 @@ if (PySequence_Check(op)) { \
                         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);
+                        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);
                     }
@@ -1629,8 +1638,7 @@ if (PySequence_Check(op)) { \
                 for (i = x = y = 0; i < n; i++) {
                     double value;
                     set_value_to_item(seq, i);
-                    IMAGING_PIXEL_INT32(image, x, y) =
-                        (INT32)(value * scale + offset);
+                    IMAGING_PIXEL_INT32(image, x, y) = (INT32)(value * scale + offset);
                     if (++x >= (int)image->xsize) {
                         x = 0, y++;
                     }
@@ -1680,8 +1688,6 @@ if (PySequence_Check(op)) { \
     return Py_None;
 }
 
-#ifdef WITH_QUANTIZE
-
 static PyObject *
 _quantize(ImagingObject *self, PyObject *args) {
     int colours = 256;
@@ -1698,17 +1704,18 @@ _quantize(ImagingObject *self, PyObject *args) {
 
     return PyImagingNew(ImagingQuantize(self->image, colours, method, kmeans));
 }
-#endif
 
 static PyObject *
 _putpalette(ImagingObject *self, PyObject *args) {
     ImagingShuffler unpack;
     int bits;
 
-    char *rawmode, *palette_mode;
+    char *palette_mode, *rawmode;
     UINT8 *palette;
     Py_ssize_t palettesize;
-    if (!PyArg_ParseTuple(args, "sy#", &rawmode, &palette, &palettesize)) {
+    if (!PyArg_ParseTuple(
+            args, "ssy#", &palette_mode, &rawmode, &palette, &palettesize
+        )) {
         return NULL;
     }
 
@@ -1718,7 +1725,6 @@ _putpalette(ImagingObject *self, PyObject *args) {
         return NULL;
     }
 
-    palette_mode = strncmp("RGBA", rawmode, 4) == 0 ? "RGBA" : "RGB";
     unpack = ImagingFindUnpacker(palette_mode, rawmode, &bits);
     if (!unpack) {
         PyErr_SetString(PyExc_ValueError, wrong_raw_mode);
@@ -1833,7 +1839,6 @@ _putpixel(ImagingObject *self, PyObject *args) {
     return Py_None;
 }
 
-#ifdef WITH_RANKFILTER
 static PyObject *
 _rankfilter(ImagingObject *self, PyObject *args) {
     int size, rank;
@@ -1843,7 +1848,6 @@ _rankfilter(ImagingObject *self, PyObject *args) {
 
     return PyImagingNew(ImagingRankFilter(self->image, size, rank));
 }
-#endif
 
 static PyObject *
 _resize(ImagingObject *self, PyObject *args) {
@@ -1867,7 +1871,8 @@ _resize(ImagingObject *self, PyObject *args) {
             &box[0],
             &box[1],
             &box[2],
-            &box[3])) {
+            &box[3]
+        )) {
         return NULL;
     }
 
@@ -1903,7 +1908,8 @@ _resize(ImagingObject *self, PyObject *args) {
         imOut = ImagingNewDirty(imIn->mode, xsize, ysize);
 
         imOut = ImagingTransform(
-            imOut, imIn, IMAGING_TRANSFORM_AFFINE, 0, 0, xsize, ysize, a, filter, 1);
+            imOut, imIn, IMAGING_TRANSFORM_AFFINE, 0, 0, xsize, ysize, a, filter, 1
+        );
     } else {
         imOut = ImagingResample(imIn, xsize, ysize, filter, box);
     }
@@ -1924,14 +1930,8 @@ _reduce(ImagingObject *self, PyObject *args) {
     box[3] = imIn->ysize;
 
     if (!PyArg_ParseTuple(
-            args,
-            "(ii)|(iiii)",
-            &xscale,
-            &yscale,
-            &box[0],
-            &box[1],
-            &box[2],
-            &box[3])) {
+            args, "(ii)|(iiii)", &xscale, &yscale, &box[0], &box[1], &box[2], &box[3]
+        )) {
         return NULL;
     }
 
@@ -2008,7 +2008,7 @@ im_setmode(ImagingObject *self, PyObject *args) {
 }
 
 static PyObject *
-_transform2(ImagingObject *self, PyObject *args) {
+_transform(ImagingObject *self, PyObject *args) {
     static const char *wrong_number = "wrong number of matrix entries";
 
     Imaging imOut;
@@ -2033,7 +2033,8 @@ _transform2(ImagingObject *self, PyObject *args) {
             &method,
             &data,
             &filter,
-            &fill)) {
+            &fill
+        )) {
         return NULL;
     }
 
@@ -2057,7 +2058,8 @@ _transform2(ImagingObject *self, PyObject *args) {
     }
 
     imOut = ImagingTransform(
-        self->image, imagep->image, method, x0, y0, x1, y1, a, filter, fill);
+        self->image, imagep->image, method, x0, y0, x1, y1, a, filter, fill
+    );
 
     free(a);
 
@@ -2127,7 +2129,6 @@ _transpose(ImagingObject *self, PyObject *args) {
     return PyImagingNew(imOut);
 }
 
-#ifdef WITH_UNSHARPMASK
 static PyObject *
 _unsharp_mask(ImagingObject *self, PyObject *args) {
     Imaging imIn;
@@ -2151,7 +2152,6 @@ _unsharp_mask(ImagingObject *self, PyObject *args) {
 
     return PyImagingNew(imOut);
 }
-#endif
 
 static PyObject *
 _box_blur(ImagingObject *self, PyObject *args) {
@@ -2230,7 +2230,13 @@ _getcolors(ImagingObject *self, PyObject *args) {
         for (i = 0; i < colors; i++) {
             ImagingColorItem *v = &items[i];
             PyObject *item = Py_BuildValue(
-                "iN", v->count, getpixel(self->image, self->access, v->x, v->y));
+                "iN", v->count, getpixel(self->image, self->access, v->x, v->y)
+            );
+            if (item == NULL) {
+                Py_DECREF(out);
+                free(items);
+                return NULL;
+            }
             PyList_SetItem(out, i, item);
         }
     }
@@ -2291,14 +2297,16 @@ _getprojection(ImagingObject *self) {
     }
 
     ImagingGetProjection(
-        self->image, (unsigned char *)xprofile, (unsigned char *)yprofile);
+        self->image, (unsigned char *)xprofile, (unsigned char *)yprofile
+    );
 
     result = Py_BuildValue(
         "y#y#",
         xprofile,
         (Py_ssize_t)self->image->xsize,
         yprofile,
-        (Py_ssize_t)self->image->ysize);
+        (Py_ssize_t)self->image->ysize
+    );
 
     free(xprofile);
     free(yprofile);
@@ -2372,7 +2380,8 @@ _merge(PyObject *self, PyObject *args) {
             &Imaging_Type,
             &band2,
             &Imaging_Type,
-            &band3)) {
+            &band3
+        )) {
         return NULL;
     }
 
@@ -2419,9 +2428,7 @@ _split(ImagingObject *self) {
     return list;
 }
 
-/* -------------------------------------------------------------------- */
-
-#ifdef WITH_IMAGECHOPS
+/* Channel operations (ImageChops) ------------------------------------ */
 
 static PyObject *
 _chop_invert(ImagingObject *self) {
@@ -2602,11 +2609,8 @@ _chop_overlay(ImagingObject *self, PyObject *args) {
 
     return PyImagingNew(ImagingOverlay(self->image, imagep->image));
 }
-#endif
 
-/* -------------------------------------------------------------------- */
-
-#ifdef WITH_IMAGEDRAW
+/* Fonts (ImageDraw and ImageFont) ------------------------------------ */
 
 static PyObject *
 _font_new(PyObject *self_, PyObject *args) {
@@ -2618,7 +2622,8 @@ _font_new(PyObject *self_, PyObject *args) {
     unsigned char *glyphdata;
     Py_ssize_t glyphdata_length;
     if (!PyArg_ParseTuple(
-            args, "O!y#", &Imaging_Type, &imagep, &glyphdata, &glyphdata_length)) {
+            args, "O!y#", &Imaging_Type, &imagep, &glyphdata, &glyphdata_length
+        )) {
         return NULL;
     }
 
@@ -2775,8 +2780,9 @@ _font_getmask(ImagingFontObject *self, PyObject *args) {
         glyph = &self->glyphs[text[i]];
         if (i == 0 || text[i] != text[i - 1]) {
             ImagingDelete(bitmap);
-            bitmap =
-                ImagingCrop(self->bitmap, glyph->sx0, glyph->sy0, glyph->sx1, glyph->sy1);
+            bitmap = ImagingCrop(
+                self->bitmap, glyph->sx0, glyph->sy0, glyph->sx1, glyph->sy1
+            );
             if (!bitmap) {
                 goto failed;
             }
@@ -2788,7 +2794,8 @@ _font_getmask(ImagingFontObject *self, PyObject *args) {
             glyph->dx0 + x,
             glyph->dy0 + b,
             glyph->dx1 + x,
-            glyph->dy1 + b);
+            glyph->dy1 + b
+        );
         if (status < 0) {
             goto failed;
         }
@@ -2832,7 +2839,7 @@ static struct PyMethodDef _font_methods[] = {
     {NULL, NULL} /* sentinel */
 };
 
-/* -------------------------------------------------------------------- */
+/* Graphics (ImageDraw) ----------------------------------------------- */
 
 static PyObject *
 _draw_new(PyObject *self_, PyObject *args) {
@@ -2927,7 +2934,8 @@ _draw_arc(ImagingDrawObject *self, PyObject *args) {
         end,
         &ink,
         width,
-        self->blend);
+        self->blend
+    );
 
     free(xy);
 
@@ -2957,13 +2965,15 @@ _draw_bitmap(ImagingDrawObject *self, PyObject *args) {
     }
     if (n != 1) {
         PyErr_SetString(
-            PyExc_TypeError, "coordinate list must contain exactly 1 coordinate");
+            PyExc_TypeError, "coordinate list must contain exactly 1 coordinate"
+        );
         free(xy);
         return NULL;
     }
 
     n = ImagingDrawBitmap(
-        self->image->image, (int)xy[0], (int)xy[1], bitmap->image, &ink, self->blend);
+        self->image->image, (int)xy[0], (int)xy[1], bitmap->image, &ink, self->blend
+    );
 
     free(xy);
 
@@ -3019,7 +3029,8 @@ _draw_chord(ImagingDrawObject *self, PyObject *args) {
         &ink,
         fill,
         width,
-        self->blend);
+        self->blend
+    );
 
     free(xy);
 
@@ -3073,7 +3084,8 @@ _draw_ellipse(ImagingDrawObject *self, PyObject *args) {
         &ink,
         fill,
         width,
-        self->blend);
+        self->blend
+    );
 
     free(xy);
 
@@ -3113,14 +3125,16 @@ _draw_lines(ImagingDrawObject *self, PyObject *args) {
                     (int)p[2],
                     (int)p[3],
                     &ink,
-                    self->blend) < 0) {
+                    self->blend
+                ) < 0) {
                 free(xy);
                 return NULL;
             }
         }
         if (p) { /* draw last point */
             ImagingDrawPoint(
-                self->image->image, (int)p[2], (int)p[3], &ink, self->blend);
+                self->image->image, (int)p[2], (int)p[3], &ink, self->blend
+            );
         }
     } else {
         for (i = 0; i < n - 1; i++) {
@@ -3133,7 +3147,8 @@ _draw_lines(ImagingDrawObject *self, PyObject *args) {
                     (int)p[3],
                     &ink,
                     width,
-                    self->blend) < 0) {
+                    self->blend
+                ) < 0) {
                 free(xy);
                 return NULL;
             }
@@ -3165,7 +3180,8 @@ _draw_points(ImagingDrawObject *self, PyObject *args) {
     for (i = 0; i < n; i++) {
         double *p = &xy[i + i];
         if (ImagingDrawPoint(
-                self->image->image, (int)p[0], (int)p[1], &ink, self->blend) < 0) {
+                self->image->image, (int)p[0], (int)p[1], &ink, self->blend
+            ) < 0) {
             free(xy);
             return NULL;
         }
@@ -3177,8 +3193,6 @@ _draw_points(ImagingDrawObject *self, PyObject *args) {
     return Py_None;
 }
 
-#ifdef WITH_ARROW
-
 /* from outline.c */
 extern ImagingOutline
 PyOutline_AsOutline(PyObject *outline);
@@ -3208,8 +3222,6 @@ _draw_outline(ImagingDrawObject *self, PyObject *args) {
     return Py_None;
 }
 
-#endif
-
 static PyObject *
 _draw_pieslice(ImagingDrawObject *self, PyObject *args) {
     double *xy;
@@ -3254,7 +3266,8 @@ _draw_pieslice(ImagingDrawObject *self, PyObject *args) {
         &ink,
         fill,
         width,
-        self->blend);
+        self->blend
+    );
 
     free(xy);
 
@@ -3286,7 +3299,8 @@ _draw_polygon(ImagingDrawObject *self, PyObject *args) {
     }
     if (n < 2) {
         PyErr_SetString(
-            PyExc_TypeError, "coordinate list must contain at least 2 coordinates");
+            PyExc_TypeError, "coordinate list must contain at least 2 coordinates"
+        );
         free(xy);
         return NULL;
     }
@@ -3305,7 +3319,8 @@ _draw_polygon(ImagingDrawObject *self, PyObject *args) {
 
     free(xy);
 
-    if (ImagingDrawPolygon(self->image->image, n, ixy, &ink, fill, width, self->blend) < 0) {
+    if (ImagingDrawPolygon(self->image->image, n, ixy, &ink, fill, width, self->blend) <
+        0) {
         free(ixy);
         return NULL;
     }
@@ -3358,7 +3373,8 @@ _draw_rectangle(ImagingDrawObject *self, PyObject *args) {
         &ink,
         fill,
         width,
-        self->blend);
+        self->blend
+    );
 
     free(xy);
 
@@ -3371,12 +3387,9 @@ _draw_rectangle(ImagingDrawObject *self, PyObject *args) {
 }
 
 static struct PyMethodDef _draw_methods[] = {
-#ifdef WITH_IMAGEDRAW
     /* Graphics (ImageDraw) */
     {"draw_lines", (PyCFunction)_draw_lines, METH_VARARGS},
-#ifdef WITH_ARROW
     {"draw_outline", (PyCFunction)_draw_outline, METH_VARARGS},
-#endif
     {"draw_polygon", (PyCFunction)_draw_polygon, METH_VARARGS},
     {"draw_rectangle", (PyCFunction)_draw_rectangle, METH_VARARGS},
     {"draw_points", (PyCFunction)_draw_points, METH_VARARGS},
@@ -3386,12 +3399,9 @@ static struct PyMethodDef _draw_methods[] = {
     {"draw_ellipse", (PyCFunction)_draw_ellipse, METH_VARARGS},
     {"draw_pieslice", (PyCFunction)_draw_pieslice, METH_VARARGS},
     {"draw_ink", (PyCFunction)_draw_ink, METH_VARARGS},
-#endif
     {NULL, NULL} /* sentinel */
 };
 
-#endif
-
 static PyObject *
 pixel_access_new(ImagingObject *imagep, PyObject *args) {
     PixelAccessObject *self;
@@ -3472,11 +3482,9 @@ pixel_access_setitem(PixelAccessObject *self, PyObject *xy, PyObject *color) {
 }
 
 /* -------------------------------------------------------------------- */
-/* EFFECTS (experimental)                            */
+/* EFFECTS (experimental)                                               */
 /* -------------------------------------------------------------------- */
 
-#ifdef WITH_EFFECTS
-
 static PyObject *
 _effect_mandelbrot(ImagingObject *self, PyObject *args) {
     int xsize = 512;
@@ -3498,7 +3506,8 @@ _effect_mandelbrot(ImagingObject *self, PyObject *args) {
             &extent[1],
             &extent[2],
             &extent[3],
-            &quality)) {
+            &quality
+        )) {
         return NULL;
     }
 
@@ -3527,8 +3536,6 @@ _effect_spread(ImagingObject *self, PyObject *args) {
     return PyImagingNew(ImagingEffectSpread(self->image, dist));
 }
 
-#endif
-
 /* -------------------------------------------------------------------- */
 /* UTILITIES                                */
 /* -------------------------------------------------------------------- */
@@ -3609,24 +3616,18 @@ static struct PyMethodDef methods[] = {
     {"filter", (PyCFunction)_filter, METH_VARARGS},
     {"histogram", (PyCFunction)_histogram, METH_VARARGS},
     {"entropy", (PyCFunction)_entropy, METH_VARARGS},
-#ifdef WITH_MODEFILTER
     {"modefilter", (PyCFunction)_modefilter, METH_VARARGS},
-#endif
     {"offset", (PyCFunction)_offset, METH_VARARGS},
     {"paste", (PyCFunction)_paste, METH_VARARGS},
     {"point", (PyCFunction)_point, METH_VARARGS},
     {"point_transform", (PyCFunction)_point_transform, METH_VARARGS},
     {"putdata", (PyCFunction)_putdata, METH_VARARGS},
-#ifdef WITH_QUANTIZE
     {"quantize", (PyCFunction)_quantize, METH_VARARGS},
-#endif
-#ifdef WITH_RANKFILTER
     {"rankfilter", (PyCFunction)_rankfilter, METH_VARARGS},
-#endif
     {"resize", (PyCFunction)_resize, METH_VARARGS},
     {"reduce", (PyCFunction)_reduce, METH_VARARGS},
     {"transpose", (PyCFunction)_transpose, METH_VARARGS},
-    {"transform2", (PyCFunction)_transform2, METH_VARARGS},
+    {"transform", (PyCFunction)_transform, METH_VARARGS},
 
     {"isblock", (PyCFunction)_isblock, METH_NOARGS},
 
@@ -3648,7 +3649,6 @@ static struct PyMethodDef methods[] = {
     {"putpalettealpha", (PyCFunction)_putpalettealpha, METH_VARARGS},
     {"putpalettealphas", (PyCFunction)_putpalettealphas, METH_VARARGS},
 
-#ifdef WITH_IMAGECHOPS
     /* Channel operations (ImageChops) */
     {"chop_invert", (PyCFunction)_chop_invert, METH_NOARGS},
     {"chop_lighter", (PyCFunction)_chop_lighter, METH_VARARGS},
@@ -3667,24 +3667,15 @@ static struct PyMethodDef methods[] = {
     {"chop_hard_light", (PyCFunction)_chop_hard_light, METH_VARARGS},
     {"chop_overlay", (PyCFunction)_chop_overlay, METH_VARARGS},
 
-#endif
-
-#ifdef WITH_UNSHARPMASK
-    /* Kevin Cazabon's unsharpmask extension */
+    /* Unsharpmask extension */
     {"gaussian_blur", (PyCFunction)_gaussian_blur, METH_VARARGS},
     {"unsharp_mask", (PyCFunction)_unsharp_mask, METH_VARARGS},
-#endif
-
     {"box_blur", (PyCFunction)_box_blur, METH_VARARGS},
 
-#ifdef WITH_EFFECTS
     /* Special effects */
     {"effect_spread", (PyCFunction)_effect_spread, METH_VARARGS},
-#endif
 
     /* Misc. */
-    {"new_block", (PyCFunction)_new_block, METH_VARARGS},
-
     {"save_ppm", (PyCFunction)_save_ppm, METH_VARARGS},
 
     {NULL, NULL} /* sentinel */
@@ -3709,16 +3700,40 @@ _getattr_bands(ImagingObject *self, void *closure) {
 
 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
+_ptr_destructor(PyObject *capsule) {
+    PyObject *self = (PyObject *)PyCapsule_GetContext(capsule);
+    Py_DECREF(self);
+}
+
 static PyObject *
 _getattr_ptr(ImagingObject *self, void *closure) {
-    return PyCapsule_New(self->image, IMAGING_MAGIC, NULL);
+    PyObject *capsule = PyCapsule_New(self->image, IMAGING_MAGIC, _ptr_destructor);
+    Py_INCREF(self);
+    PyCapsule_SetContext(capsule, self);
+    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",
@@ -3726,8 +3741,9 @@ _getattr_unsafe_ptrs(ImagingObject *self, void *closure) {
         "image32",
         self->image->image32,
         "image",
-        self->image->image);
-};
+        self->image->image
+    );
+}
 
 static struct PyGetSetDef getsetters[] = {
     {"mode", (getter)_getattr_mode},
@@ -3736,7 +3752,8 @@ static struct PyGetSetDef getsetters[] = {
     {"id", (getter)_getattr_id},
     {"ptr", (getter)_getattr_ptr},
     {"unsafe_ptrs", (getter)_getattr_unsafe_ptrs},
-    {NULL}};
+    {NULL}
+};
 
 /* basic sequence semantics */
 
@@ -3807,8 +3824,6 @@ static PyTypeObject Imaging_Type = {
     getsetters,           /*tp_getset*/
 };
 
-#ifdef WITH_IMAGEDRAW
-
 static PyTypeObject ImagingFont_Type = {
     PyVarObject_HEAD_INIT(NULL, 0) "ImagingFont", /*tp_name*/
     sizeof(ImagingFontObject),                    /*tp_basicsize*/
@@ -3875,8 +3890,6 @@ static PyTypeObject ImagingDraw_Type = {
     0,                         /*tp_getset*/
 };
 
-#endif
-
 static PyMappingMethods pixel_access_as_mapping = {
     (lenfunc)NULL,                       /*mp_length*/
     (binaryfunc)pixel_access_getitem,    /*mp_subscript*/
@@ -3908,7 +3921,6 @@ static PyObject *
 _get_stats(PyObject *self, PyObject *args) {
     PyObject *d;
     PyObject *v;
-    ImagingMemoryArena arena = &ImagingDefaultArena;
 
     if (!PyArg_ParseTuple(args, ":get_stats")) {
         return NULL;
@@ -3918,6 +3930,10 @@ _get_stats(PyObject *self, PyObject *args) {
     if (!d) {
         return NULL;
     }
+
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
+    ImagingMemoryArena arena = &ImagingDefaultArena;
+
     v = PyLong_FromLong(arena->stats_new_count);
     PyDict_SetItemString(d, "new_count", v ? v : Py_None);
     Py_XDECREF(v);
@@ -3941,22 +3957,25 @@ _get_stats(PyObject *self, PyObject *args) {
     v = PyLong_FromLong(arena->blocks_cached);
     PyDict_SetItemString(d, "blocks_cached", v ? v : Py_None);
     Py_XDECREF(v);
+
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
     return d;
 }
 
 static PyObject *
 _reset_stats(PyObject *self, PyObject *args) {
-    ImagingMemoryArena arena = &ImagingDefaultArena;
-
     if (!PyArg_ParseTuple(args, ":reset_stats")) {
         return NULL;
     }
 
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
+    ImagingMemoryArena arena = &ImagingDefaultArena;
     arena->stats_new_count = 0;
     arena->stats_allocated_blocks = 0;
     arena->stats_reused_blocks = 0;
     arena->stats_reallocated_blocks = 0;
     arena->stats_freed_blocks = 0;
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -3968,7 +3987,10 @@ _get_alignment(PyObject *self, PyObject *args) {
         return NULL;
     }
 
-    return PyLong_FromLong(ImagingDefaultArena.alignment);
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
+    int alignment = ImagingDefaultArena.alignment;
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
+    return PyLong_FromLong(alignment);
 }
 
 static PyObject *
@@ -3977,7 +3999,10 @@ _get_block_size(PyObject *self, PyObject *args) {
         return NULL;
     }
 
-    return PyLong_FromLong(ImagingDefaultArena.block_size);
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
+    int block_size = ImagingDefaultArena.block_size;
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
+    return PyLong_FromLong(block_size);
 }
 
 static PyObject *
@@ -3986,7 +4011,10 @@ _get_blocks_max(PyObject *self, PyObject *args) {
         return NULL;
     }
 
-    return PyLong_FromLong(ImagingDefaultArena.blocks_max);
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
+    int blocks_max = ImagingDefaultArena.blocks_max;
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
+    return PyLong_FromLong(blocks_max);
 }
 
 static PyObject *
@@ -4006,7 +4034,9 @@ _set_alignment(PyObject *self, PyObject *args) {
         return NULL;
     }
 
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
     ImagingDefaultArena.alignment = alignment;
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -4029,7 +4059,9 @@ _set_block_size(PyObject *self, PyObject *args) {
         return NULL;
     }
 
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
     ImagingDefaultArena.block_size = block_size;
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -4045,14 +4077,18 @@ _set_blocks_max(PyObject *self, PyObject *args) {
     if (blocks_max < 0) {
         PyErr_SetString(PyExc_ValueError, "blocks_max should be greater than 0");
         return NULL;
-    } else if (
-        (unsigned long)blocks_max >
+    }
+
+    if ((unsigned long)blocks_max >
         SIZE_MAX / sizeof(ImagingDefaultArena.blocks_pool[0])) {
         PyErr_SetString(PyExc_ValueError, "blocks_max is too large");
         return NULL;
     }
 
-    if (!ImagingMemorySetBlocksMax(&ImagingDefaultArena, blocks_max)) {
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
+    int status = ImagingMemorySetBlocksMax(&ImagingDefaultArena, blocks_max);
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
+    if (!status) {
         return ImagingError_MemoryError();
     }
 
@@ -4068,7 +4104,9 @@ _clear_cache(PyObject *self, PyObject *args) {
         return NULL;
     }
 
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
     ImagingMemoryClearCache(&ImagingDefaultArena, i);
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -4177,6 +4215,7 @@ static PyMethodDef functions[] = {
     {"blend", (PyCFunction)_blend, METH_VARARGS},
     {"fill", (PyCFunction)_fill, METH_VARARGS},
     {"new", (PyCFunction)_new, METH_VARARGS},
+    {"new_block", (PyCFunction)_new_block, METH_VARARGS},
     {"merge", (PyCFunction)_merge, METH_VARARGS},
 
     /* Functions */
@@ -4220,13 +4259,11 @@ static PyMethodDef functions[] = {
     {"zip_encoder", (PyCFunction)PyImaging_ZipEncoderNew, METH_VARARGS},
 #endif
 
-/* Memory mapping */
-#ifdef WITH_MAPPING
+    /* Memory mapping */
     {"map_buffer", (PyCFunction)PyImaging_MapBuffer, METH_VARARGS},
-#endif
 
-/* Display support */
 #ifdef _WIN32
+    /* Display support */
     {"display", (PyCFunction)PyImaging_DisplayWin32, METH_VARARGS},
     {"display_mode", (PyCFunction)PyImaging_DisplayModeWin32, METH_VARARGS},
     {"grabscreen_win32", (PyCFunction)PyImaging_GrabScreenWin32, METH_VARARGS},
@@ -4242,30 +4279,22 @@ static PyMethodDef functions[] = {
     /* Utilities */
     {"getcodecstatus", (PyCFunction)_getcodecstatus, METH_VARARGS},
 
-/* Special effects (experimental) */
-#ifdef WITH_EFFECTS
+    /* Special effects (experimental) */
     {"effect_mandelbrot", (PyCFunction)_effect_mandelbrot, METH_VARARGS},
     {"effect_noise", (PyCFunction)_effect_noise, METH_VARARGS},
     {"linear_gradient", (PyCFunction)_linear_gradient, METH_VARARGS},
     {"radial_gradient", (PyCFunction)_radial_gradient, METH_VARARGS},
     {"wedge", (PyCFunction)_linear_gradient, METH_VARARGS}, /* Compatibility */
-#endif
 
-/* Drawing support stuff */
-#ifdef WITH_IMAGEDRAW
+    /* Drawing support stuff */
     {"font", (PyCFunction)_font_new, METH_VARARGS},
     {"draw", (PyCFunction)_draw_new, METH_VARARGS},
-#endif
 
-/* Experimental path stuff */
-#ifdef WITH_IMAGEPATH
+    /* Experimental path stuff */
     {"path", (PyCFunction)PyPath_Create, METH_VARARGS},
-#endif
 
-/* Experimental arrow graphics stuff */
-#ifdef WITH_ARROW
+    /* Experimental arrow graphics stuff */
     {"outline", (PyCFunction)PyOutline_Create, METH_VARARGS},
-#endif
 
     /* Resource management */
     {"get_stats", (PyCFunction)_get_stats, METH_VARARGS},
@@ -4290,16 +4319,12 @@ setup_module(PyObject *m) {
     if (PyType_Ready(&Imaging_Type) < 0) {
         return -1;
     }
-
-#ifdef WITH_IMAGEDRAW
     if (PyType_Ready(&ImagingFont_Type) < 0) {
         return -1;
     }
-
     if (PyType_Ready(&ImagingDraw_Type) < 0) {
         return -1;
     }
-#endif
     if (PyType_Ready(&PixelAccess_Type) < 0) {
         return -1;
     }
@@ -4401,7 +4426,9 @@ setup_module(PyObject *m) {
     PyModule_AddObject(m, "HAVE_XCB", have_xcb);
 
     PyObject *pillow_version = PyUnicode_FromString(version);
-    PyDict_SetItemString(d, "PILLOW_VERSION", pillow_version ? pillow_version : Py_None);
+    PyDict_SetItemString(
+        d, "PILLOW_VERSION", pillow_version ? pillow_version : Py_None
+    );
     Py_XDECREF(pillow_version);
 
     return 0;
@@ -4426,5 +4453,9 @@ PyInit__imaging(void) {
         return NULL;
     }
 
+#ifdef Py_GIL_DISABLED
+    PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
+#endif
+
     return m;
 }
diff --git a/src/_imagingcms.c b/src/_imagingcms.c
index 56d5d73f83c..1823bcf0371 100644
--- a/src/_imagingcms.c
+++ b/src/_imagingcms.c
@@ -52,7 +52,7 @@ kevin@cazabon.com\n\
 
 */
 
-/* known to-do list with current version:
+/* known to-do list:
 
    Verify that PILmode->littleCMStype conversion in findLCMStype is correct for all
    PIL modes (it probably isn't for the more obscure ones)
@@ -143,7 +143,7 @@ cms_profile_tobytes(PyObject *self, PyObject *args) {
     cmsHPROFILE *profile;
 
     PyObject *ret;
-    if (!PyArg_ParseTuple(args, "O", &CmsProfile)) {
+    if (!PyArg_ParseTuple(args, "O!", &CmsProfile_Type, &CmsProfile)) {
         return NULL;
     }
 
@@ -181,9 +181,7 @@ cms_profile_dealloc(CmsProfileObject *self) {
 /* a transform represents the mapping between two profiles */
 
 typedef struct {
-    PyObject_HEAD char mode_in[8];
-    char mode_out[8];
-    cmsHTRANSFORM transform;
+    PyObject_HEAD cmsHTRANSFORM transform;
 } CmsTransformObject;
 
 static PyTypeObject CmsTransform_Type;
@@ -191,7 +189,7 @@ static PyTypeObject CmsTransform_Type;
 #define CmsTransform_Check(op) (Py_TYPE(op) == &CmsTransform_Type)
 
 static PyObject *
-cms_transform_new(cmsHTRANSFORM transform, char *mode_in, char *mode_out) {
+cms_transform_new(cmsHTRANSFORM transform) {
     CmsTransformObject *self;
 
     self = PyObject_New(CmsTransformObject, &CmsTransform_Type);
@@ -201,9 +199,6 @@ cms_transform_new(cmsHTRANSFORM transform, char *mode_in, char *mode_out) {
 
     self->transform = transform;
 
-    strcpy(self->mode_in, mode_in);
-    strcpy(self->mode_out, mode_out);
-
     return (PyObject *)self;
 }
 
@@ -218,35 +213,33 @@ cms_transform_dealloc(CmsTransformObject *self) {
 
 static cmsUInt32Number
 findLCMStype(char *PILmode) {
-    if (strcmp(PILmode, "RGB") == 0) {
-        return TYPE_RGBA_8;
-    } else if (strcmp(PILmode, "RGBA") == 0) {
+    if (strcmp(PILmode, "RGB") == 0 || strcmp(PILmode, "RGBA") == 0 ||
+        strcmp(PILmode, "RGBX") == 0) {
         return TYPE_RGBA_8;
-    } else if (strcmp(PILmode, "RGBX") == 0) {
-        return TYPE_RGBA_8;
-    } else if (strcmp(PILmode, "RGBA;16B") == 0) {
+    }
+    if (strcmp(PILmode, "RGBA;16B") == 0) {
         return TYPE_RGBA_16;
-    } else if (strcmp(PILmode, "CMYK") == 0) {
+    }
+    if (strcmp(PILmode, "CMYK") == 0) {
         return TYPE_CMYK_8;
-    } else if (strcmp(PILmode, "L") == 0) {
-        return TYPE_GRAY_8;
-    } else if (strcmp(PILmode, "L;16") == 0) {
+    }
+    if (strcmp(PILmode, "I;16") == 0 || strcmp(PILmode, "I;16L") == 0 ||
+        strcmp(PILmode, "L;16") == 0) {
         return TYPE_GRAY_16;
-    } else if (strcmp(PILmode, "L;16B") == 0) {
+    }
+    if (strcmp(PILmode, "I;16B") == 0 || strcmp(PILmode, "L;16B") == 0) {
         return TYPE_GRAY_16_SE;
-    } else if (strcmp(PILmode, "YCCA") == 0) {
-        return TYPE_YCbCr_8;
-    } else if (strcmp(PILmode, "YCC") == 0) {
+    }
+    if (strcmp(PILmode, "YCbCr") == 0 || strcmp(PILmode, "YCCA") == 0 ||
+        strcmp(PILmode, "YCC") == 0) {
         return TYPE_YCbCr_8;
-    } else if (strcmp(PILmode, "LAB") == 0) {
+    }
+    if (strcmp(PILmode, "LAB") == 0) {
         // LabX equivalent like ALab, but not reversed -- no #define in lcms2
         return (COLORSPACE_SH(PT_LabV2) | CHANNELS_SH(3) | BYTES_SH(1) | EXTRA_SH(1));
     }
-
-    else {
-        /* take a wild guess... but you probably should fail instead. */
-        return TYPE_GRAY_8; /* so there's no buffer overrun... */
-    }
+    /* presume "1" or "L" by default */
+    return TYPE_GRAY_8;
 }
 
 #define Cms_Min(a, b) ((a) < (b) ? (a) : (b))
@@ -338,7 +331,8 @@ pyCMScopyAux(cmsHTRANSFORM hTransform, Imaging imDst, const Imaging imSrc) {
                 memcpy(
                     pDstExtras + x * dstChunkSize,
                     pSrcExtras + x * srcChunkSize,
-                    channelSize);
+                    channelSize
+                );
             }
         }
     }
@@ -380,7 +374,8 @@ _buildTransform(
     char *sInMode,
     char *sOutMode,
     int iRenderingIntent,
-    cmsUInt32Number cmsFLAGS) {
+    cmsUInt32Number cmsFLAGS
+) {
     cmsHTRANSFORM hTransform;
 
     Py_BEGIN_ALLOW_THREADS
@@ -392,11 +387,12 @@ _buildTransform(
             hOutputProfile,
             findLCMStype(sOutMode),
             iRenderingIntent,
-            cmsFLAGS);
+            cmsFLAGS
+        );
 
-    Py_END_ALLOW_THREADS
+    Py_END_ALLOW_THREADS;
 
-        if (!hTransform) {
+    if (!hTransform) {
         PyErr_SetString(PyExc_ValueError, "cannot build transform");
     }
 
@@ -412,7 +408,8 @@ _buildProofTransform(
     char *sOutMode,
     int iRenderingIntent,
     int iProofIntent,
-    cmsUInt32Number cmsFLAGS) {
+    cmsUInt32Number cmsFLAGS
+) {
     cmsHTRANSFORM hTransform;
 
     Py_BEGIN_ALLOW_THREADS
@@ -426,11 +423,12 @@ _buildProofTransform(
             hProofProfile,
             iRenderingIntent,
             iProofIntent,
-            cmsFLAGS);
+            cmsFLAGS
+        );
 
-    Py_END_ALLOW_THREADS
+    Py_END_ALLOW_THREADS;
 
-        if (!hTransform) {
+    if (!hTransform) {
         PyErr_SetString(PyExc_ValueError, "cannot build proof transform");
     }
 
@@ -461,7 +459,8 @@ buildTransform(PyObject *self, PyObject *args) {
             &sInMode,
             &sOutMode,
             &iRenderingIntent,
-            &cmsFLAGS)) {
+            &cmsFLAGS
+        )) {
         return NULL;
     }
 
@@ -471,13 +470,14 @@ buildTransform(PyObject *self, PyObject *args) {
         sInMode,
         sOutMode,
         iRenderingIntent,
-        cmsFLAGS);
+        cmsFLAGS
+    );
 
     if (!transform) {
         return NULL;
     }
 
-    return cms_transform_new(transform, sInMode, sOutMode);
+    return cms_transform_new(transform);
 }
 
 static PyObject *
@@ -506,7 +506,8 @@ buildProofTransform(PyObject *self, PyObject *args) {
             &sOutMode,
             &iRenderingIntent,
             &iProofIntent,
-            &cmsFLAGS)) {
+            &cmsFLAGS
+        )) {
         return NULL;
     }
 
@@ -518,34 +519,36 @@ buildProofTransform(PyObject *self, PyObject *args) {
         sOutMode,
         iRenderingIntent,
         iProofIntent,
-        cmsFLAGS);
+        cmsFLAGS
+    );
 
     if (!transform) {
         return NULL;
     }
 
-    return cms_transform_new(transform, sInMode, sOutMode);
+    return cms_transform_new(transform);
 }
 
 static PyObject *
 cms_transform_apply(CmsTransformObject *self, PyObject *args) {
-    Py_ssize_t idIn;
-    Py_ssize_t idOut;
+    PyObject *i0, *i1;
     Imaging im;
     Imaging imOut;
 
-    int result;
-
-    if (!PyArg_ParseTuple(args, "nn:apply", &idIn, &idOut)) {
+    if (!PyArg_ParseTuple(args, "OO:apply", &i0, &i1)) {
         return NULL;
     }
 
-    im = (Imaging)idIn;
-    imOut = (Imaging)idOut;
+    if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) ||
+        !PyCapsule_IsValid(i1, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
+        return NULL;
+    }
 
-    result = pyCMSdoTransform(im, imOut, self->transform);
+    im = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
+    imOut = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC);
 
-    return Py_BuildValue("i", result);
+    return Py_BuildValue("i", pyCMSdoTransform(im, imOut, self->transform));
 }
 
 /* -------------------------------------------------------------------- */
@@ -570,7 +573,8 @@ createProfile(PyObject *self, PyObject *args) {
                 PyErr_SetString(
                     PyExc_ValueError,
                     "ERROR: Could not calculate white point from color temperature "
-                    "provided, must be float in degrees Kelvin");
+                    "provided, must be float in degrees Kelvin"
+                );
                 return NULL;
             }
             hProfile = cmsCreateLab2Profile(&whitePoint);
@@ -625,13 +629,14 @@ cms_profile_is_intent_supported(CmsProfileObject *self, PyObject *args) {
 static PyObject *
 cms_get_display_profile_win32(PyObject *self, PyObject *args) {
     char filename[MAX_PATH];
-    cmsUInt32Number filename_size;
+    DWORD filename_size;
     BOOL ok;
 
     HANDLE handle = 0;
     int is_dc = 0;
     if (!PyArg_ParseTuple(
-            args, "|" F_HANDLE "i:get_display_profile", &handle, &is_dc)) {
+            args, "|" F_HANDLE "i:get_display_profile", &handle, &is_dc
+        )) {
         return NULL;
     }
 
@@ -736,7 +741,8 @@ _xyz_py(cmsCIEXYZ *XYZ) {
     cmsCIExyY xyY;
     cmsXYZ2xyY(&xyY, XYZ);
     return Py_BuildValue(
-        "((d,d,d),(d,d,d))", XYZ->X, XYZ->Y, XYZ->Z, xyY.x, xyY.y, xyY.Y);
+        "((d,d,d),(d,d,d))", XYZ->X, XYZ->Y, XYZ->Z, xyY.x, xyY.y, xyY.Y
+    );
 }
 
 static PyObject *
@@ -765,7 +771,8 @@ _xyz3_py(cmsCIEXYZ *XYZ) {
         xyY[1].Y,
         xyY[2].x,
         xyY[2].y,
-        xyY[2].Y);
+        xyY[2].Y
+    );
 }
 
 static PyObject *
@@ -816,7 +823,8 @@ _profile_read_ciexyy_triple(CmsProfileObject *self, cmsTagSignature info) {
         triple->Green.Y,
         triple->Blue.x,
         triple->Blue.y,
-        triple->Blue.Y);
+        triple->Blue.Y
+    );
 }
 
 static PyObject *
@@ -880,7 +888,8 @@ _calculate_rgb_primaries(CmsProfileObject *self, cmsCIEXYZTRIPLE *result) {
         hXYZ,
         TYPE_XYZ_DBL,
         INTENT_RELATIVE_COLORIMETRIC,
-        cmsFLAGS_NOCACHE | cmsFLAGS_NOOPTIMIZE);
+        cmsFLAGS_NOCACHE | cmsFLAGS_NOOPTIMIZE
+    );
     cmsCloseProfile(hXYZ);
     if (hTransform == NULL) {
         return 0;
@@ -896,7 +905,8 @@ _check_intent(
     int clut,
     cmsHPROFILE hProfile,
     cmsUInt32Number Intent,
-    cmsUInt32Number UsedDirection) {
+    cmsUInt32Number UsedDirection
+) {
     if (clut) {
         return cmsIsCLUT(hProfile, Intent, UsedDirection);
     } else {
@@ -941,7 +951,8 @@ _is_intent_supported(CmsProfileObject *self, int clut) {
             _check_intent(clut, self->profile, intent, LCMS_USED_AS_OUTPUT) ? Py_True
                                                                             : Py_False,
             _check_intent(clut, self->profile, intent, LCMS_USED_AS_PROOF) ? Py_True
-                                                                           : Py_False);
+                                                                           : Py_False
+        );
         if (id == NULL || entry == NULL) {
             Py_XDECREF(id);
             Py_XDECREF(entry);
@@ -975,7 +986,8 @@ static PyMethodDef pyCMSdll_methods[] = {
     {"get_display_profile_win32", cms_get_display_profile_win32, METH_VARARGS},
 #endif
 
-    {NULL, NULL}};
+    {NULL, NULL}
+};
 
 static struct PyMethodDef cms_profile_methods[] = {
     {"is_intent_supported", (PyCFunction)cms_profile_is_intent_supported, METH_VARARGS},
@@ -1035,7 +1047,8 @@ cms_profile_getattr_creation_date(CmsProfileObject *self, void *closure) {
     }
 
     return PyDateTime_FromDateAndTime(
-        1900 + ct.tm_year, ct.tm_mon, ct.tm_mday, ct.tm_hour, ct.tm_min, ct.tm_sec, 0);
+        1900 + ct.tm_year, ct.tm_mon, ct.tm_mday, ct.tm_hour, ct.tm_min, ct.tm_sec, 0
+    );
 }
 
 static PyObject *
@@ -1113,13 +1126,15 @@ cms_profile_getattr_colorimetric_intent(CmsProfileObject *self, void *closure) {
 
 static PyObject *
 cms_profile_getattr_perceptual_rendering_intent_gamut(
-    CmsProfileObject *self, void *closure) {
+    CmsProfileObject *self, void *closure
+) {
     return _profile_read_signature(self, cmsSigPerceptualRenderingIntentGamutTag);
 }
 
 static PyObject *
 cms_profile_getattr_saturation_rendering_intent_gamut(
-    CmsProfileObject *self, void *closure) {
+    CmsProfileObject *self, void *closure
+) {
     return _profile_read_signature(self, cmsSigSaturationRenderingIntentGamutTag);
 }
 
@@ -1152,7 +1167,8 @@ cms_profile_getattr_blue_colorant(CmsProfileObject *self, void *closure) {
 
 static PyObject *
 cms_profile_getattr_media_white_point_temperature(
-    CmsProfileObject *self, void *closure) {
+    CmsProfileObject *self, void *closure
+) {
     cmsCIEXYZ *XYZ;
     cmsCIExyY xyY;
     cmsFloat64Number tempK;
@@ -1336,7 +1352,8 @@ cms_profile_getattr_icc_measurement_condition(CmsProfileObject *self, void *clos
         "flare",
         mc->Flare,
         "illuminant_type",
-        _illu_map(mc->IlluminantType));
+        _illu_map(mc->IlluminantType)
+    );
 }
 
 static PyObject *
@@ -1366,7 +1383,8 @@ cms_profile_getattr_icc_viewing_condition(CmsProfileObject *self, void *closure)
         vc->SurroundXYZ.Y,
         vc->SurroundXYZ.Z,
         "illuminant_type",
-        _illu_map(vc->IlluminantType));
+        _illu_map(vc->IlluminantType)
+    );
 }
 
 static struct PyGetSetDef cms_profile_getsetters[] = {
@@ -1414,16 +1432,17 @@ static struct PyGetSetDef cms_profile_getsetters[] = {
     {"colorant_table_out", (getter)cms_profile_getattr_colorant_table_out},
     {"intent_supported", (getter)cms_profile_getattr_is_intent_supported},
     {"clut", (getter)cms_profile_getattr_is_clut},
-    {"icc_measurement_condition",
-     (getter)cms_profile_getattr_icc_measurement_condition},
+    {"icc_measurement_condition", (getter)cms_profile_getattr_icc_measurement_condition
+    },
     {"icc_viewing_condition", (getter)cms_profile_getattr_icc_viewing_condition},
 
-    {NULL}};
+    {NULL}
+};
 
 static PyTypeObject CmsProfile_Type = {
-    PyVarObject_HEAD_INIT(NULL, 0) "PIL._imagingcms.CmsProfile", /*tp_name*/
-    sizeof(CmsProfileObject),                                    /*tp_basicsize*/
-    0,                                                           /*tp_itemsize*/
+    PyVarObject_HEAD_INIT(NULL, 0) "PIL.ImageCms.core.CmsProfile", /*tp_name*/
+    sizeof(CmsProfileObject),                                      /*tp_basicsize*/
+    0,                                                             /*tp_itemsize*/
     /* methods */
     (destructor)cms_profile_dealloc, /*tp_dealloc*/
     0,                               /*tp_vectorcall_offset*/
@@ -1457,25 +1476,10 @@ static struct PyMethodDef cms_transform_methods[] = {
     {"apply", (PyCFunction)cms_transform_apply, 1}, {NULL, NULL} /* sentinel */
 };
 
-static PyObject *
-cms_transform_getattr_inputMode(CmsTransformObject *self, void *closure) {
-    return PyUnicode_FromString(self->mode_in);
-}
-
-static PyObject *
-cms_transform_getattr_outputMode(CmsTransformObject *self, void *closure) {
-    return PyUnicode_FromString(self->mode_out);
-}
-
-static struct PyGetSetDef cms_transform_getsetters[] = {
-    {"inputMode", (getter)cms_transform_getattr_inputMode},
-    {"outputMode", (getter)cms_transform_getattr_outputMode},
-    {NULL}};
-
 static PyTypeObject CmsTransform_Type = {
-    PyVarObject_HEAD_INIT(NULL, 0) "CmsTransform", /*tp_name*/
-    sizeof(CmsTransformObject),                    /*tp_basicsize*/
-    0,                                             /*tp_itemsize*/
+    PyVarObject_HEAD_INIT(NULL, 0) "PIL.ImageCms.core.CmsTransform", /*tp_name*/
+    sizeof(CmsTransformObject),                                      /*tp_basicsize*/
+    0,                                                               /*tp_itemsize*/
     /* methods */
     (destructor)cms_transform_dealloc, /*tp_dealloc*/
     0,                                 /*tp_vectorcall_offset*/
@@ -1502,7 +1506,7 @@ static PyTypeObject CmsTransform_Type = {
     0,                                 /*tp_iternext*/
     cms_transform_methods,             /*tp_methods*/
     0,                                 /*tp_members*/
-    cms_transform_getsetters,          /*tp_getset*/
+    0,                                 /*tp_getset*/
 };
 
 static int
@@ -1511,8 +1515,6 @@ setup_module(PyObject *m) {
     PyObject *v;
     int vn;
 
-    CmsProfile_Type.tp_new = PyType_GenericNew;
-
     /* Ready object types */
     PyType_Ready(&CmsProfile_Type);
     PyType_Ready(&CmsTransform_Type);
@@ -1520,6 +1522,9 @@ setup_module(PyObject *m) {
     Py_INCREF(&CmsProfile_Type);
     PyModule_AddObject(m, "CmsProfile", (PyObject *)&CmsProfile_Type);
 
+    Py_INCREF(&CmsTransform_Type);
+    PyModule_AddObject(m, "CmsTransform", (PyObject *)&CmsTransform_Type);
+
     d = PyModule_GetDict(m);
 
     /* this check is also in PIL.features.pilinfo() */
@@ -1559,5 +1564,9 @@ PyInit__imagingcms(void) {
 
     PyDateTime_IMPORT;
 
+#ifdef Py_GIL_DISABLED
+    PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
+#endif
+
     return m;
 }
diff --git a/src/_imagingft.c b/src/_imagingft.c
index 68c66ac2c60..7f246412455 100644
--- a/src/_imagingft.c
+++ b/src/_imagingft.c
@@ -20,6 +20,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
+#include "thirdparty/pythoncapi_compat.h"
 #include "libImaging/Imaging.h"
 
 #include <ft2build.h>
@@ -47,17 +48,17 @@
     ;
 
 #ifdef HAVE_RAQM
-# ifdef HAVE_RAQM_SYSTEM
-#  include <raqm.h>
-# else
-#  include "thirdparty/raqm/raqm.h"
-#  ifdef HAVE_FRIBIDI_SYSTEM
-#   include <fribidi.h>
-#  else
-#   include "thirdparty/fribidi-shim/fribidi.h"
-#   include <hb.h>
-#  endif
-# endif
+#ifdef HAVE_RAQM_SYSTEM
+#include <raqm.h>
+#else
+#include "thirdparty/raqm/raqm.h"
+#ifdef HAVE_FRIBIDI_SYSTEM
+#include <fribidi.h>
+#else
+#include "thirdparty/fribidi-shim/fribidi.h"
+#include <hb.h>
+#endif
+#endif
 #endif
 
 static int have_raqm = 0;
@@ -125,7 +126,8 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) {
     unsigned char *font_bytes;
     Py_ssize_t font_bytes_size = 0;
     static char *kwlist[] = {
-        "filename", "size", "index", "encoding", "font_bytes", "layout_engine", NULL};
+        "filename", "size", "index", "encoding", "font_bytes", "layout_engine", NULL
+    };
 
     if (!library) {
         PyErr_SetString(PyExc_OSError, "failed to initialize FreeType library");
@@ -147,7 +149,8 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) {
             &encoding,
             &font_bytes,
             &font_bytes_size,
-            &layout_engine)) {
+            &layout_engine
+        )) {
         PyConfig_Clear(&config);
         return NULL;
     }
@@ -165,7 +168,8 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) {
             &encoding,
             &font_bytes,
             &font_bytes_size,
-            &layout_engine)) {
+            &layout_engine
+        )) {
         return NULL;
     }
 #endif
@@ -198,7 +202,8 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) {
                 (FT_Byte *)self->font_bytes,
                 font_bytes_size,
                 index,
-                &self->face);
+                &self->face
+            );
         }
     }
 
@@ -233,18 +238,6 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) {
     return (PyObject *)self;
 }
 
-static int
-font_getchar(PyObject *string, int index, FT_ULong *char_out) {
-    if (PyUnicode_Check(string)) {
-        if (index >= PyUnicode_GET_LENGTH(string)) {
-            return 0;
-        }
-        *char_out = PyUnicode_READ_CHAR(string, index);
-        return 1;
-    }
-    return 0;
-}
-
 #ifdef HAVE_RAQM
 
 static size_t
@@ -254,7 +247,8 @@ text_layout_raqm(
     const char *dir,
     PyObject *features,
     const char *lang,
-    GlyphInfo **glyph_info) {
+    GlyphInfo **glyph_info
+) {
     size_t i = 0, count = 0, start = 0;
     raqm_t *rq;
     raqm_glyph_t *glyphs = NULL;
@@ -266,28 +260,37 @@ text_layout_raqm(
         goto failed;
     }
 
+    Py_ssize_t size;
+    int set_text;
     if (PyUnicode_Check(string)) {
         Py_UCS4 *text = PyUnicode_AsUCS4Copy(string);
-        Py_ssize_t size = PyUnicode_GET_LENGTH(string);
+        size = PyUnicode_GET_LENGTH(string);
         if (!text || !size) {
             /* return 0 and clean up, no glyphs==no size,
                and raqm fails with empty strings */
             goto failed;
         }
-        int set_text = raqm_set_text(rq, text, size);
+        set_text = raqm_set_text(rq, text, size);
         PyMem_Free(text);
-        if (!set_text) {
-            PyErr_SetString(PyExc_ValueError, "raqm_set_text() failed");
+    } else if (PyBytes_Check(string)) {
+        char *buffer;
+        PyBytes_AsStringAndSize(string, &buffer, &size);
+        if (!buffer || !size) {
+            /* return 0 and clean up, no glyphs==no size,
+               and raqm fails with empty strings */
             goto failed;
         }
-        if (lang) {
-            if (!raqm_set_language(rq, lang, start, size)) {
-                PyErr_SetString(PyExc_ValueError, "raqm_set_language() failed");
-                goto failed;
-            }
-        }
+        set_text = raqm_set_text_utf8(rq, buffer, size);
     } else {
-        PyErr_SetString(PyExc_TypeError, "expected string");
+        PyErr_SetString(PyExc_TypeError, "expected string or bytes");
+        goto failed;
+    }
+    if (!set_text) {
+        PyErr_SetString(PyExc_ValueError, "raqm_set_text() failed");
+        goto failed;
+    }
+    if (lang && !raqm_set_language(rq, lang, start, size)) {
+        PyErr_SetString(PyExc_ValueError, "raqm_set_language() failed");
         goto failed;
     }
 
@@ -302,13 +305,14 @@ text_layout_raqm(
 #if !defined(RAQM_VERSION_ATLEAST)
             /* RAQM_VERSION_ATLEAST was added in Raqm 0.7.0 */
             PyErr_SetString(
-                PyExc_ValueError,
-                "libraqm 0.7 or greater required for 'ttb' direction");
+                PyExc_ValueError, "libraqm 0.7 or greater required for 'ttb' direction"
+            );
             goto failed;
 #endif
         } else {
             PyErr_SetString(
-                PyExc_ValueError, "direction must be either 'rtl', 'ltr' or 'ttb'");
+                PyExc_ValueError, "direction must be either 'rtl', 'ltr' or 'ttb'"
+            );
             goto failed;
         }
     }
@@ -404,29 +408,31 @@ text_layout_fallback(
     const char *lang,
     GlyphInfo **glyph_info,
     int mask,
-    int color) {
-    int error, load_flags;
+    int color
+) {
+    int error, load_flags, i;
+    char *buffer = NULL;
     FT_ULong ch;
     Py_ssize_t count;
     FT_GlyphSlot glyph;
     FT_Bool kerning = FT_HAS_KERNING(self->face);
     FT_UInt last_index = 0;
-    int i;
 
     if (features != Py_None || dir != NULL || lang != NULL) {
         PyErr_SetString(
             PyExc_KeyError,
             "setting text direction, language or font features is not supported "
-            "without libraqm");
-    }
-    if (!PyUnicode_Check(string)) {
-        PyErr_SetString(PyExc_TypeError, "expected string");
-        return 0;
+            "without libraqm"
+        );
     }
 
-    count = 0;
-    while (font_getchar(string, count, &ch)) {
-        count++;
+    if (PyUnicode_Check(string)) {
+        count = PyUnicode_GET_LENGTH(string);
+    } else if (PyBytes_Check(string)) {
+        PyBytes_AsStringAndSize(string, &buffer, &count);
+    } else {
+        PyErr_SetString(PyExc_TypeError, "expected string or bytes");
+        return 0;
     }
     if (count == 0) {
         return 0;
@@ -445,7 +451,12 @@ text_layout_fallback(
     if (color) {
         load_flags |= FT_LOAD_COLOR;
     }
-    for (i = 0; font_getchar(string, i, &ch); i++) {
+    for (i = 0; i < count; i++) {
+        if (buffer) {
+            ch = buffer[i];
+        } else {
+            ch = PyUnicode_READ_CHAR(string, i);
+        }
         (*glyph_info)[i].index = FT_Get_Char_Index(self->face, ch);
         error = FT_Load_Glyph(self->face, (*glyph_info)[i].index, load_flags);
         if (error) {
@@ -462,7 +473,8 @@ text_layout_fallback(
                     last_index,
                     (*glyph_info)[i].index,
                     ft_kerning_default,
-                    &delta) == 0) {
+                    &delta
+                ) == 0) {
                 (*glyph_info)[i - 1].x_advance += PIXEL(delta.x);
                 (*glyph_info)[i - 1].y_advance += PIXEL(delta.y);
             }
@@ -486,17 +498,18 @@ text_layout(
     const char *lang,
     GlyphInfo **glyph_info,
     int mask,
-    int color) {
+    int color
+) {
     size_t count;
 #ifdef HAVE_RAQM
     if (have_raqm && self->layout_engine == LAYOUT_RAQM) {
-        count = text_layout_raqm(
-            string, self, dir, features, lang, glyph_info);
+        count = text_layout_raqm(string, self, dir, features, lang, glyph_info);
     } else
 #endif
     {
         count = text_layout_fallback(
-            string, self, dir, features, lang, glyph_info, mask, color);
+            string, self, dir, features, lang, glyph_info, mask, color
+        );
     }
     return count;
 }
@@ -518,7 +531,8 @@ font_getlength(FontObject *self, PyObject *args) {
     /* calculate size and bearing for a given string */
 
     if (!PyArg_ParseTuple(
-            args, "O|zzOz:getlength", &string, &mode, &dir, &features, &lang)) {
+            args, "O|zzOz:getlength", &string, &mode, &dir, &features, &lang
+        )) {
         return NULL;
     }
 
@@ -550,7 +564,18 @@ font_getlength(FontObject *self, PyObject *args) {
 }
 
 static int
-bounding_box_and_anchors(FT_Face face, const char *anchor, int horizontal_dir, GlyphInfo *glyph_info, size_t count, int load_flags, int *width, int *height, int *x_offset, int *y_offset) {
+bounding_box_and_anchors(
+    FT_Face face,
+    const char *anchor,
+    int horizontal_dir,
+    GlyphInfo *glyph_info,
+    size_t count,
+    int load_flags,
+    int *width,
+    int *height,
+    int *x_offset,
+    int *y_offset
+) {
     int position; /* pen position along primary axis, in 26.6 precision */
     int advanced; /* pen position along primary axis, in pixels */
     int px, py;   /* position of current glyph, in pixels */
@@ -558,8 +583,8 @@ bounding_box_and_anchors(FT_Face face, const char *anchor, int horizontal_dir, G
     int x_anchor, y_anchor;         /* offset of point drawn at (0, 0), in pixels */
     int error;
     FT_Glyph glyph;
-    FT_BBox bbox;                   /* glyph bounding box */
-    size_t i;                       /* glyph_info index */
+    FT_BBox bbox; /* glyph bounding box */
+    size_t i;     /* glyph_info index */
     /*
      * text bounds are given by:
      *   - bounding boxes of individual glyphs
@@ -654,9 +679,9 @@ bounding_box_and_anchors(FT_Face face, const char *anchor, int horizontal_dir, G
                     break;
                 case 'm':  // middle (ascender + descender) / 2
                     y_anchor = PIXEL(
-                        (face->size->metrics.ascender +
-                         face->size->metrics.descender) /
-                        2);
+                        (face->size->metrics.ascender + face->size->metrics.descender) /
+                        2
+                    );
                     break;
                 case 's':  // horizontal baseline
                     y_anchor = 0;
@@ -719,7 +744,7 @@ bounding_box_and_anchors(FT_Face face, const char *anchor, int horizontal_dir, G
 static PyObject *
 font_getsize(FontObject *self, PyObject *args) {
     int width, height, x_offset, y_offset;
-    int load_flags;               /* FreeType load_flags parameter */
+    int load_flags; /* FreeType load_flags parameter */
     int error;
     GlyphInfo *glyph_info = NULL; /* computed text layout */
     size_t count;                 /* glyph_info length */
@@ -736,7 +761,8 @@ font_getsize(FontObject *self, PyObject *args) {
     /* calculate size and bearing for a given string */
 
     if (!PyArg_ParseTuple(
-            args, "O|zzOzz:getsize", &string, &mode, &dir, &features, &lang, &anchor)) {
+            args, "O|zzOzz:getsize", &string, &mode, &dir, &features, &lang, &anchor
+        )) {
         return NULL;
     }
 
@@ -758,7 +784,18 @@ font_getsize(FontObject *self, PyObject *args) {
         load_flags |= FT_LOAD_COLOR;
     }
 
-    error = bounding_box_and_anchors(self->face, anchor, horizontal_dir, glyph_info, count, load_flags, &width, &height, &x_offset, &y_offset);
+    error = bounding_box_and_anchors(
+        self->face,
+        anchor,
+        horizontal_dir,
+        glyph_info,
+        count,
+        load_flags,
+        &width,
+        &height,
+        &x_offset,
+        &y_offset
+    );
     if (glyph_info) {
         PyMem_Free(glyph_info);
         glyph_info = NULL;
@@ -767,12 +804,7 @@ font_getsize(FontObject *self, PyObject *args) {
         return NULL;
     }
 
-    return Py_BuildValue(
-        "(ii)(ii)",
-        width,
-        height,
-        x_offset,
-        y_offset);
+    return Py_BuildValue("(ii)(ii)", width, height, x_offset, y_offset);
 }
 
 static PyObject *
@@ -798,10 +830,9 @@ font_render(FontObject *self, PyObject *args) {
     unsigned char convert_scale;    /* scale factor for non-8bpp bitmaps */
     PyObject *image;
     Imaging im;
-    Py_ssize_t id;
     int mask = 0;  /* is FT_LOAD_TARGET_MONO enabled? */
     int color = 0; /* is FT_LOAD_COLOR enabled? */
-    int stroke_width = 0;
+    float stroke_width = 0;
     PY_LONG_LONG foreground_ink_long = 0;
     unsigned int foreground_ink;
     const char *mode = NULL;
@@ -821,7 +852,7 @@ font_render(FontObject *self, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "OO|zzOzizLffO:render",
+            "OO|zzOzfzLffO:render",
             &string,
             &fill,
             &mode,
@@ -832,7 +863,8 @@ font_render(FontObject *self, PyObject *args) {
             &anchor,
             &foreground_ink_long,
             &x_start,
-            &y_start)) {
+            &y_start
+        )) {
         return NULL;
     }
 
@@ -869,32 +901,39 @@ font_render(FontObject *self, PyObject *args) {
 
     horizontal_dir = dir && strcmp(dir, "ttb") == 0 ? 0 : 1;
 
-    error = bounding_box_and_anchors(self->face, anchor, horizontal_dir, glyph_info, count, load_flags, &width, &height, &x_offset, &y_offset);
+    error = bounding_box_and_anchors(
+        self->face,
+        anchor,
+        horizontal_dir,
+        glyph_info,
+        count,
+        load_flags,
+        &width,
+        &height,
+        &x_offset,
+        &y_offset
+    );
     if (error) {
         PyMem_Del(glyph_info);
         return NULL;
     }
 
-    width += stroke_width * 2 + ceil(x_start);
-    height += stroke_width * 2 + ceil(y_start);
+    width += ceil(stroke_width * 2 + x_start);
+    height += ceil(stroke_width * 2 + y_start);
     image = PyObject_CallFunction(fill, "ii", width, height);
-    if (image == Py_None) {
-        PyMem_Del(glyph_info);
-        return Py_BuildValue("ii", 0, 0);
-    } else if (image == NULL) {
+    if (image == NULL) {
         PyMem_Del(glyph_info);
         return NULL;
     }
-    PyObject *imageId = PyObject_GetAttrString(image, "id");
-    id = PyLong_AsSsize_t(imageId);
-    Py_XDECREF(imageId);
-    im = (Imaging)id;
+    PyObject *imagePtr = PyObject_GetAttrString(image, "ptr");
+    im = (Imaging)PyCapsule_GetPointer(imagePtr, IMAGING_MAGIC);
+    Py_XDECREF(imagePtr);
 
-    x_offset -= stroke_width;
-    y_offset -= stroke_width;
+    x_offset = round(x_offset - stroke_width);
+    y_offset = round(y_offset - stroke_width);
     if (count == 0 || width == 0 || height == 0) {
         PyMem_Del(glyph_info);
-        return Py_BuildValue("ii", x_offset, y_offset);
+        return Py_BuildValue("N(ii)", image, x_offset, y_offset);
     }
 
     if (stroke_width) {
@@ -906,10 +945,11 @@ font_render(FontObject *self, PyObject *args) {
 
         FT_Stroker_Set(
             stroker,
-            (FT_Fixed)stroke_width * 64,
+            (FT_Fixed)round(stroke_width * 64),
             FT_STROKER_LINECAP_ROUND,
             FT_STROKER_LINEJOIN_ROUND,
-            0);
+            0
+        );
     }
 
     /*
@@ -943,8 +983,8 @@ font_render(FontObject *self, PyObject *args) {
     }
 
     /* set pen position to text origin */
-    x = (-x_min + stroke_width + x_start) * 64;
-    y = (-y_max + (-stroke_width) - y_start) * 64;
+    x = round((-x_min + stroke_width + x_start) * 64);
+    y = round((-y_max + (-stroke_width) - y_start) * 64);
 
     if (stroker == NULL) {
         load_flags |= FT_LOAD_RENDER;
@@ -1066,17 +1106,26 @@ font_render(FontObject *self, PyObject *args) {
                         /* paste only if source has data */
                         if (src_alpha > 0) {
                             /* unpremultiply BGRa */
-                            int src_red = CLIP8((255 * (int)source[k * 4 + 2]) / src_alpha);
-                            int src_green = CLIP8((255 * (int)source[k * 4 + 1]) / src_alpha);
-                            int src_blue = CLIP8((255 * (int)source[k * 4 + 0]) / src_alpha);
+                            int src_red =
+                                CLIP8((255 * (int)source[k * 4 + 2]) / src_alpha);
+                            int src_green =
+                                CLIP8((255 * (int)source[k * 4 + 1]) / src_alpha);
+                            int src_blue =
+                                CLIP8((255 * (int)source[k * 4 + 0]) / src_alpha);
 
                             /* blend required if target has data */
                             if (target[k * 4 + 3] > 0) {
                                 /* blend RGBA colors */
-                                target[k * 4 + 0] = BLEND(src_alpha, target[k * 4 + 0], src_red, tmp);
-                                target[k * 4 + 1] = BLEND(src_alpha, target[k * 4 + 1], src_green, tmp);
-                                target[k * 4 + 2] = BLEND(src_alpha, target[k * 4 + 2], src_blue, tmp);
-                                target[k * 4 + 3] = CLIP8(src_alpha + MULDIV255(target[k * 4 + 3], (255 - src_alpha), tmp));
+                                target[k * 4 + 0] =
+                                    BLEND(src_alpha, target[k * 4 + 0], src_red, tmp);
+                                target[k * 4 + 1] =
+                                    BLEND(src_alpha, target[k * 4 + 1], src_green, tmp);
+                                target[k * 4 + 2] =
+                                    BLEND(src_alpha, target[k * 4 + 2], src_blue, tmp);
+                                target[k * 4 + 3] = CLIP8(
+                                    src_alpha +
+                                    MULDIV255(target[k * 4 + 3], (255 - src_alpha), tmp)
+                                );
                             } else {
                                 /* paste unpremultiplied RGBA values */
                                 target[k * 4 + 0] = src_red;
@@ -1093,10 +1142,21 @@ font_render(FontObject *self, PyObject *args) {
                             unsigned int src_alpha = source[k] * convert_scale;
                             if (src_alpha > 0) {
                                 if (target[k * 4 + 3] > 0) {
-                                    target[k * 4 + 0] = BLEND(src_alpha, target[k * 4 + 0], ink[0], tmp);
-                                    target[k * 4 + 1] = BLEND(src_alpha, target[k * 4 + 1], ink[1], tmp);
-                                    target[k * 4 + 2] = BLEND(src_alpha, target[k * 4 + 2], ink[2], tmp);
-                                    target[k * 4 + 3] = CLIP8(src_alpha + MULDIV255(target[k * 4 + 3], (255 - src_alpha), tmp));
+                                    target[k * 4 + 0] = BLEND(
+                                        src_alpha, target[k * 4 + 0], ink[0], tmp
+                                    );
+                                    target[k * 4 + 1] = BLEND(
+                                        src_alpha, target[k * 4 + 1], ink[1], tmp
+                                    );
+                                    target[k * 4 + 2] = BLEND(
+                                        src_alpha, target[k * 4 + 2], ink[2], tmp
+                                    );
+                                    target[k * 4 + 3] = CLIP8(
+                                        src_alpha +
+                                        MULDIV255(
+                                            target[k * 4 + 3], (255 - src_alpha), tmp
+                                        )
+                                    );
                                 } else {
                                     target[k * 4 + 0] = ink[0];
                                     target[k * 4 + 1] = ink[1];
@@ -1109,7 +1169,15 @@ font_render(FontObject *self, PyObject *args) {
                         for (k = x0; k < x1; k++) {
                             unsigned int src_alpha = source[k] * convert_scale;
                             if (src_alpha > 0) {
-                                target[k] = target[k] > 0 ? CLIP8(src_alpha + MULDIV255(target[k], (255 - src_alpha), tmp)) : src_alpha;
+                                target[k] =
+                                    target[k] > 0
+                                        ? CLIP8(
+                                              src_alpha +
+                                              MULDIV255(
+                                                  target[k], (255 - src_alpha), tmp
+                                              )
+                                          )
+                                        : src_alpha;
                             }
                         }
                     }
@@ -1130,18 +1198,12 @@ font_render(FontObject *self, PyObject *args) {
     if (bitmap_converted_ready) {
         FT_Bitmap_Done(library, &bitmap_converted);
     }
-    Py_DECREF(image);
     FT_Stroker_Done(stroker);
     PyMem_Del(glyph_info);
-    return Py_BuildValue("ii", x_offset, y_offset);
+    return Py_BuildValue("N(ii)", image, x_offset, y_offset);
 
 glyph_error:
-    if (im->destroy) {
-        im->destroy(im);
-    }
-    if (im->image) {
-        free(im->image);
-    }
+    Py_DECREF(image);
     if (stroker != NULL) {
         FT_Done_Glyph(glyph);
     }
@@ -1175,30 +1237,49 @@ font_getvarnames(FontObject *self) {
         return NULL;
     }
 
+    int *list_names_filled = PyMem_Malloc(num_namedstyles * sizeof(int));
+    if (list_names_filled == NULL) {
+        Py_DECREF(list_names);
+        FT_Done_MM_Var(library, master);
+        return PyErr_NoMemory();
+    }
+
+    for (unsigned int i = 0; i < num_namedstyles; i++) {
+        list_names_filled[i] = 0;
+    }
+
     name_count = FT_Get_Sfnt_Name_Count(self->face);
     for (i = 0; i < name_count; i++) {
         error = FT_Get_Sfnt_Name(self->face, i, &name);
         if (error) {
+            PyMem_Free(list_names_filled);
             Py_DECREF(list_names);
             FT_Done_MM_Var(library, master);
             return geterror(error);
         }
 
         for (j = 0; j < num_namedstyles; j++) {
-            if (PyList_GetItem(list_names, j) != NULL) {
+            if (list_names_filled[j]) {
                 continue;
             }
 
             if (master->namedstyle[j].strid == name.name_id) {
                 list_name = Py_BuildValue("y#", name.string, name.string_len);
+                if (list_name == NULL) {
+                    PyMem_Free(list_names_filled);
+                    Py_DECREF(list_names);
+                    FT_Done_MM_Var(library, master);
+                    return NULL;
+                }
                 PyList_SetItem(list_names, j, list_name);
+                list_names_filled[j] = 1;
                 break;
             }
         }
     }
 
+    PyMem_Free(list_names_filled);
     FT_Done_MM_Var(library, master);
-
     return list_names;
 }
 
@@ -1255,8 +1336,14 @@ font_getvaraxes(FontObject *self) {
 
             if (name.name_id == axis.strid) {
                 axis_name = Py_BuildValue("y#", name.string, name.string_len);
-                PyDict_SetItemString(list_axis, "name", axis_name ? axis_name : Py_None);
-                Py_XDECREF(axis_name);
+                if (axis_name == NULL) {
+                    Py_DECREF(list_axis);
+                    Py_DECREF(list_axes);
+                    FT_Done_MM_Var(library, master);
+                    return NULL;
+                }
+                PyDict_SetItemString(list_axis, "name", axis_name);
+                Py_DECREF(axis_name);
                 break;
             }
         }
@@ -1305,12 +1392,17 @@ font_setvaraxes(FontObject *self, PyObject *args) {
     }
 
     num_coords = PyObject_Length(axes);
-    coords = (FT_Fixed*)malloc(num_coords * sizeof(FT_Fixed));
+    coords = (FT_Fixed *)malloc(num_coords * sizeof(FT_Fixed));
     if (coords == NULL) {
         return PyErr_NoMemory();
     }
     for (i = 0; i < num_coords; i++) {
-        item = PyList_GET_ITEM(axes, i);
+        item = PyList_GetItemRef(axes, i);
+        if (item == NULL) {
+            free(coords);
+            return NULL;
+        }
+
         if (PyFloat_Check(item)) {
             coord = PyFloat_AS_DOUBLE(item);
         } else if (PyLong_Check(item)) {
@@ -1318,10 +1410,12 @@ font_setvaraxes(FontObject *self, PyObject *args) {
         } else if (PyNumber_Check(item)) {
             coord = PyFloat_AsDouble(item);
         } else {
+            Py_DECREF(item);
             free(coords);
             PyErr_SetString(PyExc_TypeError, "list must contain numbers");
             return NULL;
         }
+        Py_DECREF(item);
         coords[i] = coord * 65536;
     }
 
@@ -1358,7 +1452,8 @@ static PyMethodDef font_methods[] = {
     {"setvarname", (PyCFunction)font_setvarname, METH_VARARGS},
     {"setvaraxes", (PyCFunction)font_setvaraxes, METH_VARARGS},
 #endif
-    {NULL, NULL}};
+    {NULL, NULL}
+};
 
 static PyObject *
 font_getattr_family(FontObject *self, void *closure) {
@@ -1415,7 +1510,8 @@ static struct PyGetSetDef font_getsetters[] = {
     {"x_ppem", (getter)font_getattr_x_ppem},
     {"y_ppem", (getter)font_getattr_y_ppem},
     {"glyphs", (getter)font_getattr_glyphs},
-    {NULL}};
+    {NULL}
+};
 
 static PyTypeObject Font_Type = {
     PyVarObject_HEAD_INIT(NULL, 0) "Font", /*tp_name*/
@@ -1451,7 +1547,8 @@ static PyTypeObject Font_Type = {
 };
 
 static PyMethodDef _functions[] = {
-    {"getfont", (PyCFunction)getfont, METH_VARARGS | METH_KEYWORDS}, {NULL, NULL}};
+    {"getfont", (PyCFunction)getfont, METH_VARARGS | METH_KEYWORDS}, {NULL, NULL}
+};
 
 static int
 setup_module(PyObject *m) {
@@ -1541,5 +1638,9 @@ PyInit__imagingft(void) {
         return NULL;
     }
 
+#ifdef Py_GIL_DISABLED
+    PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
+#endif
+
     return m;
 }
diff --git a/src/_imagingmath.c b/src/_imagingmath.c
index 067c165b248..dbe636707f4 100644
--- a/src/_imagingmath.c
+++ b/src/_imagingmath.c
@@ -23,6 +23,9 @@
 #define MAX_INT32 2147483647.0
 #define MIN_INT32 -2147483648.0
 
+#define MATH_FUNC_UNOP_MAGIC "Pillow Math unary func"
+#define MATH_FUNC_BINOP_MAGIC "Pillow Math binary func"
+
 #define UNOP(name, op, type)                   \
     void name(Imaging out, Imaging im1) {      \
         int x, y;                              \
@@ -168,15 +171,24 @@ _unop(PyObject *self, PyObject *args) {
     Imaging im1;
     void (*unop)(Imaging, Imaging);
 
-    Py_ssize_t op, i0, i1;
-    if (!PyArg_ParseTuple(args, "nnn", &op, &i0, &i1)) {
+    PyObject *op, *i0, *i1;
+    if (!PyArg_ParseTuple(args, "OOO", &op, &i0, &i1)) {
         return NULL;
     }
 
-    out = (Imaging)i0;
-    im1 = (Imaging)i1;
+    if (!PyCapsule_IsValid(op, MATH_FUNC_UNOP_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_UNOP_MAGIC);
+        return NULL;
+    }
+    if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) ||
+        !PyCapsule_IsValid(i1, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
+        return NULL;
+    }
 
-    unop = (void *)op;
+    unop = (void *)PyCapsule_GetPointer(op, MATH_FUNC_UNOP_MAGIC);
+    out = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
+    im1 = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC);
 
     unop(out, im1);
 
@@ -191,16 +203,26 @@ _binop(PyObject *self, PyObject *args) {
     Imaging im2;
     void (*binop)(Imaging, Imaging, Imaging);
 
-    Py_ssize_t op, i0, i1, i2;
-    if (!PyArg_ParseTuple(args, "nnnn", &op, &i0, &i1, &i2)) {
+    PyObject *op, *i0, *i1, *i2;
+    if (!PyArg_ParseTuple(args, "OOOO", &op, &i0, &i1, &i2)) {
         return NULL;
     }
 
-    out = (Imaging)i0;
-    im1 = (Imaging)i1;
-    im2 = (Imaging)i2;
+    if (!PyCapsule_IsValid(op, MATH_FUNC_BINOP_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_BINOP_MAGIC);
+        return NULL;
+    }
+    if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) ||
+        !PyCapsule_IsValid(i1, IMAGING_MAGIC) ||
+        !PyCapsule_IsValid(i2, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
+        return NULL;
+    }
 
-    binop = (void *)op;
+    binop = (void *)PyCapsule_GetPointer(op, MATH_FUNC_BINOP_MAGIC);
+    out = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
+    im1 = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC);
+    im2 = (Imaging)PyCapsule_GetPointer(i2, IMAGING_MAGIC);
 
     binop(out, im1, im2);
 
@@ -209,11 +231,21 @@ _binop(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef _functions[] = {
-    {"unop", _unop, 1}, {"binop", _binop, 1}, {NULL, NULL}};
+    {"unop", _unop, 1}, {"binop", _binop, 1}, {NULL, NULL}
+};
 
 static void
-install(PyObject *d, char *name, void *value) {
-    PyObject *v = PyLong_FromSsize_t((Py_ssize_t)value);
+install_unary(PyObject *d, char *name, void *func) {
+    PyObject *v = PyCapsule_New(func, MATH_FUNC_UNOP_MAGIC, NULL);
+    if (!v || PyDict_SetItemString(d, name, v)) {
+        PyErr_Clear();
+    }
+    Py_XDECREF(v);
+}
+
+static void
+install_binary(PyObject *d, char *name, void *func) {
+    PyObject *v = PyCapsule_New(func, MATH_FUNC_BINOP_MAGIC, NULL);
     if (!v || PyDict_SetItemString(d, name, v)) {
         PyErr_Clear();
     }
@@ -224,50 +256,50 @@ static int
 setup_module(PyObject *m) {
     PyObject *d = PyModule_GetDict(m);
 
-    install(d, "abs_I", abs_I);
-    install(d, "neg_I", neg_I);
-    install(d, "add_I", add_I);
-    install(d, "sub_I", sub_I);
-    install(d, "diff_I", diff_I);
-    install(d, "mul_I", mul_I);
-    install(d, "div_I", div_I);
-    install(d, "mod_I", mod_I);
-    install(d, "min_I", min_I);
-    install(d, "max_I", max_I);
-    install(d, "pow_I", pow_I);
-
-    install(d, "invert_I", invert_I);
-    install(d, "and_I", and_I);
-    install(d, "or_I", or_I);
-    install(d, "xor_I", xor_I);
-    install(d, "lshift_I", lshift_I);
-    install(d, "rshift_I", rshift_I);
-
-    install(d, "eq_I", eq_I);
-    install(d, "ne_I", ne_I);
-    install(d, "lt_I", lt_I);
-    install(d, "le_I", le_I);
-    install(d, "gt_I", gt_I);
-    install(d, "ge_I", ge_I);
-
-    install(d, "abs_F", abs_F);
-    install(d, "neg_F", neg_F);
-    install(d, "add_F", add_F);
-    install(d, "sub_F", sub_F);
-    install(d, "diff_F", diff_F);
-    install(d, "mul_F", mul_F);
-    install(d, "div_F", div_F);
-    install(d, "mod_F", mod_F);
-    install(d, "min_F", min_F);
-    install(d, "max_F", max_F);
-    install(d, "pow_F", pow_F);
-
-    install(d, "eq_F", eq_F);
-    install(d, "ne_F", ne_F);
-    install(d, "lt_F", lt_F);
-    install(d, "le_F", le_F);
-    install(d, "gt_F", gt_F);
-    install(d, "ge_F", ge_F);
+    install_unary(d, "abs_I", abs_I);
+    install_unary(d, "neg_I", neg_I);
+    install_binary(d, "add_I", add_I);
+    install_binary(d, "sub_I", sub_I);
+    install_binary(d, "diff_I", diff_I);
+    install_binary(d, "mul_I", mul_I);
+    install_binary(d, "div_I", div_I);
+    install_binary(d, "mod_I", mod_I);
+    install_binary(d, "min_I", min_I);
+    install_binary(d, "max_I", max_I);
+    install_binary(d, "pow_I", pow_I);
+
+    install_unary(d, "invert_I", invert_I);
+    install_binary(d, "and_I", and_I);
+    install_binary(d, "or_I", or_I);
+    install_binary(d, "xor_I", xor_I);
+    install_binary(d, "lshift_I", lshift_I);
+    install_binary(d, "rshift_I", rshift_I);
+
+    install_binary(d, "eq_I", eq_I);
+    install_binary(d, "ne_I", ne_I);
+    install_binary(d, "lt_I", lt_I);
+    install_binary(d, "le_I", le_I);
+    install_binary(d, "gt_I", gt_I);
+    install_binary(d, "ge_I", ge_I);
+
+    install_unary(d, "abs_F", abs_F);
+    install_unary(d, "neg_F", neg_F);
+    install_binary(d, "add_F", add_F);
+    install_binary(d, "sub_F", sub_F);
+    install_binary(d, "diff_F", diff_F);
+    install_binary(d, "mul_F", mul_F);
+    install_binary(d, "div_F", div_F);
+    install_binary(d, "mod_F", mod_F);
+    install_binary(d, "min_F", min_F);
+    install_binary(d, "max_F", max_F);
+    install_binary(d, "pow_F", pow_F);
+
+    install_binary(d, "eq_F", eq_F);
+    install_binary(d, "ne_F", ne_F);
+    install_binary(d, "lt_F", lt_F);
+    install_binary(d, "le_F", le_F);
+    install_binary(d, "gt_F", gt_F);
+    install_binary(d, "ge_F", ge_F);
 
     return 0;
 }
@@ -290,5 +322,9 @@ PyInit__imagingmath(void) {
         return NULL;
     }
 
+#ifdef Py_GIL_DISABLED
+    PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
+#endif
+
     return m;
 }
diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c
index 8815c2b7ec6..b763e3a6f7e 100644
--- a/src/_imagingmorph.c
+++ b/src/_imagingmorph.c
@@ -11,7 +11,6 @@
  * See the README file for information on usage and redistribution.
  */
 
-#include "Python.h"
 #include "libImaging/Imaging.h"
 
 #define LUT_SIZE (1 << 9)
@@ -30,43 +29,36 @@
 static PyObject *
 apply(PyObject *self, PyObject *args) {
     const char *lut;
-    PyObject *py_lut;
-    Py_ssize_t lut_len, i0, i1;
+    Py_ssize_t lut_len;
+    PyObject *i0, *i1;
     Imaging imgin, imgout;
     int width, height;
     int row_idx, col_idx;
     UINT8 **inrows, **outrows;
     int num_changed_pixels = 0;
 
-    if (!PyArg_ParseTuple(args, "Onn", &py_lut, &i0, &i1)) {
-        PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem");
+    if (!PyArg_ParseTuple(args, "s#OO", &lut, &lut_len, &i0, &i1)) {
         return NULL;
     }
 
-    if (!PyBytes_Check(py_lut)) {
-        PyErr_SetString(PyExc_RuntimeError, "The morphology LUT is not a bytes object");
-        return NULL;
-    }
-
-    lut_len = PyBytes_Size(py_lut);
-
     if (lut_len < LUT_SIZE) {
         PyErr_SetString(PyExc_RuntimeError, "The morphology LUT has the wrong size");
         return NULL;
     }
 
-    lut = PyBytes_AsString(py_lut);
+    if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) ||
+        !PyCapsule_IsValid(i1, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
+        return NULL;
+    }
 
-    imgin = (Imaging)i0;
-    imgout = (Imaging)i1;
+    imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
+    imgout = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC);
     width = imgin->xsize;
     height = imgin->ysize;
 
-    if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1) {
-        PyErr_SetString(PyExc_RuntimeError, "Unsupported image type");
-        return NULL;
-    }
-    if (imgout->type != IMAGING_TYPE_UINT8 || imgout->bands != 1) {
+    if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1 ||
+        imgout->type != IMAGING_TYPE_UINT8 || imgout->bands != 1) {
         PyErr_SetString(PyExc_RuntimeError, "Unsupported image type");
         return NULL;
     }
@@ -129,46 +121,39 @@ apply(PyObject *self, PyObject *args) {
 static PyObject *
 match(PyObject *self, PyObject *args) {
     const char *lut;
-    PyObject *py_lut;
-    Py_ssize_t lut_len, i0;
+    Py_ssize_t lut_len;
+    PyObject *i0;
     Imaging imgin;
     int width, height;
     int row_idx, col_idx;
     UINT8 **inrows;
-    PyObject *ret = PyList_New(0);
-    if (ret == NULL) {
-        return NULL;
-    }
 
-    if (!PyArg_ParseTuple(args, "On", &py_lut, &i0)) {
-        Py_DECREF(ret);
-        PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem");
+    if (!PyArg_ParseTuple(args, "s#O", &lut, &lut_len, &i0)) {
         return NULL;
     }
 
-    if (!PyBytes_Check(py_lut)) {
-        Py_DECREF(ret);
-        PyErr_SetString(PyExc_RuntimeError, "The morphology LUT is not a bytes object");
+    if (lut_len < LUT_SIZE) {
+        PyErr_SetString(PyExc_RuntimeError, "The morphology LUT has the wrong size");
         return NULL;
     }
 
-    lut_len = PyBytes_Size(py_lut);
-
-    if (lut_len < LUT_SIZE) {
-        Py_DECREF(ret);
-        PyErr_SetString(PyExc_RuntimeError, "The morphology LUT has the wrong size");
+    if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
 
-    lut = PyBytes_AsString(py_lut);
-    imgin = (Imaging)i0;
+    imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
 
     if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1) {
-        Py_DECREF(ret);
         PyErr_SetString(PyExc_RuntimeError, "Unsupported image type");
         return NULL;
     }
 
+    PyObject *ret = PyList_New(0);
+    if (ret == NULL) {
+        return NULL;
+    }
+
     inrows = imgin->image8;
     width = imgin->xsize;
     height = imgin->ysize;
@@ -215,26 +200,31 @@ match(PyObject *self, PyObject *args) {
 */
 static PyObject *
 get_on_pixels(PyObject *self, PyObject *args) {
-    Py_ssize_t i0;
+    PyObject *i0;
     Imaging img;
     UINT8 **rows;
     int row_idx, col_idx;
     int width, height;
-    PyObject *ret = PyList_New(0);
-    if (ret == NULL) {
+
+    if (!PyArg_ParseTuple(args, "O", &i0)) {
         return NULL;
     }
 
-    if (!PyArg_ParseTuple(args, "n", &i0)) {
-        Py_DECREF(ret);
-        PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem");
+    if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
-    img = (Imaging)i0;
+
+    img = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
     rows = img->image8;
     width = img->xsize;
     height = img->ysize;
 
+    PyObject *ret = PyList_New(0);
+    if (ret == NULL) {
+        return NULL;
+    }
+
     for (row_idx = 0; row_idx < height; row_idx++) {
         UINT8 *row = rows[row_idx];
         for (col_idx = 0; col_idx < width; col_idx++) {
@@ -253,7 +243,8 @@ static PyMethodDef functions[] = {
     {"apply", (PyCFunction)apply, METH_VARARGS, NULL},
     {"get_on_pixels", (PyCFunction)get_on_pixels, METH_VARARGS, NULL},
     {"match", (PyCFunction)match, METH_VARARGS, NULL},
-    {NULL, NULL, 0, NULL}};
+    {NULL, NULL, 0, NULL}
+};
 
 PyMODINIT_FUNC
 PyInit__imagingmorph(void) {
@@ -269,5 +260,9 @@ PyInit__imagingmorph(void) {
 
     m = PyModule_Create(&module_def);
 
+#ifdef Py_GIL_DISABLED
+    PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
+#endif
+
     return m;
 }
diff --git a/src/_imagingtk.c b/src/_imagingtk.c
index efa7fc1b6fa..c70d044bb86 100644
--- a/src/_imagingtk.c
+++ b/src/_imagingtk.c
@@ -62,5 +62,10 @@ PyInit__imagingtk(void) {
         Py_DECREF(m);
         return NULL;
     }
+
+#ifdef Py_GIL_DISABLED
+    PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
+#endif
+
     return m;
 }
diff --git a/src/_webp.c b/src/_webp.c
index a1b4dbc1a25..dfda7048de4 100644
--- a/src/_webp.c
+++ b/src/_webp.c
@@ -4,8 +4,6 @@
 #include <webp/encode.h>
 #include <webp/decode.h>
 #include <webp/types.h>
-
-#ifdef HAVE_WEBPMUX
 #include <webp/mux.h>
 #include <webp/demux.h>
 
@@ -13,12 +11,10 @@
  * Check the versions from mux.h and demux.h, to ensure the WebPAnimEncoder and
  * WebPAnimDecoder APIs are present (initial support was added in 0.5.0). The
  * very early versions had some significant differences, so we require later
- * versions, before enabling animation support.
+ * versions.
  */
-#if WEBP_MUX_ABI_VERSION >= 0x0104 && WEBP_DEMUX_ABI_VERSION >= 0x0105
-#define HAVE_WEBPANIM
-#endif
-
+#if WEBP_MUX_ABI_VERSION < 0x0106 || WEBP_DEMUX_ABI_VERSION < 0x0107
+#error libwebp 0.5.0 and above is required. Upgrade libwebp or build Pillow with --disable-webp flag
 #endif
 
 void
@@ -35,14 +31,13 @@ ImagingSectionLeave(ImagingSectionCookie *cookie) {
 /* WebP Muxer Error Handling                                            */
 /* -------------------------------------------------------------------- */
 
-#ifdef HAVE_WEBPMUX
-
 static const char *const kErrorMessages[-WEBP_MUX_NOT_ENOUGH_DATA + 1] = {
     "WEBP_MUX_NOT_FOUND",
     "WEBP_MUX_INVALID_ARGUMENT",
     "WEBP_MUX_BAD_DATA",
     "WEBP_MUX_MEMORY_ERROR",
-    "WEBP_MUX_NOT_ENOUGH_DATA"};
+    "WEBP_MUX_NOT_ENOUGH_DATA"
+};
 
 PyObject *
 HandleMuxError(WebPMuxError err, char *chunk) {
@@ -61,7 +56,8 @@ HandleMuxError(WebPMuxError err, char *chunk) {
             sprintf(message, "could not assemble chunks: %s", kErrorMessages[-err]);
     } else {
         message_len = sprintf(
-            message, "could not set %.4s chunk: %s", chunk, kErrorMessages[-err]);
+            message, "could not set %.4s chunk: %s", chunk, kErrorMessages[-err]
+        );
     }
     if (message_len < 0) {
         PyErr_SetString(PyExc_RuntimeError, "failed to construct error message");
@@ -87,14 +83,53 @@ HandleMuxError(WebPMuxError err, char *chunk) {
     return NULL;
 }
 
-#endif
+/* -------------------------------------------------------------------- */
+/* Frame import                                                         */
+/* -------------------------------------------------------------------- */
+
+static int
+import_frame_libwebp(WebPPicture *frame, Imaging im) {
+    if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") &&
+        strcmp(im->mode, "RGBX")) {
+        PyErr_SetString(PyExc_ValueError, "unsupported image mode");
+        return -1;
+    }
+
+    frame->width = im->xsize;
+    frame->height = im->ysize;
+    frame->use_argb = 1;  // Don't convert RGB pixels to YUV
+
+    if (!WebPPictureAlloc(frame)) {
+        PyErr_SetString(PyExc_MemoryError, "can't allocate picture frame");
+        return -2;
+    }
+
+    int ignore_fourth_channel = strcmp(im->mode, "RGBA");
+    for (int y = 0; y < im->ysize; ++y) {
+        UINT8 *src = (UINT8 *)im->image32[y];
+        UINT32 *dst = frame->argb + frame->argb_stride * y;
+        if (ignore_fourth_channel) {
+            for (int x = 0; x < im->xsize; ++x) {
+                dst[x] =
+                    ((UINT32)(src[x * 4 + 2]) | ((UINT32)(src[x * 4 + 1]) << 8) |
+                     ((UINT32)(src[x * 4]) << 16) | (0xff << 24));
+            }
+        } else {
+            for (int x = 0; x < im->xsize; ++x) {
+                dst[x] =
+                    ((UINT32)(src[x * 4 + 2]) | ((UINT32)(src[x * 4 + 1]) << 8) |
+                     ((UINT32)(src[x * 4]) << 16) | ((UINT32)(src[x * 4 + 3]) << 24));
+            }
+        }
+    }
+
+    return 0;
+}
 
 /* -------------------------------------------------------------------- */
 /* WebP Animation Support                                               */
 /* -------------------------------------------------------------------- */
 
-#ifdef HAVE_WEBPANIM
-
 // Encoder type
 typedef struct {
     PyObject_HEAD WebPAnimEncoder *enc;
@@ -138,7 +173,8 @@ _anim_encoder_new(PyObject *self, PyObject *args) {
             &kmin,
             &kmax,
             &allow_mixed,
-            &verbose)) {
+            &verbose
+        )) {
         return NULL;
     }
 
@@ -187,15 +223,14 @@ _anim_encoder_dealloc(PyObject *self) {
 
 PyObject *
 _anim_encoder_add(PyObject *self, PyObject *args) {
-    uint8_t *rgb;
-    Py_ssize_t size;
+    PyObject *i0;
+    Imaging im;
     int timestamp;
-    int width;
-    int height;
-    char *mode;
     int lossless;
     float quality_factor;
+    float alpha_quality_factor;
     int method;
+    ImagingSectionCookie cookie;
     WebPConfig config;
     WebPAnimEncoderObject *encp = (WebPAnimEncoderObject *)self;
     WebPAnimEncoder *enc = encp->enc;
@@ -203,25 +238,30 @@ _anim_encoder_add(PyObject *self, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "z#iiisifi",
-            (char **)&rgb,
-            &size,
+            "Oiiffi",
+            &i0,
             &timestamp,
-            &width,
-            &height,
-            &mode,
             &lossless,
             &quality_factor,
-            &method)) {
+            &alpha_quality_factor,
+            &method
+        )) {
         return NULL;
     }
 
     // Check for NULL frame, which sets duration of final frame
-    if (!rgb) {
+    if (i0 == Py_None) {
         WebPAnimEncoderAdd(enc, NULL, timestamp, NULL);
         Py_RETURN_NONE;
     }
 
+    if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
+        return NULL;
+    }
+
+    im = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
+
     // Setup config for this frame
     if (!WebPConfigInit(&config)) {
         PyErr_SetString(PyExc_RuntimeError, "failed to initialize config!");
@@ -229,6 +269,7 @@ _anim_encoder_add(PyObject *self, PyObject *args) {
     }
     config.lossless = lossless;
     config.quality = quality_factor;
+    config.alpha_quality = alpha_quality_factor;
     config.method = method;
 
     // Validate the config
@@ -237,20 +278,15 @@ _anim_encoder_add(PyObject *self, PyObject *args) {
         return NULL;
     }
 
-    // Populate the frame with raw bytes passed to us
-    frame->width = width;
-    frame->height = height;
-    frame->use_argb = 1;  // Don't convert RGB pixels to YUV
-    if (strcmp(mode, "RGBA") == 0) {
-        WebPPictureImportRGBA(frame, rgb, 4 * width);
-    } else if (strcmp(mode, "RGBX") == 0) {
-        WebPPictureImportRGBX(frame, rgb, 4 * width);
-    } else {
-        WebPPictureImportRGB(frame, rgb, 3 * width);
+    if (import_frame_libwebp(frame, im)) {
+        return NULL;
     }
 
-    // Add the frame to the encoder
-    if (!WebPAnimEncoderAdd(enc, frame, timestamp, &config)) {
+    ImagingSectionEnter(&cookie);
+    int ok = WebPAnimEncoderAdd(enc, frame, timestamp, &config);
+    ImagingSectionLeave(&cookie);
+
+    if (!ok) {
         PyErr_SetString(PyExc_RuntimeError, WebPAnimEncoderGetError(enc));
         return NULL;
     }
@@ -280,7 +316,8 @@ _anim_encoder_assemble(PyObject *self, PyObject *args) {
             &exif_bytes,
             &exif_size,
             &xmp_bytes,
-            &xmp_size)) {
+            &xmp_size
+        )) {
         return NULL;
     }
 
@@ -418,7 +455,8 @@ _anim_decoder_get_info(PyObject *self) {
         info->loop_count,
         info->bgcolor,
         info->frame_count,
-        decp->mode);
+        decp->mode
+    );
 }
 
 PyObject *
@@ -448,17 +486,23 @@ PyObject *
 _anim_decoder_get_next(PyObject *self) {
     uint8_t *buf;
     int timestamp;
+    int ok;
     PyObject *bytes;
     PyObject *ret;
+    ImagingSectionCookie cookie;
     WebPAnimDecoderObject *decp = (WebPAnimDecoderObject *)self;
 
-    if (!WebPAnimDecoderGetNext(decp->dec, &buf, &timestamp)) {
+    ImagingSectionEnter(&cookie);
+    ok = WebPAnimDecoderGetNext(decp->dec, &buf, &timestamp);
+    ImagingSectionLeave(&cookie);
+    if (!ok) {
         PyErr_SetString(PyExc_OSError, "failed to read next frame");
         return NULL;
     }
 
     bytes = PyBytes_FromStringAndSize(
-        (char *)buf, decp->info.canvas_width * 4 * decp->info.canvas_height);
+        (char *)buf, decp->info.canvas_width * 4 * decp->info.canvas_height
+    );
 
     ret = Py_BuildValue("Si", bytes, timestamp);
 
@@ -561,33 +605,27 @@ static PyTypeObject WebPAnimDecoder_Type = {
     0,                                 /*tp_getset*/
 };
 
-#endif
-
 /* -------------------------------------------------------------------- */
 /* Legacy WebP Support                                                  */
 /* -------------------------------------------------------------------- */
 
 PyObject *
 WebPEncode_wrapper(PyObject *self, PyObject *args) {
-    int width;
-    int height;
     int lossless;
     float quality_factor;
+    float alpha_quality_factor;
     int method;
     int exact;
-    uint8_t *rgb;
+    Imaging im;
+    PyObject *i0;
     uint8_t *icc_bytes;
     uint8_t *exif_bytes;
     uint8_t *xmp_bytes;
     uint8_t *output;
-    char *mode;
-    Py_ssize_t size;
     Py_ssize_t icc_size;
     Py_ssize_t exif_size;
     Py_ssize_t xmp_size;
     size_t ret_size;
-    int rgba_mode;
-    int channels;
     int ok;
     ImagingSectionCookie cookie;
     WebPConfig config;
@@ -596,14 +634,11 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "y#iiifss#iis#s#",
-            (char **)&rgb,
-            &size,
-            &width,
-            &height,
+            "Oiffs#iis#s#",
+            &i0,
             &lossless,
             &quality_factor,
-            &mode,
+            &alpha_quality_factor,
             &icc_bytes,
             &icc_size,
             &method,
@@ -611,19 +646,17 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
             &exif_bytes,
             &exif_size,
             &xmp_bytes,
-            &xmp_size)) {
+            &xmp_size
+        )) {
         return NULL;
     }
 
-    rgba_mode = strcmp(mode, "RGBA") == 0;
-    if (!rgba_mode && strcmp(mode, "RGB") != 0) {
-        Py_RETURN_NONE;
+    if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) {
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
+        return NULL;
     }
 
-    channels = rgba_mode ? 4 : 3;
-    if (size < width * height * channels) {
-        Py_RETURN_NONE;
-    }
+    im = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
 
     // Setup config for this frame
     if (!WebPConfigInit(&config)) {
@@ -632,11 +665,9 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
     }
     config.lossless = lossless;
     config.quality = quality_factor;
+    config.alpha_quality = alpha_quality_factor;
     config.method = method;
-#if WEBP_ENCODER_ABI_VERSION >= 0x0209
-    // the "exact" flag is only available in libwebp 0.5.0 and later
     config.exact = exact;
-#endif
 
     // Validate the config
     if (!WebPValidateConfig(&config)) {
@@ -648,14 +679,9 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_ValueError, "could not initialise picture");
         return NULL;
     }
-    pic.width = width;
-    pic.height = height;
-    pic.use_argb = 1;  // Don't convert RGB pixels to YUV
 
-    if (rgba_mode) {
-        WebPPictureImportRGBA(&pic, rgb, channels * width);
-    } else {
-        WebPPictureImportRGB(&pic, rgb, channels * width);
+    if (import_frame_libwebp(&pic, im)) {
+        return NULL;
     }
 
     WebPMemoryWriterInit(&writer);
@@ -668,19 +694,21 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
 
     WebPPictureFree(&pic);
     if (!ok) {
-        PyErr_Format(PyExc_ValueError, "encoding error %d", (&pic)->error_code);
+        int error_code = (&pic)->error_code;
+        char message[50] = "";
+        if (error_code == VP8_ENC_ERROR_BAD_DIMENSION) {
+            sprintf(
+                message,
+                ": Image size exceeds WebP limit of %d pixels",
+                WEBP_MAX_DIMENSION
+            );
+        }
+        PyErr_Format(PyExc_ValueError, "encoding error %d%s", error_code, message);
         return NULL;
     }
     output = writer.mem;
     ret_size = writer.size;
 
-#ifndef HAVE_WEBPMUX
-    if (ret_size > 0) {
-        PyObject *ret = PyBytes_FromStringAndSize((char *)output, ret_size);
-        free(output);
-        return ret;
-    }
-#else
     {
         /* I want to truncate the *_size items that get passed into WebP
            data. Pypy2.1.0 had some issues where the Py_ssize_t items had
@@ -756,127 +784,9 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
             return ret;
         }
     }
-#endif
     Py_RETURN_NONE;
 }
 
-PyObject *
-WebPDecode_wrapper(PyObject *self, PyObject *args) {
-    PyBytesObject *webp_string;
-    const uint8_t *webp;
-    Py_ssize_t size;
-    PyObject *ret = Py_None, *bytes = NULL, *pymode = NULL, *icc_profile = NULL,
-             *exif = NULL;
-    WebPDecoderConfig config;
-    VP8StatusCode vp8_status_code = VP8_STATUS_OK;
-    char *mode = "RGB";
-
-    if (!PyArg_ParseTuple(args, "S", &webp_string)) {
-        return NULL;
-    }
-
-    if (!WebPInitDecoderConfig(&config)) {
-        Py_RETURN_NONE;
-    }
-
-    PyBytes_AsStringAndSize((PyObject *)webp_string, (char **)&webp, &size);
-
-    vp8_status_code = WebPGetFeatures(webp, size, &config.input);
-    if (vp8_status_code == VP8_STATUS_OK) {
-        // If we don't set it, we don't get alpha.
-        // Initialized to MODE_RGB
-        if (config.input.has_alpha) {
-            config.output.colorspace = MODE_RGBA;
-            mode = "RGBA";
-        }
-
-#ifndef HAVE_WEBPMUX
-        vp8_status_code = WebPDecode(webp, size, &config);
-#else
-        {
-            int copy_data = 0;
-            WebPData data = {webp, size};
-            WebPMuxFrameInfo image;
-            WebPData icc_profile_data = {0};
-            WebPData exif_data = {0};
-
-            WebPMux *mux = WebPMuxCreate(&data, copy_data);
-            if (NULL == mux) {
-                goto end;
-            }
-
-            if (WEBP_MUX_OK != WebPMuxGetFrame(mux, 1, &image)) {
-                WebPMuxDelete(mux);
-                goto end;
-            }
-
-            webp = image.bitstream.bytes;
-            size = image.bitstream.size;
-
-            vp8_status_code = WebPDecode(webp, size, &config);
-
-            if (WEBP_MUX_OK == WebPMuxGetChunk(mux, "ICCP", &icc_profile_data)) {
-                icc_profile = PyBytes_FromStringAndSize(
-                    (const char *)icc_profile_data.bytes, icc_profile_data.size);
-            }
-
-            if (WEBP_MUX_OK == WebPMuxGetChunk(mux, "EXIF", &exif_data)) {
-                exif = PyBytes_FromStringAndSize(
-                    (const char *)exif_data.bytes, exif_data.size);
-            }
-
-            WebPDataClear(&image.bitstream);
-            WebPMuxDelete(mux);
-        }
-#endif
-    }
-
-    if (vp8_status_code != VP8_STATUS_OK) {
-        goto end;
-    }
-
-    if (config.output.colorspace < MODE_YUV) {
-        bytes = PyBytes_FromStringAndSize(
-            (char *)config.output.u.RGBA.rgba, config.output.u.RGBA.size);
-    } else {
-        // Skipping YUV for now. Need Test Images.
-        // UNDONE -- unclear if we'll ever get here if we set mode_rgb*
-        bytes = PyBytes_FromStringAndSize(
-            (char *)config.output.u.YUVA.y, config.output.u.YUVA.y_size);
-    }
-
-    pymode = PyUnicode_FromString(mode);
-    ret = Py_BuildValue(
-        "SiiSSS",
-        bytes,
-        config.output.width,
-        config.output.height,
-        pymode,
-        NULL == icc_profile ? Py_None : icc_profile,
-        NULL == exif ? Py_None : exif);
-
-end:
-    WebPFreeDecBuffer(&config.output);
-
-    Py_XDECREF(bytes);
-    Py_XDECREF(pymode);
-    Py_XDECREF(icc_profile);
-    Py_XDECREF(exif);
-
-    if (Py_None == ret) {
-        Py_RETURN_NONE;
-    }
-
-    return ret;
-}
-
-// Return the decoder's version number, packed in hexadecimal using 8bits for
-// each of major/minor/revision. E.g: v2.5.7 is 0x020507.
-PyObject *
-WebPDecoderVersion_wrapper() {
-    return Py_BuildValue("i", WebPGetDecoderVersion());
-}
-
 // Version as string
 const char *
 WebPDecoderVersion_str(void) {
@@ -887,88 +797,31 @@ WebPDecoderVersion_str(void) {
         "%d.%d.%d",
         version_number >> 16,
         (version_number >> 8) % 0x100,
-        version_number % 0x100);
+        version_number % 0x100
+    );
     return version;
 }
 
-/*
- * The version of webp that ships with (0.1.3) Ubuntu 12.04 doesn't handle alpha well.
- * Files that are valid with 0.3 are reported as being invalid.
- */
-int
-WebPDecoderBuggyAlpha(void) {
-    return WebPGetDecoderVersion() == 0x0103;
-}
-
-PyObject *
-WebPDecoderBuggyAlpha_wrapper() {
-    return Py_BuildValue("i", WebPDecoderBuggyAlpha());
-}
-
 /* -------------------------------------------------------------------- */
 /* Module Setup                                                         */
 /* -------------------------------------------------------------------- */
 
 static PyMethodDef webpMethods[] = {
-#ifdef HAVE_WEBPANIM
     {"WebPAnimDecoder", _anim_decoder_new, METH_VARARGS, "WebPAnimDecoder"},
     {"WebPAnimEncoder", _anim_encoder_new, METH_VARARGS, "WebPAnimEncoder"},
-#endif
     {"WebPEncode", WebPEncode_wrapper, METH_VARARGS, "WebPEncode"},
-    {"WebPDecode", WebPDecode_wrapper, METH_VARARGS, "WebPDecode"},
-    {"WebPDecoderVersion", WebPDecoderVersion_wrapper, METH_NOARGS, "WebPVersion"},
-    {"WebPDecoderBuggyAlpha",
-     WebPDecoderBuggyAlpha_wrapper,
-     METH_NOARGS,
-     "WebPDecoderBuggyAlpha"},
-    {NULL, NULL}};
-
-void
-addMuxFlagToModule(PyObject *m) {
-    PyObject *have_webpmux;
-#ifdef HAVE_WEBPMUX
-    have_webpmux = Py_True;
-#else
-    have_webpmux = Py_False;
-#endif
-    Py_INCREF(have_webpmux);
-    PyModule_AddObject(m, "HAVE_WEBPMUX", have_webpmux);
-}
-
-void
-addAnimFlagToModule(PyObject *m) {
-    PyObject *have_webpanim;
-#ifdef HAVE_WEBPANIM
-    have_webpanim = Py_True;
-#else
-    have_webpanim = Py_False;
-#endif
-    Py_INCREF(have_webpanim);
-    PyModule_AddObject(m, "HAVE_WEBPANIM", have_webpanim);
-}
-
-void
-addTransparencyFlagToModule(PyObject *m) {
-    PyObject *have_transparency = PyBool_FromLong(!WebPDecoderBuggyAlpha());
-    if (PyModule_AddObject(m, "HAVE_TRANSPARENCY", have_transparency)) {
-        Py_DECREF(have_transparency);
-    }
-}
+    {NULL, NULL}
+};
 
 static int
 setup_module(PyObject *m) {
-#ifdef HAVE_WEBPANIM
     /* Ready object types */
     if (PyType_Ready(&WebPAnimDecoder_Type) < 0 ||
         PyType_Ready(&WebPAnimEncoder_Type) < 0) {
         return -1;
     }
-#endif
-    PyObject *d = PyModule_GetDict(m);
-    addMuxFlagToModule(m);
-    addAnimFlagToModule(m);
-    addTransparencyFlagToModule(m);
 
+    PyObject *d = PyModule_GetDict(m);
     PyObject *v = PyUnicode_FromString(WebPDecoderVersion_str());
     PyDict_SetItemString(d, "webpdecoder_version", v ? v : Py_None);
     Py_XDECREF(v);
@@ -994,5 +847,9 @@ PyInit__webp(void) {
         return NULL;
     }
 
+#ifdef Py_GIL_DISABLED
+    PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
+#endif
+
     return m;
 }
diff --git a/src/decode.c b/src/decode.c
index ea2f3af8012..51d0aced2bd 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -46,7 +46,8 @@
 
 typedef struct {
     PyObject_HEAD int (*decode)(
-        Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
+        Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes
+    );
     int (*cleanup)(ImagingCodecState state);
     struct ImagingCodecStateInstance state;
     Imaging im;
@@ -889,7 +890,8 @@ PyImaging_Jpeg2KDecoderNew(PyObject *self, PyObject *args) {
     PY_LONG_LONG length = -1;
 
     if (!PyArg_ParseTuple(
-            args, "ss|iiiL", &mode, &format, &reduce, &layers, &fd, &length)) {
+            args, "ss|iiiL", &mode, &format, &reduce, &layers, &fd, &length
+        )) {
         return NULL;
     }
 
diff --git a/src/display.c b/src/display.c
index ef2ff3754f1..b4e2e38991a 100644
--- a/src/display.c
+++ b/src/display.c
@@ -105,7 +105,8 @@ _draw(ImagingDisplayObject *display, PyObject *args) {
             src + 0,
             src + 1,
             src + 2,
-            src + 3)) {
+            src + 3
+        )) {
         return NULL;
     }
 
@@ -221,7 +222,8 @@ _tobytes(ImagingDisplayObject *display, PyObject *args) {
     }
 
     return PyBytes_FromStringAndSize(
-        display->dib->bits, display->dib->ysize * display->dib->linesize);
+        display->dib->bits, display->dib->ysize * display->dib->linesize
+    );
 }
 
 static struct PyMethodDef methods[] = {
@@ -247,7 +249,8 @@ _getattr_size(ImagingDisplayObject *self, void *closure) {
 }
 
 static struct PyGetSetDef getsetters[] = {
-    {"mode", (getter)_getattr_mode}, {"size", (getter)_getattr_size}, {NULL}};
+    {"mode", (getter)_getattr_mode}, {"size", (getter)_getattr_size}, {NULL}
+};
 
 static PyTypeObject ImagingDisplayType = {
     PyVarObject_HEAD_INIT(NULL, 0) "ImagingDisplay", /*tp_name*/
@@ -341,9 +344,8 @@ PyImaging_GrabScreenWin32(PyObject *self, PyObject *args) {
     // added in Windows 10 (1607)
     // loaded dynamically to avoid link errors
     user32 = LoadLibraryA("User32.dll");
-    SetThreadDpiAwarenessContext_function =
-        (Func_SetThreadDpiAwarenessContext)GetProcAddress(
-            user32, "SetThreadDpiAwarenessContext");
+    SetThreadDpiAwarenessContext_function = (Func_SetThreadDpiAwarenessContext
+    )GetProcAddress(user32, "SetThreadDpiAwarenessContext");
     if (SetThreadDpiAwarenessContext_function != NULL) {
         // DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE = ((DPI_CONTEXT_HANDLE)-3)
         dpiAwareness = SetThreadDpiAwarenessContext_function((HANDLE)-3);
@@ -403,7 +405,8 @@ PyImaging_GrabScreenWin32(PyObject *self, PyObject *args) {
             height,
             PyBytes_AS_STRING(buffer),
             (BITMAPINFO *)&core,
-            DIB_RGB_COLORS)) {
+            DIB_RGB_COLORS
+        )) {
         goto error;
     }
 
@@ -427,7 +430,6 @@ PyImaging_GrabScreenWin32(PyObject *self, PyObject *args) {
 
 PyObject *
 PyImaging_GrabClipboardWin32(PyObject *self, PyObject *args) {
-    int clip;
     HANDLE handle = NULL;
     int size;
     void *data;
@@ -548,7 +550,8 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) {
                 ps.rcPaint.left,
                 ps.rcPaint.top,
                 ps.rcPaint.right,
-                ps.rcPaint.bottom);
+                ps.rcPaint.bottom
+            );
             if (result) {
                 Py_DECREF(result);
             } else {
@@ -563,7 +566,8 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) {
                 0,
                 0,
                 rect.right - rect.left,
-                rect.bottom - rect.top);
+                rect.bottom - rect.top
+            );
             if (result) {
                 Py_DECREF(result);
             } else {
@@ -578,7 +582,8 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) {
                 0,
                 0,
                 rect.right - rect.left,
-                rect.bottom - rect.top);
+                rect.bottom - rect.top
+            );
             if (result) {
                 Py_DECREF(result);
             } else {
@@ -592,7 +597,8 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) {
         case WM_SIZE:
             /* resize window */
             result = PyObject_CallFunction(
-                callback, "sii", "resize", LOWORD(lParam), HIWORD(lParam));
+                callback, "sii", "resize", LOWORD(lParam), HIWORD(lParam)
+            );
             if (result) {
                 InvalidateRect(wnd, NULL, 1);
                 Py_DECREF(result);
@@ -619,7 +625,7 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) {
     if (callback) {
         /* restore thread state */
         PyEval_SaveThread();
-        PyThreadState_Swap(threadstate);
+        PyThreadState_Swap(current_threadstate);
     }
 
     return status;
@@ -671,7 +677,8 @@ PyImaging_CreateWindowWin32(PyObject *self, PyObject *args) {
         HWND_DESKTOP,
         NULL,
         NULL,
-        NULL);
+        NULL
+    );
 
     if (!wnd) {
         PyErr_SetString(PyExc_OSError, "failed to create window");
@@ -717,7 +724,7 @@ PyImaging_DrawWmf(PyObject *self, PyObject *args) {
     HDC dc;
     RECT rect;
     PyObject *buffer = NULL;
-    char *ptr;
+    void *ptr;
 
     char *data;
     Py_ssize_t datasize;
@@ -733,7 +740,8 @@ PyImaging_DrawWmf(PyObject *self, PyObject *args) {
             &x0,
             &x1,
             &y0,
-            &y1)) {
+            &y1
+        )) {
         return NULL;
     }
 
@@ -845,7 +853,8 @@ PyImaging_GrabScreenX11(PyObject *self, PyObject *args) {
         PyErr_Format(
             PyExc_OSError,
             "X connection failed: error %i",
-            xcb_connection_has_error(connection));
+            xcb_connection_has_error(connection)
+        );
         xcb_disconnect(connection);
         return NULL;
     }
@@ -879,8 +888,10 @@ PyImaging_GrabScreenX11(PyObject *self, PyObject *args) {
             0,
             width,
             height,
-            0x00ffffff),
-        &error);
+            0x00ffffff
+        ),
+        &error
+    );
     if (reply == NULL) {
         PyErr_Format(
             PyExc_OSError,
@@ -888,7 +899,8 @@ PyImaging_GrabScreenX11(PyObject *self, PyObject *args) {
             error->error_code,
             error->major_code,
             error->minor_code,
-            error->resource_id);
+            error->resource_id
+        );
         free(error);
         xcb_disconnect(connection);
         return NULL;
@@ -898,7 +910,8 @@ PyImaging_GrabScreenX11(PyObject *self, PyObject *args) {
 
     if (reply->depth == 24) {
         buffer = PyBytes_FromStringAndSize(
-            (char *)xcb_get_image_data(reply), xcb_get_image_data_length(reply));
+            (char *)xcb_get_image_data(reply), xcb_get_image_data_length(reply)
+        );
     } else {
         PyErr_Format(PyExc_OSError, "unsupported bit depth: %i", reply->depth);
     }
diff --git a/src/encode.c b/src/encode.c
index c7dd510150e..1a4cd489da2 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -25,6 +25,7 @@
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
+#include "thirdparty/pythoncapi_compat.h"
 #include "libImaging/Imaging.h"
 #include "libImaging/Gif.h"
 
@@ -38,7 +39,8 @@
 
 typedef struct {
     PyObject_HEAD int (*encode)(
-        Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes);
+        Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes
+    );
     int (*cleanup)(ImagingCodecState state);
     struct ImagingCodecStateInstance state;
     Imaging im;
@@ -134,7 +136,8 @@ _encode(ImagingEncoderObject *encoder, PyObject *args) {
     }
 
     status = encoder->encode(
-        encoder->im, &encoder->state, (UINT8 *)PyBytes_AsString(buf), bufsize);
+        encoder->im, &encoder->state, (UINT8 *)PyBytes_AsString(buf), bufsize
+    );
 
     /* adjust string length to avoid slicing in encoder */
     if (_PyBytes_Resize(&buf, (status > 0) ? status : 0) < 0) {
@@ -571,7 +574,8 @@ PyImaging_ZipEncoderNew(PyObject *self, PyObject *args) {
             &compress_level,
             &compress_type,
             &dictionary,
-            &dictionary_size)) {
+            &dictionary_size
+        )) {
         return NULL;
     }
 
@@ -652,15 +656,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
     PyObject *item;
 
     if (!PyArg_ParseTuple(
-            args,
-            "sssnsOO",
-            &mode,
-            &rawmode,
-            &compname,
-            &fp,
-            &filename,
-            &tags,
-            &types)) {
+            args, "sssnsOO", &mode, &rawmode, &compname, &fp, &filename, &tags, &types
+        )) {
         return NULL;
     }
 
@@ -671,11 +668,17 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
         tags_size = PyList_Size(tags);
         TRACE(("tags size: %d\n", (int)tags_size));
         for (pos = 0; pos < tags_size; pos++) {
-            item = PyList_GetItem(tags, pos);
+            item = PyList_GetItemRef(tags, pos);
+            if (item == NULL) {
+                return NULL;
+            }
+
             if (!PyTuple_Check(item) || PyTuple_Size(item) != 2) {
+                Py_DECREF(item);
                 PyErr_SetString(PyExc_ValueError, "Invalid tags list");
                 return NULL;
             }
+            Py_DECREF(item);
         }
         pos = 0;
     }
@@ -703,11 +706,17 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
 
     num_core_tags = sizeof(core_tags) / sizeof(int);
     for (pos = 0; pos < tags_size; pos++) {
-        item = PyList_GetItem(tags, pos);
+        item = PyList_GetItemRef(tags, pos);
+        if (item == NULL) {
+            return NULL;
+        }
+
         // We already checked that tags is a 2-tuple list.
-        key = PyTuple_GetItem(item, 0);
+        key = PyTuple_GET_ITEM(item, 0);
         key_int = (int)PyLong_AsLong(key);
-        value = PyTuple_GetItem(item, 1);
+        value = PyTuple_GET_ITEM(item, 1);
+        Py_DECREF(item);
+
         status = 0;
         is_core_tag = 0;
         is_var_length = 0;
@@ -721,7 +730,10 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
         }
 
         if (!is_core_tag) {
-            PyObject *tag_type = PyDict_GetItem(types, key);
+            PyObject *tag_type;
+            if (PyDict_GetItemRef(types, key, &tag_type) < 0) {
+                return NULL;  // Exception has been already set
+            }
             if (tag_type) {
                 int type_int = PyLong_AsLong(tag_type);
                 if (type_int >= TIFF_BYTE && type_int <= TIFF_DOUBLE) {
@@ -769,7 +781,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                 is_var_length = 1;
             }
             if (ImagingLibTiffMergeFieldInfo(
-                    &encoder->state, type, key_int, is_var_length)) {
+                    &encoder->state, type, key_int, is_var_length
+                )) {
                 continue;
             }
         }
@@ -779,7 +792,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                 &encoder->state,
                 (ttag_t)key_int,
                 PyBytes_Size(value),
-                PyBytes_AsString(value));
+                PyBytes_AsString(value)
+            );
         } else if (is_var_length) {
             Py_ssize_t len, i;
             TRACE(("Setting from Tuple: %d \n", key_int));
@@ -789,7 +803,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                 int stride = 256;
                 if (len != 768) {
                     PyErr_SetString(
-                        PyExc_ValueError, "Requiring 768 items for Colormap");
+                        PyExc_ValueError, "Requiring 768 items for Colormap"
+                    );
                     return NULL;
                 }
                 UINT16 *av;
@@ -804,7 +819,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                         (ttag_t)key_int,
                         av,
                         av + stride,
-                        av + stride * 2);
+                        av + stride * 2
+                    );
                     free(av);
                 }
             } else if (key_int == TIFFTAG_YCBCRSUBSAMPLING) {
@@ -812,7 +828,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                     &encoder->state,
                     (ttag_t)key_int,
                     (UINT16)PyLong_AsLong(PyTuple_GetItem(value, 0)),
-                    (UINT16)PyLong_AsLong(PyTuple_GetItem(value, 1)));
+                    (UINT16)PyLong_AsLong(PyTuple_GetItem(value, 1))
+                );
             } else if (type == TIFF_SHORT) {
                 UINT16 *av;
                 /* malloc check ok, calloc checks for overflow */
@@ -822,7 +839,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                         av[i] = (UINT16)PyLong_AsLong(PyTuple_GetItem(value, i));
                     }
                     status = ImagingLibTiffSetField(
-                        &encoder->state, (ttag_t)key_int, len, av);
+                        &encoder->state, (ttag_t)key_int, len, av
+                    );
                     free(av);
                 }
             } else if (type == TIFF_LONG) {
@@ -834,7 +852,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                         av[i] = (UINT32)PyLong_AsLong(PyTuple_GetItem(value, i));
                     }
                     status = ImagingLibTiffSetField(
-                        &encoder->state, (ttag_t)key_int, len, av);
+                        &encoder->state, (ttag_t)key_int, len, av
+                    );
                     free(av);
                 }
             } else if (type == TIFF_SBYTE) {
@@ -846,7 +865,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                         av[i] = (INT8)PyLong_AsLong(PyTuple_GetItem(value, i));
                     }
                     status = ImagingLibTiffSetField(
-                        &encoder->state, (ttag_t)key_int, len, av);
+                        &encoder->state, (ttag_t)key_int, len, av
+                    );
                     free(av);
                 }
             } else if (type == TIFF_SSHORT) {
@@ -858,7 +878,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                         av[i] = (INT16)PyLong_AsLong(PyTuple_GetItem(value, i));
                     }
                     status = ImagingLibTiffSetField(
-                        &encoder->state, (ttag_t)key_int, len, av);
+                        &encoder->state, (ttag_t)key_int, len, av
+                    );
                     free(av);
                 }
             } else if (type == TIFF_SLONG) {
@@ -870,7 +891,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                         av[i] = (INT32)PyLong_AsLong(PyTuple_GetItem(value, i));
                     }
                     status = ImagingLibTiffSetField(
-                        &encoder->state, (ttag_t)key_int, len, av);
+                        &encoder->state, (ttag_t)key_int, len, av
+                    );
                     free(av);
                 }
             } else if (type == TIFF_FLOAT) {
@@ -882,7 +904,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                         av[i] = (FLOAT32)PyFloat_AsDouble(PyTuple_GetItem(value, i));
                     }
                     status = ImagingLibTiffSetField(
-                        &encoder->state, (ttag_t)key_int, len, av);
+                        &encoder->state, (ttag_t)key_int, len, av
+                    );
                     free(av);
                 }
             } else if (type == TIFF_DOUBLE) {
@@ -894,43 +917,54 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
                         av[i] = PyFloat_AsDouble(PyTuple_GetItem(value, i));
                     }
                     status = ImagingLibTiffSetField(
-                        &encoder->state, (ttag_t)key_int, len, av);
+                        &encoder->state, (ttag_t)key_int, len, av
+                    );
                     free(av);
                 }
             }
         } else {
             if (type == TIFF_SHORT) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, (UINT16)PyLong_AsLong(value));
+                    &encoder->state, (ttag_t)key_int, (UINT16)PyLong_AsLong(value)
+                );
             } else if (type == TIFF_LONG) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value));
+                    &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value)
+                );
             } else if (type == TIFF_SSHORT) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, (INT16)PyLong_AsLong(value));
+                    &encoder->state, (ttag_t)key_int, (INT16)PyLong_AsLong(value)
+                );
             } else if (type == TIFF_SLONG) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, (INT32)PyLong_AsLong(value));
+                    &encoder->state, (ttag_t)key_int, (INT32)PyLong_AsLong(value)
+                );
             } else if (type == TIFF_FLOAT) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, (FLOAT32)PyFloat_AsDouble(value));
+                    &encoder->state, (ttag_t)key_int, (FLOAT32)PyFloat_AsDouble(value)
+                );
             } else if (type == TIFF_DOUBLE) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value));
+                    &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value)
+                );
             } else if (type == TIFF_SBYTE) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, (INT8)PyLong_AsLong(value));
+                    &encoder->state, (ttag_t)key_int, (INT8)PyLong_AsLong(value)
+                );
             } else if (type == TIFF_ASCII) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, PyBytes_AsString(value));
+                    &encoder->state, (ttag_t)key_int, PyBytes_AsString(value)
+                );
             } else if (type == TIFF_RATIONAL) {
                 status = ImagingLibTiffSetField(
-                    &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value));
+                    &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value)
+                );
             } else {
                 TRACE(
                     ("Unhandled type for key %d : %s \n",
                      key_int,
-                     PyBytes_AsString(PyObject_Str(value))));
+                     PyBytes_AsString(PyObject_Str(value)))
+                );
             }
         }
         if (!status) {
@@ -991,7 +1025,8 @@ get_qtables_arrays(PyObject *qtables, int *qtablesLen) {
     if (num_tables < 1 || num_tables > NUM_QUANT_TBLS) {
         PyErr_SetString(
             PyExc_ValueError,
-            "Not a valid number of quantization tables. Should be between 1 and 4.");
+            "Not a valid number of quantization tables. Should be between 1 and 4."
+        );
         Py_DECREF(tables);
         return NULL;
     }
@@ -1080,7 +1115,8 @@ PyImaging_JpegEncoderNew(PyObject *self, PyObject *args) {
             &extra,
             &extra_size,
             &rawExif,
-            &rawExifLen)) {
+            &rawExifLen
+        )) {
         return NULL;
     }
 
@@ -1150,27 +1186,27 @@ PyImaging_JpegEncoderNew(PyObject *self, PyObject *args) {
 
     encoder->encode = ImagingJpegEncode;
 
-    strncpy(((JPEGENCODERSTATE *)encoder->state.context)->rawmode, rawmode, 8);
-
-    ((JPEGENCODERSTATE *)encoder->state.context)->keep_rgb = keep_rgb;
-    ((JPEGENCODERSTATE *)encoder->state.context)->quality = quality;
-    ((JPEGENCODERSTATE *)encoder->state.context)->qtables = qarrays;
-    ((JPEGENCODERSTATE *)encoder->state.context)->qtablesLen = qtablesLen;
-    ((JPEGENCODERSTATE *)encoder->state.context)->subsampling = subsampling;
-    ((JPEGENCODERSTATE *)encoder->state.context)->progressive = progressive;
-    ((JPEGENCODERSTATE *)encoder->state.context)->smooth = smooth;
-    ((JPEGENCODERSTATE *)encoder->state.context)->optimize = optimize;
-    ((JPEGENCODERSTATE *)encoder->state.context)->streamtype = streamtype;
-    ((JPEGENCODERSTATE *)encoder->state.context)->xdpi = xdpi;
-    ((JPEGENCODERSTATE *)encoder->state.context)->ydpi = ydpi;
-    ((JPEGENCODERSTATE *)encoder->state.context)->restart_marker_blocks = restart_marker_blocks;
-    ((JPEGENCODERSTATE *)encoder->state.context)->restart_marker_rows = restart_marker_rows;
-    ((JPEGENCODERSTATE *)encoder->state.context)->comment = comment;
-    ((JPEGENCODERSTATE *)encoder->state.context)->comment_size = comment_size;
-    ((JPEGENCODERSTATE *)encoder->state.context)->extra = extra;
-    ((JPEGENCODERSTATE *)encoder->state.context)->extra_size = extra_size;
-    ((JPEGENCODERSTATE *)encoder->state.context)->rawExif = rawExif;
-    ((JPEGENCODERSTATE *)encoder->state.context)->rawExifLen = rawExifLen;
+    JPEGENCODERSTATE *jpeg_encoder_state = (JPEGENCODERSTATE *)encoder->state.context;
+    strncpy(jpeg_encoder_state->rawmode, rawmode, 8);
+    jpeg_encoder_state->keep_rgb = keep_rgb;
+    jpeg_encoder_state->quality = quality;
+    jpeg_encoder_state->qtables = qarrays;
+    jpeg_encoder_state->qtablesLen = qtablesLen;
+    jpeg_encoder_state->subsampling = subsampling;
+    jpeg_encoder_state->progressive = progressive;
+    jpeg_encoder_state->smooth = smooth;
+    jpeg_encoder_state->optimize = optimize;
+    jpeg_encoder_state->streamtype = streamtype;
+    jpeg_encoder_state->xdpi = xdpi;
+    jpeg_encoder_state->ydpi = ydpi;
+    jpeg_encoder_state->restart_marker_blocks = restart_marker_blocks;
+    jpeg_encoder_state->restart_marker_rows = restart_marker_rows;
+    jpeg_encoder_state->comment = comment;
+    jpeg_encoder_state->comment_size = comment_size;
+    jpeg_encoder_state->extra = extra;
+    jpeg_encoder_state->extra_size = extra_size;
+    jpeg_encoder_state->rawExif = rawExif;
+    jpeg_encoder_state->rawExifLen = rawExifLen;
 
     return (PyObject *)encoder;
 }
@@ -1248,7 +1284,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
             &fd,
             &comment,
             &comment_size,
-            &plt)) {
+            &plt
+        )) {
         return NULL;
     }
 
@@ -1305,7 +1342,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
 
     j2k_decode_coord_tuple(offset, &context->offset_x, &context->offset_y);
     j2k_decode_coord_tuple(
-        tile_offset, &context->tile_offset_x, &context->tile_offset_y);
+        tile_offset, &context->tile_offset_x, &context->tile_offset_y
+    );
     j2k_decode_coord_tuple(tile_size, &context->tile_size_x, &context->tile_size_y);
 
     /* Error on illegal tile offsets */
@@ -1315,7 +1353,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
             PyErr_SetString(
                 PyExc_ValueError,
                 "JPEG 2000 tile offset too small; top left tile must "
-                "intersect image area");
+                "intersect image area"
+            );
             Py_DECREF(encoder);
             return NULL;
         }
@@ -1323,8 +1362,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
         if (context->tile_offset_x > context->offset_x ||
             context->tile_offset_y > context->offset_y) {
             PyErr_SetString(
-                PyExc_ValueError,
-                "JPEG 2000 tile offset too large to cover image area");
+                PyExc_ValueError, "JPEG 2000 tile offset too large to cover image area"
+            );
             Py_DECREF(encoder);
             return NULL;
         }
@@ -1333,9 +1372,7 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
     if (comment && comment_size > 0) {
         /* Size is stored as as an uint16, subtract 4 bytes for the header */
         if (comment_size >= 65532) {
-            PyErr_SetString(
-                PyExc_ValueError,
-                "JPEG 2000 comment is too long");
+            PyErr_SetString(PyExc_ValueError, "JPEG 2000 comment is too long");
             Py_DECREF(encoder);
             return NULL;
         }
@@ -1360,7 +1397,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
 
     j2k_decode_coord_tuple(cblk_size, &context->cblk_width, &context->cblk_height);
     j2k_decode_coord_tuple(
-        precinct_size, &context->precinct_width, &context->precinct_height);
+        precinct_size, &context->precinct_width, &context->precinct_height
+    );
 
     context->irreversible = PyObject_IsTrue(irreversible);
     context->progression = prog_order;
@@ -1373,10 +1411,3 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
 }
 
 #endif
-
-/*
- * Local Variables:
- * c-basic-offset: 4
- * End:
- *
- */
diff --git a/src/libImaging/Access.c b/src/libImaging/Access.c
index 091c84e18fa..1c193710531 100644
--- a/src/libImaging/Access.c
+++ b/src/libImaging/Access.c
@@ -36,7 +36,8 @@ add_item(const char *mode) {
             "AccessInit: hash collision: %d for both %s and %s\n",
             i,
             mode,
-            access_table[i].mode);
+            access_table[i].mode
+        );
         exit(1);
     }
     access_table[i].mode = mode;
@@ -81,12 +82,6 @@ get_pixel_16B(Imaging im, int x, int y, void *color) {
 #endif
 }
 
-static void
-get_pixel_16(Imaging im, int x, int y, void *color) {
-    UINT8 *in = (UINT8 *)&im->image[y][x + x];
-    memcpy(color, in, sizeof(UINT16));
-}
-
 static void
 get_pixel_BGR15(Imaging im, int x, int y, void *color) {
     UINT8 *in = (UINT8 *)&im->image8[y][x * 2];
@@ -190,12 +185,12 @@ put_pixel_32(Imaging im, int x, int y, const void *color) {
 }
 
 void
-ImagingAccessInit() {
-#define ADD(mode_, get_pixel_, put_pixel_)        \
-    {                                             \
-        ImagingAccess access = add_item(mode_);   \
-        access->get_pixel = get_pixel_;           \
-        access->put_pixel = put_pixel_;           \
+ImagingAccessInit(void) {
+#define ADD(mode_, get_pixel_, put_pixel_)      \
+    {                                           \
+        ImagingAccess access = add_item(mode_); \
+        access->get_pixel = get_pixel_;         \
+        access->put_pixel = put_pixel_;         \
     }
 
     /* populate access table */
@@ -207,7 +202,11 @@ ImagingAccessInit() {
     ADD("I;16", get_pixel_16L, put_pixel_16L);
     ADD("I;16L", get_pixel_16L, put_pixel_16L);
     ADD("I;16B", get_pixel_16B, put_pixel_16B);
-    ADD("I;16N", get_pixel_16, put_pixel_16L);
+#ifdef WORDS_BIGENDIAN
+    ADD("I;16N", get_pixel_16B, put_pixel_16B);
+#else
+    ADD("I;16N", get_pixel_16L, put_pixel_16L);
+#endif
     ADD("I;32L", get_pixel_32L, put_pixel_32L);
     ADD("I;32B", get_pixel_32B, put_pixel_32B);
     ADD("F", get_pixel_32, put_pixel_32);
diff --git a/src/libImaging/BcnDecode.c b/src/libImaging/BcnDecode.c
index 5e4296eeba1..9a41febc764 100644
--- a/src/libImaging/BcnDecode.c
+++ b/src/libImaging/BcnDecode.c
@@ -83,7 +83,6 @@ decode_bc1_color(rgba *dst, const UINT8 *src, int separate_alpha) {
     g1 = p[1].g;
     b1 = p[1].b;
 
-
     /* NOTE: BC2 and BC3 reuse BC1 color blocks but always act like c0 > c1 */
     if (col.c0 > col.c1 || separate_alpha) {
         p[2].r = (2 * r0 + 1 * r1) / 3;
@@ -244,7 +243,8 @@ static const bc7_mode_info bc7_modes[] = {
     {1, 0, 2, 1, 5, 6, 0, 0, 2, 3},
     {1, 0, 2, 0, 7, 8, 0, 0, 2, 2},
     {1, 0, 0, 0, 7, 7, 1, 0, 4, 0},
-    {2, 6, 0, 0, 5, 5, 1, 0, 2, 0}};
+    {2, 6, 0, 0, 5, 5, 1, 0, 2, 0}
+};
 
 /* Subset indices:
    Table.P2, 1 bit per index */
@@ -255,7 +255,8 @@ static const UINT16 bc7_si2[] = {
     0x718e, 0x399c, 0xaaaa, 0xf0f0, 0x5a5a, 0x33cc, 0x3c3c, 0x55aa, 0x9696, 0xa55a,
     0x73ce, 0x13c8, 0x324c, 0x3bdc, 0x6996, 0xc33c, 0x9966, 0x0660, 0x0272, 0x04e4,
     0x4e40, 0x2720, 0xc936, 0x936c, 0x39c6, 0x639c, 0x9336, 0x9cc6, 0x817e, 0xe718,
-    0xccf0, 0x0fcc, 0x7744, 0xee22};
+    0xccf0, 0x0fcc, 0x7744, 0xee22
+};
 
 /* Table.P3, 2 bits per index */
 static const UINT32 bc7_si3[] = {
@@ -268,20 +269,23 @@ static const UINT32 bc7_si3[] = {
     0x66660000, 0xa5a0a5a0, 0x50a050a0, 0x69286928, 0x44aaaa44, 0x66666600, 0xaa444444,
     0x54a854a8, 0x95809580, 0x96969600, 0xa85454a8, 0x80959580, 0xaa141414, 0x96960000,
     0xaaaa1414, 0xa05050a0, 0xa0a5a5a0, 0x96000000, 0x40804080, 0xa9a8a9a8, 0xaaaaaa44,
-    0x2a4a5254};
+    0x2a4a5254
+};
 
 /* Anchor indices:
    Table.A2 */
-static const char bc7_ai0[] = {
-    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 2,  8, 2, 2, 8,
-    8,  15, 2,  8,  2,  2,  8,  8,  2,  2,  15, 15, 6,  8,  2,  8,  15, 15, 2, 8, 2, 2,
-    2,  15, 15, 6,  6,  2,  6,  8,  15, 15, 2,  2,  15, 15, 15, 15, 15, 2,  2, 15};
+static const char bc7_ai0[] = {15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+                               15, 15, 15, 15, 2,  8,  2,  2,  8,  8,  15, 2,  8,
+                               2,  2,  8,  8,  2,  2,  15, 15, 6,  8,  2,  8,  15,
+                               15, 2,  8,  2,  2,  2,  15, 15, 6,  6,  2,  6,  8,
+                               15, 15, 2,  2,  15, 15, 15, 15, 15, 2,  2,  15};
 
 /* Table.A3a */
-static const char bc7_ai1[] = {
-    3,  3,  15, 15, 8, 3,  15, 15, 8,  8,  6, 6,  6, 5,  3, 3,  3,  3,  8,  15, 3,  3,
-    6,  10, 5,  8,  8, 6,  8,  5,  15, 15, 8, 15, 3, 5,  6, 10, 8,  15, 15, 3,  15, 5,
-    15, 15, 15, 15, 3, 15, 5,  5,  5,  8,  5, 10, 5, 10, 8, 13, 15, 12, 3,  3};
+static const char bc7_ai1[] = {3,  3,  15, 15, 8,  3,  15, 15, 8,  8,  6,  6,  6,
+                               5,  3,  3,  3,  3,  8,  15, 3,  3,  6,  10, 5,  8,
+                               8,  6,  8,  5,  15, 15, 8,  15, 3,  5,  6,  10, 8,
+                               15, 15, 3,  15, 5,  15, 15, 15, 15, 3,  15, 5,  5,
+                               5,  8,  5,  10, 5,  10, 8,  13, 15, 12, 3,  3};
 
 /* Table.A3b */
 static const char bc7_ai2[] = {15, 8,  8,  3,  15, 15, 3,  8,  15, 15, 15, 15, 15,
@@ -294,7 +298,8 @@ static const char bc7_ai2[] = {15, 8,  8,  3,  15, 15, 3,  8,  15, 15, 15, 15, 1
 static const char bc7_weights2[] = {0, 21, 43, 64};
 static const char bc7_weights3[] = {0, 9, 18, 27, 37, 46, 55, 64};
 static const char bc7_weights4[] = {
-    0, 4, 9, 13, 17, 21, 26, 30, 34, 38, 43, 47, 51, 55, 60, 64};
+    0, 4, 9, 13, 17, 21, 26, 30, 34, 38, 43, 47, 51, 55, 60, 64
+};
 
 static const char *
 bc7_get_weights(int n) {
@@ -354,8 +359,7 @@ decode_bc7_block(rgba *col, const UINT8 *src) {
         }
         return;
     }
-    while (!(mode & (1 << bit++)))
-        ;
+    while (!(mode & (1 << bit++)));
     mode = bit - 1;
     info = &bc7_modes[mode];
     /* color selection bits: {subset}{endpoint} */
@@ -528,7 +532,8 @@ static const bc6_mode_info bc6_modes[] = {
     {1, 0, 0, 10, 10, 10, 10},
     {1, 1, 0, 11, 9, 9, 9},
     {1, 1, 0, 12, 8, 8, 8},
-    {1, 1, 0, 16, 4, 4, 4}};
+    {1, 1, 0, 16, 4, 4, 4}
+};
 
 /* Table.F, encoded as a sequence of bit indices */
 static const UINT8 bc6_bit_packings[][75] = {
@@ -546,7 +551,7 @@ static const UINT8 bc6_bit_packings[][75] = {
      21,  22,  23,  24,  25,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,
      48,  49,  50,  51,  52,  10,  112, 113, 114, 115, 64,  65,  66,  67,  26,
      176, 160, 161, 162, 163, 80,  81,  82,  83,  42,  177, 128, 129, 130, 131,
-     96,  97, 98,  99,  100, 178, 144, 145, 146, 147, 148, 179},
+     96,  97,  98,  99,  100, 178, 144, 145, 146, 147, 148, 179},
     {0,  1,   2,   3,   4,   5,   6,   7,   8,   9,   16,  17,  18,  19,  20,
      21, 22,  23,  24,  25,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,
      48, 49,  50,  51,  10,  164, 112, 113, 114, 115, 64,  65,  66,  67,  68,
@@ -593,7 +598,8 @@ static const UINT8 bc6_bit_packings[][75] = {
      64, 65, 66, 67, 68, 69, 70, 71, 27, 26, 80, 81, 82, 83, 84, 85, 86, 87, 43, 42},
     {0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
      32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 48, 49, 50, 51, 15, 14, 13, 12, 11, 10,
-     64, 65, 66, 67, 31, 30, 29, 28, 27, 26, 80, 81, 82, 83, 47, 46, 45, 44, 43, 42}};
+     64, 65, 66, 67, 31, 30, 29, 28, 27, 26, 80, 81, 82, 83, 47, 46, 45, 44, 43, 42}
+};
 
 static void
 bc6_sign_extend(UINT16 *v, int prec) {
@@ -684,7 +690,7 @@ bc6_clamp(float value) {
     } else if (value > 1.0f) {
         return 255;
     } else {
-        return (UINT8) (value * 255.0f);
+        return (UINT8)(value * 255.0f);
     }
 }
 
@@ -826,7 +832,14 @@ put_block(Imaging im, ImagingCodecState state, const char *col, int sz, int C) {
 
 static int
 decode_bcn(
-    Imaging im, ImagingCodecState state, const UINT8 *src, int bytes, int N, int C, char *pixel_format) {
+    Imaging im,
+    ImagingCodecState state,
+    const UINT8 *src,
+    int bytes,
+    int N,
+    int C,
+    char *pixel_format
+) {
     int ymax = state->ysize + state->yoff;
     const UINT8 *ptr = src;
     switch (N) {
@@ -849,8 +862,7 @@ decode_bcn(
         DECODE_LOOP(2, 16, rgba);
         DECODE_LOOP(3, 16, rgba);
         DECODE_LOOP(4, 8, lum);
-        case 5:
-        {
+        case 5: {
             int sign = strcmp(pixel_format, "BC5S") == 0 ? 1 : 0;
             while (bytes >= 16) {
                 rgba col[16];
@@ -865,8 +877,7 @@ decode_bcn(
             }
             break;
         }
-        case 6:
-        {
+        case 6: {
             int sign = strcmp(pixel_format, "BC6HS") == 0 ? 1 : 0;
             while (bytes >= 16) {
                 rgba col[16];
@@ -880,7 +891,7 @@ decode_bcn(
             }
             break;
         }
-        DECODE_LOOP(7, 16, rgba);
+            DECODE_LOOP(7, 16, rgba);
 #undef DECODE_LOOP
     }
     return (int)(ptr - src);
diff --git a/src/libImaging/BoxBlur.c b/src/libImaging/BoxBlur.c
index adf425d0dbd..ed91541fed4 100644
--- a/src/libImaging/BoxBlur.c
+++ b/src/libImaging/BoxBlur.c
@@ -13,7 +13,8 @@ void static inline ImagingLineBoxBlur32(
     int edgeA,
     int edgeB,
     UINT32 ww,
-    UINT32 fw) {
+    UINT32 fw
+) {
     int x;
     UINT32 acc[4];
     UINT32 bulk[4];
@@ -109,7 +110,8 @@ void static inline ImagingLineBoxBlur8(
     int edgeA,
     int edgeB,
     UINT32 ww,
-    UINT32 fw) {
+    UINT32 fw
+) {
     int x;
     UINT32 acc;
     UINT32 bulk;
@@ -198,7 +200,8 @@ ImagingHorizontalBoxBlur(Imaging imOut, Imaging imIn, float floatRadius) {
                 edgeA,
                 edgeB,
                 ww,
-                fw);
+                fw
+            );
             if (imIn == imOut) {
                 // Commit.
                 memcpy(imOut->image8[y], lineOut, imIn->xsize);
@@ -214,7 +217,8 @@ ImagingHorizontalBoxBlur(Imaging imOut, Imaging imIn, float floatRadius) {
                 edgeA,
                 edgeB,
                 ww,
-                fw);
+                fw
+            );
             if (imIn == imOut) {
                 // Commit.
                 memcpy(imOut->image32[y], lineOut, imIn->xsize * 4);
@@ -234,6 +238,9 @@ ImagingBoxBlur(Imaging imOut, Imaging imIn, float xradius, float yradius, int n)
     int i;
     Imaging imTransposed;
 
+    if (imOut->xsize == 0 || imOut->ysize == 0) {
+        return imOut;
+    }
     if (n < 1) {
         return ImagingError_ValueError("number of passes must be greater than zero");
     }
@@ -313,12 +320,14 @@ _gaussian_blur_radius(float radius, int passes) {
 }
 
 Imaging
-ImagingGaussianBlur(Imaging imOut, Imaging imIn, float xradius, float yradius, int passes) {
+ImagingGaussianBlur(
+    Imaging imOut, Imaging imIn, float xradius, float yradius, int passes
+) {
     return ImagingBoxBlur(
-      imOut,
-      imIn,
-      _gaussian_blur_radius(xradius, passes),
-      _gaussian_blur_radius(yradius, passes),
-      passes
+        imOut,
+        imIn,
+        _gaussian_blur_radius(xradius, passes),
+        _gaussian_blur_radius(yradius, passes),
+        passes
     );
 }
diff --git a/src/libImaging/Chops.c b/src/libImaging/Chops.c
index f9c005efe3a..f326d402f2c 100644
--- a/src/libImaging/Chops.c
+++ b/src/libImaging/Chops.c
@@ -142,7 +142,8 @@ ImagingChopSoftLight(Imaging imIn1, Imaging imIn2) {
     CHOP2(
         (((255 - in1[x]) * (in1[x] * in2[x])) / 65536) +
             (in1[x] * (255 - ((255 - in1[x]) * (255 - in2[x]) / 255))) / 255,
-        NULL);
+        NULL
+    );
 }
 
 Imaging
@@ -150,7 +151,8 @@ ImagingChopHardLight(Imaging imIn1, Imaging imIn2) {
     CHOP2(
         (in2[x] < 128) ? ((in1[x] * in2[x]) / 127)
                        : 255 - (((255 - in2[x]) * (255 - in1[x])) / 127),
-        NULL);
+        NULL
+    );
 }
 
 Imaging
@@ -158,5 +160,6 @@ ImagingOverlay(Imaging imIn1, Imaging imIn2) {
     CHOP2(
         (in1[x] < 128) ? ((in1[x] * in2[x]) / 127)
                        : 255 - (((255 - in1[x]) * (255 - in2[x])) / 127),
-        NULL);
+        NULL
+    );
 }
diff --git a/src/libImaging/ColorLUT.c b/src/libImaging/ColorLUT.c
index aee7cda067d..5559de689b2 100644
--- a/src/libImaging/ColorLUT.c
+++ b/src/libImaging/ColorLUT.c
@@ -63,7 +63,8 @@ ImagingColorLUT3D_linear(
     int size1D,
     int size2D,
     int size3D,
-    INT16 *table) {
+    INT16 *table
+) {
     /* This float to int conversion doesn't have rounding
        error compensation (+0.5) for two reasons:
        1. As we don't hit the highest value,
@@ -112,7 +113,8 @@ ImagingColorLUT3D_linear(
                                            index2D >> SCALE_BITS,
                                            index3D >> SCALE_BITS,
                                            size1D,
-                                           size1D_2D);
+                                           size1D_2D
+                                       );
             INT16 result[4], left[4], right[4];
             INT16 leftleft[4], leftright[4], rightleft[4], rightright[4];
 
@@ -123,19 +125,22 @@ ImagingColorLUT3D_linear(
                     leftright,
                     &table[idx + size1D * 3],
                     &table[idx + size1D * 3 + 3],
-                    shift1D);
+                    shift1D
+                );
                 interpolate3(left, leftleft, leftright, shift2D);
 
                 interpolate3(
                     rightleft,
                     &table[idx + size1D_2D * 3],
                     &table[idx + size1D_2D * 3 + 3],
-                    shift1D);
+                    shift1D
+                );
                 interpolate3(
                     rightright,
                     &table[idx + size1D_2D * 3 + size1D * 3],
                     &table[idx + size1D_2D * 3 + size1D * 3 + 3],
-                    shift1D);
+                    shift1D
+                );
                 interpolate3(right, rightleft, rightright, shift2D);
 
                 interpolate3(result, left, right, shift3D);
@@ -144,7 +149,8 @@ ImagingColorLUT3D_linear(
                     clip8(result[0]),
                     clip8(result[1]),
                     clip8(result[2]),
-                    rowIn[x * 4 + 3]);
+                    rowIn[x * 4 + 3]
+                );
                 memcpy(rowOut + x * sizeof(v), &v, sizeof(v));
             }
 
@@ -155,19 +161,22 @@ ImagingColorLUT3D_linear(
                     leftright,
                     &table[idx + size1D * 4],
                     &table[idx + size1D * 4 + 4],
-                    shift1D);
+                    shift1D
+                );
                 interpolate4(left, leftleft, leftright, shift2D);
 
                 interpolate4(
                     rightleft,
                     &table[idx + size1D_2D * 4],
                     &table[idx + size1D_2D * 4 + 4],
-                    shift1D);
+                    shift1D
+                );
                 interpolate4(
                     rightright,
                     &table[idx + size1D_2D * 4 + size1D * 4],
                     &table[idx + size1D_2D * 4 + size1D * 4 + 4],
-                    shift1D);
+                    shift1D
+                );
                 interpolate4(right, rightleft, rightright, shift2D);
 
                 interpolate4(result, left, right, shift3D);
@@ -176,7 +185,8 @@ ImagingColorLUT3D_linear(
                     clip8(result[0]),
                     clip8(result[1]),
                     clip8(result[2]),
-                    clip8(result[3]));
+                    clip8(result[3])
+                );
                 memcpy(rowOut + x * sizeof(v), &v, sizeof(v));
             }
         }
diff --git a/src/libImaging/Convert.c b/src/libImaging/Convert.c
index 99d2a4ada70..c8f23426105 100644
--- a/src/libImaging/Convert.c
+++ b/src/libImaging/Convert.c
@@ -250,6 +250,24 @@ rgb2i(UINT8 *out_, const UINT8 *in, int xsize) {
     }
 }
 
+static void
+rgb2i16l(UINT8 *out_, const UINT8 *in, int xsize) {
+    int x;
+    for (x = 0; x < xsize; x++, in += 4) {
+        *out_++ = L24(in) >> 16;
+        *out_++ = 0;
+    }
+}
+
+static void
+rgb2i16b(UINT8 *out_, const UINT8 *in, int xsize) {
+    int x;
+    for (x = 0; x < xsize; x++, in += 4) {
+        *out_++ = 0;
+        *out_++ = L24(in) >> 16;
+    }
+}
+
 static void
 rgb2f(UINT8 *out_, const UINT8 *in, int xsize) {
     int x;
@@ -499,26 +517,27 @@ rgba2rgb_(UINT8 *out, const UINT8 *in, int xsize) {
 }
 
 /*
- * Conversion of RGB + single transparent color to RGBA,
- * where any pixel that matches the color will have the
- * alpha channel set to 0
+ * Conversion of RGB + single transparent color either to
+ * RGBA or LA, where any pixel matching the color will have the alpha channel set to 0,
+ * or RGBa or La, where any pixel matching the color will have all channels set to 0
  */
 
 static void
-rgbT2rgba(UINT8 *out, int xsize, int r, int g, int b) {
+rgbT2a(UINT8 *out, UINT8 *in, int xsize, int r, int g, int b, int premultiplied) {
 #ifdef WORDS_BIGENDIAN
     UINT32 trns = ((r & 0xff) << 24) | ((g & 0xff) << 16) | ((b & 0xff) << 8) | 0xff;
-    UINT32 repl = trns & 0xffffff00;
+    UINT32 repl = premultiplied ? 0 : (trns & 0xffffff00);
 #else
-    UINT32 trns = (0xff << 24) | ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
-    UINT32 repl = trns & 0x00ffffff;
+    UINT32 trns = (0xffU << 24) | ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
+    UINT32 repl = premultiplied ? 0 : (trns & 0x00ffffff);
 #endif
 
     int i;
 
-    for (i = 0; i < xsize; i++, out += sizeof(trns)) {
+    UINT8 *ref = in != NULL ? in : out;
+    for (i = 0; i < xsize; i++, ref += sizeof(trns), out += sizeof(trns)) {
         UINT32 v;
-        memcpy(&v, out, sizeof(v));
+        memcpy(&v, ref, sizeof(v));
         if (v == trns) {
             memcpy(out, &repl, sizeof(repl));
         }
@@ -878,6 +897,18 @@ I16B_L(UINT8 *out, const UINT8 *in, int xsize) {
     }
 }
 
+static void
+I16_RGB(UINT8 *out, const UINT8 *in, int xsize) {
+    int x;
+    for (x = 0; x < xsize; x++, in += 2) {
+        UINT8 v = in[1] == 0 ? in[0] : 255;
+        *out++ = v;
+        *out++ = v;
+        *out++ = v;
+        *out++ = 255;
+    }
+}
+
 static struct {
     const char *from;
     const char *to;
@@ -929,12 +960,22 @@ static struct {
     {"RGB", "1", rgb2bit},
     {"RGB", "L", rgb2l},
     {"RGB", "LA", rgb2la},
+    {"RGB", "La", rgb2la},
     {"RGB", "I", rgb2i},
+    {"RGB", "I;16", rgb2i16l},
+    {"RGB", "I;16L", rgb2i16l},
+    {"RGB", "I;16B", rgb2i16b},
+#ifdef WORDS_BIGENDIAN
+    {"RGB", "I;16N", rgb2i16b},
+#else
+    {"RGB", "I;16N", rgb2i16l},
+#endif
     {"RGB", "F", rgb2f},
     {"RGB", "BGR;15", rgb2bgr15},
     {"RGB", "BGR;16", rgb2bgr16},
     {"RGB", "BGR;24", rgb2bgr24},
     {"RGB", "RGBA", rgb2rgba},
+    {"RGB", "RGBa", rgb2rgba},
     {"RGB", "RGBX", rgb2rgba},
     {"RGB", "CMYK", rgb2cmyk},
     {"RGB", "YCbCr", ImagingConvertRGB2YCbCr},
@@ -978,6 +1019,7 @@ static struct {
 
     {"I", "I;16", I_I16L},
     {"I;16", "I", I16L_I},
+    {"I;16", "RGB", I16_RGB},
     {"L", "I;16", L_I16L},
     {"I;16", "L", I16L_L},
 
@@ -1002,7 +1044,8 @@ static struct {
     {"I;16L", "F", I16L_F},
     {"I;16B", "F", I16B_F},
 
-    {NULL}};
+    {NULL}
+};
 
 /* FIXME: translate indexed versions to pointer versions below this line */
 
@@ -1274,7 +1317,8 @@ frompalette(Imaging imOut, Imaging imIn, const char *mode) {
             (UINT8 *)imOut->image[y],
             (UINT8 *)imIn->image[y],
             imIn->xsize,
-            imIn->palette);
+            imIn->palette
+        );
     }
     ImagingSectionLeave(&cookie);
 
@@ -1286,11 +1330,8 @@ frompalette(Imaging imOut, Imaging imIn, const char *mode) {
 #endif
 static Imaging
 topalette(
-    Imaging imOut,
-    Imaging imIn,
-    const char *mode,
-    ImagingPalette inpalette,
-    int dither) {
+    Imaging imOut, Imaging imIn, const char *mode, ImagingPalette inpalette, int dither
+) {
     ImagingSectionCookie cookie;
     int alpha;
     int x, y;
@@ -1581,7 +1622,8 @@ tobilevel(Imaging imOut, Imaging imIn) {
 
 static Imaging
 convert(
-    Imaging imOut, Imaging imIn, const char *mode, ImagingPalette palette, int dither) {
+    Imaging imOut, Imaging imIn, const char *mode, ImagingPalette palette, int dither
+) {
     ImagingSectionCookie cookie;
     ImagingShuffler convert;
     int y;
@@ -1634,7 +1676,9 @@ convert(
         return (Imaging)ImagingError_ValueError("conversion not supported");
 #else
         static char buf[100];
-        snprintf(buf, 100, "conversion from %.10s to %.10s not supported", imIn->mode, mode);
+        snprintf(
+            buf, 100, "conversion from %.10s to %.10s not supported", imIn->mode, mode
+        );
         return (Imaging)ImagingError_ValueError(buf);
 #endif
     }
@@ -1668,25 +1712,38 @@ ImagingConvertTransparent(Imaging imIn, const char *mode, int r, int g, int b) {
     ImagingSectionCookie cookie;
     ImagingShuffler convert;
     Imaging imOut = NULL;
+    int premultiplied = 0;
+    // If the transparency matches pixels in the source image, not the converted image
+    UINT8 *source;
+    int source_transparency = 0;
     int y;
 
     if (!imIn) {
         return (Imaging)ImagingError_ModeError();
     }
 
-    if (strcmp(imIn->mode, "RGB") == 0 && strcmp(mode, "RGBA") == 0) {
+    if (strcmp(imIn->mode, "RGB") == 0 &&
+        (strcmp(mode, "RGBA") == 0 || strcmp(mode, "RGBa") == 0)) {
         convert = rgb2rgba;
-    } else if ((strcmp(imIn->mode, "1") == 0 ||
-                strcmp(imIn->mode, "I") == 0 ||
-                strcmp(imIn->mode, "L") == 0
-               ) && (
-                strcmp(mode, "RGBA") == 0 ||
-                strcmp(mode, "LA") == 0
-               )) {
+        if (strcmp(mode, "RGBa") == 0) {
+            premultiplied = 1;
+        }
+    } else if (strcmp(imIn->mode, "RGB") == 0 &&
+               (strcmp(mode, "LA") == 0 || strcmp(mode, "La") == 0)) {
+        convert = rgb2la;
+        source_transparency = 1;
+        if (strcmp(mode, "La") == 0) {
+            premultiplied = 1;
+        }
+    } else if ((strcmp(imIn->mode, "1") == 0 || strcmp(imIn->mode, "I") == 0 ||
+                strcmp(imIn->mode, "I;16") == 0 || strcmp(imIn->mode, "L") == 0) &&
+               (strcmp(mode, "RGBA") == 0 || strcmp(mode, "LA") == 0)) {
         if (strcmp(imIn->mode, "1") == 0) {
             convert = bit2rgb;
         } else if (strcmp(imIn->mode, "I") == 0) {
             convert = i2rgb;
+        } else if (strcmp(imIn->mode, "I;16") == 0) {
+            convert = I16_RGB;
         } else {
             convert = l2rgb;
         }
@@ -1698,7 +1755,8 @@ ImagingConvertTransparent(Imaging imIn, const char *mode, int r, int g, int b) {
             100,
             "conversion from %.10s to %.10s not supported in convert_transparent",
             imIn->mode,
-            mode);
+            mode
+        );
         return (Imaging)ImagingError_ValueError(buf);
     }
 
@@ -1710,7 +1768,9 @@ ImagingConvertTransparent(Imaging imIn, const char *mode, int r, int g, int b) {
     ImagingSectionEnter(&cookie);
     for (y = 0; y < imIn->ysize; y++) {
         (*convert)((UINT8 *)imOut->image[y], (UINT8 *)imIn->image[y], imIn->xsize);
-        rgbT2rgba((UINT8 *)imOut->image[y], imIn->xsize, r, g, b);
+
+        source = source_transparency ? (UINT8 *)imIn->image[y] : NULL;
+        rgbT2a((UINT8 *)imOut->image[y], source, imIn->xsize, r, g, b, premultiplied);
     }
     ImagingSectionLeave(&cookie);
 
diff --git a/src/libImaging/ConvertYCbCr.c b/src/libImaging/ConvertYCbCr.c
index 142f065e57d..285b4332740 100644
--- a/src/libImaging/ConvertYCbCr.c
+++ b/src/libImaging/ConvertYCbCr.c
@@ -47,7 +47,8 @@ static INT16 Y_R[] = {
     4019, 4038, 4057, 4076, 4095, 4114, 4133, 4153, 4172, 4191, 4210, 4229, 4248, 4267,
     4286, 4306, 4325, 4344, 4363, 4382, 4401, 4420, 4440, 4459, 4478, 4497, 4516, 4535,
     4554, 4574, 4593, 4612, 4631, 4650, 4669, 4688, 4707, 4727, 4746, 4765, 4784, 4803,
-    4822, 4841, 4861, 4880};
+    4822, 4841, 4861, 4880
+};
 
 static INT16 Y_G[] = {
     0,    38,   75,   113,  150,  188,  225,  263,  301,  338,  376,  413,  451,  488,
@@ -68,7 +69,8 @@ static INT16 Y_G[] = {
     7889, 7927, 7964, 8002, 8040, 8077, 8115, 8152, 8190, 8227, 8265, 8303, 8340, 8378,
     8415, 8453, 8490, 8528, 8566, 8603, 8641, 8678, 8716, 8753, 8791, 8828, 8866, 8904,
     8941, 8979, 9016, 9054, 9091, 9129, 9167, 9204, 9242, 9279, 9317, 9354, 9392, 9430,
-    9467, 9505, 9542, 9580};
+    9467, 9505, 9542, 9580
+};
 
 static INT16 Y_B[] = {
     0,    7,    15,   22,   29,   36,   44,   51,   58,   66,   73,   80,   88,   95,
@@ -89,7 +91,8 @@ static INT16 Y_B[] = {
     1532, 1539, 1547, 1554, 1561, 1569, 1576, 1583, 1591, 1598, 1605, 1612, 1620, 1627,
     1634, 1642, 1649, 1656, 1663, 1671, 1678, 1685, 1693, 1700, 1707, 1715, 1722, 1729,
     1736, 1744, 1751, 1758, 1766, 1773, 1780, 1788, 1795, 1802, 1809, 1817, 1824, 1831,
-    1839, 1846, 1853, 1860};
+    1839, 1846, 1853, 1860
+};
 
 static INT16 Cb_R[] = {
     0,     -10,   -21,   -31,   -42,   -53,   -64,   -75,   -85,   -96,   -107,  -118,
@@ -113,7 +116,8 @@ static INT16 Cb_R[] = {
     -2332, -2342, -2353, -2364, -2375, -2386, -2396, -2407, -2418, -2429, -2440, -2450,
     -2461, -2472, -2483, -2494, -2504, -2515, -2526, -2537, -2548, -2558, -2569, -2580,
     -2591, -2602, -2612, -2623, -2634, -2645, -2656, -2666, -2677, -2688, -2699, -2710,
-    -2720, -2731, -2742, -2753};
+    -2720, -2731, -2742, -2753
+};
 
 static INT16 Cb_G[] = {
     0,     -20,   -41,   -63,   -84,   -105,  -126,  -147,  -169,  -190,  -211,  -232,
@@ -137,7 +141,8 @@ static INT16 Cb_G[] = {
     -4578, -4600, -4621, -4642, -4663, -4684, -4706, -4727, -4748, -4769, -4790, -4812,
     -4833, -4854, -4875, -4896, -4918, -4939, -4960, -4981, -5002, -5024, -5045, -5066,
     -5087, -5108, -5130, -5151, -5172, -5193, -5214, -5236, -5257, -5278, -5299, -5320,
-    -5342, -5363, -5384, -5405};
+    -5342, -5363, -5384, -5405
+};
 
 static INT16 Cb_B[] = {
     0,    32,   64,   96,   128,  160,  192,  224,  256,  288,  320,  352,  384,  416,
@@ -158,7 +163,8 @@ static INT16 Cb_B[] = {
     6720, 6752, 6784, 6816, 6848, 6880, 6912, 6944, 6976, 7008, 7040, 7072, 7104, 7136,
     7168, 7200, 7232, 7264, 7296, 7328, 7360, 7392, 7424, 7456, 7488, 7520, 7552, 7584,
     7616, 7648, 7680, 7712, 7744, 7776, 7808, 7840, 7872, 7904, 7936, 7968, 8000, 8032,
-    8064, 8096, 8128, 8160};
+    8064, 8096, 8128, 8160
+};
 
 #define Cr_R Cb_B
 
@@ -184,7 +190,8 @@ static INT16 Cr_G[] = {
     -5787, -5814, -5841, -5867, -5894, -5921, -5948, -5975, -6001, -6028, -6055, -6082,
     -6109, -6135, -6162, -6189, -6216, -6243, -6269, -6296, -6323, -6350, -6376, -6403,
     -6430, -6457, -6484, -6510, -6537, -6564, -6591, -6618, -6644, -6671, -6698, -6725,
-    -6752, -6778, -6805, -6832};
+    -6752, -6778, -6805, -6832
+};
 
 static INT16 Cr_B[] = {
     0,     -4,    -9,    -15,   -20,   -25,   -30,   -35,   -41,   -46,   -51,   -56,
@@ -208,7 +215,8 @@ static INT16 Cr_B[] = {
     -1123, -1128, -1133, -1139, -1144, -1149, -1154, -1159, -1165, -1170, -1175, -1180,
     -1185, -1191, -1196, -1201, -1206, -1211, -1217, -1222, -1227, -1232, -1238, -1243,
     -1248, -1253, -1258, -1264, -1269, -1274, -1279, -1284, -1290, -1295, -1300, -1305,
-    -1310, -1316, -1321, -1326};
+    -1310, -1316, -1321, -1326
+};
 
 static INT16 R_Cr[] = {
     -11484, -11394, -11305, -11215, -11125, -11036, -10946, -10856, -10766, -10677,
@@ -236,7 +244,8 @@ static INT16 R_Cr[] = {
     8255,   8345,   8434,   8524,   8614,   8704,   8793,   8883,   8973,   9063,
     9152,   9242,   9332,   9421,   9511,   9601,   9691,   9780,   9870,   9960,
     10050,  10139,  10229,  10319,  10408,  10498,  10588,  10678,  10767,  10857,
-    10947,  11037,  11126,  11216,  11306,  11395};
+    10947,  11037,  11126,  11216,  11306,  11395
+};
 
 static INT16 G_Cb[] = {
     2819,  2797,  2775,  2753,  2731,  2709,  2687,  2665,  2643,  2621,  2599,  2577,
@@ -260,7 +269,8 @@ static INT16 G_Cb[] = {
     -1937, -1959, -1981, -2003, -2025, -2047, -2069, -2091, -2113, -2135, -2157, -2179,
     -2201, -2224, -2246, -2268, -2290, -2312, -2334, -2356, -2378, -2400, -2422, -2444,
     -2466, -2488, -2510, -2532, -2554, -2576, -2598, -2620, -2642, -2664, -2686, -2708,
-    -2730, -2752, -2774, -2796};
+    -2730, -2752, -2774, -2796
+};
 
 static INT16 G_Cr[] = {
     5850,  5805,  5759,  5713,  5667,  5622,  5576,  5530,  5485,  5439,  5393,  5347,
@@ -284,7 +294,8 @@ static INT16 G_Cr[] = {
     -4021, -4067, -4112, -4158, -4204, -4250, -4295, -4341, -4387, -4432, -4478, -4524,
     -4569, -4615, -4661, -4707, -4752, -4798, -4844, -4889, -4935, -4981, -5027, -5072,
     -5118, -5164, -5209, -5255, -5301, -5346, -5392, -5438, -5484, -5529, -5575, -5621,
-    -5666, -5712, -5758, -5804};
+    -5666, -5712, -5758, -5804
+};
 
 static INT16 B_Cb[] = {
     -14515, -14402, -14288, -14175, -14062, -13948, -13835, -13721, -13608, -13495,
@@ -312,7 +323,8 @@ static INT16 B_Cb[] = {
     10434,  10547,  10660,  10774,  10887,  11001,  11114,  11227,  11341,  11454,
     11568,  11681,  11794,  11908,  12021,  12135,  12248,  12361,  12475,  12588,
     12702,  12815,  12929,  13042,  13155,  13269,  13382,  13496,  13609,  13722,
-    13836,  13949,  14063,  14176,  14289,  14403};
+    13836,  13949,  14063,  14176,  14289,  14403
+};
 
 void
 ImagingConvertRGB2YCbCr(UINT8 *out, const UINT8 *in, int pixels) {
diff --git a/src/libImaging/Dib.c b/src/libImaging/Dib.c
index 1b5bfe1324e..c69e9e552ae 100644
--- a/src/libImaging/Dib.c
+++ b/src/libImaging/Dib.c
@@ -94,8 +94,9 @@ ImagingNewDIB(const char *mode, int xsize, int ysize) {
         return (ImagingDIB)ImagingError_MemoryError();
     }
 
-    dib->bitmap =
-        CreateDIBSection(dib->dc, dib->info, DIB_RGB_COLORS, &dib->bits, NULL, 0);
+    dib->bitmap = CreateDIBSection(
+        dib->dc, dib->info, DIB_RGB_COLORS, (void **)&dib->bits, NULL, 0
+    );
     if (!dib->bitmap) {
         free(dib->info);
         free(dib);
@@ -218,7 +219,8 @@ ImagingPasteDIB(ImagingDIB dib, Imaging im, int xy[4]) {
             dib->bits + dib->linesize * (dib->ysize - (xy[1] + y) - 1) +
                 xy[0] * dib->pixelsize,
             im->image[y],
-            im->xsize);
+            im->xsize
+        );
     }
 }
 
@@ -251,7 +253,8 @@ ImagingDrawDIB(ImagingDIB dib, void *dc, int dst[4], int src[4]) {
             dib->bits,
             dib->info,
             DIB_RGB_COLORS,
-            SRCCOPY);
+            SRCCOPY
+        );
     } else {
         /* stretchblt (displays) */
         if (dib->palette != 0) {
@@ -268,7 +271,8 @@ ImagingDrawDIB(ImagingDIB dib, void *dc, int dst[4], int src[4]) {
             src[1],
             src[2] - src[0],
             src[3] - src[1],
-            SRCCOPY);
+            SRCCOPY
+        );
     }
 }
 
diff --git a/src/libImaging/Draw.c b/src/libImaging/Draw.c
index 0ccf22d58dd..f1c8ffcff8d 100644
--- a/src/libImaging/Draw.c
+++ b/src/libImaging/Draw.c
@@ -48,7 +48,7 @@
  * This guarantees that ROUND_UP|DOWN(f) == -ROUND_UP|DOWN(-f)
  */
 #define ROUND_UP(f) ((int)((f) >= 0.0 ? floor((f) + 0.5F) : -floor(fabs(f) + 0.5F)))
-#define ROUND_DOWN(f) ((int)((f) >= 0.0 ? ceil((f)-0.5F) : -ceil(fabs(f) - 0.5F)))
+#define ROUND_DOWN(f) ((int)((f) >= 0.0 ? ceil((f) - 0.5F) : -ceil(fabs(f) - 0.5F)))
 
 /* -------------------------------------------------------------------- */
 /* Primitives                                                           */
@@ -120,9 +120,8 @@ hline8(Imaging im, int x0, int y0, int x1, int ink) {
         if (x0 <= x1) {
             pixelwidth = strncmp(im->mode, "I;16", 4) == 0 ? 2 : 1;
             memset(
-                im->image8[y0] + x0 * pixelwidth,
-                (UINT8)ink,
-                (x1 - x0 + 1) * pixelwidth);
+                im->image8[y0] + x0 * pixelwidth, (UINT8)ink, (x1 - x0 + 1) * pixelwidth
+            );
         }
     }
 }
@@ -408,7 +407,8 @@ x_cmp(const void *x0, const void *x1) {
 
 static void
 draw_horizontal_lines(
-    Imaging im, int n, Edge *e, int ink, int *x_pos, int y, hline_handler hline) {
+    Imaging im, int n, Edge *e, int ink, int *x_pos, int y, hline_handler hline
+) {
     int i;
     for (i = 0; i < n; i++) {
         if (e[i].ymin == y && e[i].ymin == e[i].ymax) {
@@ -439,7 +439,9 @@ draw_horizontal_lines(
  * Filled polygon draw function using scan line algorithm.
  */
 static inline int
-polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler hline, int hasAlpha) {
+polygon_generic(
+    Imaging im, int n, Edge *e, int ink, int eofill, hline_handler hline, int hasAlpha
+) {
     Edge **edge_table;
     float *xx;
     int edge_count = 0;
@@ -499,7 +501,7 @@ polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler h
                     // Needed to draw consistent polygons
                     xx[j] = xx[j - 1];
                     j++;
-                } else if (current->dx != 0 && roundf(xx[j-1]) == xx[j-1]) {
+                } else if (current->dx != 0 && roundf(xx[j - 1]) == xx[j - 1]) {
                     // Connect discontiguous corners
                     for (k = 0; k < i; k++) {
                         Edge *other_edge = edge_table[k];
@@ -510,23 +512,42 @@ polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler h
                         // Check if the two edges join to make a corner
                         if (((ymin == current->ymin && ymin == other_edge->ymin) ||
                              (ymin == current->ymax && ymin == other_edge->ymax)) &&
-                            xx[j-1] == (ymin - other_edge->y0) * other_edge->dx + other_edge->x0) {
+                            xx[j - 1] == (ymin - other_edge->y0) * other_edge->dx +
+                                             other_edge->x0) {
                             // Determine points from the edges on the next row
                             // Or if this is the last row, check the previous row
                             int offset = ymin == ymax ? -1 : 1;
-                            adjacent_line_x = (ymin + offset - current->y0) * current->dx + current->x0;
-                            adjacent_line_x_other_edge = (ymin + offset - other_edge->y0) * other_edge->dx + other_edge->x0;
+                            adjacent_line_x =
+                                (ymin + offset - current->y0) * current->dx +
+                                current->x0;
+                            adjacent_line_x_other_edge =
+                                (ymin + offset - other_edge->y0) * other_edge->dx +
+                                other_edge->x0;
                             if (ymin == current->ymax) {
                                 if (current->dx > 0) {
-                                    xx[k] = fmax(adjacent_line_x, adjacent_line_x_other_edge) + 1;
+                                    xx[k] =
+                                        fmax(
+                                            adjacent_line_x, adjacent_line_x_other_edge
+                                        ) +
+                                        1;
                                 } else {
-                                    xx[k] = fmin(adjacent_line_x, adjacent_line_x_other_edge) - 1;
+                                    xx[k] =
+                                        fmin(
+                                            adjacent_line_x, adjacent_line_x_other_edge
+                                        ) -
+                                        1;
                                 }
                             } else {
                                 if (current->dx > 0) {
-                                    xx[k] = fmin(adjacent_line_x, adjacent_line_x_other_edge);
+                                    xx[k] = fmin(
+                                        adjacent_line_x, adjacent_line_x_other_edge
+                                    );
                                 } else {
-                                    xx[k] = fmax(adjacent_line_x, adjacent_line_x_other_edge) + 1;
+                                    xx[k] =
+                                        fmax(
+                                            adjacent_line_x, adjacent_line_x_other_edge
+                                        ) +
+                                        1;
                                 }
                             }
                             break;
@@ -552,7 +573,8 @@ polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler h
 
                 int x_start = ROUND_UP(xx[i - 1]);
                 if (x_pos > x_start) {
-                    // Line would be partway through x_pos, so increase the starting point
+                    // Line would be partway through x_pos, so increase the starting
+                    // point
                     x_start = x_pos;
                     if (x_end < x_start) {
                         // Line would now end before it started
@@ -676,7 +698,8 @@ ImagingDrawLine(Imaging im, int x0, int y0, int x1, int y1, const void *ink_, in
 
 int
 ImagingDrawWideLine(
-    Imaging im, int x0, int y0, int x1, int y1, const void *ink_, int width, int op) {
+    Imaging im, int x0, int y0, int x1, int y1, const void *ink_, int width, int op
+) {
     DRAW *draw;
     INT32 ink;
     int dx, dy;
@@ -707,7 +730,8 @@ ImagingDrawWideLine(
             {x0 - dxmin, y0 + dymax},
             {x1 - dxmin, y1 + dymax},
             {x1 + dxmax, y1 - dymin},
-            {x0 + dxmax, y0 - dymin}};
+            {x0 + dxmax, y0 - dymin}
+        };
 
         add_edge(e + 0, vertices[0][0], vertices[0][1], vertices[1][0], vertices[1][1]);
         add_edge(e + 1, vertices[1][0], vertices[1][1], vertices[2][0], vertices[2][1]);
@@ -729,7 +753,8 @@ ImagingDrawRectangle(
     const void *ink_,
     int fill,
     int width,
-    int op) {
+    int op
+) {
     int i;
     int y;
     int tmp;
@@ -776,7 +801,9 @@ ImagingDrawRectangle(
 }
 
 int
-ImagingDrawPolygon(Imaging im, int count, int *xy, const void *ink_, int fill, int width, int op) {
+ImagingDrawPolygon(
+    Imaging im, int count, int *xy, const void *ink_, int fill, int width, int op
+) {
     int i, n, x0, y0, x1, y1;
     DRAW *draw;
     INT32 ink;
@@ -803,7 +830,7 @@ ImagingDrawPolygon(Imaging im, int count, int *xy, const void *ink_, int fill, i
             if (y0 == y1 && i != 0 && y0 == xy[i * 2 - 1]) {
                 // This is a horizontal line,
                 // that immediately follows another horizontal line
-                Edge *last_e = &e[n-1];
+                Edge *last_e = &e[n - 1];
                 if (x1 > x0 && x0 > xy[i * 2 - 2]) {
                     // They are both increasing in x
                     last_e->xmax = x1;
@@ -826,14 +853,27 @@ ImagingDrawPolygon(Imaging im, int count, int *xy, const void *ink_, int fill, i
         /* Outline */
         if (width == 1) {
             for (i = 0; i < count - 1; i++) {
-                draw->line(im, xy[i * 2], xy[i * 2 + 1], xy[i * 2 + 2], xy[i * 2 + 3], ink);
+                draw->line(
+                    im, xy[i * 2], xy[i * 2 + 1], xy[i * 2 + 2], xy[i * 2 + 3], ink
+                );
             }
             draw->line(im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink);
         } else {
             for (i = 0; i < count - 1; i++) {
-                ImagingDrawWideLine(im, xy[i * 2], xy[i * 2 + 1], xy[i * 2 + 2], xy[i * 2 + 3], ink_, width, op);
+                ImagingDrawWideLine(
+                    im,
+                    xy[i * 2],
+                    xy[i * 2 + 1],
+                    xy[i * 2 + 2],
+                    xy[i * 2 + 3],
+                    ink_,
+                    width,
+                    op
+                );
             }
-            ImagingDrawWideLine(im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink_, width, op);
+            ImagingDrawWideLine(
+                im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink_, width, op
+            );
         }
     }
 
@@ -843,7 +883,8 @@ ImagingDrawPolygon(Imaging im, int count, int *xy, const void *ink_, int fill, i
 int
 ImagingDrawBitmap(Imaging im, int x0, int y0, Imaging bitmap, const void *ink, int op) {
     return ImagingFill2(
-        im, ink, bitmap, x0, y0, x0 + bitmap->xsize, y0 + bitmap->ysize);
+        im, ink, bitmap, x0, y0, x0 + bitmap->xsize, y0 + bitmap->ysize
+    );
 }
 
 /* -------------------------------------------------------------------- */
@@ -1052,7 +1093,8 @@ clip_tree_transpose(clip_node *root) {
 // segments, i.e. something like correct bracket sequences.
 int
 clip_tree_do_clip(
-    clip_node *root, int32_t x0, int32_t y, int32_t x1, event_list **ret) {
+    clip_node *root, int32_t x0, int32_t y, int32_t x1, event_list **ret
+) {
     if (root == NULL) {
         event_list *start = malloc(sizeof(event_list));
         if (!start) {
@@ -1189,7 +1231,8 @@ typedef struct {
 } clip_ellipse_state;
 
 typedef void (*clip_ellipse_init)(
-    clip_ellipse_state *, int32_t, int32_t, int32_t, float, float);
+    clip_ellipse_state *, int32_t, int32_t, int32_t, float, float
+);
 
 void
 debug_clip_tree(clip_node *root, int space) {
@@ -1301,7 +1344,8 @@ arc_init(clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float
 // A chord line.
 void
 chord_line_init(
-    clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float ar) {
+    clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float ar
+) {
     ellipse_init(&s->st, a, b, a + b + 1);
 
     s->head = NULL;
@@ -1328,7 +1372,8 @@ chord_line_init(
 // Pie side.
 void
 pie_side_init(
-    clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float _) {
+    clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float _
+) {
     ellipse_init(&s->st, a, b, a + b + 1);
 
     s->head = NULL;
@@ -1444,7 +1489,8 @@ clip_ellipse_free(clip_ellipse_state *s) {
 
 int8_t
 clip_ellipse_next(
-    clip_ellipse_state *s, int32_t *ret_x0, int32_t *ret_y, int32_t *ret_x1) {
+    clip_ellipse_state *s, int32_t *ret_x0, int32_t *ret_y, int32_t *ret_x1
+) {
     int32_t x0, y, x1;
     while (s->head == NULL && ellipse_next(&s->st, &x0, &y, &x1) >= 0) {
         if (clip_tree_do_clip(s->root, x0, y, x1, &s->head) < 0) {
@@ -1478,7 +1524,8 @@ ellipseNew(
     const void *ink_,
     int fill,
     int width,
-    int op) {
+    int op
+) {
     DRAW *draw;
     INT32 ink;
     DRAWINIT();
@@ -1513,7 +1560,8 @@ clipEllipseNew(
     const void *ink_,
     int width,
     int op,
-    clip_ellipse_init init) {
+    clip_ellipse_init init
+) {
     DRAW *draw;
     INT32 ink;
     DRAWINIT();
@@ -1546,7 +1594,8 @@ arcNew(
     float end,
     const void *ink_,
     int width,
-    int op) {
+    int op
+) {
     return clipEllipseNew(im, x0, y0, x1, y1, start, end, ink_, width, op, arc_init);
 }
 
@@ -1561,7 +1610,8 @@ chordNew(
     float end,
     const void *ink_,
     int width,
-    int op) {
+    int op
+) {
     return clipEllipseNew(im, x0, y0, x1, y1, start, end, ink_, width, op, chord_init);
 }
 
@@ -1576,9 +1626,11 @@ chordLineNew(
     float end,
     const void *ink_,
     int width,
-    int op) {
+    int op
+) {
     return clipEllipseNew(
-        im, x0, y0, x1, y1, start, end, ink_, width, op, chord_line_init);
+        im, x0, y0, x1, y1, start, end, ink_, width, op, chord_line_init
+    );
 }
 
 static int
@@ -1592,7 +1644,8 @@ pieNew(
     float end,
     const void *ink_,
     int width,
-    int op) {
+    int op
+) {
     return clipEllipseNew(im, x0, y0, x1, y1, start, end, ink_, width, op, pie_init);
 }
 
@@ -1606,7 +1659,8 @@ pieSideNew(
     float start,
     const void *ink_,
     int width,
-    int op) {
+    int op
+) {
     return clipEllipseNew(im, x0, y0, x1, y1, start, 0, ink_, width, op, pie_side_init);
 }
 
@@ -1620,7 +1674,8 @@ ImagingDrawEllipse(
     const void *ink,
     int fill,
     int width,
-    int op) {
+    int op
+) {
     return ellipseNew(im, x0, y0, x1, y1, ink, fill, width, op);
 }
 
@@ -1635,7 +1690,8 @@ ImagingDrawArc(
     float end,
     const void *ink,
     int width,
-    int op) {
+    int op
+) {
     normalize_angles(&start, &end);
     if (start + 360 == end) {
         return ImagingDrawEllipse(im, x0, y0, x1, y1, ink, 0, width, op);
@@ -1658,7 +1714,8 @@ ImagingDrawChord(
     const void *ink,
     int fill,
     int width,
-    int op) {
+    int op
+) {
     normalize_angles(&start, &end);
     if (start + 360 == end) {
         return ImagingDrawEllipse(im, x0, y0, x1, y1, ink, fill, width, op);
@@ -1688,7 +1745,8 @@ ImagingDrawPieslice(
     const void *ink,
     int fill,
     int width,
-    int op) {
+    int op
+) {
     normalize_angles(&start, &end);
     if (start + 360 == end) {
         return ellipseNew(im, x0, y0, x1, y1, ink, fill, width, op);
@@ -1816,13 +1874,8 @@ ImagingOutlineLine(ImagingOutline outline, float x1, float y1) {
 
 int
 ImagingOutlineCurve(
-    ImagingOutline outline,
-    float x1,
-    float y1,
-    float x2,
-    float y2,
-    float x3,
-    float y3) {
+    ImagingOutline outline, float x1, float y1, float x2, float y2, float x3, float y3
+) {
     Edge *e;
     int i;
     float xo, yo;
@@ -1936,7 +1989,8 @@ ImagingOutlineTransform(ImagingOutline outline, double a[6]) {
 
 int
 ImagingDrawOutline(
-    Imaging im, ImagingOutline outline, const void *ink_, int fill, int op) {
+    Imaging im, ImagingOutline outline, const void *ink_, int fill, int op
+) {
     DRAW *draw;
     INT32 ink;
 
diff --git a/src/libImaging/Fill.c b/src/libImaging/Fill.c
index 5b6bfb89cd8..8fb481e7e4d 100644
--- a/src/libImaging/Fill.c
+++ b/src/libImaging/Fill.c
@@ -118,8 +118,8 @@ ImagingFillRadialGradient(const char *mode) {
 
     for (y = 0; y < 256; y++) {
         for (x = 0; x < 256; x++) {
-            d = (int)sqrt(
-                (double)((x - 128) * (x - 128) + (y - 128) * (y - 128)) * 2.0);
+            d = (int
+            )sqrt((double)((x - 128) * (x - 128) + (y - 128) * (y - 128)) * 2.0);
             if (d >= 255) {
                 d = 255;
             }
diff --git a/src/libImaging/Filter.c b/src/libImaging/Filter.c
index 4dcd368ca80..7b7b2e4292d 100644
--- a/src/libImaging/Filter.c
+++ b/src/libImaging/Filter.c
@@ -26,6 +26,8 @@
 
 #include "Imaging.h"
 
+#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f) - 0.5F))
+
 static inline UINT8
 clip8(float in) {
     if (in <= 0.0) {
@@ -59,7 +61,8 @@ ImagingExpand(Imaging imIn, int xmargin, int ymargin) {
     }
 
     imOut = ImagingNewDirty(
-        imIn->mode, imIn->xsize + 2 * xmargin, imIn->ysize + 2 * ymargin);
+        imIn->mode, imIn->xsize + 2 * xmargin, imIn->ysize + 2 * ymargin
+    );
     if (!imOut) {
         return NULL;
     }
@@ -104,9 +107,25 @@ ImagingExpand(Imaging imIn, int xmargin, int ymargin) {
     return imOut;
 }
 
+float
+kernel_i16(int size, UINT8 *in0, int x, const float *kernel, int bigendian) {
+    int i;
+    float result = 0;
+    int half_size = (size - 1) / 2;
+    for (i = 0; i < size; i++) {
+        int x1 = x + i - half_size;
+        result += _i2f(
+                      in0[x1 * 2 + (bigendian ? 1 : 0)] +
+                      (in0[x1 * 2 + (bigendian ? 0 : 1)] >> 8)
+                  ) *
+                  kernel[i];
+    }
+    return result;
+}
+
 void
 ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
-#define KERNEL1x3(in0, x, kernel, d)                                             \
+#define KERNEL1x3(in0, x, kernel, d)                               \
     (_i2f(in0[x - d]) * (kernel)[0] + _i2f(in0[x]) * (kernel)[1] + \
      _i2f(in0[x + d]) * (kernel)[2])
 
@@ -134,6 +153,16 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
                 out[x] = in0[x];
             }
         } else {
+            int bigendian = 0;
+            if (im->type == IMAGING_TYPE_SPECIAL) {
+                if (strcmp(im->mode, "I;16B") == 0
+#ifdef WORDS_BIGENDIAN
+                    || strcmp(im->mode, "I;16N") == 0
+#endif
+                ) {
+                    bigendian = 1;
+                }
+            }
             for (y = 1; y < im->ysize - 1; y++) {
                 UINT8 *in_1 = (UINT8 *)im->image[y - 1];
                 UINT8 *in0 = (UINT8 *)im->image[y];
@@ -141,14 +170,31 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
                 UINT8 *out = (UINT8 *)imOut->image[y];
 
                 out[0] = in0[0];
+                if (im->type == IMAGING_TYPE_SPECIAL) {
+                    out[1] = in0[1];
+                }
                 for (x = 1; x < im->xsize - 1; x++) {
                     float ss = offset;
-                    ss += KERNEL1x3(in1, x, &kernel[0], 1);
-                    ss += KERNEL1x3(in0, x, &kernel[3], 1);
-                    ss += KERNEL1x3(in_1, x, &kernel[6], 1);
-                    out[x] = clip8(ss);
+                    if (im->type == IMAGING_TYPE_SPECIAL) {
+                        ss += kernel_i16(3, in1, x, &kernel[0], bigendian);
+                        ss += kernel_i16(3, in0, x, &kernel[3], bigendian);
+                        ss += kernel_i16(3, in_1, x, &kernel[6], bigendian);
+                        int ss_int = ROUND_UP(ss);
+                        out[x * 2 + (bigendian ? 1 : 0)] = clip8(ss_int % 256);
+                        out[x * 2 + (bigendian ? 0 : 1)] = clip8(ss_int >> 8);
+                    } else {
+                        ss += KERNEL1x3(in1, x, &kernel[0], 1);
+                        ss += KERNEL1x3(in0, x, &kernel[3], 1);
+                        ss += KERNEL1x3(in_1, x, &kernel[6], 1);
+                        out[x] = clip8(ss);
+                    }
+                }
+                if (im->type == IMAGING_TYPE_SPECIAL) {
+                    out[x * 2] = in0[x * 2];
+                    out[x * 2 + 1] = in0[x * 2 + 1];
+                } else {
+                    out[x] = in0[x];
                 }
-                out[x] = in0[x];
             }
         }
     } else {
@@ -224,10 +270,9 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
 
 void
 ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
-#define KERNEL1x5(in0, x, kernel, d)                                             \
-    (_i2f(in0[x - d - d]) * (kernel)[0] +                                 \
-     _i2f(in0[x - d]) * (kernel)[1] + _i2f(in0[x]) * (kernel)[2] + \
-     _i2f(in0[x + d]) * (kernel)[3] +                                     \
+#define KERNEL1x5(in0, x, kernel, d)                                       \
+    (_i2f(in0[x - d - d]) * (kernel)[0] + _i2f(in0[x - d]) * (kernel)[1] + \
+     _i2f(in0[x]) * (kernel)[2] + _i2f(in0[x + d]) * (kernel)[3] +         \
      _i2f(in0[x + d + d]) * (kernel)[4])
 
     int x = 0, y = 0;
@@ -261,6 +306,16 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
                 out[x + 1] = in0[x + 1];
             }
         } else {
+            int bigendian = 0;
+            if (im->type == IMAGING_TYPE_SPECIAL) {
+                if (strcmp(im->mode, "I;16B") == 0
+#ifdef WORDS_BIGENDIAN
+                    || strcmp(im->mode, "I;16N") == 0
+#endif
+                ) {
+                    bigendian = 1;
+                }
+            }
             for (y = 2; y < im->ysize - 2; y++) {
                 UINT8 *in_2 = (UINT8 *)im->image[y - 2];
                 UINT8 *in_1 = (UINT8 *)im->image[y - 1];
@@ -271,17 +326,39 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
 
                 out[0] = in0[0];
                 out[1] = in0[1];
+                if (im->type == IMAGING_TYPE_SPECIAL) {
+                    out[2] = in0[2];
+                    out[3] = in0[3];
+                }
                 for (x = 2; x < im->xsize - 2; x++) {
                     float ss = offset;
-                    ss += KERNEL1x5(in2, x, &kernel[0], 1);
-                    ss += KERNEL1x5(in1, x, &kernel[5], 1);
-                    ss += KERNEL1x5(in0, x, &kernel[10], 1);
-                    ss += KERNEL1x5(in_1, x, &kernel[15], 1);
-                    ss += KERNEL1x5(in_2, x, &kernel[20], 1);
-                    out[x] = clip8(ss);
+                    if (im->type == IMAGING_TYPE_SPECIAL) {
+                        ss += kernel_i16(5, in2, x, &kernel[0], bigendian);
+                        ss += kernel_i16(5, in1, x, &kernel[5], bigendian);
+                        ss += kernel_i16(5, in0, x, &kernel[10], bigendian);
+                        ss += kernel_i16(5, in_1, x, &kernel[15], bigendian);
+                        ss += kernel_i16(5, in_2, x, &kernel[20], bigendian);
+                        int ss_int = ROUND_UP(ss);
+                        out[x * 2 + (bigendian ? 1 : 0)] = clip8(ss_int % 256);
+                        out[x * 2 + (bigendian ? 0 : 1)] = clip8(ss_int >> 8);
+                    } else {
+                        ss += KERNEL1x5(in2, x, &kernel[0], 1);
+                        ss += KERNEL1x5(in1, x, &kernel[5], 1);
+                        ss += KERNEL1x5(in0, x, &kernel[10], 1);
+                        ss += KERNEL1x5(in_1, x, &kernel[15], 1);
+                        ss += KERNEL1x5(in_2, x, &kernel[20], 1);
+                        out[x] = clip8(ss);
+                    }
+                }
+                if (im->type == IMAGING_TYPE_SPECIAL) {
+                    out[x * 2 + 0] = in0[x * 2 + 0];
+                    out[x * 2 + 1] = in0[x * 2 + 1];
+                    out[x * 2 + 2] = in0[x * 2 + 2];
+                    out[x * 2 + 3] = in0[x * 2 + 3];
+                } else {
+                    out[x + 0] = in0[x + 0];
+                    out[x + 1] = in0[x + 1];
                 }
-                out[x + 0] = in0[x + 0];
-                out[x + 1] = in0[x + 1];
             }
         }
     } else {
@@ -370,7 +447,8 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
                 }
             }
             memcpy(
-                out + x * sizeof(UINT32), in0 + x * sizeof(UINT32), sizeof(UINT32) * 2);
+                out + x * sizeof(UINT32), in0 + x * sizeof(UINT32), sizeof(UINT32) * 2
+            );
         }
     }
     memcpy(imOut->image[y], im->image[y], im->linesize);
@@ -382,7 +460,8 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32 *kernel, FLOAT32 o
     Imaging imOut;
     ImagingSectionCookie cookie;
 
-    if (im->type != IMAGING_TYPE_UINT8 && im->type != IMAGING_TYPE_INT32) {
+    if (im->type == IMAGING_TYPE_FLOAT32 ||
+        (im->type == IMAGING_TYPE_SPECIAL && im->bands != 1)) {
         return (Imaging)ImagingError_ModeError();
     }
 
diff --git a/src/libImaging/FliDecode.c b/src/libImaging/FliDecode.c
index d6e4ea0ff9d..130ecb7f75d 100644
--- a/src/libImaging/FliDecode.c
+++ b/src/libImaging/FliDecode.c
@@ -224,15 +224,16 @@ ImagingFliDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
                 break;
             case 16:
                 /* COPY chunk */
-                if (INT32_MAX / state->xsize < state->ysize) {
+                if (INT32_MAX < (uint64_t)state->xsize * state->ysize) {
                     /* Integer overflow, bail */
                     state->errcode = IMAGING_CODEC_OVERRUN;
                     return -1;
                 }
                 /* Note, have to check Data + size, not just ptr + size) */
                 if (data + (state->xsize * state->ysize) > ptr + bytes) {
-                    /* not enough data for frame */
-                    /* UNDONE Unclear that we're actually going to leave the buffer at the right place. */
+                    // not enough data for frame
+                    // UNDONE Unclear that we're actually going to leave the buffer at
+                    // the right place.
                     return ptr - buf; /* bytes consumed */
                 }
                 for (y = 0; y < state->ysize; y++) {
@@ -251,7 +252,7 @@ ImagingFliDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
                 return -1;
         }
         advance = I32(ptr);
-        if (advance == 0 ) {
+        if (advance == 0) {
             // If there's no advance, we're in an infinite loop
             state->errcode = IMAGING_CODEC_BROKEN;
             return -1;
diff --git a/src/libImaging/Geometry.c b/src/libImaging/Geometry.c
index 0c591579217..1e2abd7e75c 100644
--- a/src/libImaging/Geometry.c
+++ b/src/libImaging/Geometry.c
@@ -565,13 +565,13 @@ bilinear_filter32RGB(void *out, Imaging im, double xin, double yin) {
 #undef BILINEAR_HEAD
 #undef BILINEAR_BODY
 
-#define BICUBIC(v, v1, v2, v3, v4, d)              \
-    {                                              \
-        double p1 = v2;                            \
-        double p2 = -v1 + v3;                      \
-        double p3 = 2 * (v1 - v2) + v3 - v4;       \
-        double p4 = -v1 + v2 - v3 + v4;            \
-        v = p1 + (d) * (p2 + (d) * (p3 + (d)*p4)); \
+#define BICUBIC(v, v1, v2, v3, v4, d)                \
+    {                                                \
+        double p1 = v2;                              \
+        double p2 = -v1 + v3;                        \
+        double p3 = 2 * (v1 - v2) + v3 - v4;         \
+        double p4 = -v1 + v2 - v3 + v4;              \
+        v = p1 + (d) * (p2 + (d) * (p3 + (d) * p4)); \
     }
 
 #define BICUBIC_HEAD(type)                                                \
@@ -781,7 +781,8 @@ ImagingGenericTransform(
     ImagingTransformMap transform,
     void *transform_data,
     int filterid,
-    int fill) {
+    int fill
+) {
     /* slow generic transformation.  use ImagingTransformAffine or
        ImagingScaleAffine where possible. */
 
@@ -790,15 +791,15 @@ ImagingGenericTransform(
     char *out;
     double xx, yy;
 
+    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) {
+        return (Imaging)ImagingError_ModeError();
+    }
+
     ImagingTransformFilter filter = getfilter(imIn, filterid);
     if (!filter) {
         return (Imaging)ImagingError_ValueError("bad filter number");
     }
 
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) {
-        return (Imaging)ImagingError_ModeError();
-    }
-
     ImagingCopyPalette(imOut, imIn);
 
     ImagingSectionEnter(&cookie);
@@ -836,14 +837,8 @@ ImagingGenericTransform(
 
 static Imaging
 ImagingScaleAffine(
-    Imaging imOut,
-    Imaging imIn,
-    int x0,
-    int y0,
-    int x1,
-    int y1,
-    double a[6],
-    int fill) {
+    Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, double a[6], int fill
+) {
     /* scale, nearest neighbour resampling */
 
     ImagingSectionCookie cookie;
@@ -936,7 +931,8 @@ static inline int
 check_fixed(double a[6], int x, int y) {
     return (
         fabs(x * a[0] + y * a[1] + a[2]) < 32768.0 &&
-        fabs(x * a[3] + y * a[4] + a[5]) < 32768.0);
+        fabs(x * a[3] + y * a[4] + a[5]) < 32768.0
+    );
 }
 
 static inline Imaging
@@ -949,7 +945,8 @@ affine_fixed(
     int y1,
     double a[6],
     int filterid,
-    int fill) {
+    int fill
+) {
     /* affine transform, nearest neighbour resampling, fixed point
        arithmetics */
 
@@ -966,7 +963,7 @@ affine_fixed(
     ysize = (int)imIn->ysize;
 
 /* use 16.16 fixed point arithmetics */
-#define FIX(v) FLOOR((v)*65536.0 + 0.5)
+#define FIX(v) FLOOR((v) * 65536.0 + 0.5)
 
     a0 = FIX(a[0]);
     a1 = FIX(a[1]);
@@ -1026,7 +1023,8 @@ ImagingTransformAffine(
     int y1,
     double a[6],
     int filterid,
-    int fill) {
+    int fill
+) {
     /* affine transform, nearest neighbour resampling, floating point
        arithmetics*/
 
@@ -1037,9 +1035,14 @@ ImagingTransformAffine(
     double xx, yy;
     double xo, yo;
 
+    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) {
+        return (Imaging)ImagingError_ModeError();
+    }
+
     if (filterid || imIn->type == IMAGING_TYPE_SPECIAL) {
         return ImagingGenericTransform(
-            imOut, imIn, x0, y0, x1, y1, affine_transform, a, filterid, fill);
+            imOut, imIn, x0, y0, x1, y1, affine_transform, a, filterid, fill
+        );
     }
 
     if (a[1] == 0 && a[3] == 0) {
@@ -1047,10 +1050,6 @@ ImagingTransformAffine(
         return ImagingScaleAffine(imOut, imIn, x0, y0, x1, y1, a, fill);
     }
 
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) {
-        return (Imaging)ImagingError_ModeError();
-    }
-
     if (x0 < 0) {
         x0 = 0;
     }
@@ -1134,13 +1133,15 @@ ImagingTransform(
     int y1,
     double a[8],
     int filterid,
-    int fill) {
+    int fill
+) {
     ImagingTransformMap transform;
 
     switch (method) {
         case IMAGING_TRANSFORM_AFFINE:
             return ImagingTransformAffine(
-                imOut, imIn, x0, y0, x1, y1, a, filterid, fill);
+                imOut, imIn, x0, y0, x1, y1, a, filterid, fill
+            );
             break;
         case IMAGING_TRANSFORM_PERSPECTIVE:
             transform = perspective_transform;
@@ -1153,5 +1154,6 @@ ImagingTransform(
     }
 
     return ImagingGenericTransform(
-        imOut, imIn, x0, y0, x1, y1, transform, a, filterid, fill);
+        imOut, imIn, x0, y0, x1, y1, transform, a, filterid, fill
+    );
 }
diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c
index 86c687ca0a8..d430893ddb2 100644
--- a/src/libImaging/GetBBox.c
+++ b/src/libImaging/GetBBox.c
@@ -30,26 +30,57 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) {
     bbox[1] = -1;
     bbox[2] = bbox[3] = 0;
 
-#define GETBBOX(image, mask)              \
-    for (y = 0; y < im->ysize; y++) {     \
-        has_data = 0;                     \
-        for (x = 0; x < im->xsize; x++) { \
-            if (im->image[y][x] & mask) { \
-                has_data = 1;             \
-                if (x < bbox[0]) {        \
-                    bbox[0] = x;          \
-                }                         \
-                if (x >= bbox[2]) {       \
-                    bbox[2] = x + 1;      \
-                }                         \
-            }                             \
-        }                                 \
-        if (has_data) {                   \
-            if (bbox[1] < 0) {            \
-                bbox[1] = y;              \
-            }                             \
-            bbox[3] = y + 1;              \
-        }                                 \
+#define GETBBOX(image, mask)                                 \
+    /* first stage: looking for any pixels from top */       \
+    for (y = 0; y < im->ysize; y++) {                        \
+        has_data = 0;                                        \
+        for (x = 0; x < im->xsize; x++) {                    \
+            if (im->image[y][x] & mask) {                    \
+                has_data = 1;                                \
+                bbox[0] = x;                                 \
+                bbox[1] = y;                                 \
+                break;                                       \
+            }                                                \
+        }                                                    \
+        if (has_data) {                                      \
+            break;                                           \
+        }                                                    \
+    }                                                        \
+    /* Check that we have a box */                           \
+    if (bbox[1] < 0) {                                       \
+        return 0; /* no data */                              \
+    }                                                        \
+    /* second stage: looking for any pixels from bottom */   \
+    for (y = im->ysize - 1; y >= bbox[1]; y--) {             \
+        has_data = 0;                                        \
+        for (x = 0; x < im->xsize; x++) {                    \
+            if (im->image[y][x] & mask) {                    \
+                has_data = 1;                                \
+                if (x < bbox[0]) {                           \
+                    bbox[0] = x;                             \
+                }                                            \
+                bbox[3] = y + 1;                             \
+                break;                                       \
+            }                                                \
+        }                                                    \
+        if (has_data) {                                      \
+            break;                                           \
+        }                                                    \
+    }                                                        \
+    /* third stage: looking for left and right boundaries */ \
+    for (y = bbox[1]; y < bbox[3]; y++) {                    \
+        for (x = 0; x < bbox[0]; x++) {                      \
+            if (im->image[y][x] & mask) {                    \
+                bbox[0] = x;                                 \
+                break;                                       \
+            }                                                \
+        }                                                    \
+        for (x = im->xsize - 1; x >= bbox[2]; x--) {         \
+            if (im->image[y][x] & mask) {                    \
+                bbox[2] = x + 1;                             \
+                break;                                       \
+            }                                                \
+        }                                                    \
     }
 
     if (im->image8) {
@@ -58,11 +89,10 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) {
         INT32 mask = 0xffffffff;
         if (im->bands == 3) {
             ((UINT8 *)&mask)[3] = 0;
-        } else if (alpha_only && (
-            strcmp(im->mode, "RGBa") == 0 || strcmp(im->mode, "RGBA") == 0 ||
-            strcmp(im->mode, "La") == 0 || strcmp(im->mode, "LA") == 0 ||
-            strcmp(im->mode, "PA") == 0
-        )) {
+        } else if (alpha_only &&
+                   (strcmp(im->mode, "RGBa") == 0 || strcmp(im->mode, "RGBA") == 0 ||
+                    strcmp(im->mode, "La") == 0 || strcmp(im->mode, "LA") == 0 ||
+                    strcmp(im->mode, "PA") == 0)) {
 #ifdef WORDS_BIGENDIAN
             mask = 0x000000ff;
 #else
@@ -72,11 +102,6 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) {
         GETBBOX(image32, mask);
     }
 
-    /* Check that we got a box */
-    if (bbox[1] < 0) {
-        return 0; /* no data */
-    }
-
     return 1; /* ok */
 }
 
@@ -145,6 +170,9 @@ ImagingGetExtrema(Imaging im, void *extrema) {
                         imax = in[x];
                     }
                 }
+                if (imin == 0 && imax == 255) {
+                    break;
+                }
             }
             ((UINT8 *)extrema)[0] = (UINT8)imin;
             ((UINT8 *)extrema)[1] = (UINT8)imax;
@@ -246,13 +274,14 @@ getcolors32(Imaging im, int maxcolors, int *size) {
        code in Python 2.1.3; the exact implementation is borrowed from
        Python's Unicode property database (written by yours truly) /F */
 
-    static int SIZES[] = {
-        4,         3,  8,         3,  16,        3,  32,         5,  64,       3,
-        128,       3,  256,       29, 512,       17, 1024,       9,  2048,     5,
-        4096,      83, 8192,      27, 16384,     43, 32768,      3,  65536,    45,
-        131072,    9,  262144,    39, 524288,    39, 1048576,    9,  2097152,  5,
-        4194304,   3,  8388608,   33, 16777216,  27, 33554432,   9,  67108864, 71,
-        134217728, 39, 268435456, 9,  536870912, 5,  1073741824, 83, 0};
+    static int SIZES[] = {4,          3,  8,         3,  16,        3,  32,        5,
+                          64,         3,  128,       3,  256,       29, 512,       17,
+                          1024,       9,  2048,      5,  4096,      83, 8192,      27,
+                          16384,      43, 32768,     3,  65536,     45, 131072,    9,
+                          262144,     39, 524288,    39, 1048576,   9,  2097152,   5,
+                          4194304,    3,  8388608,   33, 16777216,  27, 33554432,  9,
+                          67108864,   71, 134217728, 39, 268435456, 9,  536870912, 5,
+                          1073741824, 83, 0};
 
     code_size = code_poly = code_mask = 0;
 
diff --git a/src/libImaging/Gif.h b/src/libImaging/Gif.h
index 5d7e2bdaa96..8edfbc2edc0 100644
--- a/src/libImaging/Gif.h
+++ b/src/libImaging/Gif.h
@@ -9,10 +9,10 @@
 
 /* Max size for a LZW code word. */
 
-#define GIFBITS     12
+#define GIFBITS 12
 
-#define GIFTABLE    (1<<GIFBITS)
-#define GIFBUFFER   (1<<GIFBITS)
+#define GIFTABLE (1 << GIFBITS)
+#define GIFBUFFER (1 << GIFBITS)
 
 typedef struct {
     /* CONFIGURATION */
@@ -66,7 +66,7 @@ typedef struct {
 } GIFDECODERSTATE;
 
 /* For GIF LZW encoder. */
-#define TABLE_SIZE  8192
+#define TABLE_SIZE 8192
 
 typedef struct {
     /* CONFIGURATION */
diff --git a/src/libImaging/GifEncode.c b/src/libImaging/GifEncode.c
index f232454052a..203fb9d0af0 100644
--- a/src/libImaging/GifEncode.c
+++ b/src/libImaging/GifEncode.c
@@ -34,28 +34,36 @@ enum { INIT, ENCODE, FINISH };
  */
 
 /* Return values */
-#define GLZW_OK                 0
-#define GLZW_NO_INPUT_AVAIL     1
-#define GLZW_NO_OUTPUT_AVAIL    2
-#define GLZW_INTERNAL_ERROR     3
+#define GLZW_OK 0
+#define GLZW_NO_INPUT_AVAIL 1
+#define GLZW_NO_OUTPUT_AVAIL 2
+#define GLZW_INTERNAL_ERROR 3
 
-#define CODE_LIMIT              4096
+#define CODE_LIMIT 4096
 
 /* Values of entry_state */
-enum { LZW_INITIAL, LZW_TRY_IN1, LZW_TRY_IN2, LZW_TRY_OUT1, LZW_TRY_OUT2,
-    LZW_FINISHED };
+enum {
+    LZW_INITIAL,
+    LZW_TRY_IN1,
+    LZW_TRY_IN2,
+    LZW_TRY_OUT1,
+    LZW_TRY_OUT2,
+    LZW_FINISHED
+};
 
 /* Values of control_state */
 enum { PUT_HEAD, PUT_INIT_CLEAR, PUT_CLEAR, PUT_LAST_HEAD, PUT_END };
 
-static void glzwe_reset(GIFENCODERSTATE *st) {
+static void
+glzwe_reset(GIFENCODERSTATE *st) {
     st->next_code = st->end_code + 1;
     st->max_code = 2 * st->clear_code - 1;
     st->code_width = st->bits + 1;
     memset(st->codes, 0, sizeof(st->codes));
 }
 
-static void glzwe_init(GIFENCODERSTATE *st) {
+static void
+glzwe_init(GIFENCODERSTATE *st) {
     st->clear_code = 1 << st->bits;
     st->end_code = st->clear_code + 1;
     glzwe_reset(st);
@@ -64,156 +72,158 @@ static void glzwe_init(GIFENCODERSTATE *st) {
     st->code_buffer = 0;
 }
 
-static int glzwe(GIFENCODERSTATE *st, const UINT8 *in_ptr, UINT8 *out_ptr,
-        UINT32 *in_avail, UINT32 *out_avail,
-        UINT32 end_of_data) {
+static int
+glzwe(
+    GIFENCODERSTATE *st,
+    const UINT8 *in_ptr,
+    UINT8 *out_ptr,
+    UINT32 *in_avail,
+    UINT32 *out_avail,
+    UINT32 end_of_data
+) {
     switch (st->entry_state) {
-
-    case LZW_TRY_IN1:
+        case LZW_TRY_IN1:
 get_first_byte:
-        if (!*in_avail) {
-            if (end_of_data) {
-                goto end_of_data;
+            if (!*in_avail) {
+                if (end_of_data) {
+                    goto end_of_data;
+                }
+                st->entry_state = LZW_TRY_IN1;
+                return GLZW_NO_INPUT_AVAIL;
             }
-            st->entry_state = LZW_TRY_IN1;
-            return GLZW_NO_INPUT_AVAIL;
-        }
-        st->head = *in_ptr++;
-        (*in_avail)--;
+            st->head = *in_ptr++;
+            (*in_avail)--;
 
-    case LZW_TRY_IN2:
+        case LZW_TRY_IN2:
 encode_loop:
-        if (!*in_avail) {
-            if (end_of_data) {
-                st->code = st->head;
-                st->put_state = PUT_LAST_HEAD;
-                goto put_code;
-            }
-            st->entry_state = LZW_TRY_IN2;
-            return GLZW_NO_INPUT_AVAIL;
-        }
-        st->tail = *in_ptr++;
-        (*in_avail)--;
-
-        /* Knuth TAOCP vol 3 sec. 6.4 algorithm D. */
-        /* Hash found experimentally to be pretty good. */
-        /* This works ONLY with TABLE_SIZE a power of 2. */
-        st->probe = ((st->head ^ (st->tail << 6)) * 31) & (TABLE_SIZE - 1);
-        while (st->codes[st->probe]) {
-            if ((st->codes[st->probe] & 0xFFFFF) ==
-                                        ((st->head << 8) | st->tail)) {
-                st->head = st->codes[st->probe] >> 20;
-                goto encode_loop;
-            } else {
-        /* Reprobe decrement must be nonzero and relatively prime to table
-         * size. So, any odd positive number for power-of-2 size. */
-                if ((st->probe -= ((st->tail << 2) | 1)) < 0) {
-                    st->probe += TABLE_SIZE;
+            if (!*in_avail) {
+                if (end_of_data) {
+                    st->code = st->head;
+                    st->put_state = PUT_LAST_HEAD;
+                    goto put_code;
                 }
+                st->entry_state = LZW_TRY_IN2;
+                return GLZW_NO_INPUT_AVAIL;
             }
-        }
-        /* Key not found, probe is at empty slot. */
-        st->code = st->head;
-        st->put_state = PUT_HEAD;
-        goto put_code;
-insert_code_or_clear: /* jump here after put_code */
-        if (st->next_code < CODE_LIMIT) {
-            st->codes[st->probe] = (st->next_code << 20) |
-                                    (st->head << 8) | st->tail;
-            if (st->next_code > st->max_code) {
-                st->max_code = st->max_code * 2 + 1;
-                st->code_width++;
+            st->tail = *in_ptr++;
+            (*in_avail)--;
+
+            /* Knuth TAOCP vol 3 sec. 6.4 algorithm D. */
+            /* Hash found experimentally to be pretty good. */
+            /* This works ONLY with TABLE_SIZE a power of 2. */
+            st->probe = ((st->head ^ (st->tail << 6)) * 31) & (TABLE_SIZE - 1);
+            while (st->codes[st->probe]) {
+                if ((st->codes[st->probe] & 0xFFFFF) == ((st->head << 8) | st->tail)) {
+                    st->head = st->codes[st->probe] >> 20;
+                    goto encode_loop;
+                } else {
+                    // Reprobe decrement must be non-zero and relatively prime to table
+                    // size. So, any odd positive number for power-of-2 size.
+                    if ((st->probe -= ((st->tail << 2) | 1)) < 0) {
+                        st->probe += TABLE_SIZE;
+                    }
+                }
             }
-            st->next_code++;
-        } else {
-            st->code = st->clear_code;
-            st->put_state = PUT_CLEAR;
+            /* Key not found, probe is at empty slot. */
+            st->code = st->head;
+            st->put_state = PUT_HEAD;
             goto put_code;
+insert_code_or_clear: /* jump here after put_code */
+            if (st->next_code < CODE_LIMIT) {
+                st->codes[st->probe] =
+                    (st->next_code << 20) | (st->head << 8) | st->tail;
+                if (st->next_code > st->max_code) {
+                    st->max_code = st->max_code * 2 + 1;
+                    st->code_width++;
+                }
+                st->next_code++;
+            } else {
+                st->code = st->clear_code;
+                st->put_state = PUT_CLEAR;
+                goto put_code;
 reset_after_clear: /* jump here after put_code */
-            glzwe_reset(st);
-        }
-        st->head = st->tail;
-        goto encode_loop;
+                glzwe_reset(st);
+            }
+            st->head = st->tail;
+            goto encode_loop;
 
-    case LZW_INITIAL:
-        glzwe_reset(st);
-        st->code = st->clear_code;
-        st->put_state = PUT_INIT_CLEAR;
+        case LZW_INITIAL:
+            glzwe_reset(st);
+            st->code = st->clear_code;
+            st->put_state = PUT_INIT_CLEAR;
 put_code:
-        st->code_bits_left = st->code_width;
+            st->code_bits_left = st->code_width;
 check_buf_bits:
-        if (!st->buf_bits_left) {   /* out buffer full */
-
-    case LZW_TRY_OUT1:
-            if (!*out_avail) {
-                st->entry_state = LZW_TRY_OUT1;
-                return GLZW_NO_OUTPUT_AVAIL;
+            if (!st->buf_bits_left) { /* out buffer full */
+
+                case LZW_TRY_OUT1:
+                    if (!*out_avail) {
+                        st->entry_state = LZW_TRY_OUT1;
+                        return GLZW_NO_OUTPUT_AVAIL;
+                    }
+                    *out_ptr++ = st->code_buffer;
+                    (*out_avail)--;
+                    st->code_buffer = 0;
+                    st->buf_bits_left = 8;
+            }
+            /* code bits to pack */
+            UINT32 n = st->buf_bits_left < st->code_bits_left ? st->buf_bits_left
+                                                              : st->code_bits_left;
+            st->code_buffer |= (st->code & ((1 << n) - 1)) << (8 - st->buf_bits_left);
+            st->code >>= n;
+            st->buf_bits_left -= n;
+            st->code_bits_left -= n;
+            if (st->code_bits_left) {
+                goto check_buf_bits;
+            }
+            switch (st->put_state) {
+                case PUT_INIT_CLEAR:
+                    goto get_first_byte;
+                case PUT_HEAD:
+                    goto insert_code_or_clear;
+                case PUT_CLEAR:
+                    goto reset_after_clear;
+                case PUT_LAST_HEAD:
+                    goto end_of_data;
+                case PUT_END:
+                    goto flush_code_buffer;
+                default:
+                    return GLZW_INTERNAL_ERROR;
             }
-            *out_ptr++ = st->code_buffer;
-            (*out_avail)--;
-            st->code_buffer = 0;
-            st->buf_bits_left = 8;
-        }
-        /* code bits to pack */
-        UINT32 n = st->buf_bits_left < st->code_bits_left
-                        ? st->buf_bits_left : st->code_bits_left;
-        st->code_buffer |=
-                        (st->code & ((1 << n) - 1)) << (8 - st->buf_bits_left);
-        st->code >>= n;
-        st->buf_bits_left -= n;
-        st->code_bits_left -= n;
-        if (st->code_bits_left) {
-            goto check_buf_bits;
-        }
-        switch (st->put_state) {
-        case PUT_INIT_CLEAR:
-            goto get_first_byte;
-        case PUT_HEAD:
-            goto insert_code_or_clear;
-        case PUT_CLEAR:
-            goto reset_after_clear;
-        case PUT_LAST_HEAD:
-            goto end_of_data;
-        case PUT_END:
-            goto flush_code_buffer;
-        default:
-            return GLZW_INTERNAL_ERROR;
-        }
 
 end_of_data:
-        st->code = st->end_code;
-        st->put_state = PUT_END;
-        goto put_code;
+            st->code = st->end_code;
+            st->put_state = PUT_END;
+            goto put_code;
 flush_code_buffer: /* jump here after put_code */
-        if (st->buf_bits_left < 8) {
-
-    case LZW_TRY_OUT2:
-            if (!*out_avail) {
-                st->entry_state = LZW_TRY_OUT2;
-                return GLZW_NO_OUTPUT_AVAIL;
+            if (st->buf_bits_left < 8) {
+                case LZW_TRY_OUT2:
+                    if (!*out_avail) {
+                        st->entry_state = LZW_TRY_OUT2;
+                        return GLZW_NO_OUTPUT_AVAIL;
+                    }
+                    *out_ptr++ = st->code_buffer;
+                    (*out_avail)--;
             }
-            *out_ptr++ = st->code_buffer;
-            (*out_avail)--;
-        }
-        st->entry_state = LZW_FINISHED;
-        return GLZW_OK;
+            st->entry_state = LZW_FINISHED;
+            return GLZW_OK;
 
-    case LZW_FINISHED:
-        return GLZW_OK;
+        case LZW_FINISHED:
+            return GLZW_OK;
 
-    default:
-        return GLZW_INTERNAL_ERROR;
+        default:
+            return GLZW_INTERNAL_ERROR;
     }
 }
 /* -END- GIF LZW encoder. */
 
 int
-ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) {
-    UINT8* ptr;
-    UINT8* sub_block_ptr;
-    UINT8* sub_block_limit;
-    UINT8* buf_limit;
-    GIFENCODERSTATE *context = (GIFENCODERSTATE*) state->context;
+ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
+    UINT8 *ptr;
+    UINT8 *sub_block_ptr;
+    UINT8 *sub_block_limit;
+    UINT8 *buf_limit;
+    GIFENCODERSTATE *context = (GIFENCODERSTATE *)state->context;
     int r;
 
     UINT32 in_avail, in_used;
@@ -278,9 +288,9 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) {
                 return ptr - buf;
             }
             sub_block_ptr = ptr;
-            sub_block_limit = sub_block_ptr +
-                (256 < buf_limit - sub_block_ptr ?
-                 256 : buf_limit - sub_block_ptr);
+            sub_block_limit =
+                sub_block_ptr +
+                (256 < buf_limit - sub_block_ptr ? 256 : buf_limit - sub_block_ptr);
             *ptr++ = 0;
         }
 
@@ -301,8 +311,9 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) {
             /* get another line of data */
             state->shuffle(
                 state->buffer,
-                (UINT8*) im->image[state->y + state->yoff] +
-                state->xoff * im->pixelsize, state->xsize
+                (UINT8 *)im->image[state->y + state->yoff] +
+                    state->xoff * im->pixelsize,
+                state->xsize
             );
             state->x = 0;
 
@@ -331,10 +342,16 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) {
             }
         }
 
-        in_avail = state->xsize - state->x;   /* bytes left in line */
+        in_avail = state->xsize - state->x; /* bytes left in line */
         out_avail = sub_block_limit - ptr;  /* bytes left in sub-block */
-        r = glzwe(context, &state->buffer[state->x], ptr, &in_avail,
-                &out_avail, state->state == FINISH);
+        r = glzwe(
+            context,
+            &state->buffer[state->x],
+            ptr,
+            &in_avail,
+            &out_avail,
+            state->state == FINISH
+        );
         out_used = sub_block_limit - ptr - out_avail;
         *sub_block_ptr += out_used;
         ptr += out_used;
diff --git a/src/libImaging/HexDecode.c b/src/libImaging/HexDecode.c
index bd16cdbe1da..e26c0e9b348 100644
--- a/src/libImaging/HexDecode.c
+++ b/src/libImaging/HexDecode.c
@@ -49,7 +49,8 @@ ImagingHexDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
             if (++state->x >= state->bytes) {
                 /* Got a full line, unpack it */
                 state->shuffle(
-                    (UINT8 *)im->image[state->y], state->buffer, state->xsize);
+                    (UINT8 *)im->image[state->y], state->buffer, state->xsize
+                );
 
                 state->x = 0;
 
diff --git a/src/libImaging/ImPlatform.h b/src/libImaging/ImPlatform.h
index f6e7fb6b921..c9b7e43b425 100644
--- a/src/libImaging/ImPlatform.h
+++ b/src/libImaging/ImPlatform.h
@@ -7,6 +7,7 @@
  * Copyright (c) Fredrik Lundh 1995-2003.
  */
 
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 /* Check that we have an ANSI compliant compiler */
diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h
index afcd2229bde..31052c68a97 100644
--- a/src/libImaging/Imaging.h
+++ b/src/libImaging/Imaging.h
@@ -60,8 +60,8 @@ typedef struct ImagingHistogramInstance *ImagingHistogram;
 typedef struct ImagingOutlineInstance *ImagingOutline;
 typedef struct ImagingPaletteInstance *ImagingPalette;
 
-/* handle magics (used with PyCObject). */
-#define IMAGING_MAGIC "PIL Imaging"
+/* handle magics (used with PyCapsule). */
+#define IMAGING_MAGIC "Pillow Imaging"
 
 /* pixel types */
 #define IMAGING_TYPE_UINT8 0
@@ -108,15 +108,15 @@ struct ImagingMemoryInstance {
 
 #define IMAGING_PIXEL_1(im, x, y) ((im)->image8[(y)][(x)])
 #define IMAGING_PIXEL_L(im, x, y) ((im)->image8[(y)][(x)])
-#define IMAGING_PIXEL_LA(im, x, y) ((im)->image[(y)][(x)*4])
+#define IMAGING_PIXEL_LA(im, x, y) ((im)->image[(y)][(x) * 4])
 #define IMAGING_PIXEL_P(im, x, y) ((im)->image8[(y)][(x)])
-#define IMAGING_PIXEL_PA(im, x, y) ((im)->image[(y)][(x)*4])
+#define IMAGING_PIXEL_PA(im, x, y) ((im)->image[(y)][(x) * 4])
 #define IMAGING_PIXEL_I(im, x, y) ((im)->image32[(y)][(x)])
 #define IMAGING_PIXEL_F(im, x, y) (((FLOAT32 *)(im)->image32[y])[x])
-#define IMAGING_PIXEL_RGB(im, x, y) ((im)->image[(y)][(x)*4])
-#define IMAGING_PIXEL_RGBA(im, x, y) ((im)->image[(y)][(x)*4])
-#define IMAGING_PIXEL_CMYK(im, x, y) ((im)->image[(y)][(x)*4])
-#define IMAGING_PIXEL_YCbCr(im, x, y) ((im)->image[(y)][(x)*4])
+#define IMAGING_PIXEL_RGB(im, x, y) ((im)->image[(y)][(x) * 4])
+#define IMAGING_PIXEL_RGBA(im, x, y) ((im)->image[(y)][(x) * 4])
+#define IMAGING_PIXEL_CMYK(im, x, y) ((im)->image[(y)][(x) * 4])
+#define IMAGING_PIXEL_YCbCr(im, x, y) ((im)->image[(y)][(x) * 4])
 
 #define IMAGING_PIXEL_UINT8(im, x, y) ((im)->image8[(y)][(x)])
 #define IMAGING_PIXEL_INT32(im, x, y) ((im)->image32[(y)][(x)])
@@ -161,7 +161,10 @@ typedef struct ImagingMemoryArena {
     int stats_reallocated_blocks; /* Number of blocks which were actually reallocated
                                      after retrieving */
     int stats_freed_blocks;       /* Number of freed blocks */
-} * ImagingMemoryArena;
+#ifdef Py_GIL_DISABLED
+    PyMutex mutex;
+#endif
+} *ImagingMemoryArena;
 
 /* Objects */
 /* ------- */
@@ -295,7 +298,8 @@ extern Imaging
 ImagingFill(Imaging im, const void *ink);
 extern int
 ImagingFill2(
-    Imaging into, const void *ink, Imaging mask, int x0, int y0, int x1, int y1);
+    Imaging into, const void *ink, Imaging mask, int x0, int y0, int x1, int y1
+);
 extern Imaging
 ImagingFillBand(Imaging im, int band, int color);
 extern Imaging
@@ -309,7 +313,9 @@ ImagingFlipLeftRight(Imaging imOut, Imaging imIn);
 extern Imaging
 ImagingFlipTopBottom(Imaging imOut, Imaging imIn);
 extern Imaging
-ImagingGaussianBlur(Imaging imOut, Imaging imIn, float xradius, float yradius, int passes);
+ImagingGaussianBlur(
+    Imaging imOut, Imaging imIn, float xradius, float yradius, int passes
+);
 extern Imaging
 ImagingGetBand(Imaging im, int band);
 extern Imaging
@@ -372,7 +378,8 @@ ImagingTransform(
     int y1,
     double a[8],
     int filter,
-    int fill);
+    int fill
+);
 extern Imaging
 ImagingUnsharpMask(Imaging imOut, Imaging im, float radius, int percent, int threshold);
 extern Imaging
@@ -385,7 +392,8 @@ ImagingColorLUT3D_linear(
     int size1D,
     int size2D,
     int size3D,
-    INT16 *table);
+    INT16 *table
+);
 
 extern Imaging
 ImagingCopy2(Imaging imOut, Imaging imIn);
@@ -439,7 +447,8 @@ ImagingDrawArc(
     float end,
     const void *ink,
     int width,
-    int op);
+    int op
+);
 extern int
 ImagingDrawBitmap(Imaging im, int x0, int y0, Imaging bitmap, const void *ink, int op);
 extern int
@@ -454,7 +463,8 @@ ImagingDrawChord(
     const void *ink,
     int fill,
     int width,
-    int op);
+    int op
+);
 extern int
 ImagingDrawEllipse(
     Imaging im,
@@ -465,12 +475,14 @@ ImagingDrawEllipse(
     const void *ink,
     int fill,
     int width,
-    int op);
+    int op
+);
 extern int
 ImagingDrawLine(Imaging im, int x0, int y0, int x1, int y1, const void *ink, int op);
 extern int
 ImagingDrawWideLine(
-    Imaging im, int x0, int y0, int x1, int y1, const void *ink, int width, int op);
+    Imaging im, int x0, int y0, int x1, int y1, const void *ink, int width, int op
+);
 extern int
 ImagingDrawPieslice(
     Imaging im,
@@ -483,11 +495,14 @@ ImagingDrawPieslice(
     const void *ink,
     int fill,
     int width,
-    int op);
+    int op
+);
 extern int
 ImagingDrawPoint(Imaging im, int x, int y, const void *ink, int op);
 extern int
-ImagingDrawPolygon(Imaging im, int points, int *xy, const void *ink, int fill, int width, int op);
+ImagingDrawPolygon(
+    Imaging im, int points, int *xy, const void *ink, int fill, int width, int op
+);
 extern int
 ImagingDrawRectangle(
     Imaging im,
@@ -498,7 +513,8 @@ ImagingDrawRectangle(
     const void *ink,
     int fill,
     int width,
-    int op);
+    int op
+);
 
 /* Level 2 graphics (WORK IN PROGRESS) */
 extern ImagingOutline
@@ -508,7 +524,8 @@ ImagingOutlineDelete(ImagingOutline outline);
 
 extern int
 ImagingDrawOutline(
-    Imaging im, ImagingOutline outline, const void *ink, int fill, int op);
+    Imaging im, ImagingOutline outline, const void *ink, int fill, int op
+);
 
 extern int
 ImagingOutlineMove(ImagingOutline outline, float x, float y);
@@ -516,7 +533,8 @@ extern int
 ImagingOutlineLine(ImagingOutline outline, float x, float y);
 extern int
 ImagingOutlineCurve(
-    ImagingOutline outline, float x1, float y1, float x2, float y2, float x3, float y3);
+    ImagingOutline outline, float x1, float y1, float x2, float y2, float x3, float y3
+);
 extern int
 ImagingOutlineTransform(ImagingOutline outline, double a[6]);
 
@@ -543,7 +561,8 @@ ImagingSavePPM(Imaging im, const char *filename);
 /* Codecs */
 typedef struct ImagingCodecStateInstance *ImagingCodecState;
 typedef int (*ImagingCodec)(
-    Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes);
+    Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes
+);
 
 extern int
 ImagingBcnDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
@@ -573,7 +592,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes)
 #ifdef HAVE_OPENJPEG
 extern int
 ImagingJpeg2KDecode(
-    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
+    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes
+);
 extern int
 ImagingJpeg2KDecodeCleanup(ImagingCodecState state);
 extern int
@@ -584,7 +604,8 @@ ImagingJpeg2KEncodeCleanup(ImagingCodecState state);
 #ifdef HAVE_LIBTIFF
 extern int
 ImagingLibTiffDecode(
-    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
+    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes
+);
 extern int
 ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes);
 #endif
@@ -596,7 +617,8 @@ extern int
 ImagingMspDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
 extern int
 ImagingPackbitsDecode(
-    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
+    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes
+);
 extern int
 ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
 extern int
@@ -609,13 +631,16 @@ extern int
 ImagingRawEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes);
 extern int
 ImagingSgiRleDecode(
-    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
+    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes
+);
 extern int
 ImagingSunRleDecode(
-    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
+    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes
+);
 extern int
 ImagingTgaRleDecode(
-    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
+    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes
+);
 extern int
 ImagingTgaRleEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes);
 extern int
@@ -688,6 +713,15 @@ _imaging_tell_pyFd(PyObject *fd);
 #include "ImagingUtils.h"
 extern UINT8 *clip8_lookups;
 
+/* Mutex lock/unlock helpers */
+#ifdef Py_GIL_DISABLED
+#define MUTEX_LOCK(m) PyMutex_Lock(m)
+#define MUTEX_UNLOCK(m) PyMutex_Unlock(m)
+#else
+#define MUTEX_LOCK(m)
+#define MUTEX_UNLOCK(m)
+#endif
+
 #if defined(__cplusplus)
 }
 #endif
diff --git a/src/libImaging/ImagingUtils.h b/src/libImaging/ImagingUtils.h
index 0c0c1eda917..714458ad02a 100644
--- a/src/libImaging/ImagingUtils.h
+++ b/src/libImaging/ImagingUtils.h
@@ -21,7 +21,7 @@
 
 #define DIV255(a, tmp) (tmp = (a) + 128, SHIFTFORDIV255(tmp))
 
-#define BLEND(mask, in1, in2, tmp1) DIV255(in1 *(255 - mask) + in2 * mask, tmp1)
+#define BLEND(mask, in1, in2, tmp1) DIV255(in1 * (255 - mask) + in2 * mask, tmp1)
 
 #define PREBLEND(mask, in1, in2, tmp1) (MULDIV255(in1, (255 - mask), tmp1) + in2)
 
diff --git a/src/libImaging/Jpeg.h b/src/libImaging/Jpeg.h
index 98eaac28dd6..7cdba902281 100644
--- a/src/libImaging/Jpeg.h
+++ b/src/libImaging/Jpeg.h
@@ -74,7 +74,7 @@ typedef struct {
     /* Optimize Huffman tables (slow) */
     int optimize;
 
-    /* Disable automatic conversion of RGB images to YCbCr if nonzero */
+    /* Disable automatic conversion of RGB images to YCbCr if non-zero */
     int keep_rgb;
 
     /* Stream type (0=full, 1=tables only, 2=image only) */
diff --git a/src/libImaging/Jpeg2K.h b/src/libImaging/Jpeg2K.h
index e8d92f7b6bc..6fbbf7311a1 100644
--- a/src/libImaging/Jpeg2K.h
+++ b/src/libImaging/Jpeg2K.h
@@ -104,10 +104,3 @@ typedef struct {
     int plt;
 
 } JPEG2KENCODESTATE;
-
-/*
- * Local Variables:
- * c-basic-offset: 4
- * End:
- *
- */
diff --git a/src/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c
index cff30e2d0bf..fc927d2f0c0 100644
--- a/src/libImaging/Jpeg2KDecode.c
+++ b/src/libImaging/Jpeg2KDecode.c
@@ -67,7 +67,8 @@ j2k_skip(OPJ_OFF_T p_nb_bytes, void *p_user_data) {
 /* -------------------------------------------------------------------- */
 
 typedef void (*j2k_unpacker_t)(
-    opj_image_t *in, const JPEG2KTILEINFO *tileInfo, const UINT8 *data, Imaging im);
+    opj_image_t *in, const JPEG2KTILEINFO *tileInfo, const UINT8 *data, Imaging im
+);
 
 struct j2k_decode_unpacker {
     const char *mode;
@@ -89,10 +90,8 @@ j2ku_shift(unsigned x, int n) {
 
 static void
 j2ku_gray_l(
-    opj_image_t *in,
-    const JPEG2KTILEINFO *tileinfo,
-    const UINT8 *tiledata,
-    Imaging im) {
+    opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im
+) {
     unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0;
     unsigned w = tileinfo->x1 - tileinfo->x0;
     unsigned h = tileinfo->y1 - tileinfo->y0;
@@ -145,10 +144,8 @@ j2ku_gray_l(
 
 static void
 j2ku_gray_i(
-    opj_image_t *in,
-    const JPEG2KTILEINFO *tileinfo,
-    const UINT8 *tiledata,
-    Imaging im) {
+    opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im
+) {
     unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0;
     unsigned w = tileinfo->x1 - tileinfo->x0;
     unsigned h = tileinfo->y1 - tileinfo->y0;
@@ -183,9 +180,9 @@ j2ku_gray_i(
                 UINT16 *row = (UINT16 *)im->image[y0 + y] + x0;
                 for (x = 0; x < w; ++x) {
                     UINT16 pixel = j2ku_shift(offset + *data++, shift);
-                    #ifdef WORDS_BIGENDIAN
-                        pixel = (pixel >> 8) | (pixel << 8);
-                    #endif
+#ifdef WORDS_BIGENDIAN
+                    pixel = (pixel >> 8) | (pixel << 8);
+#endif
                     *row++ = pixel;
                 }
             }
@@ -204,10 +201,8 @@ j2ku_gray_i(
 
 static void
 j2ku_gray_rgb(
-    opj_image_t *in,
-    const JPEG2KTILEINFO *tileinfo,
-    const UINT8 *tiledata,
-    Imaging im) {
+    opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im
+) {
     unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0;
     unsigned w = tileinfo->x1 - tileinfo->x0;
     unsigned h = tileinfo->y1 - tileinfo->y0;
@@ -268,10 +263,8 @@ j2ku_gray_rgb(
 
 static void
 j2ku_graya_la(
-    opj_image_t *in,
-    const JPEG2KTILEINFO *tileinfo,
-    const UINT8 *tiledata,
-    Imaging im) {
+    opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im
+) {
     unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0;
     unsigned w = tileinfo->x1 - tileinfo->x0;
     unsigned h = tileinfo->y1 - tileinfo->y0;
@@ -347,10 +340,8 @@ j2ku_graya_la(
 
 static void
 j2ku_srgb_rgb(
-    opj_image_t *in,
-    const JPEG2KTILEINFO *tileinfo,
-    const UINT8 *tiledata,
-    Imaging im) {
+    opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im
+) {
     unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0;
     unsigned w = tileinfo->x1 - tileinfo->x0;
     unsigned h = tileinfo->y1 - tileinfo->y0;
@@ -413,10 +404,8 @@ j2ku_srgb_rgb(
 
 static void
 j2ku_sycc_rgb(
-    opj_image_t *in,
-    const JPEG2KTILEINFO *tileinfo,
-    const UINT8 *tiledata,
-    Imaging im) {
+    opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im
+) {
     unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0;
     unsigned w = tileinfo->x1 - tileinfo->x0;
     unsigned h = tileinfo->y1 - tileinfo->y0;
@@ -482,10 +471,8 @@ j2ku_sycc_rgb(
 
 static void
 j2ku_srgba_rgba(
-    opj_image_t *in,
-    const JPEG2KTILEINFO *tileinfo,
-    const UINT8 *tiledata,
-    Imaging im) {
+    opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im
+) {
     unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0;
     unsigned w = tileinfo->x1 - tileinfo->x0;
     unsigned h = tileinfo->y1 - tileinfo->y0;
@@ -547,10 +534,8 @@ j2ku_srgba_rgba(
 
 static void
 j2ku_sycca_rgba(
-    opj_image_t *in,
-    const JPEG2KTILEINFO *tileinfo,
-    const UINT8 *tiledata,
-    Imaging im) {
+    opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im
+) {
     unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0;
     unsigned w = tileinfo->x1 - tileinfo->x0;
     unsigned h = tileinfo->y1 - tileinfo->y0;
@@ -615,6 +600,8 @@ j2ku_sycca_rgba(
 
 static const struct j2k_decode_unpacker j2k_unpackers[] = {
     {"L", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_l},
+    {"P", OPJ_CLRSPC_SRGB, 1, 0, j2ku_gray_l},
+    {"PA", OPJ_CLRSPC_SRGB, 2, 0, j2ku_graya_la},
     {"I;16", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_i},
     {"I;16B", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_i},
     {"LA", OPJ_CLRSPC_GRAY, 2, 0, j2ku_graya_la},
@@ -630,6 +617,7 @@ static const struct j2k_decode_unpacker j2k_unpackers[] = {
     {"RGBA", OPJ_CLRSPC_SYCC, 3, 1, j2ku_sycc_rgb},
     {"RGBA", OPJ_CLRSPC_SRGB, 4, 1, j2ku_srgba_rgba},
     {"RGBA", OPJ_CLRSPC_SYCC, 4, 1, j2ku_sycca_rgba},
+    {"CMYK", OPJ_CLRSPC_CMYK, 4, 1, j2ku_srgba_rgba},
 };
 
 /* -------------------------------------------------------------------- */
@@ -710,8 +698,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
     }
 
     /* Check that this image is something we can handle */
-    if (image->numcomps < 1 || image->numcomps > 4 ||
-        image->color_space == OPJ_CLRSPC_UNKNOWN) {
+    if (image->numcomps < 1 || image->numcomps > 4) {
         state->errcode = IMAGING_CODEC_BROKEN;
         state->state = J2K_STATE_FAILED;
         goto quick_exit;
@@ -756,7 +743,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
     /* Find the correct unpacker */
     color_space = image->color_space;
 
-    if (color_space == OPJ_CLRSPC_UNSPECIFIED) {
+    if (color_space == OPJ_CLRSPC_UNKNOWN || color_space == OPJ_CLRSPC_UNSPECIFIED) {
         switch (image->numcomps) {
             case 1:
             case 2:
@@ -775,7 +762,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
                         color_space = OPJ_CLRSPC_SYCC;
                         break;
                 }
-            break;
+                break;
         }
     }
 
@@ -812,7 +799,8 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
                 &tile_info.x1,
                 &tile_info.y1,
                 &tile_info.nb_comps,
-                &should_continue)) {
+                &should_continue
+            )) {
             state->errcode = IMAGING_CODEC_BROKEN;
             state->state = J2K_STATE_FAILED;
             goto quick_exit;
@@ -861,7 +849,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
          a, and then a malicious file could have a smaller tile_bytes
         */
 
-        for (n=0; n < tile_info.nb_comps; n++) {
+        for (n = 0; n < tile_info.nb_comps; n++) {
             // see csize /acsize calcs
             int csize = (image->comps[n].prec + 7) >> 3;
             csize = (csize == 3) ? 4 : csize;
@@ -903,7 +891,8 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
                 tile_info.tile_index,
                 (OPJ_BYTE *)state->buffer,
                 tile_info.data_size,
-                stream)) {
+                stream
+            )) {
             state->errcode = IMAGING_CODEC_BROKEN;
             state->state = J2K_STATE_FAILED;
             goto quick_exit;
@@ -990,10 +979,3 @@ ImagingJpeg2KVersion(void) {
 }
 
 #endif /* HAVE_OPENJPEG */
-
-/*
- * Local Variables:
- * c-basic-offset: 4
- * End:
- *
- */
diff --git a/src/libImaging/Jpeg2KEncode.c b/src/libImaging/Jpeg2KEncode.c
index 3295373fd64..d30ccde603e 100644
--- a/src/libImaging/Jpeg2KEncode.c
+++ b/src/libImaging/Jpeg2KEncode.c
@@ -89,7 +89,8 @@ j2k_seek(OPJ_OFF_T p_nb_bytes, void *p_user_data) {
 /* -------------------------------------------------------------------- */
 
 typedef void (*j2k_pack_tile_t)(
-    Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h);
+    Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h
+);
 
 static void
 j2k_pack_l(Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h) {
@@ -157,7 +158,8 @@ j2k_pack_rgb(Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsig
 
 static void
 j2k_pack_rgba(
-    Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h) {
+    Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h
+) {
     UINT8 *pr = buf;
     UINT8 *pg = pr + w * h;
     UINT8 *pb = pg + w * h;
@@ -205,8 +207,8 @@ j2k_set_cinema_params(Imaging im, int components, opj_cparameters_t *params) {
 
     if (params->cp_cinema == OPJ_CINEMA4K_24) {
         float max_rate =
-            ((float)(components * im->xsize * im->ysize * 8) /
-             (CINEMA_24_CS_LENGTH * 8));
+            ((float)(components * im->xsize * im->ysize * 8) / (CINEMA_24_CS_LENGTH * 8)
+            );
 
         params->POC[0].tile = 1;
         params->POC[0].resno0 = 0;
@@ -241,8 +243,8 @@ j2k_set_cinema_params(Imaging im, int components, opj_cparameters_t *params) {
         params->max_comp_size = COMP_24_CS_MAX_LENGTH;
     } else {
         float max_rate =
-            ((float)(components * im->xsize * im->ysize * 8) /
-             (CINEMA_48_CS_LENGTH * 8));
+            ((float)(components * im->xsize * im->ysize * 8) / (CINEMA_48_CS_LENGTH * 8)
+            );
 
         for (n = 0; n < params->tcp_numlayers; ++n) {
             rate = 0;
@@ -383,8 +385,7 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
         float *pq;
 
         if (len > 0) {
-            if ((size_t)len >
-                sizeof(params.tcp_rates) / sizeof(params.tcp_rates[0])) {
+            if ((size_t)len > sizeof(params.tcp_rates) / sizeof(params.tcp_rates[0])) {
                 len = sizeof(params.tcp_rates) / sizeof(params.tcp_rates[0]);
             }
 
@@ -464,7 +465,8 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
     }
 
     if (!context->num_resolutions) {
-        while (tile_width < (1U << (params.numresolution - 1U)) || tile_height < (1U << (params.numresolution - 1U))) {
+        while (tile_width < (1U << (params.numresolution - 1U)) ||
+               tile_height < (1U << (params.numresolution - 1U))) {
             params.numresolution -= 1;
         }
     }
@@ -650,10 +652,3 @@ ImagingJpeg2KEncodeCleanup(ImagingCodecState state) {
 }
 
 #endif /* HAVE_OPENJPEG */
-
-/*
- * Local Variables:
- * c-basic-offset: 4
- * End:
- *
- */
diff --git a/src/libImaging/JpegDecode.c b/src/libImaging/JpegDecode.c
index 55d10a81aec..2970f56d1af 100644
--- a/src/libImaging/JpegDecode.c
+++ b/src/libImaging/JpegDecode.c
@@ -48,7 +48,7 @@ char *libjpeg_turbo_version = NULL;
 #endif
 
 int
-ImagingJpegUseJCSExtensions() {
+ImagingJpegUseJCSExtensions(void) {
     int use_jcs_extensions = 0;
 #ifdef JCS_EXTENSIONS
 #if defined(LIBJPEG_TURBO_VERSION_NUMBER)
@@ -180,7 +180,7 @@ ImagingJpegDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t by
 
             /* Decoder settings */
 
-            /* jpegmode indicates whats in the file; if not set, we'll
+            /* jpegmode indicates what's in the file; if not set, we'll
                trust the decoder */
             if (strcmp(context->jpegmode, "L") == 0) {
                 context->cinfo.jpeg_color_space = JCS_GRAYSCALE;
@@ -206,9 +206,8 @@ ImagingJpegDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t by
                 context->cinfo.out_color_space = JCS_EXT_RGBX;
             }
 #endif
-            else if (
-                strcmp(context->rawmode, "CMYK") == 0 ||
-                strcmp(context->rawmode, "CMYK;I") == 0) {
+            else if (strcmp(context->rawmode, "CMYK") == 0 ||
+                     strcmp(context->rawmode, "CMYK;I") == 0) {
                 context->cinfo.out_color_space = JCS_CMYK;
             } else if (strcmp(context->rawmode, "YCbCr") == 0) {
                 context->cinfo.out_color_space = JCS_YCbCr;
@@ -256,7 +255,8 @@ ImagingJpegDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t by
                     (UINT8 *)im->image[state->y + state->yoff] +
                         state->xoff * im->pixelsize,
                     state->buffer,
-                    state->xsize);
+                    state->xsize
+                );
                 state->y++;
             }
             if (ok != 1) {
diff --git a/src/libImaging/JpegEncode.c b/src/libImaging/JpegEncode.c
index 00f3d5f74db..4372d51d5c3 100644
--- a/src/libImaging/JpegEncode.c
+++ b/src/libImaging/JpegEncode.c
@@ -145,8 +145,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                     case JCS_EXT_RGBX:
 #endif
                         switch (context->subsampling) {
-                            case -1:  /* Default */
-                            case 0:   /* No subsampling */
+                            case -1: /* Default */
+                            case 0:  /* No subsampling */
                                 break;
                             default:
                                 /* Would subsample the green and blue
@@ -175,7 +175,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                         i,
                         &context->qtables[i * DCTSIZE2],
                         quality,
-                        FALSE);
+                        FALSE
+                    );
                     context->cinfo.comp_info[i].quant_tbl_no = i;
                     last_q = i;
                 }
@@ -183,7 +184,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                     // jpeg_set_defaults created two qtables internally, but we only
                     // wanted one.
                     jpeg_add_quant_table(
-                        &context->cinfo, 1, &context->qtables[0], quality, FALSE);
+                        &context->cinfo, 1, &context->qtables[0], quality, FALSE
+                    );
                 }
                 for (i = last_q; i < context->cinfo.num_components; i++) {
                     context->cinfo.comp_info[i].quant_tbl_no = last_q;
@@ -273,7 +275,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                     &context->cinfo,
                     JPEG_APP0 + 1,
                     (unsigned char *)context->rawExif,
-                    context->rawExifLen);
+                    context->rawExifLen
+                );
             }
 
             state->state++;
@@ -289,7 +292,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                 memcpy(
                     context->destination.pub.next_output_byte,
                     context->extra + context->extra_offset,
-                    n);
+                    n
+                );
                 context->destination.pub.next_output_byte += n;
                 context->destination.pub.free_in_buffer -= n;
                 context->extra_offset += n;
@@ -305,7 +309,12 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
         case 4:
 
             if (context->comment) {
-                jpeg_write_marker(&context->cinfo, JPEG_COM, (unsigned char *)context->comment, context->comment_size);
+                jpeg_write_marker(
+                    &context->cinfo,
+                    JPEG_COM,
+                    (unsigned char *)context->comment,
+                    context->comment_size
+                );
             }
             state->state++;
 
@@ -320,7 +329,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                     state->buffer,
                     (UINT8 *)im->image[state->y + state->yoff] +
                         state->xoff * im->pixelsize,
-                    state->xsize);
+                    state->xsize
+                );
                 ok = jpeg_write_scanlines(&context->cinfo, &state->buffer, 1);
                 if (ok != 1) {
                     break;
diff --git a/src/libImaging/Matrix.c b/src/libImaging/Matrix.c
index 182eb62a7e6..ec7f4d93e06 100644
--- a/src/libImaging/Matrix.c
+++ b/src/libImaging/Matrix.c
@@ -24,11 +24,11 @@ ImagingConvertMatrix(Imaging im, const char *mode, float m[]) {
     ImagingSectionCookie cookie;
 
     /* Assume there's enough data in the buffer */
-    if (!im) {
+    if (!im || im->bands != 3) {
         return (Imaging)ImagingError_ModeError();
     }
 
-    if (strcmp(mode, "L") == 0 && im->bands == 3) {
+    if (strcmp(mode, "L") == 0) {
         imOut = ImagingNewDirty("L", im->xsize, im->ysize);
         if (!imOut) {
             return NULL;
@@ -47,7 +47,7 @@ ImagingConvertMatrix(Imaging im, const char *mode, float m[]) {
         }
         ImagingSectionLeave(&cookie);
 
-    } else if (strlen(mode) == 3 && im->bands == 3) {
+    } else if (strlen(mode) == 3) {
         imOut = ImagingNewDirty(mode, im->xsize, im->ysize);
         if (!imOut) {
             return NULL;
diff --git a/src/libImaging/Pack.c b/src/libImaging/Pack.c
index d47344245cc..c29473d90db 100644
--- a/src/libImaging/Pack.c
+++ b/src/libImaging/Pack.c
@@ -258,16 +258,6 @@ void
 ImagingPackRGB(UINT8 *out, const UINT8 *in, int pixels) {
     int i = 0;
     /* RGB triplets */
-#ifdef __sparc
-    /* SPARC CPUs cannot read integers from nonaligned addresses. */
-    for (; i < pixels; i++) {
-        out[0] = in[R];
-        out[1] = in[G];
-        out[2] = in[B];
-        out += 3;
-        in += 4;
-    }
-#else
     for (; i < pixels - 1; i++) {
         memcpy(out, in + i * 4, 4);
         out += 3;
@@ -278,7 +268,6 @@ ImagingPackRGB(UINT8 *out, const UINT8 *in, int pixels) {
         out[2] = in[i * 4 + B];
         out += 3;
     }
-#endif
 }
 
 void
@@ -339,7 +328,7 @@ ImagingPackXBGR(UINT8 *out, const UINT8 *in, int pixels) {
 void
 ImagingPackBGRA(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
-    /* BGRX, reversed bytes with right padding */
+    /* BGRA, reversed bytes with right alpha */
     for (i = 0; i < pixels; i++) {
         out[0] = in[B];
         out[1] = in[G];
@@ -353,7 +342,7 @@ ImagingPackBGRA(UINT8 *out, const UINT8 *in, int pixels) {
 void
 ImagingPackABGR(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
-    /* XBGR, reversed bytes with left padding */
+    /* ABGR, reversed bytes with left alpha */
     for (i = 0; i < pixels; i++) {
         out[0] = in[A];
         out[1] = in[B];
diff --git a/src/libImaging/PackDecode.c b/src/libImaging/PackDecode.c
index 7dd432b91c2..52f1ac502bd 100644
--- a/src/libImaging/PackDecode.c
+++ b/src/libImaging/PackDecode.c
@@ -17,7 +17,8 @@
 
 int
 ImagingPackbitsDecode(
-    Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t bytes) {
+    Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t bytes
+) {
     UINT8 n;
     UINT8 *ptr;
     int i;
@@ -79,7 +80,8 @@ ImagingPackbitsDecode(
                 (UINT8 *)im->image[state->y + state->yoff] +
                     state->xoff * im->pixelsize,
                 state->buffer,
-                state->xsize);
+                state->xsize
+            );
 
             state->x = 0;
 
diff --git a/src/libImaging/Paste.c b/src/libImaging/Paste.c
index 6684b11efe3..86085942a2e 100644
--- a/src/libImaging/Paste.c
+++ b/src/libImaging/Paste.c
@@ -33,7 +33,8 @@ paste(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* paste opaque region */
 
     int y;
@@ -59,21 +60,39 @@ paste_mask_1(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* paste with mode "1" mask */
 
     int x, y;
 
     if (imOut->image8) {
+        int in_i16 = strncmp(imIn->mode, "I;16", 4) == 0;
+        int out_i16 = strncmp(imOut->mode, "I;16", 4) == 0;
         for (y = 0; y < ysize; y++) {
             UINT8 *out = imOut->image8[y + dy] + dx;
+            if (out_i16) {
+                out += dx;
+            }
             UINT8 *in = imIn->image8[y + sy] + sx;
+            if (in_i16) {
+                in += sx;
+            }
             UINT8 *mask = imMask->image8[y + sy] + sx;
             for (x = 0; x < xsize; x++) {
-                if (*mask++) {
+                if (*mask) {
                     *out = *in;
                 }
-                out++, in++;
+                if (in_i16) {
+                    in++;
+                }
+                if (out_i16) {
+                    out++;
+                    if (*mask) {
+                        *out = *in;
+                    }
+                }
+                out++, in++, mask++;
             }
         }
 
@@ -103,7 +122,8 @@ paste_mask_L(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* paste with mode "L" matte */
 
     int x, y;
@@ -150,7 +170,8 @@ paste_mask_RGBA(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* paste with mode "RGBA" matte */
 
     int x, y;
@@ -197,7 +218,8 @@ paste_mask_RGBa(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* paste with mode "RGBa" matte */
 
     int x, y;
@@ -235,7 +257,8 @@ paste_mask_RGBa(
 
 int
 ImagingPaste(
-    Imaging imOut, Imaging imIn, Imaging imMask, int dx0, int dy0, int dx1, int dy1) {
+    Imaging imOut, Imaging imIn, Imaging imMask, int dx0, int dy0, int dx1, int dy1
+) {
     int xsize, ysize;
     int pixelsize;
     int sx0, sy0;
@@ -298,13 +321,15 @@ ImagingPaste(
     } else if (strcmp(imMask->mode, "LA") == 0 || strcmp(imMask->mode, "RGBA") == 0) {
         ImagingSectionEnter(&cookie);
         paste_mask_RGBA(
-            imOut, imIn, imMask, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize);
+            imOut, imIn, imMask, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize
+        );
         ImagingSectionLeave(&cookie);
 
     } else if (strcmp(imMask->mode, "RGBa") == 0) {
         ImagingSectionEnter(&cookie);
         paste_mask_RGBa(
-            imOut, imIn, imMask, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize);
+            imOut, imIn, imMask, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize
+        );
         ImagingSectionLeave(&cookie);
 
     } else {
@@ -317,13 +342,8 @@ ImagingPaste(
 
 static inline void
 fill(
-    Imaging imOut,
-    const void *ink_,
-    int dx,
-    int dy,
-    int xsize,
-    int ysize,
-    int pixelsize) {
+    Imaging imOut, const void *ink_, int dx, int dy, int xsize, int ysize, int pixelsize
+) {
     /* fill opaque region */
 
     int x, y;
@@ -361,7 +381,8 @@ fill_mask_1(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* fill with mode "1" mask */
 
     int x, y;
@@ -408,22 +429,24 @@ fill_mask_L(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* fill with mode "L" matte */
 
     int x, y, i;
     unsigned int tmp1;
 
     if (imOut->image8) {
+        int i16 = strncmp(imOut->mode, "I;16", 4) == 0;
         for (y = 0; y < ysize; y++) {
             UINT8 *out = imOut->image8[y + dy] + dx;
-            if (strncmp(imOut->mode, "I;16", 4) == 0) {
+            if (i16) {
                 out += dx;
             }
             UINT8 *mask = imMask->image8[y + sy] + sx;
             for (x = 0; x < xsize; x++) {
                 *out = BLEND(*mask, *out, ink[0], tmp1);
-                if (strncmp(imOut->mode, "I;16", 4) == 0) {
+                if (i16) {
                     out++;
                     *out = BLEND(*mask, *out, ink[1], tmp1);
                 }
@@ -432,11 +455,10 @@ fill_mask_L(
         }
 
     } else {
-        int alpha_channel = strcmp(imOut->mode, "RGBa") == 0 ||
-                            strcmp(imOut->mode, "RGBA") == 0 ||
-                            strcmp(imOut->mode, "La") == 0 ||
-                            strcmp(imOut->mode, "LA") == 0 ||
-                            strcmp(imOut->mode, "PA") == 0;
+        int alpha_channel =
+            strcmp(imOut->mode, "RGBa") == 0 || strcmp(imOut->mode, "RGBA") == 0 ||
+            strcmp(imOut->mode, "La") == 0 || strcmp(imOut->mode, "LA") == 0 ||
+            strcmp(imOut->mode, "PA") == 0;
         for (y = 0; y < ysize; y++) {
             UINT8 *out = (UINT8 *)imOut->image[y + dy] + dx * pixelsize;
             UINT8 *mask = (UINT8 *)imMask->image[y + sy] + sx;
@@ -467,7 +489,8 @@ fill_mask_RGBA(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* fill with mode "RGBA" matte */
 
     int x, y, i;
@@ -512,7 +535,8 @@ fill_mask_RGBa(
     int sy,
     int xsize,
     int ysize,
-    int pixelsize) {
+    int pixelsize
+) {
     /* fill with mode "RGBa" matte */
 
     int x, y, i;
@@ -548,13 +572,8 @@ fill_mask_RGBa(
 
 int
 ImagingFill2(
-    Imaging imOut,
-    const void *ink,
-    Imaging imMask,
-    int dx0,
-    int dy0,
-    int dx1,
-    int dy1) {
+    Imaging imOut, const void *ink, Imaging imMask, int dx0, int dy0, int dx1, int dy1
+) {
     ImagingSectionCookie cookie;
     int xsize, ysize;
     int pixelsize;
diff --git a/src/libImaging/PcxDecode.c b/src/libImaging/PcxDecode.c
index c95ffc8692c..942c8dc224d 100644
--- a/src/libImaging/PcxDecode.c
+++ b/src/libImaging/PcxDecode.c
@@ -68,7 +68,8 @@ ImagingPcxDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
                     memmove(
                         &state->buffer[i * state->xsize],
                         &state->buffer[i * stride],
-                        state->xsize);
+                        state->xsize
+                    );
                 }
             }
             /* Got a full line, unpack it */
@@ -76,7 +77,8 @@ ImagingPcxDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
                 (UINT8 *)im->image[state->y + state->yoff] +
                     state->xoff * im->pixelsize,
                 state->buffer,
-                state->xsize);
+                state->xsize
+            );
 
             state->x = 0;
 
diff --git a/src/libImaging/PcxEncode.c b/src/libImaging/PcxEncode.c
index 549614bfd39..625cf7ffa72 100644
--- a/src/libImaging/PcxEncode.c
+++ b/src/libImaging/PcxEncode.c
@@ -71,7 +71,8 @@ ImagingPcxEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                     state->buffer,
                     (UINT8 *)im->image[state->y + state->yoff] +
                         state->xoff * im->pixelsize,
-                    state->xsize);
+                    state->xsize
+                );
 
                 state->y += 1;
 
diff --git a/src/libImaging/Point.c b/src/libImaging/Point.c
index 8883578cbff..6a4060b4bc1 100644
--- a/src/libImaging/Point.c
+++ b/src/libImaging/Point.c
@@ -134,7 +134,7 @@ ImagingPoint(Imaging imIn, const char *mode, const void *table) {
     ImagingSectionCookie cookie;
     Imaging imOut;
     im_point_context context;
-    void (*point)(Imaging imIn, Imaging imOut, im_point_context * context);
+    void (*point)(Imaging imIn, Imaging imOut, im_point_context *context);
 
     if (!imIn) {
         return (Imaging)ImagingError_ModeError();
@@ -197,8 +197,8 @@ ImagingPoint(Imaging imIn, const char *mode, const void *table) {
     return imOut;
 
 mode_mismatch:
-    return (Imaging)ImagingError_ValueError(
-        "point operation not supported for this mode");
+    return (Imaging
+    )ImagingError_ValueError("point operation not supported for this mode");
 }
 
 Imaging
diff --git a/src/libImaging/Quant.c b/src/libImaging/Quant.c
index 398fbf6db57..a489a882db2 100644
--- a/src/libImaging/Quant.c
+++ b/src/libImaging/Quant.c
@@ -36,7 +36,8 @@
 #define UINT32_MAX 0xffffffff
 #endif
 
-#define NO_OUTPUT
+// #define DEBUG
+// #define TEST_NEAREST_NEIGHBOUR
 
 typedef struct {
     uint32_t scale;
@@ -103,7 +104,8 @@ static uint32_t
 pixel_hash(const HashTable *h, const Pixel pixel) {
     PixelHashData *d = (PixelHashData *)hashtable_get_user_data(h);
     return PIXEL_HASH(
-        pixel.c.r >> d->scale, pixel.c.g >> d->scale, pixel.c.b >> d->scale);
+        pixel.c.r >> d->scale, pixel.c.g >> d->scale, pixel.c.b >> d->scale
+    );
 }
 
 static int
@@ -111,9 +113,11 @@ pixel_cmp(const HashTable *h, const Pixel pixel1, const Pixel pixel2) {
     PixelHashData *d = (PixelHashData *)hashtable_get_user_data(h);
     uint32_t A, B;
     A = PIXEL_HASH(
-        pixel1.c.r >> d->scale, pixel1.c.g >> d->scale, pixel1.c.b >> d->scale);
+        pixel1.c.r >> d->scale, pixel1.c.g >> d->scale, pixel1.c.b >> d->scale
+    );
     B = PIXEL_HASH(
-        pixel2.c.r >> d->scale, pixel2.c.g >> d->scale, pixel2.c.b >> d->scale);
+        pixel2.c.r >> d->scale, pixel2.c.g >> d->scale, pixel2.c.b >> d->scale
+    );
     return (A == B) ? 0 : ((A < B) ? -1 : 1);
 }
 
@@ -129,7 +133,8 @@ new_count_func(const HashTable *h, const Pixel key, uint32_t *val) {
 
 static void
 rehash_collide(
-    const HashTable *h, Pixel *keyp, uint32_t *valp, Pixel newkey, uint32_t newval) {
+    const HashTable *h, Pixel *keyp, uint32_t *valp, Pixel newkey, uint32_t newval
+) {
     *valp += newval;
 }
 
@@ -140,7 +145,7 @@ create_pixel_hash(Pixel *pixelData, uint32_t nPixels) {
     PixelHashData *d;
     HashTable *hash;
     uint32_t i;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     uint32_t timer, timer2, timer3;
 #endif
 
@@ -152,32 +157,33 @@ create_pixel_hash(Pixel *pixelData, uint32_t nPixels) {
     hash = hashtable_new(pixel_hash, pixel_cmp);
     hashtable_set_user_data(hash, d);
     d->scale = 0;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     timer = timer3 = clock();
 #endif
     for (i = 0; i < nPixels; i++) {
         if (!hashtable_insert_or_update_computed(
-                hash, pixelData[i], new_count_func, exists_count_func)) {
+                hash, pixelData[i], new_count_func, exists_count_func
+            )) {
             ;
         }
         while (hashtable_get_count(hash) > MAX_HASH_ENTRIES) {
             d->scale++;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             printf("rehashing - new scale: %d\n", (int)d->scale);
             timer2 = clock();
 #endif
             hashtable_rehash_compute(hash, rehash_collide);
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             timer2 = clock() - timer2;
             printf("rehash took %f sec\n", timer2 / (double)CLOCKS_PER_SEC);
             timer += timer2;
 #endif
         }
     }
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("inserts took %f sec\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
 #endif
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("total        %f sec\n", (clock() - timer3) / (double)CLOCKS_PER_SEC);
 #endif
     return hash;
@@ -260,8 +266,7 @@ mergesort_pixels(PixelList *head, int i) {
         return head;
     }
     for (c = t = head; c && t;
-         c = c->next[i], t = (t->next[i]) ? t->next[i]->next[i] : NULL)
-        ;
+         c = c->next[i], t = (t->next[i]) ? t->next[i]->next[i] : NULL);
     if (c) {
         if (c->prev[i]) {
             c->prev[i]->next[i] = NULL;
@@ -300,18 +305,18 @@ mergesort_pixels(PixelList *head, int i) {
     return head;
 }
 
-#if defined(TEST_MERGESORT) || defined(TEST_SORTED)
+#ifdef DEBUG
 static int
 test_sorted(PixelList *pl[3]) {
-    int i, n, l;
+    int i, l;
     PixelList *t;
 
     for (i = 0; i < 3; i++) {
-        n = 0;
         l = 256;
         for (t = pl[i]; t; t = t->next[i]) {
-            if (l < t->p.a.v[i])
+            if (l < t->p.a.v[i]) {
                 return 0;
+            }
             l = t->p.a.v[i];
         }
     }
@@ -336,30 +341,29 @@ splitlists(
     PixelList *nt[2][3],
     uint32_t nCount[2],
     int axis,
-    uint32_t pixelCount) {
+    uint32_t pixelCount
+) {
     uint32_t left;
 
     PixelList *l, *r, *c, *n;
     int i;
     int nRight;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     int nLeft;
 #endif
     int splitColourVal;
 
-#ifdef TEST_SPLIT
+#ifdef DEBUG
     {
         PixelList *_prevTest, *_nextTest;
         int _i, _nextCount[3], _prevCount[3];
         for (_i = 0; _i < 3; _i++) {
             for (_nextCount[_i] = 0, _nextTest = h[_i];
                  _nextTest && _nextTest->next[_i];
-                 _nextTest = _nextTest->next[_i], _nextCount[_i]++)
-                ;
+                 _nextTest = _nextTest->next[_i], _nextCount[_i]++);
             for (_prevCount[_i] = 0, _prevTest = t[_i];
                  _prevTest && _prevTest->prev[_i];
-                 _prevTest = _prevTest->prev[_i], _prevCount[_i]++)
-                ;
+                 _prevTest = _prevTest->prev[_i], _prevCount[_i]++);
             if (_nextTest != t[_i]) {
                 printf("next-list of axis %d does not end at tail\n", _i);
                 exit(1);
@@ -368,10 +372,8 @@ splitlists(
                 printf("prev-list of axis %d does not end at head\n", _i);
                 exit(1);
             }
-            for (; _nextTest && _nextTest->prev[_i]; _nextTest = _nextTest->prev[_i])
-                ;
-            for (; _prevTest && _prevTest->next[_i]; _prevTest = _prevTest->next[_i])
-                ;
+            for (; _nextTest && _nextTest->prev[_i]; _nextTest = _nextTest->prev[_i]);
+            for (; _prevTest && _prevTest->next[_i]; _prevTest = _prevTest->next[_i]);
             if (_nextTest != h[_i]) {
                 printf("next-list of axis %d does not loop back to head\n", _i);
                 exit(1);
@@ -392,7 +394,8 @@ splitlists(
                     _prevCount[2],
                     _nextCount[0],
                     _nextCount[1],
-                    _nextCount[2]);
+                    _nextCount[2]
+                );
                 exit(1);
             }
         }
@@ -400,14 +403,14 @@ splitlists(
 #endif
     nCount[0] = nCount[1] = 0;
     nRight = 0;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     nLeft = 0;
 #endif
     for (left = 0, c = h[axis]; c;) {
         left = left + c->count;
         nCount[0] += c->count;
         c->flag = 0;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
         nLeft++;
 #endif
         c = c->next[axis];
@@ -422,7 +425,7 @@ splitlists(
                 break;
             }
             c->flag = 0;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             nLeft++;
 #endif
             nCount[0] += c->count;
@@ -440,14 +443,14 @@ splitlists(
             }
             c->flag = 1;
             nRight++;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             nLeft--;
 #endif
             nCount[0] -= c->count;
             nCount[1] += c->count;
         }
     }
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     if (!nLeft) {
         for (c = h[axis]; c; c = c->next[axis]) {
             printf("[%d %d %d]\n", c->p.c.r, c->p.c.g, c->p.c.b);
@@ -509,7 +512,7 @@ split(BoxNode *node) {
     gl = node->tail[1]->p.c.g;
     bh = node->head[2]->p.c.b;
     bl = node->tail[2]->p.c.b;
-#ifdef TEST_SPLIT
+#ifdef DEBUG
     printf("splitting node [%d %d %d] [%d %d %d] ", rl, gl, bl, rh, gh, bh);
 #endif
     f[0] = (rh - rl) * 77;
@@ -524,11 +527,8 @@ split(BoxNode *node) {
             axis = i;
         }
     }
-#ifdef TEST_SPLIT
+#ifdef DEBUG
     printf("along axis %d\n", axis + 1);
-#endif
-
-#ifdef TEST_SPLIT
     {
         PixelList *_prevTest, *_nextTest;
         int _i, _nextCount[3], _prevCount[3];
@@ -536,34 +536,32 @@ split(BoxNode *node) {
             if (node->tail[_i]->next[_i]) {
                 printf("tail is not tail\n");
                 printf(
-                    "node->tail[%d]->next[%d]=%p\n", _i, _i, node->tail[_i]->next[_i]);
+                    "node->tail[%d]->next[%d]=%p\n", _i, _i, node->tail[_i]->next[_i]
+                );
             }
             if (node->head[_i]->prev[_i]) {
                 printf("head is not head\n");
                 printf(
-                    "node->head[%d]->prev[%d]=%p\n", _i, _i, node->head[_i]->prev[_i]);
+                    "node->head[%d]->prev[%d]=%p\n", _i, _i, node->head[_i]->prev[_i]
+                );
             }
         }
 
         for (_i = 0; _i < 3; _i++) {
             for (_nextCount[_i] = 0, _nextTest = node->head[_i];
                  _nextTest && _nextTest->next[_i];
-                 _nextTest = _nextTest->next[_i], _nextCount[_i]++)
-                ;
+                 _nextTest = _nextTest->next[_i], _nextCount[_i]++);
             for (_prevCount[_i] = 0, _prevTest = node->tail[_i];
                  _prevTest && _prevTest->prev[_i];
-                 _prevTest = _prevTest->prev[_i], _prevCount[_i]++)
-                ;
+                 _prevTest = _prevTest->prev[_i], _prevCount[_i]++);
             if (_nextTest != node->tail[_i]) {
                 printf("next-list of axis %d does not end at tail\n", _i);
             }
             if (_prevTest != node->head[_i]) {
                 printf("prev-list of axis %d does not end at head\n", _i);
             }
-            for (; _nextTest && _nextTest->prev[_i]; _nextTest = _nextTest->prev[_i])
-                ;
-            for (; _prevTest && _prevTest->next[_i]; _prevTest = _prevTest->next[_i])
-                ;
+            for (; _nextTest && _nextTest->prev[_i]; _nextTest = _nextTest->prev[_i]);
+            for (; _prevTest && _prevTest->next[_i]; _prevTest = _prevTest->next[_i]);
             if (_nextTest != node->head[_i]) {
                 printf("next-list of axis %d does not loop back to head\n", _i);
             }
@@ -582,20 +580,22 @@ split(BoxNode *node) {
                     _prevCount[2],
                     _nextCount[0],
                     _nextCount[1],
-                    _nextCount[2]);
+                    _nextCount[2]
+                );
             }
         }
     }
 #endif
     node->axis = axis;
     if (!splitlists(
-            node->head, node->tail, heads, tails, newCounts, axis, node->pixelCount)) {
-#ifndef NO_OUTPUT
+            node->head, node->tail, heads, tails, newCounts, axis, node->pixelCount
+        )) {
+#ifdef DEBUG
         printf("list split failed.\n");
 #endif
         return 0;
     }
-#ifdef TEST_SPLIT
+#ifdef DEBUG
     if (!test_sorted(heads[0])) {
         printf("bug in split");
         exit(1);
@@ -621,7 +621,7 @@ split(BoxNode *node) {
         node->head[i] = NULL;
         node->tail[i] = NULL;
     }
-#ifdef TEST_SPLIT
+#ifdef DEBUG
     if (left->head[0]) {
         rh = left->head[0]->p.c.r;
         rl = left->tail[0]->p.c.r;
@@ -668,8 +668,7 @@ median_cut(PixelList *hl[3], uint32_t imPixelCount, int nPixels) {
         return NULL;
     }
     for (i = 0; i < 3; i++) {
-        for (tl[i] = hl[i]; tl[i] && tl[i]->next[i]; tl[i] = tl[i]->next[i])
-            ;
+        for (tl[i] = hl[i]; tl[i] && tl[i]->next[i]; tl[i] = tl[i]->next[i]);
         root->head[i] = hl[i];
         root->tail[i] = tl[i];
     }
@@ -686,7 +685,7 @@ median_cut(PixelList *hl[3], uint32_t imPixelCount, int nPixels) {
             }
         } while (compute_box_volume(thisNode) == 1);
         if (!split(thisNode)) {
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             printf("Oops, split failed...\n");
 #endif
             exit(1);
@@ -715,16 +714,14 @@ free_box_tree(BoxNode *n) {
     free(n);
 }
 
-#ifdef TEST_SPLIT_INTEGRITY
+#ifdef DEBUG
 static int
 checkContained(BoxNode *n, Pixel *pp) {
     if (n->l && n->r) {
         return checkContained(n->l, pp) + checkContained(n->r, pp);
     }
     if (n->l || n->r) {
-#ifndef NO_OUTPUT
         printf("box tree is dead\n");
-#endif
         return 0;
     }
     if (pp->c.r <= n->head[0]->p.c.r && pp->c.r >= n->tail[0]->p.c.r &&
@@ -745,7 +742,7 @@ annotate_hash_table(BoxNode *n, HashTable *h, uint32_t *box) {
         return annotate_hash_table(n->l, h, box) && annotate_hash_table(n->r, h, box);
     }
     if (n->l || n->r) {
-#ifndef NO_OUTPUT
+#ifdef DEBUG
         printf("box tree is dead\n");
 #endif
         return 0;
@@ -753,7 +750,7 @@ annotate_hash_table(BoxNode *n, HashTable *h, uint32_t *box) {
     for (p = n->head[0]; p; p = p->next[0]) {
         PIXEL_UNSCALE(&(p->p), &q, d->scale);
         if (!hashtable_insert(h, q, *box)) {
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             printf("hashtable insert failed\n");
 #endif
             return 0;
@@ -782,7 +779,8 @@ _distance_index_cmp(const void *a, const void *b) {
 
 static int
 resort_distance_tables(
-    uint32_t *avgDist, uint32_t **avgDistSortKey, Pixel *p, uint32_t nEntries) {
+    uint32_t *avgDist, uint32_t **avgDistSortKey, Pixel *p, uint32_t nEntries
+) {
     uint32_t i, j, k;
     uint32_t **skRow;
     uint32_t *skElt;
@@ -811,7 +809,8 @@ resort_distance_tables(
 
 static int
 build_distance_tables(
-    uint32_t *avgDist, uint32_t **avgDistSortKey, Pixel *p, uint32_t nEntries) {
+    uint32_t *avgDist, uint32_t **avgDistSortKey, Pixel *p, uint32_t nEntries
+) {
     uint32_t i, j;
     DistanceWithIndex *dwi;
 
@@ -832,16 +831,9 @@ build_distance_tables(
     }
     for (i = 0; i < nEntries; i++) {
         for (j = 0; j < nEntries; j++) {
-            dwi[j] = (DistanceWithIndex){
-                &(avgDist[i * nEntries + j]),
-                j
-            };
+            dwi[j] = (DistanceWithIndex){&(avgDist[i * nEntries + j]), j};
         }
-        qsort(
-            dwi,
-            nEntries,
-            sizeof(DistanceWithIndex),
-            _distance_index_cmp);
+        qsort(dwi, nEntries, sizeof(DistanceWithIndex), _distance_index_cmp);
         for (j = 0; j < nEntries; j++) {
             avgDistSortKey[i * nEntries + j] = dwi[j].distance;
         }
@@ -858,7 +850,8 @@ map_image_pixels(
     uint32_t nPaletteEntries,
     uint32_t *avgDist,
     uint32_t **avgDistSortKey,
-    uint32_t *pixelArray) {
+    uint32_t *pixelArray
+) {
     uint32_t *aD, **aDSK;
     uint32_t idx;
     uint32_t i, j;
@@ -905,7 +898,8 @@ map_image_pixels_from_quantized_pixels(
     uint32_t **avgDistSortKey,
     uint32_t *pixelArray,
     uint32_t *avg[3],
-    uint32_t *count) {
+    uint32_t *count
+) {
     uint32_t *aD, **aDSK;
     uint32_t idx;
     uint32_t i, j;
@@ -963,7 +957,8 @@ map_image_pixels_from_median_box(
     HashTable *medianBoxHash,
     uint32_t *avgDist,
     uint32_t **avgDistSortKey,
-    uint32_t *pixelArray) {
+    uint32_t *pixelArray
+) {
     uint32_t *aD, **aDSK;
     uint32_t idx;
     uint32_t i, j;
@@ -979,7 +974,7 @@ map_image_pixels_from_median_box(
             continue;
         }
         if (!hashtable_lookup(medianBoxHash, pixelData[i], &pixelVal)) {
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             printf("pixel lookup failed\n");
 #endif
             return 0;
@@ -1015,7 +1010,9 @@ compute_palette_from_median_cut(
     uint32_t nPixels,
     HashTable *medianBoxHash,
     Pixel **palette,
-    uint32_t nPaletteEntries) {
+    uint32_t nPaletteEntries,
+    BoxNode *root
+) {
     uint32_t i;
     uint32_t paletteEntry;
     Pixel *p;
@@ -1043,7 +1040,7 @@ compute_palette_from_median_cut(
         }
     }
     for (i = 0; i < nPixels; i++) {
-#ifdef TEST_SPLIT_INTEGRITY
+#ifdef DEBUG
         if (!(i % 100)) {
             printf("%05d\r", i);
             fflush(stdout);
@@ -1058,7 +1055,7 @@ compute_palette_from_median_cut(
         }
 #endif
         if (!hashtable_lookup(medianBoxHash, pixelData[i], &paletteEntry)) {
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             printf("pixel lookup failed\n");
 #endif
             for (i = 0; i < 3; i++) {
@@ -1068,11 +1065,12 @@ compute_palette_from_median_cut(
             return 0;
         }
         if (paletteEntry >= nPaletteEntries) {
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             printf(
                 "panic - paletteEntry>=nPaletteEntries (%d>=%d)\n",
                 (int)paletteEntry,
-                (int)nPaletteEntries);
+                (int)nPaletteEntries
+            );
 #endif
             for (i = 0; i < 3; i++) {
                 free(avg[i]);
@@ -1109,7 +1107,8 @@ compute_palette_from_median_cut(
 
 static int
 recompute_palette_from_averages(
-    Pixel *palette, uint32_t nPaletteEntries, uint32_t *avg[3], uint32_t *count) {
+    Pixel *palette, uint32_t nPaletteEntries, uint32_t *avg[3], uint32_t *count
+) {
     uint32_t i;
 
     for (i = 0; i < nPaletteEntries; i++) {
@@ -1128,7 +1127,8 @@ compute_palette_from_quantized_pixels(
     uint32_t nPaletteEntries,
     uint32_t *avg[3],
     uint32_t *count,
-    uint32_t *qp) {
+    uint32_t *qp
+) {
     uint32_t i;
 
     memset(count, 0, sizeof(uint32_t) * nPaletteEntries);
@@ -1137,7 +1137,7 @@ compute_palette_from_quantized_pixels(
     }
     for (i = 0; i < nPixels; i++) {
         if (qp[i] >= nPaletteEntries) {
-#ifndef NO_OUTPUT
+#ifdef DEBUG
             printf("scream\n");
 #endif
             return 0;
@@ -1162,7 +1162,8 @@ k_means(
     Pixel *paletteData,
     uint32_t nPaletteEntries,
     uint32_t *qp,
-    int threshold) {
+    int threshold
+) {
     uint32_t *avg[3];
     uint32_t *count;
     uint32_t i;
@@ -1204,23 +1205,26 @@ k_means(
         goto error_2;
     }
 
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("[");
     fflush(stdout);
 #endif
     while (1) {
         if (!built) {
             compute_palette_from_quantized_pixels(
-                pixelData, nPixels, paletteData, nPaletteEntries, avg, count, qp);
+                pixelData, nPixels, paletteData, nPaletteEntries, avg, count, qp
+            );
             if (!build_distance_tables(
-                avgDist, avgDistSortKey, paletteData, nPaletteEntries)) {
+                    avgDist, avgDistSortKey, paletteData, nPaletteEntries
+                )) {
                 goto error_3;
             }
             built = 1;
         } else {
             recompute_palette_from_averages(paletteData, nPaletteEntries, avg, count);
             resort_distance_tables(
-                avgDist, avgDistSortKey, paletteData, nPaletteEntries);
+                avgDist, avgDistSortKey, paletteData, nPaletteEntries
+            );
         }
         changes = map_image_pixels_from_quantized_pixels(
             pixelData,
@@ -1231,11 +1235,12 @@ k_means(
             avgDistSortKey,
             qp,
             avg,
-            count);
+            count
+        );
         if (changes < 0) {
             goto error_3;
         }
-#ifndef NO_OUTPUT
+#ifdef DEBUG
         printf(".(%d)", changes);
         fflush(stdout);
 #endif
@@ -1243,7 +1248,7 @@ k_means(
             break;
         }
     }
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("]\n");
 #endif
     if (avgDistSortKey) {
@@ -1290,7 +1295,8 @@ quantize(
     Pixel **palette,
     uint32_t *paletteLength,
     uint32_t **quantizedPixels,
-    int kmeans) {
+    int kmeans
+) {
     PixelList *hl[3];
     HashTable *h;
     BoxNode *root;
@@ -1302,32 +1308,32 @@ quantize(
     uint32_t **avgDistSortKey;
     Pixel *p;
 
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     uint32_t timer, timer2;
 #endif
 
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     timer2 = clock();
     printf("create hash table...");
     fflush(stdout);
     timer = clock();
 #endif
     h = create_pixel_hash(pixelData, nPixels);
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
 #endif
     if (!h) {
         goto error_0;
     }
 
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("create lists from hash table...");
     fflush(stdout);
     timer = clock();
 #endif
     hl[0] = hl[1] = hl[2] = NULL;
     hashtable_foreach(h, hash_to_list, hl);
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
 #endif
 
@@ -1335,7 +1341,7 @@ quantize(
         goto error_1;
     }
 
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("mergesort lists...");
     fflush(stdout);
     timer = clock();
@@ -1343,47 +1349,47 @@ quantize(
     for (i = 0; i < 3; i++) {
         hl[i] = mergesort_pixels(hl[i], i);
     }
-#ifdef TEST_MERGESORT
+#ifdef DEBUG
     if (!test_sorted(hl)) {
         printf("bug in mergesort\n");
         goto error_1;
     }
-#endif
-#ifndef NO_OUTPUT
     printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
 #endif
 
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("median cut...");
     fflush(stdout);
     timer = clock();
 #endif
     root = median_cut(hl, nPixels, nQuantPixels);
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
 #endif
     if (!root) {
         goto error_1;
     }
     nPaletteEntries = 0;
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("median cut tree to hash table...");
     fflush(stdout);
     timer = clock();
 #endif
     annotate_hash_table(root, h, &nPaletteEntries);
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
 #endif
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("compute palette...\n");
     fflush(stdout);
     timer = clock();
 #endif
-    if (!compute_palette_from_median_cut(pixelData, nPixels, h, &p, nPaletteEntries)) {
+    if (!compute_palette_from_median_cut(
+            pixelData, nPixels, h, &p, nPaletteEntries, root
+        )) {
         goto error_3;
     }
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
 #endif
 
@@ -1416,7 +1422,8 @@ quantize(
     }
 
     if (!map_image_pixels_from_median_box(
-            pixelData, nPixels, p, nPaletteEntries, h, avgDist, avgDistSortKey, qp)) {
+            pixelData, nPixels, p, nPaletteEntries, h, avgDist, avgDistSortKey, qp
+        )) {
         goto error_7;
     }
 
@@ -1452,29 +1459,32 @@ quantize(
                 hashtable_insert(h2, pixelData[i], bestmatch);
             }
             if (qp[i] != bestmatch) {
-                printf ("discrepancy in matching algorithms pixel %d [%d %d] %f %f\n",
-                    i,qp[i],bestmatch,
-                    sqrt((double)(_SQR(pixelData[i].c.r-p[qp[i]].c.r)+
-                                  _SQR(pixelData[i].c.g-p[qp[i]].c.g)+
-                                  _SQR(pixelData[i].c.b-p[qp[i]].c.b))),
-                    sqrt((double)(_SQR(pixelData[i].c.r-p[bestmatch].c.r)+
-                                  _SQR(pixelData[i].c.g-p[bestmatch].c.g)+
-                                  _SQR(pixelData[i].c.b-p[bestmatch].c.b)))
-                   );
+                printf(
+                    "discrepancy in matching algorithms pixel %d [%d %d] %f %f\n",
+                    i,
+                    qp[i],
+                    bestmatch,
+                    sqrt((double)(_SQR(pixelData[i].c.r - p[qp[i]].c.r) +
+                                  _SQR(pixelData[i].c.g - p[qp[i]].c.g) +
+                                  _SQR(pixelData[i].c.b - p[qp[i]].c.b))),
+                    sqrt((double)(_SQR(pixelData[i].c.r - p[bestmatch].c.r) +
+                                  _SQR(pixelData[i].c.g - p[bestmatch].c.g) +
+                                  _SQR(pixelData[i].c.b - p[bestmatch].c.b)))
+                );
             }
         }
         hashtable_free(h2);
     }
 #endif
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("k means...\n");
     fflush(stdout);
     timer = clock();
 #endif
-    if (kmeans) {
+    if (kmeans > 0) {
         k_means(pixelData, nPixels, p, nPaletteEntries, qp, kmeans - 1);
     }
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
 #endif
 
@@ -1482,7 +1492,7 @@ quantize(
     *palette = p;
     *paletteLength = nPaletteEntries;
 
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("cleanup...");
     fflush(stdout);
     timer = clock();
@@ -1494,7 +1504,7 @@ quantize(
         free(avgDistSortKey);
     }
     destroy_pixel_hash(h);
-#ifndef NO_OUTPUT
+#ifdef DEBUG
     printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC);
     printf("-----\ntotal time %f\n", (clock() - timer2) / (double)CLOCKS_PER_SEC);
 #endif
@@ -1560,7 +1570,8 @@ quantize2(
     Pixel **palette,
     uint32_t *paletteLength,
     uint32_t **quantizedPixels,
-    int kmeans) {
+    int kmeans
+) {
     HashTable *h;
     uint32_t i;
     uint32_t mean[3];
@@ -1624,10 +1635,11 @@ quantize2(
     }
 
     if (!map_image_pixels(
-            pixelData, nPixels, p, nQuantPixels, avgDist, avgDistSortKey, qp)) {
+            pixelData, nPixels, p, nQuantPixels, avgDist, avgDistSortKey, qp
+        )) {
         goto error_4;
     }
-    if (kmeans) {
+    if (kmeans > 0) {
         k_means(pixelData, nPixels, p, nQuantPixels, qp, kmeans - 1);
     }
 
@@ -1767,7 +1779,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) {
                 &palette,
                 &paletteLength,
                 &newData,
-                kmeans);
+                kmeans
+            );
             break;
         case 1:
             /* maximum coverage */
@@ -1778,7 +1791,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) {
                 &palette,
                 &paletteLength,
                 &newData,
-                kmeans);
+                kmeans
+            );
             break;
         case 2:
             result = quantize_octree(
@@ -1788,7 +1802,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) {
                 &palette,
                 &paletteLength,
                 &newData,
-                withAlpha);
+                withAlpha
+            );
             break;
         case 3:
 #ifdef HAVE_LIBIMAGEQUANT
@@ -1800,7 +1815,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) {
                 &palette,
                 &paletteLength,
                 &newData,
-                withAlpha);
+                withAlpha
+            );
 #else
             result = -1;
 #endif
@@ -1851,7 +1867,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) {
         if (result == -1) {
             return (Imaging)ImagingError_ValueError(
                 "dependency required by this method was not "
-                "enabled at compile time");
+                "enabled at compile time"
+            );
         }
 
         return (Imaging)ImagingError_ValueError("quantization error");
diff --git a/src/libImaging/QuantHash.c b/src/libImaging/QuantHash.c
index ea75d6037f9..bf2f29fde85 100644
--- a/src/libImaging/QuantHash.c
+++ b/src/libImaging/QuantHash.c
@@ -132,7 +132,8 @@ _hashtable_resize(HashTable *h) {
 
 static int
 _hashtable_insert_node(
-    HashTable *h, HashNode *node, int resize, int update, CollisionFunc cf) {
+    HashTable *h, HashNode *node, int resize, int update, CollisionFunc cf
+) {
     uint32_t hash = h->hashFunc(h, node->key) % h->length;
     HashNode **n, *nv;
     int i;
@@ -207,7 +208,8 @@ _hashtable_insert(HashTable *h, HashKey_t key, HashVal_t val, int resize, int up
 
 int
 hashtable_insert_or_update_computed(
-    HashTable *h, HashKey_t key, ComputeFunc newFunc, ComputeFunc existsFunc) {
+    HashTable *h, HashKey_t key, ComputeFunc newFunc, ComputeFunc existsFunc
+) {
     HashNode **n, *nv;
     HashNode *t;
     int i;
diff --git a/src/libImaging/QuantHash.h b/src/libImaging/QuantHash.h
index fc1a9900376..0462cfd4968 100644
--- a/src/libImaging/QuantHash.h
+++ b/src/libImaging/QuantHash.h
@@ -20,13 +20,12 @@ typedef uint32_t HashVal_t;
 
 typedef uint32_t (*HashFunc)(const HashTable *, const HashKey_t);
 typedef int (*HashCmpFunc)(const HashTable *, const HashKey_t, const HashKey_t);
-typedef void (*IteratorFunc)(
-    const HashTable *, const HashKey_t, const HashVal_t, void *);
-typedef void (*IteratorUpdateFunc)(
-    const HashTable *, const HashKey_t, HashVal_t *, void *);
+typedef void (*IteratorFunc)(const HashTable *, const HashKey_t, const HashVal_t, void *);
+typedef void (*IteratorUpdateFunc)(const HashTable *, const HashKey_t, HashVal_t *, void *);
 typedef void (*ComputeFunc)(const HashTable *, const HashKey_t, HashVal_t *);
 typedef void (*CollisionFunc)(
-    const HashTable *, HashKey_t *, HashVal_t *, HashKey_t, HashVal_t);
+    const HashTable *, HashKey_t *, HashVal_t *, HashKey_t, HashVal_t
+);
 
 HashTable *
 hashtable_new(HashFunc hf, HashCmpFunc cf);
@@ -42,7 +41,8 @@ int
 hashtable_lookup(const HashTable *h, const HashKey_t key, HashVal_t *valp);
 int
 hashtable_insert_or_update_computed(
-    HashTable *h, HashKey_t key, ComputeFunc newFunc, ComputeFunc existsFunc);
+    HashTable *h, HashKey_t key, ComputeFunc newFunc, ComputeFunc existsFunc
+);
 void *
 hashtable_set_user_data(HashTable *h, void *data);
 void *
diff --git a/src/libImaging/QuantOctree.c b/src/libImaging/QuantOctree.c
index 5e79bce358a..ec60b214ef1 100644
--- a/src/libImaging/QuantOctree.c
+++ b/src/libImaging/QuantOctree.c
@@ -38,7 +38,7 @@ typedef struct _ColorBucket {
     uint64_t g;
     uint64_t b;
     uint64_t a;
-} * ColorBucket;
+} *ColorBucket;
 
 typedef struct _ColorCube {
     unsigned int rBits, gBits, bBits, aBits;
@@ -47,7 +47,7 @@ typedef struct _ColorCube {
 
     unsigned long size;
     ColorBucket buckets;
-} * ColorCube;
+} *ColorCube;
 
 #define MAX(a, b) (a) > (b) ? (a) : (b)
 
@@ -107,11 +107,8 @@ free_color_cube(ColorCube cube) {
 
 static long
 color_bucket_offset_pos(
-    const ColorCube cube,
-    unsigned int r,
-    unsigned int g,
-    unsigned int b,
-    unsigned int a) {
+    const ColorCube cube, unsigned int r, unsigned int g, unsigned int b, unsigned int a
+) {
     return r << cube->rOffset | g << cube->gOffset | b << cube->bOffset |
            a << cube->aOffset;
 }
@@ -191,7 +188,8 @@ create_sorted_color_palette(const ColorCube cube) {
         buckets,
         cube->size,
         sizeof(struct _ColorBucket),
-        (int (*)(void const *, void const *)) & compare_bucket_count);
+        (int (*)(void const *, void const *))&compare_bucket_count
+    );
 
     return buckets;
 }
@@ -212,7 +210,8 @@ copy_color_cube(
     unsigned int rBits,
     unsigned int gBits,
     unsigned int bBits,
-    unsigned int aBits) {
+    unsigned int aBits
+) {
     unsigned int r, g, b, a;
     long src_pos, dst_pos;
     unsigned int src_reduce[4] = {0}, dst_reduce[4] = {0};
@@ -262,15 +261,18 @@ copy_color_cube(
                         r >> src_reduce[0],
                         g >> src_reduce[1],
                         b >> src_reduce[2],
-                        a >> src_reduce[3]);
+                        a >> src_reduce[3]
+                    );
                     dst_pos = color_bucket_offset_pos(
                         result,
                         r >> dst_reduce[0],
                         g >> dst_reduce[1],
                         b >> dst_reduce[2],
-                        a >> dst_reduce[3]);
+                        a >> dst_reduce[3]
+                    );
                     add_bucket_values(
-                        &cube->buckets[src_pos], &result->buckets[dst_pos]);
+                        &cube->buckets[src_pos], &result->buckets[dst_pos]
+                    );
                 }
             }
         }
@@ -328,7 +330,8 @@ combined_palette(
     ColorBucket bucketsA,
     unsigned long nBucketsA,
     ColorBucket bucketsB,
-    unsigned long nBucketsB) {
+    unsigned long nBucketsB
+) {
     ColorBucket result;
     if (nBucketsA > LONG_MAX - nBucketsB ||
         (nBucketsA + nBucketsB) > LONG_MAX / sizeof(struct _ColorBucket)) {
@@ -366,7 +369,8 @@ map_image_pixels(
     const Pixel *pixelData,
     uint32_t nPixels,
     const ColorCube lookupCube,
-    uint32_t *pixelArray) {
+    uint32_t *pixelArray
+) {
     long i;
     for (i = 0; i < nPixels; i++) {
         pixelArray[i] = lookup_color(lookupCube, &pixelData[i]);
@@ -384,7 +388,8 @@ quantize_octree(
     Pixel **palette,
     uint32_t *paletteLength,
     uint32_t **quantizedPixels,
-    int withAlpha) {
+    int withAlpha
+) {
     ColorCube fineCube = NULL;
     ColorCube coarseCube = NULL;
     ColorCube lookupCube = NULL;
@@ -461,7 +466,8 @@ quantize_octree(
         subtract_color_buckets(
             coarseCube,
             &paletteBucketsFine[nAlreadySubtracted],
-            nFineColors - nAlreadySubtracted);
+            nFineColors - nAlreadySubtracted
+        );
     }
 
     /* create our palette buckets with fine and coarse combined */
@@ -470,7 +476,8 @@ quantize_octree(
         goto error;
     }
     paletteBuckets = combined_palette(
-        paletteBucketsCoarse, nCoarseColors, paletteBucketsFine, nFineColors);
+        paletteBucketsCoarse, nCoarseColors, paletteBucketsFine, nFineColors
+    );
 
     free(paletteBucketsFine);
     paletteBucketsFine = NULL;
@@ -491,7 +498,8 @@ quantize_octree(
     /* expand coarse cube (64) to larger fine cube (4k). the value of each
        coarse bucket is then present in the according 64 fine buckets. */
     lookupCube = copy_color_cube(
-        coarseLookupCube, cubeBits[0], cubeBits[1], cubeBits[2], cubeBits[3]);
+        coarseLookupCube, cubeBits[0], cubeBits[1], cubeBits[2], cubeBits[3]
+    );
     if (!lookupCube) {
         goto error;
     }
diff --git a/src/libImaging/QuantPngQuant.c b/src/libImaging/QuantPngQuant.c
index 7a36300e408..a2258c3a289 100644
--- a/src/libImaging/QuantPngQuant.c
+++ b/src/libImaging/QuantPngQuant.c
@@ -26,7 +26,8 @@ quantize_pngquant(
     Pixel **palette,
     uint32_t *paletteLength,
     uint32_t **quantizedPixels,
-    int withAlpha) {
+    int withAlpha
+) {
     int result = 0;
     liq_image *image = NULL;
     liq_attr *attr = NULL;
diff --git a/src/libImaging/QuantPngQuant.h b/src/libImaging/QuantPngQuant.h
index d65e42590ca..ae96a52f371 100644
--- a/src/libImaging/QuantPngQuant.h
+++ b/src/libImaging/QuantPngQuant.h
@@ -12,6 +12,7 @@ quantize_pngquant(
     Pixel **,
     uint32_t *,
     uint32_t **,
-    int);
+    int
+);
 
 #endif
diff --git a/src/libImaging/RankFilter.c b/src/libImaging/RankFilter.c
index 73a6baecbb2..899b1fd3a29 100644
--- a/src/libImaging/RankFilter.c
+++ b/src/libImaging/RankFilter.c
@@ -102,7 +102,8 @@ MakeRankFunction(UINT8) MakeRankFunction(INT32) MakeRankFunction(FLOAT32)
                     memcpy(                                                       \
                         buf + i * size,                                           \
                         &IMAGING_PIXEL_##type(im, x, y + i),                      \
-                        size * sizeof(type));                                     \
+                        size * sizeof(type)                                       \
+                    );                                                            \
                 }                                                                 \
                 IMAGING_PIXEL_##type(imOut, x, y) = Rank##type(buf, size2, rank); \
             }                                                                     \
diff --git a/src/libImaging/RawDecode.c b/src/libImaging/RawDecode.c
index 24abe48041f..80ed0d6880a 100644
--- a/src/libImaging/RawDecode.c
+++ b/src/libImaging/RawDecode.c
@@ -74,7 +74,8 @@ ImagingRawDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
         state->shuffle(
             (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize,
             ptr,
-            state->xsize);
+            state->xsize
+        );
 
         ptr += state->bytes;
         bytes -= state->bytes;
diff --git a/src/libImaging/RawEncode.c b/src/libImaging/RawEncode.c
index 50de8d98275..5e60e1106b9 100644
--- a/src/libImaging/RawEncode.c
+++ b/src/libImaging/RawEncode.c
@@ -65,7 +65,8 @@ ImagingRawEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
         state->shuffle(
             ptr,
             (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize,
-            state->xsize);
+            state->xsize
+        );
 
         if (state->bytes > state->count) {
             /* zero-pad the buffer, if necessary */
diff --git a/src/libImaging/Reduce.c b/src/libImaging/Reduce.c
index 60928d2bc36..022daa0003f 100644
--- a/src/libImaging/Reduce.c
+++ b/src/libImaging/Reduce.c
@@ -2,7 +2,7 @@
 
 #include <math.h>
 
-#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f)-0.5F))
+#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f) - 0.5F))
 
 UINT32
 division_UINT32(int divider, int result_bits) {
@@ -82,7 +82,8 @@ ImagingReduceNxN(Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale
                         }
                     }
                     v = MAKE_UINT32(
-                        (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24);
+                        (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else if (imIn->bands == 3) {
@@ -124,7 +125,8 @@ ImagingReduceNxN(Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale
                         (ss0 * multiplier) >> 24,
                         (ss1 * multiplier) >> 24,
                         (ss2 * multiplier) >> 24,
-                        0);
+                        0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -171,7 +173,8 @@ ImagingReduceNxN(Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale
                         (ss0 * multiplier) >> 24,
                         (ss1 * multiplier) >> 24,
                         (ss2 * multiplier) >> 24,
-                        (ss3 * multiplier) >> 24);
+                        (ss3 * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -226,7 +229,8 @@ ImagingReduce1xN(Imaging imOut, Imaging imIn, int box[4], int yscale) {
                         ss3 += line[xx * 4 + 3];
                     }
                     v = MAKE_UINT32(
-                        (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24);
+                        (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else if (imIn->bands == 3) {
@@ -251,7 +255,8 @@ ImagingReduce1xN(Imaging imOut, Imaging imIn, int box[4], int yscale) {
                         (ss0 * multiplier) >> 24,
                         (ss1 * multiplier) >> 24,
                         (ss2 * multiplier) >> 24,
-                        0);
+                        0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -278,7 +283,8 @@ ImagingReduce1xN(Imaging imOut, Imaging imIn, int box[4], int yscale) {
                         (ss0 * multiplier) >> 24,
                         (ss1 * multiplier) >> 24,
                         (ss2 * multiplier) >> 24,
-                        (ss3 * multiplier) >> 24);
+                        (ss3 * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -329,7 +335,8 @@ ImagingReduceNx1(Imaging imOut, Imaging imIn, int box[4], int xscale) {
                         ss3 += line[xx * 4 + 3];
                     }
                     v = MAKE_UINT32(
-                        (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24);
+                        (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else if (imIn->bands == 3) {
@@ -351,7 +358,8 @@ ImagingReduceNx1(Imaging imOut, Imaging imIn, int box[4], int xscale) {
                         (ss0 * multiplier) >> 24,
                         (ss1 * multiplier) >> 24,
                         (ss2 * multiplier) >> 24,
-                        0);
+                        0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -375,7 +383,8 @@ ImagingReduceNx1(Imaging imOut, Imaging imIn, int box[4], int xscale) {
                         (ss0 * multiplier) >> 24,
                         (ss1 * multiplier) >> 24,
                         (ss2 * multiplier) >> 24,
-                        (ss3 * multiplier) >> 24);
+                        (ss3 * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -425,7 +434,8 @@ ImagingReduce1x2(Imaging imOut, Imaging imIn, int box[4]) {
                     ss1 = line0[xx * 4 + 1] + line1[xx * 4 + 1];
                     ss2 = line0[xx * 4 + 2] + line1[xx * 4 + 2];
                     v = MAKE_UINT32(
-                        (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, 0);
+                        (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, 0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -440,7 +450,8 @@ ImagingReduce1x2(Imaging imOut, Imaging imIn, int box[4]) {
                         (ss0 + amend) >> 1,
                         (ss1 + amend) >> 1,
                         (ss2 + amend) >> 1,
-                        (ss3 + amend) >> 1);
+                        (ss3 + amend) >> 1
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -488,7 +499,8 @@ ImagingReduce2x1(Imaging imOut, Imaging imIn, int box[4]) {
                     ss1 = line0[xx * 4 + 1] + line0[xx * 4 + 5];
                     ss2 = line0[xx * 4 + 2] + line0[xx * 4 + 6];
                     v = MAKE_UINT32(
-                        (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, 0);
+                        (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, 0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -503,7 +515,8 @@ ImagingReduce2x1(Imaging imOut, Imaging imIn, int box[4]) {
                         (ss0 + amend) >> 1,
                         (ss1 + amend) >> 1,
                         (ss2 + amend) >> 1,
-                        (ss3 + amend) >> 1);
+                        (ss3 + amend) >> 1
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -558,7 +571,8 @@ ImagingReduce2x2(Imaging imOut, Imaging imIn, int box[4]) {
                     ss2 = line0[xx * 4 + 2] + line0[xx * 4 + 6] + line1[xx * 4 + 2] +
                           line1[xx * 4 + 6];
                     v = MAKE_UINT32(
-                        (ss0 + amend) >> 2, (ss1 + amend) >> 2, (ss2 + amend) >> 2, 0);
+                        (ss0 + amend) >> 2, (ss1 + amend) >> 2, (ss2 + amend) >> 2, 0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -577,7 +591,8 @@ ImagingReduce2x2(Imaging imOut, Imaging imIn, int box[4]) {
                         (ss0 + amend) >> 2,
                         (ss1 + amend) >> 2,
                         (ss2 + amend) >> 2,
-                        (ss3 + amend) >> 2);
+                        (ss3 + amend) >> 2
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -623,7 +638,8 @@ ImagingReduce1x3(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         0,
                         0,
-                        ((ss3 + amend) * multiplier) >> 24);
+                        ((ss3 + amend) * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else if (imIn->bands == 3) {
@@ -637,7 +653,8 @@ ImagingReduce1x3(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         ((ss1 + amend) * multiplier) >> 24,
                         ((ss2 + amend) * multiplier) >> 24,
-                        0);
+                        0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -652,7 +669,8 @@ ImagingReduce1x3(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         ((ss1 + amend) * multiplier) >> 24,
                         ((ss2 + amend) * multiplier) >> 24,
-                        ((ss3 + amend) * multiplier) >> 24);
+                        ((ss3 + amend) * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -694,7 +712,8 @@ ImagingReduce3x1(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         0,
                         0,
-                        ((ss3 + amend) * multiplier) >> 24);
+                        ((ss3 + amend) * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else if (imIn->bands == 3) {
@@ -708,7 +727,8 @@ ImagingReduce3x1(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         ((ss1 + amend) * multiplier) >> 24,
                         ((ss2 + amend) * multiplier) >> 24,
-                        0);
+                        0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -723,7 +743,8 @@ ImagingReduce3x1(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         ((ss1 + amend) * multiplier) >> 24,
                         ((ss2 + amend) * multiplier) >> 24,
-                        ((ss3 + amend) * multiplier) >> 24);
+                        ((ss3 + amend) * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -775,7 +796,8 @@ ImagingReduce3x3(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         0,
                         0,
-                        ((ss3 + amend) * multiplier) >> 24);
+                        ((ss3 + amend) * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else if (imIn->bands == 3) {
@@ -795,7 +817,8 @@ ImagingReduce3x3(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         ((ss1 + amend) * multiplier) >> 24,
                         ((ss2 + amend) * multiplier) >> 24,
-                        0);
+                        0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -818,7 +841,8 @@ ImagingReduce3x3(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         ((ss1 + amend) * multiplier) >> 24,
                         ((ss2 + amend) * multiplier) >> 24,
-                        ((ss3 + amend) * multiplier) >> 24);
+                        ((ss3 + amend) * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -900,7 +924,8 @@ ImagingReduce4x4(Imaging imOut, Imaging imIn, int box[4]) {
                           line3[xx * 4 + 2] + line3[xx * 4 + 6] + line3[xx * 4 + 10] +
                           line3[xx * 4 + 14];
                     v = MAKE_UINT32(
-                        (ss0 + amend) >> 4, (ss1 + amend) >> 4, (ss2 + amend) >> 4, 0);
+                        (ss0 + amend) >> 4, (ss1 + amend) >> 4, (ss2 + amend) >> 4, 0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -935,7 +960,8 @@ ImagingReduce4x4(Imaging imOut, Imaging imIn, int box[4]) {
                         (ss0 + amend) >> 4,
                         (ss1 + amend) >> 4,
                         (ss2 + amend) >> 4,
-                        (ss3 + amend) >> 4);
+                        (ss3 + amend) >> 4
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -1007,7 +1033,8 @@ ImagingReduce5x5(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         0,
                         0,
-                        ((ss3 + amend) * multiplier) >> 24);
+                        ((ss3 + amend) * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else if (imIn->bands == 3) {
@@ -1045,7 +1072,8 @@ ImagingReduce5x5(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         ((ss1 + amend) * multiplier) >> 24,
                         ((ss2 + amend) * multiplier) >> 24,
-                        0);
+                        0
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             } else {  // bands == 4
@@ -1092,7 +1120,8 @@ ImagingReduce5x5(Imaging imOut, Imaging imIn, int box[4]) {
                         ((ss0 + amend) * multiplier) >> 24,
                         ((ss1 + amend) * multiplier) >> 24,
                         ((ss2 + amend) * multiplier) >> 24,
-                        ((ss3 + amend) * multiplier) >> 24);
+                        ((ss3 + amend) * multiplier) >> 24
+                    );
                     memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
                 }
             }
@@ -1181,7 +1210,8 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys
                     (ss0 * multiplier) >> 24,
                     (ss1 * multiplier) >> 24,
                     (ss2 * multiplier) >> 24,
-                    (ss3 * multiplier) >> 24);
+                    (ss3 * multiplier) >> 24
+                );
                 memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
             }
         }
@@ -1207,7 +1237,8 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys
                     (ss0 * multiplier) >> 24,
                     (ss1 * multiplier) >> 24,
                     (ss2 * multiplier) >> 24,
-                    (ss3 * multiplier) >> 24);
+                    (ss3 * multiplier) >> 24
+                );
                 memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
             }
         }
@@ -1232,7 +1263,8 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys
                 (ss0 * multiplier) >> 24,
                 (ss1 * multiplier) >> 24,
                 (ss2 * multiplier) >> 24,
-                (ss3 * multiplier) >> 24);
+                (ss3 * multiplier) >> 24
+            );
             memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v));
         }
     }
@@ -1240,7 +1272,8 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys
 
 void
 ImagingReduceNxN_32bpc(
-    Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale) {
+    Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale
+) {
     /* The most general implementation for any xscale and yscale
      */
     int x, y, xx, yy;
@@ -1313,7 +1346,8 @@ ImagingReduceNxN_32bpc(
 
 void
 ImagingReduceCorners_32bpc(
-    Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale) {
+    Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale
+) {
     /* Fill the last row and the last column for any xscale and yscale.
      */
     int x, y, xx, yy;
@@ -1427,7 +1461,8 @@ ImagingReduce(Imaging imIn, int xscale, int yscale, int box[4]) {
     }
 
     imOut = ImagingNewDirty(
-        imIn->mode, (box[2] + xscale - 1) / xscale, (box[3] + yscale - 1) / yscale);
+        imIn->mode, (box[2] + xscale - 1) / xscale, (box[3] + yscale - 1) / yscale
+    );
     if (!imOut) {
         return NULL;
     }
diff --git a/src/libImaging/Resample.c b/src/libImaging/Resample.c
index cf79d8a4e4d..f5e386dc2ba 100644
--- a/src/libImaging/Resample.c
+++ b/src/libImaging/Resample.c
@@ -2,7 +2,7 @@
 
 #include <math.h>
 
-#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f)-0.5F))
+#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f) - 0.5F))
 
 struct filter {
     double (*filter)(double x);
@@ -186,7 +186,8 @@ precompute_coeffs(
     int outSize,
     struct filter *filterp,
     int **boundsp,
-    double **kkp) {
+    double **kkp
+) {
     double support, scale, filterscale;
     double center, ww, ss;
     int xx, x, ksize, xmin, xmax;
@@ -284,7 +285,8 @@ normalize_coeffs_8bpc(int outSize, int ksize, double *prekk) {
 
 void
 ImagingResampleHorizontal_8bpc(
-    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *prekk) {
+    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *prekk
+) {
     ImagingSectionCookie cookie;
     int ss0, ss1, ss2, ss3;
     int xx, yy, x, xmin, xmax;
@@ -376,7 +378,8 @@ ImagingResampleHorizontal_8bpc(
 
 void
 ImagingResampleVertical_8bpc(
-    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *prekk) {
+    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *prekk
+) {
     ImagingSectionCookie cookie;
     int ss0, ss1, ss2, ss3;
     int xx, yy, y, ymin, ymax;
@@ -457,9 +460,87 @@ ImagingResampleVertical_8bpc(
     ImagingSectionLeave(&cookie);
 }
 
+void
+ImagingResampleHorizontal_16bpc(
+    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk
+) {
+    ImagingSectionCookie cookie;
+    double ss;
+    int xx, yy, x, xmin, xmax, ss_int;
+    double *k;
+
+    int bigendian = 0;
+    if (strcmp(imIn->mode, "I;16N") == 0
+#ifdef WORDS_BIGENDIAN
+        || strcmp(imIn->mode, "I;16B") == 0
+#endif
+    ) {
+        bigendian = 1;
+    }
+
+    ImagingSectionEnter(&cookie);
+    for (yy = 0; yy < imOut->ysize; yy++) {
+        for (xx = 0; xx < imOut->xsize; xx++) {
+            xmin = bounds[xx * 2 + 0];
+            xmax = bounds[xx * 2 + 1];
+            k = &kk[xx * ksize];
+            ss = 0.0;
+            for (x = 0; x < xmax; x++) {
+                ss += (imIn->image8[yy + offset][(x + xmin) * 2 + (bigendian ? 1 : 0)] +
+                       (imIn->image8[yy + offset][(x + xmin) * 2 + (bigendian ? 0 : 1)]
+                        << 8)) *
+                      k[x];
+            }
+            ss_int = ROUND_UP(ss);
+            imOut->image8[yy][xx * 2 + (bigendian ? 1 : 0)] = CLIP8(ss_int % 256);
+            imOut->image8[yy][xx * 2 + (bigendian ? 0 : 1)] = CLIP8(ss_int >> 8);
+        }
+    }
+    ImagingSectionLeave(&cookie);
+}
+
+void
+ImagingResampleVertical_16bpc(
+    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk
+) {
+    ImagingSectionCookie cookie;
+    double ss;
+    int xx, yy, y, ymin, ymax, ss_int;
+    double *k;
+
+    int bigendian = 0;
+    if (strcmp(imIn->mode, "I;16N") == 0
+#ifdef WORDS_BIGENDIAN
+        || strcmp(imIn->mode, "I;16B") == 0
+#endif
+    ) {
+        bigendian = 1;
+    }
+
+    ImagingSectionEnter(&cookie);
+    for (yy = 0; yy < imOut->ysize; yy++) {
+        ymin = bounds[yy * 2 + 0];
+        ymax = bounds[yy * 2 + 1];
+        k = &kk[yy * ksize];
+        for (xx = 0; xx < imOut->xsize; xx++) {
+            ss = 0.0;
+            for (y = 0; y < ymax; y++) {
+                ss += (imIn->image8[y + ymin][xx * 2 + (bigendian ? 1 : 0)] +
+                       (imIn->image8[y + ymin][xx * 2 + (bigendian ? 0 : 1)] << 8)) *
+                      k[y];
+            }
+            ss_int = ROUND_UP(ss);
+            imOut->image8[yy][xx * 2 + (bigendian ? 1 : 0)] = CLIP8(ss_int % 256);
+            imOut->image8[yy][xx * 2 + (bigendian ? 0 : 1)] = CLIP8(ss_int >> 8);
+        }
+    }
+    ImagingSectionLeave(&cookie);
+}
+
 void
 ImagingResampleHorizontal_32bpc(
-    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk) {
+    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk
+) {
     ImagingSectionCookie cookie;
     double ss;
     int xx, yy, x, xmin, xmax;
@@ -502,7 +583,8 @@ ImagingResampleHorizontal_32bpc(
 
 void
 ImagingResampleVertical_32bpc(
-    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk) {
+    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk
+) {
     ImagingSectionCookie cookie;
     double ss;
     int xx, yy, y, ymin, ymax;
@@ -544,7 +626,8 @@ ImagingResampleVertical_32bpc(
 }
 
 typedef void (*ResampleFunction)(
-    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk);
+    Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk
+);
 
 Imaging
 ImagingResampleInner(
@@ -554,7 +637,8 @@ ImagingResampleInner(
     struct filter *filterp,
     float box[4],
     ResampleFunction ResampleHorizontal,
-    ResampleFunction ResampleVertical);
+    ResampleFunction ResampleVertical
+);
 
 Imaging
 ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) {
@@ -567,7 +651,12 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) {
     }
 
     if (imIn->type == IMAGING_TYPE_SPECIAL) {
-        return (Imaging)ImagingError_ModeError();
+        if (strncmp(imIn->mode, "I;16", 4) == 0) {
+            ResampleHorizontal = ImagingResampleHorizontal_16bpc;
+            ResampleVertical = ImagingResampleVertical_16bpc;
+        } else {
+            return (Imaging)ImagingError_ModeError();
+        }
     } else if (imIn->image8) {
         ResampleHorizontal = ImagingResampleHorizontal_8bpc;
         ResampleVertical = ImagingResampleVertical_8bpc;
@@ -609,7 +698,8 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) {
     }
 
     return ImagingResampleInner(
-        imIn, xsize, ysize, filterp, box, ResampleHorizontal, ResampleVertical);
+        imIn, xsize, ysize, filterp, box, ResampleHorizontal, ResampleVertical
+    );
 }
 
 Imaging
@@ -620,7 +710,8 @@ ImagingResampleInner(
     struct filter *filterp,
     float box[4],
     ResampleFunction ResampleHorizontal,
-    ResampleFunction ResampleVertical) {
+    ResampleFunction ResampleVertical
+) {
     Imaging imTemp = NULL;
     Imaging imOut = NULL;
 
@@ -634,13 +725,15 @@ ImagingResampleInner(
     need_vertical = ysize != imIn->ysize || box[1] || box[3] != ysize;
 
     ksize_horiz = precompute_coeffs(
-        imIn->xsize, box[0], box[2], xsize, filterp, &bounds_horiz, &kk_horiz);
+        imIn->xsize, box[0], box[2], xsize, filterp, &bounds_horiz, &kk_horiz
+    );
     if (!ksize_horiz) {
         return NULL;
     }
 
     ksize_vert = precompute_coeffs(
-        imIn->ysize, box[1], box[3], ysize, filterp, &bounds_vert, &kk_vert);
+        imIn->ysize, box[1], box[3], ysize, filterp, &bounds_vert, &kk_vert
+    );
     if (!ksize_vert) {
         free(bounds_horiz);
         free(kk_horiz);
@@ -662,7 +755,8 @@ ImagingResampleInner(
         imTemp = ImagingNewDirty(imIn->mode, xsize, ybox_last - ybox_first);
         if (imTemp) {
             ResampleHorizontal(
-                imTemp, imIn, ybox_first, ksize_horiz, bounds_horiz, kk_horiz);
+                imTemp, imIn, ybox_first, ksize_horiz, bounds_horiz, kk_horiz
+            );
         }
         free(bounds_horiz);
         free(kk_horiz);
diff --git a/src/libImaging/SgiRleDecode.c b/src/libImaging/SgiRleDecode.c
index 4eef44ba510..e604689908c 100644
--- a/src/libImaging/SgiRleDecode.c
+++ b/src/libImaging/SgiRleDecode.c
@@ -113,7 +113,9 @@ expandrow(UINT8 *dest, UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer
 }
 
 static int
-expandrow2(UINT8 *dest, const UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer) {
+expandrow2(
+    UINT8 *dest, const UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer
+) {
     UINT8 pixel, count;
     int x = 0;
 
@@ -181,7 +183,7 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
        each with 4 bytes per element of tablen
        Check here before we allocate any memory
     */
-    if (c->bufsize < 8 * c->tablen) {
+    if (c->bufsize < 8 * (int64_t)c->tablen) {
         state->errcode = IMAGING_CODEC_OVERRUN;
         return -1;
     }
@@ -193,11 +195,11 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
     }
     _imaging_seek_pyFd(state->fd, SGI_HEADER_SIZE, SEEK_SET);
     if (_imaging_read_pyFd(state->fd, (char *)ptr, c->bufsize) != c->bufsize) {
+        free(ptr);
         state->errcode = IMAGING_CODEC_UNKNOWN;
         return -1;
     }
 
-
     /* decoder initialization */
     state->count = 0;
     state->y = 0;
@@ -252,7 +254,8 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
                     c->rlelength,
                     im->bands,
                     im->xsize,
-                    &ptr[c->bufsize-1]);
+                    &ptr[c->bufsize - 1]
+                );
             } else {
                 status = expandrow2(
                     &state->buffer[c->channo * 2],
@@ -260,7 +263,8 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
                     c->rlelength,
                     im->bands,
                     im->xsize,
-                    &ptr[c->bufsize-1]);
+                    &ptr[c->bufsize - 1]
+                );
             }
             if (status == -1) {
                 state->errcode = IMAGING_CODEC_OVERRUN;
@@ -268,7 +272,6 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
             } else if (status == 1) {
                 goto sgi_finish_decode;
             }
-
         }
 
         /* store decompressed data in image */
diff --git a/src/libImaging/Storage.c b/src/libImaging/Storage.c
index b1b03c515ad..522e9f37557 100644
--- a/src/libImaging/Storage.c
+++ b/src/libImaging/Storage.c
@@ -110,9 +110,8 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
         im->linesize = xsize * 4;
         im->type = IMAGING_TYPE_INT32;
 
-    } else if (
-        strcmp(mode, "I;16") == 0 || strcmp(mode, "I;16L") == 0 ||
-        strcmp(mode, "I;16B") == 0 || strcmp(mode, "I;16N") == 0) {
+    } else if (strcmp(mode, "I;16") == 0 || strcmp(mode, "I;16L") == 0 ||
+               strcmp(mode, "I;16B") == 0 || strcmp(mode, "I;16N") == 0) {
         /* EXPERIMENTAL */
         /* 16-bit raw integer images */
         im->bands = 1;
@@ -219,7 +218,9 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
             break;
     }
 
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
     ImagingDefaultArena.stats_new_count += 1;
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
 
     return im;
 }
@@ -227,7 +228,8 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
 Imaging
 ImagingNewPrologue(const char *mode, int xsize, int ysize) {
     return ImagingNewPrologueSubtype(
-        mode, xsize, ysize, sizeof(struct ImagingMemoryInstance));
+        mode, xsize, ysize, sizeof(struct ImagingMemoryInstance)
+    );
 }
 
 void
@@ -267,7 +269,10 @@ struct ImagingMemoryArena ImagingDefaultArena = {
     0,
     0,
     0,
-    0  // Stats
+    0,  // Stats
+#ifdef Py_GIL_DISABLED
+    {0},
+#endif
 };
 
 int
@@ -364,18 +369,19 @@ ImagingDestroyArray(Imaging im) {
     int y = 0;
 
     if (im->blocks) {
+        MUTEX_LOCK(&ImagingDefaultArena.mutex);
         while (im->blocks[y].ptr) {
             memory_return_block(&ImagingDefaultArena, im->blocks[y]);
             y += 1;
         }
+        MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
         free(im->blocks);
     }
 }
 
 Imaging
-ImagingAllocateArray(Imaging im, int dirty, int block_size) {
+ImagingAllocateArray(Imaging im, ImagingMemoryArena arena, int dirty, int block_size) {
     int y, line_in_block, current_block;
-    ImagingMemoryArena arena = &ImagingDefaultArena;
     ImagingMemoryBlock block = {NULL, 0};
     int aligned_linesize, lines_per_block, blocks_count;
     char *aligned_ptr = NULL;
@@ -418,9 +424,8 @@ ImagingAllocateArray(Imaging im, int dirty, int block_size) {
             }
             im->blocks[current_block] = block;
             /* Bulletproof code from libc _int_memalign */
-            aligned_ptr = (char *)(
-                ((size_t) (block.ptr + arena->alignment - 1)) &
-                -((Py_ssize_t) arena->alignment));
+            aligned_ptr = (char *)(((size_t)(block.ptr + arena->alignment - 1)) &
+                                   -((Py_ssize_t)arena->alignment));
         }
 
         im->image[y] = aligned_ptr + aligned_linesize * line_in_block;
@@ -499,14 +504,22 @@ ImagingNewInternal(const char *mode, int xsize, int ysize, int dirty) {
         return NULL;
     }
 
-    if (ImagingAllocateArray(im, dirty, ImagingDefaultArena.block_size)) {
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
+    Imaging tmp = ImagingAllocateArray(
+        im, &ImagingDefaultArena, dirty, ImagingDefaultArena.block_size
+    );
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
+    if (tmp) {
         return im;
     }
 
     ImagingError_Clear();
 
     // Try to allocate the image once more with smallest possible block size
-    if (ImagingAllocateArray(im, dirty, IMAGING_PAGE_SIZE)) {
+    MUTEX_LOCK(&ImagingDefaultArena.mutex);
+    tmp = ImagingAllocateArray(im, &ImagingDefaultArena, dirty, IMAGING_PAGE_SIZE);
+    MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
+    if (tmp) {
         return im;
     }
 
diff --git a/src/libImaging/SunRleDecode.c b/src/libImaging/SunRleDecode.c
index 9d8e1292a47..d3231ad901f 100644
--- a/src/libImaging/SunRleDecode.c
+++ b/src/libImaging/SunRleDecode.c
@@ -107,7 +107,8 @@ ImagingSunRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
                     (UINT8 *)im->image[state->y + state->yoff] +
                         state->xoff * im->pixelsize,
                     state->buffer,
-                    state->xsize);
+                    state->xsize
+                );
 
                 state->x = 0;
 
diff --git a/src/libImaging/TgaRleDecode.c b/src/libImaging/TgaRleDecode.c
index 95ae9b62228..fbf29452c8e 100644
--- a/src/libImaging/TgaRleDecode.c
+++ b/src/libImaging/TgaRleDecode.c
@@ -93,7 +93,8 @@ ImagingTgaRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
                     (UINT8 *)im->image[state->y + state->yoff] +
                         state->xoff * im->pixelsize,
                     state->buffer,
-                    state->xsize);
+                    state->xsize
+                );
 
                 state->x = 0;
 
diff --git a/src/libImaging/TgaRleEncode.c b/src/libImaging/TgaRleEncode.c
index aa7e7b96d81..dde4766143a 100644
--- a/src/libImaging/TgaRleEncode.c
+++ b/src/libImaging/TgaRleEncode.c
@@ -63,7 +63,8 @@ ImagingTgaRleEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes)
                     state->buffer,
                     (UINT8 *)im->image[state->y + state->yoff] +
                         state->xoff * im->pixelsize,
-                    state->xsize);
+                    state->xsize
+                );
             }
 
             row = state->buffer;
@@ -146,7 +147,8 @@ ImagingTgaRleEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes)
         }
 
         memcpy(
-            dst, state->buffer + (state->x * bytesPerPixel - state->count), flushCount);
+            dst, state->buffer + (state->x * bytesPerPixel - state->count), flushCount
+        );
         dst += flushCount;
         bytes -= flushCount;
 
diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c
index e3b81590ec2..e4da9162dc9 100644
--- a/src/libImaging/TiffDecode.c
+++ b/src/libImaging/TiffDecode.c
@@ -44,7 +44,8 @@ dump_state(const TIFFSTATE *state) {
          (int)state->size,
          (uint)state->eof,
          state->data,
-         state->ifd));
+         state->ifd)
+    );
 }
 
 /*
@@ -60,7 +61,12 @@ _tiffReadProc(thandle_t hdata, tdata_t buf, tsize_t size) {
     dump_state(state);
 
     if (state->loc > state->eof) {
-        TIFFError("_tiffReadProc", "Invalid Read at loc %" PRIu64 ", eof: %" PRIu64, state->loc, state->eof);
+        TIFFError(
+            "_tiffReadProc",
+            "Invalid Read at loc %" PRIu64 ", eof: %" PRIu64,
+            state->loc,
+            state->eof
+        );
         return 0;
     }
     to_read = min(size, min(state->size, (tsize_t)state->eof) - (tsize_t)state->loc);
@@ -196,13 +202,15 @@ ImagingLibTiffInit(ImagingCodecState state, int fp, uint32_t offset) {
          state->state,
          state->x,
          state->y,
-         state->ystep));
+         state->ystep)
+    );
     TRACE(
         ("State: xsize %d, ysize %d, xoff %d, yoff %d \n",
          state->xsize,
          state->ysize,
          state->xoff,
-         state->yoff));
+         state->yoff)
+    );
     TRACE(("State: bits %d, bytes %d \n", state->bits, state->bytes));
     TRACE(("State: context %p \n", state->context));
 
@@ -217,7 +225,13 @@ ImagingLibTiffInit(ImagingCodecState state, int fp, uint32_t offset) {
 }
 
 int
-_pickUnpackers(Imaging im, ImagingCodecState state, TIFF *tiff, uint16_t planarconfig, ImagingShuffler *unpackers) {
+_pickUnpackers(
+    Imaging im,
+    ImagingCodecState state,
+    TIFF *tiff,
+    uint16_t planarconfig,
+    ImagingShuffler *unpackers
+) {
     // if number of bands is 1, there is no difference with contig case
     if (planarconfig == PLANARCONFIG_SEPARATE && im->bands > 1) {
         uint16_t bits_per_sample = 8;
@@ -232,10 +246,14 @@ _pickUnpackers(Imaging im, ImagingCodecState state, TIFF *tiff, uint16_t planarc
         // We'll pick appropriate set of unpackers depending on planar_configuration
         // It does not matter if data is RGB(A), CMYK or LUV really,
         // we just copy it plane by plane
-        unpackers[0] = ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "R;16N" : "R", NULL);
-        unpackers[1] = ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "G;16N" : "G", NULL);
-        unpackers[2] = ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "B;16N" : "B", NULL);
-        unpackers[3] = ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "A;16N" : "A", NULL);
+        unpackers[0] =
+            ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "R;16N" : "R", NULL);
+        unpackers[1] =
+            ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "G;16N" : "G", NULL);
+        unpackers[2] =
+            ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "B;16N" : "B", NULL);
+        unpackers[3] =
+            ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "A;16N" : "A", NULL);
 
         return im->bands;
     } else {
@@ -247,10 +265,10 @@ _pickUnpackers(Imaging im, ImagingCodecState state, TIFF *tiff, uint16_t planarc
 
 int
 _decodeAsRGBA(Imaging im, ImagingCodecState state, TIFF *tiff) {
-    // To avoid dealing with YCbCr subsampling and other complications, let libtiff handle it
-    // Use a TIFFRGBAImage wrapping the tiff image, and let libtiff handle
-    // all of the conversion. Metadata read from the TIFFRGBAImage could
-    // be different from the metadata that the base tiff returns.
+    // To avoid dealing with YCbCr subsampling and other complications, let libtiff
+    // handle it Use a TIFFRGBAImage wrapping the tiff image, and let libtiff handle all
+    // of the conversion. Metadata read from the TIFFRGBAImage could be different from
+    // the metadata that the base tiff returns.
 
     INT32 current_row;
     UINT8 *new_data;
@@ -259,17 +277,16 @@ _decodeAsRGBA(Imaging im, ImagingCodecState state, TIFF *tiff) {
     TIFFRGBAImage img;
     char emsg[1024] = "";
 
-    // Since using TIFFRGBAImage* functions, we can read whole tiff into rastrr in one call
-    // Let's select smaller block size. Multiplying image width by (tile length OR rows per strip)
-    // gives us manageable block size in pixels
+    // Since using TIFFRGBAImage* functions, we can read whole tiff into rastrr in one
+    // call Let's select smaller block size. Multiplying image width by (tile length OR
+    // rows per strip) gives us manageable block size in pixels
     if (TIFFIsTiled(tiff)) {
         ret = TIFFGetFieldDefaulted(tiff, TIFFTAG_TILELENGTH, &rows_per_block);
-    }
-    else {
+    } else {
         ret = TIFFGetFieldDefaulted(tiff, TIFFTAG_ROWSPERSTRIP, &rows_per_block);
     }
 
-    if (ret != 1 || rows_per_block==(UINT32)(-1)) {
+    if (ret != 1 || rows_per_block == (UINT32)(-1)) {
         rows_per_block = state->ysize;
     }
 
@@ -344,7 +361,8 @@ _decodeAsRGBA(Imaging im, ImagingCodecState state, TIFF *tiff) {
                 (UINT8 *)im->image[state->y + state->yoff + current_row] +
                     state->xoff * im->pixelsize,
                 state->buffer + current_row * row_byte_size,
-                state->xsize);
+                state->xsize
+            );
         }
     }
 
@@ -357,7 +375,13 @@ _decodeAsRGBA(Imaging im, ImagingCodecState state, TIFF *tiff) {
 }
 
 int
-_decodeTile(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, ImagingShuffler *unpackers) {
+_decodeTile(
+    Imaging im,
+    ImagingCodecState state,
+    TIFF *tiff,
+    int planes,
+    ImagingShuffler *unpackers
+) {
     INT32 x, y, tile_y, current_tile_length, current_tile_width;
     UINT32 tile_width, tile_length;
     tsize_t tile_bytes_size, row_byte_size;
@@ -396,8 +420,8 @@ _decodeTile(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imaging
 
     if (tile_bytes_size > ((tile_length * state->bits / planes + 7) / 8) * tile_width) {
         // If the tile size as expected by LibTiff isn't what we're expecting, abort.
-        // man:   TIFFTileSize returns the equivalent size for a tile of data as it would be returned in a
-        //        call to TIFFReadTile ...
+        // man:   TIFFTileSize returns the equivalent size for a tile of data as it
+        // would be returned in a call to TIFFReadTile ...
         state->errcode = IMAGING_CODEC_BROKEN;
         return -1;
     }
@@ -428,19 +452,26 @@ _decodeTile(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imaging
 
                 TRACE(("Read tile at %dx%d; \n\n", x, y));
 
-                current_tile_width = min((INT32) tile_width, state->xsize - x);
-                current_tile_length =  min((INT32) tile_length, state->ysize - y);
+                current_tile_width = min((INT32)tile_width, state->xsize - x);
+                current_tile_length = min((INT32)tile_length, state->ysize - y);
                 // iterate over each line in the tile and stuff data into image
                 for (tile_y = 0; tile_y < current_tile_length; tile_y++) {
-                    TRACE(("Writing tile data at %dx%d using tile_width: %d; \n", tile_y + y, x, current_tile_width));
+                    TRACE(
+                        ("Writing tile data at %dx%d using tile_width: %d; \n",
+                         tile_y + y,
+                         x,
+                         current_tile_width)
+                    );
 
                     // UINT8 * bbb = state->buffer + tile_y * row_byte_size;
-                    // TRACE(("chars: %x%x%x%x\n", ((UINT8 *)bbb)[0], ((UINT8 *)bbb)[1], ((UINT8 *)bbb)[2], ((UINT8 *)bbb)[3]));
-
-                    shuffler((UINT8*) im->image[tile_y + y] + x * im->pixelsize,
-                             state->buffer + tile_y * row_byte_size,
-                             current_tile_width
-                             );
+                    // TRACE(("chars: %x%x%x%x\n", ((UINT8 *)bbb)[0], ((UINT8 *)bbb)[1],
+                    // ((UINT8 *)bbb)[2], ((UINT8 *)bbb)[3]));
+
+                    shuffler(
+                        (UINT8 *)im->image[tile_y + y] + x * im->pixelsize,
+                        state->buffer + tile_y * row_byte_size,
+                        current_tile_width
+                    );
                 }
             }
         }
@@ -450,7 +481,13 @@ _decodeTile(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imaging
 }
 
 int
-_decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, ImagingShuffler *unpackers) {
+_decodeStrip(
+    Imaging im,
+    ImagingCodecState state,
+    TIFF *tiff,
+    int planes,
+    ImagingShuffler *unpackers
+) {
     INT32 strip_row = 0;
     UINT8 *new_data;
     UINT32 rows_per_strip;
@@ -458,7 +495,7 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
     tsize_t strip_size, row_byte_size, unpacker_row_byte_size;
 
     ret = TIFFGetField(tiff, TIFFTAG_ROWSPERSTRIP, &rows_per_strip);
-    if (ret != 1 || rows_per_strip==(UINT32)(-1)) {
+    if (ret != 1 || rows_per_strip == (UINT32)(-1)) {
         rows_per_strip = state->ysize;
     }
 
@@ -478,8 +515,8 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
     unpacker_row_byte_size = (state->xsize * state->bits / planes + 7) / 8;
     if (strip_size > (unpacker_row_byte_size * rows_per_strip)) {
         // If the strip size as expected by LibTiff isn't what we're expecting, abort.
-        // man:   TIFFStripSize returns the equivalent size for a strip of data as it would be returned in a
-        //        call to TIFFReadEncodedStrip ...
+        // man:   TIFFStripSize returns the equivalent size for a strip of data as it
+        // would be returned in a call to TIFFReadEncodedStrip ...
         state->errcode = IMAGING_CODEC_BROKEN;
         return -1;
     }
@@ -513,8 +550,14 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
         int plane;
         for (plane = 0; plane < planes; plane++) {
             ImagingShuffler shuffler = unpackers[plane];
-            if (TIFFReadEncodedStrip(tiff, TIFFComputeStrip(tiff, state->y, plane), (tdata_t)state->buffer, strip_size) == -1) {
-                TRACE(("Decode Error, strip %d\n", TIFFComputeStrip(tiff, state->y, 0)));
+            if (TIFFReadEncodedStrip(
+                    tiff,
+                    TIFFComputeStrip(tiff, state->y, plane),
+                    (tdata_t)state->buffer,
+                    strip_size
+                ) == -1) {
+                TRACE(("Decode Error, strip %d\n", TIFFComputeStrip(tiff, state->y, 0))
+                );
                 state->errcode = IMAGING_CODEC_BROKEN;
                 return -1;
             }
@@ -523,18 +566,20 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
 
             // iterate over each row in the strip and stuff data into image
             for (strip_row = 0;
-                 strip_row < min((INT32) rows_per_strip, state->ysize - state->y);
+                 strip_row < min((INT32)rows_per_strip, state->ysize - state->y);
                  strip_row++) {
                 TRACE(("Writing data into line %d ; \n", state->y + strip_row));
 
-                // UINT8 * bbb = state->buffer + strip_row * (state->bytes / rows_per_strip);
-                // TRACE(("chars: %x %x %x %x\n", ((UINT8 *)bbb)[0], ((UINT8 *)bbb)[1], ((UINT8 *)bbb)[2], ((UINT8 *)bbb)[3]));
+                // UINT8 * bbb = state->buffer + strip_row * (state->bytes /
+                // rows_per_strip); TRACE(("chars: %x %x %x %x\n", ((UINT8 *)bbb)[0],
+                // ((UINT8 *)bbb)[1], ((UINT8 *)bbb)[2], ((UINT8 *)bbb)[3]));
 
                 shuffler(
-                    (UINT8*) im->image[state->y + state->yoff + strip_row] +
-                    state->xoff * im->pixelsize,
+                    (UINT8 *)im->image[state->y + state->yoff + strip_row] +
+                        state->xoff * im->pixelsize,
                     state->buffer + strip_row * row_byte_size,
-                    state->xsize);
+                    state->xsize
+                );
             }
         }
     }
@@ -544,7 +589,8 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
 
 int
 ImagingLibTiffDecode(
-    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes) {
+    Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes
+) {
     TIFFSTATE *clientstate = (TIFFSTATE *)state->context;
     char *filename = "tempfile.tif";
     char *mode = "rC";
@@ -569,13 +615,15 @@ ImagingLibTiffDecode(
          state->state,
          state->x,
          state->y,
-         state->ystep));
+         state->ystep)
+    );
     TRACE(
         ("State: xsize %d, ysize %d, xoff %d, yoff %d \n",
          state->xsize,
          state->ysize,
          state->xoff,
-         state->yoff));
+         state->yoff)
+    );
     TRACE(("State: bits %d, bytes %d \n", state->bits, state->bytes));
     TRACE(
         ("Buffer: %p: %c%c%c%c\n",
@@ -583,26 +631,30 @@ ImagingLibTiffDecode(
          (char)buffer[0],
          (char)buffer[1],
          (char)buffer[2],
-         (char)buffer[3]));
+         (char)buffer[3])
+    );
     TRACE(
         ("State->Buffer: %c%c%c%c\n",
          (char)state->buffer[0],
          (char)state->buffer[1],
          (char)state->buffer[2],
-         (char)state->buffer[3]));
+         (char)state->buffer[3])
+    );
     TRACE(
         ("Image: mode %s, type %d, bands: %d, xsize %d, ysize %d \n",
          im->mode,
          im->type,
          im->bands,
          im->xsize,
-         im->ysize));
+         im->ysize)
+    );
     TRACE(
         ("Image: image8 %p, image32 %p, image %p, block %p \n",
          im->image8,
          im->image32,
          im->image,
-         im->block));
+         im->block)
+    );
     TRACE(("Image: pixelsize: %d, linesize %d \n", im->pixelsize, im->linesize));
 
     dump_state(clientstate);
@@ -632,7 +684,8 @@ ImagingLibTiffDecode(
             _tiffCloseProc,
             _tiffSizeProc,
             _tiffMapProc,
-            _tiffUnmapProc);
+            _tiffUnmapProc
+        );
     }
 
     if (!tiff) {
@@ -661,12 +714,12 @@ ImagingLibTiffDecode(
              state->xsize,
              img_width,
              state->ysize,
-             img_height));
+             img_height)
+        );
         state->errcode = IMAGING_CODEC_BROKEN;
         goto decode_err;
     }
 
-
     TIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric);
     TIFFGetField(tiff, TIFFTAG_COMPRESSION, &compression);
     TIFFGetFieldDefaulted(tiff, TIFFTAG_PLANARCONFIG, &planarconfig);
@@ -675,16 +728,17 @@ ImagingLibTiffDecode(
     // Let LibTiff read them as RGBA
     readAsRGBA = photometric == PHOTOMETRIC_YCBCR;
 
-    if (readAsRGBA && compression == COMPRESSION_JPEG && planarconfig == PLANARCONFIG_CONTIG) {
-        // If using new JPEG compression, let libjpeg do RGB conversion for performance reasons
+    if (readAsRGBA && compression == COMPRESSION_JPEG &&
+        planarconfig == PLANARCONFIG_CONTIG) {
+        // If using new JPEG compression, let libjpeg do RGB conversion for performance
+        // reasons
         TIFFSetField(tiff, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
         readAsRGBA = 0;
     }
 
     if (readAsRGBA) {
         _decodeAsRGBA(im, state, tiff);
-    }
-    else {
+    } else {
         planes = _pickUnpackers(im, state, tiff, planarconfig, unpackers);
         if (planes <= 0) {
             goto decode_err;
@@ -692,8 +746,7 @@ ImagingLibTiffDecode(
 
         if (TIFFIsTiled(tiff)) {
             _decodeTile(im, state, tiff, planes, unpackers);
-        }
-        else {
+        } else {
             _decodeStrip(im, state, tiff, planes, unpackers);
         }
 
@@ -702,20 +755,21 @@ ImagingLibTiffDecode(
             // so we have to convert it to RGBA
             if (planes > 3 && strcmp(im->mode, "RGBA") == 0) {
                 uint16_t extrasamples;
-                uint16_t* sampleinfo;
+                uint16_t *sampleinfo;
                 ImagingShuffler shuffle;
                 INT32 y;
 
-                TIFFGetFieldDefaulted(tiff, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampleinfo);
+                TIFFGetFieldDefaulted(
+                    tiff, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampleinfo
+                );
 
-                if (extrasamples >= 1 &&
-                    (sampleinfo[0] == EXTRASAMPLE_UNSPECIFIED || sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA)
-                    ) {
+                if (extrasamples >= 1 && (sampleinfo[0] == EXTRASAMPLE_UNSPECIFIED ||
+                                          sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA)) {
                     shuffle = ImagingFindUnpacker("RGBA", "RGBa", NULL);
 
                     for (y = state->yoff; y < state->ysize; y++) {
-                        UINT8* ptr = (UINT8*) im->image[y + state->yoff] +
-                            state->xoff * im->pixelsize;
+                        UINT8 *ptr = (UINT8 *)im->image[y + state->yoff] +
+                                     state->xoff * im->pixelsize;
                         shuffle(ptr, ptr, state->xsize);
                     }
                 }
@@ -723,10 +777,10 @@ ImagingLibTiffDecode(
         }
     }
 
- decode_err:
+decode_err:
     // TIFFClose in libtiff calls tif_closeproc and TIFFCleanup
     if (clientstate->fp) {
-        // Pillow will manage the closing of the file rather than libtiff
+        // Python will manage the closing of the file rather than libtiff
         // So only call TIFFCleanup
         TIFFCleanup(tiff);
     } else {
@@ -761,13 +815,15 @@ ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp) {
          state->state,
          state->x,
          state->y,
-         state->ystep));
+         state->ystep)
+    );
     TRACE(
         ("State: xsize %d, ysize %d, xoff %d, yoff %d \n",
          state->xsize,
          state->ysize,
          state->xoff,
-         state->yoff));
+         state->yoff)
+    );
     TRACE(("State: bits %d, bytes %d \n", state->bits, state->bytes));
     TRACE(("State: context %p \n", state->context));
 
@@ -807,7 +863,8 @@ ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp) {
             _tiffCloseProc,
             _tiffSizeProc,
             _tiffNullMapProc,
-            _tiffUnmapProc); /*force no mmap*/
+            _tiffUnmapProc
+        ); /*force no mmap*/
     }
 
     if (!clientstate->tiff) {
@@ -820,7 +877,8 @@ ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp) {
 
 int
 ImagingLibTiffMergeFieldInfo(
-    ImagingCodecState state, TIFFDataType field_type, int key, int is_var_length) {
+    ImagingCodecState state, TIFFDataType field_type, int key, int is_var_length
+) {
     // Refer to libtiff docs (http://www.simplesystems.org/libtiff/addingtags.html)
     TIFFSTATE *clientstate = (TIFFSTATE *)state->context;
     uint32_t n;
@@ -842,7 +900,8 @@ ImagingLibTiffMergeFieldInfo(
          FIELD_CUSTOM,
          1,
          passcount,
-         "CustomField"}};
+         "CustomField"}
+    };
 
     n = sizeof(info) / sizeof(info[0]);
 
@@ -890,13 +949,15 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
          state->state,
          state->x,
          state->y,
-         state->ystep));
+         state->ystep)
+    );
     TRACE(
         ("State: xsize %d, ysize %d, xoff %d, yoff %d \n",
          state->xsize,
          state->ysize,
          state->xoff,
-         state->yoff));
+         state->yoff)
+    );
     TRACE(("State: bits %d, bytes %d \n", state->bits, state->bytes));
     TRACE(
         ("Buffer: %p: %c%c%c%c\n",
@@ -904,26 +965,30 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
          (char)buffer[0],
          (char)buffer[1],
          (char)buffer[2],
-         (char)buffer[3]));
+         (char)buffer[3])
+    );
     TRACE(
         ("State->Buffer: %c%c%c%c\n",
          (char)state->buffer[0],
          (char)state->buffer[1],
          (char)state->buffer[2],
-         (char)state->buffer[3]));
+         (char)state->buffer[3])
+    );
     TRACE(
         ("Image: mode %s, type %d, bands: %d, xsize %d, ysize %d \n",
          im->mode,
          im->type,
          im->bands,
          im->xsize,
-         im->ysize));
+         im->ysize)
+    );
     TRACE(
         ("Image: image8 %p, image32 %p, image %p, block %p \n",
          im->image8,
          im->image32,
          im->image,
-         im->block));
+         im->block)
+    );
     TRACE(("Image: pixelsize: %d, linesize %d \n", im->pixelsize, im->linesize));
 
     dump_state(clientstate);
@@ -935,13 +1000,25 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
                 state->buffer,
                 (UINT8 *)im->image[state->y + state->yoff] +
                     state->xoff * im->pixelsize,
-                state->xsize);
+                state->xsize
+            );
 
             if (TIFFWriteScanline(
-                    tiff, (tdata_t)(state->buffer), (uint32_t)state->y, 0) == -1) {
+                    tiff, (tdata_t)(state->buffer), (uint32_t)state->y, 0
+                ) == -1) {
                 TRACE(("Encode Error, row %d\n", state->y));
                 state->errcode = IMAGING_CODEC_BROKEN;
-                TIFFClose(tiff);
+
+                // TIFFClose in libtiff calls tif_closeproc and TIFFCleanup
+                if (clientstate->fp) {
+                    // Python will manage the closing of the file rather than libtiff
+                    // So only call TIFFCleanup
+                    TIFFCleanup(tiff);
+                } else {
+                    // When tif_closeproc refers to our custom _tiffCloseProc though,
+                    // that is fine, as it does not close the file
+                    TIFFClose(tiff);
+                }
                 if (!clientstate->fp) {
                     free(clientstate->data);
                 }
@@ -958,14 +1035,22 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
                 TRACE(("Error flushing the tiff"));
                 // likely reason is memory.
                 state->errcode = IMAGING_CODEC_MEMORY;
-                TIFFClose(tiff);
+                if (clientstate->fp) {
+                    TIFFCleanup(tiff);
+                } else {
+                    TIFFClose(tiff);
+                }
                 if (!clientstate->fp) {
                     free(clientstate->data);
                 }
                 return -1;
             }
             TRACE(("Closing \n"));
-            TIFFClose(tiff);
+            if (clientstate->fp) {
+                TIFFCleanup(tiff);
+            } else {
+                TIFFClose(tiff);
+            }
             // reset the clientstate metadata to use it to read out the buffer.
             clientstate->loc = 0;
             clientstate->size = clientstate->eof;  // redundant?
@@ -973,14 +1058,16 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
     }
 
     if (state->state == 1 && !clientstate->fp) {
-        int read = (int)_tiffReadProc(clientstate, (tdata_t)buffer, (tsize_t)bytes);
+        int read =
+            (int)_tiffReadProc((thandle_t)clientstate, (tdata_t)buffer, (tsize_t)bytes);
         TRACE(
             ("Buffer: %p: %c%c%c%c\n",
              buffer,
              (char)buffer[0],
              (char)buffer[1],
              (char)buffer[2],
-             (char)buffer[3]));
+             (char)buffer[3])
+        );
         if (clientstate->loc == clientstate->eof) {
             TRACE(("Hit EOF, calling an end, freeing data"));
             state->errcode = IMAGING_CODEC_END;
diff --git a/src/libImaging/TiffDecode.h b/src/libImaging/TiffDecode.h
index 02454ba0396..22361210dcb 100644
--- a/src/libImaging/TiffDecode.h
+++ b/src/libImaging/TiffDecode.h
@@ -30,7 +30,7 @@ typedef struct {
                    * Should be uint32 for libtiff 3.9.x
                    * uint64 for libtiff 4.0.x
                    */
-    TIFF *tiff; /* Used in write */
+    TIFF *tiff;   /* Used in write */
     toff_t eof;
     int flrealloc; /* may we realloc */
 } TIFFSTATE;
@@ -41,7 +41,8 @@ extern int
 ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp);
 extern int
 ImagingLibTiffMergeFieldInfo(
-    ImagingCodecState state, TIFFDataType field_type, int key, int is_var_length);
+    ImagingCodecState state, TIFFDataType field_type, int key, int is_var_length
+);
 extern int
 ImagingLibTiffSetField(ImagingCodecState state, ttag_t tag, ...);
 
diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c
index 6c7d52f58d1..c23d5d889f6 100644
--- a/src/libImaging/Unpack.c
+++ b/src/libImaging/Unpack.c
@@ -104,7 +104,8 @@ static UINT8 BITFLIP[] = {
     3,  131, 67, 195, 35, 163, 99,  227, 19, 147, 83, 211, 51, 179, 115, 243,
     11, 139, 75, 203, 43, 171, 107, 235, 27, 155, 91, 219, 59, 187, 123, 251,
     7,  135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247,
-    15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255};
+    15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255
+};
 
 /* Unpack to "1" image */
 
@@ -718,6 +719,21 @@ ImagingUnpackBGRA15(UINT8 *out, const UINT8 *in, int pixels) {
     }
 }
 
+void
+ImagingUnpackBGRA15Z(UINT8 *out, const UINT8 *in, int pixels) {
+    int i, pixel;
+    /* RGB, rearranged channels, 5/5/5/1 bits per pixel, inverted alpha */
+    for (i = 0; i < pixels; i++) {
+        pixel = in[0] + (in[1] << 8);
+        out[B] = (pixel & 31) * 255 / 31;
+        out[G] = ((pixel >> 5) & 31) * 255 / 31;
+        out[R] = ((pixel >> 10) & 31) * 255 / 31;
+        out[A] = ~((pixel >> 15) * 255);
+        out += 4;
+        in += 2;
+    }
+}
+
 void
 ImagingUnpackRGB16(UINT8 *out, const UINT8 *in, int pixels) {
     int i, pixel;
@@ -790,6 +806,17 @@ ImagingUnpackBGRX(UINT8 *_out, const UINT8 *in, int pixels) {
     }
 }
 
+static void
+ImagingUnpackBGXR(UINT8 *_out, const UINT8 *in, int pixels) {
+    int i;
+    for (i = 0; i < pixels; i++) {
+        UINT32 iv = MAKE_UINT32(in[3], in[1], in[0], 255);
+        memcpy(_out, &iv, sizeof(iv));
+        in += 4;
+        _out += 4;
+    }
+}
+
 static void
 ImagingUnpackXRGB(UINT8 *_out, const UINT8 *in, int pixels) {
     int i;
@@ -856,7 +883,8 @@ unpackRGBa16L(UINT8 *_out, const UINT8 *in, int pixels) {
                 CLIP8(in[1] * 255 / a),
                 CLIP8(in[3] * 255 / a),
                 CLIP8(in[5] * 255 / a),
-                a);
+                a
+            );
         }
         memcpy(_out, &iv, sizeof(iv));
         in += 8;
@@ -880,7 +908,8 @@ unpackRGBa16B(UINT8 *_out, const UINT8 *in, int pixels) {
                 CLIP8(in[0] * 255 / a),
                 CLIP8(in[2] * 255 / a),
                 CLIP8(in[4] * 255 / a),
-                a);
+                a
+            );
         }
         memcpy(_out, &iv, sizeof(iv));
         in += 8;
@@ -904,7 +933,8 @@ unpackRGBa(UINT8 *_out, const UINT8 *in, int pixels) {
                 CLIP8(in[0] * 255 / a),
                 CLIP8(in[1] * 255 / a),
                 CLIP8(in[2] * 255 / a),
-                a);
+                a
+            );
         }
         memcpy(_out, &iv, sizeof(iv));
         in += 4;
@@ -928,7 +958,8 @@ unpackRGBaskip1(UINT8 *_out, const UINT8 *in, int pixels) {
                 CLIP8(in[0] * 255 / a),
                 CLIP8(in[1] * 255 / a),
                 CLIP8(in[2] * 255 / a),
-                a);
+                a
+            );
         }
         in += 5;
     }
@@ -950,7 +981,8 @@ unpackRGBaskip2(UINT8 *_out, const UINT8 *in, int pixels) {
                 CLIP8(in[0] * 255 / a),
                 CLIP8(in[1] * 255 / a),
                 CLIP8(in[2] * 255 / a),
-                a);
+                a
+            );
         }
         in += 6;
     }
@@ -972,7 +1004,8 @@ unpackBGRa(UINT8 *_out, const UINT8 *in, int pixels) {
                 CLIP8(in[2] * 255 / a),
                 CLIP8(in[1] * 255 / a),
                 CLIP8(in[0] * 255 / a),
-                a);
+                a
+            );
         }
         memcpy(_out, &iv, sizeof(iv));
         in += 4;
@@ -1003,7 +1036,8 @@ unpackRGBAL(UINT8 *_out, const UINT8 *in, int pixels) {
             in[i],
             in[i + pixels],
             in[i + pixels + pixels],
-            in[i + pixels + pixels + pixels]);
+            in[i + pixels + pixels + pixels]
+        );
         memcpy(_out, &iv, sizeof(iv));
     }
 }
@@ -1090,6 +1124,17 @@ unpackBGRA16B(UINT8 *_out, const UINT8 *in, int pixels) {
     }
 }
 
+static void
+unpackBGAR(UINT8 *_out, const UINT8 *in, int pixels) {
+    int i;
+    for (i = 0; i < pixels; i++) {
+        UINT32 iv = MAKE_UINT32(in[3], in[1], in[0], in[2]);
+        memcpy(_out, &iv, sizeof(iv));
+        in += 4;
+        _out += 4;
+    }
+}
+
 /* Unpack to "CMYK" image */
 
 static void
@@ -1415,90 +1460,90 @@ band3I(UINT8 *out, const UINT8 *in, int pixels) {
 }
 
 static void
-band016B(UINT8* out, const UINT8* in, int pixels)
-{
+band016B(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
     /* band 0 only, big endian */
     for (i = 0; i < pixels; i++) {
         out[0] = in[0];
-        out += 4; in += 2;
+        out += 4;
+        in += 2;
     }
 }
 
 static void
-band116B(UINT8* out, const UINT8* in, int pixels)
-{
+band116B(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
     /* band 1 only, big endian */
     for (i = 0; i < pixels; i++) {
         out[1] = in[0];
-        out += 4; in += 2;
+        out += 4;
+        in += 2;
     }
 }
 
 static void
-band216B(UINT8* out, const UINT8* in, int pixels)
-{
+band216B(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
     /* band 2 only, big endian */
     for (i = 0; i < pixels; i++) {
         out[2] = in[0];
-        out += 4; in += 2;
+        out += 4;
+        in += 2;
     }
 }
 
 static void
-band316B(UINT8* out, const UINT8* in, int pixels)
-{
+band316B(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
     /* band 3 only, big endian */
     for (i = 0; i < pixels; i++) {
         out[3] = in[0];
-        out += 4; in += 2;
+        out += 4;
+        in += 2;
     }
 }
 
 static void
-band016L(UINT8* out, const UINT8* in, int pixels)
-{
+band016L(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
     /* band 0 only, little endian */
     for (i = 0; i < pixels; i++) {
         out[0] = in[1];
-        out += 4; in += 2;
+        out += 4;
+        in += 2;
     }
 }
 
 static void
-band116L(UINT8* out, const UINT8* in, int pixels)
-{
+band116L(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
     /* band 1 only, little endian */
     for (i = 0; i < pixels; i++) {
         out[1] = in[1];
-        out += 4; in += 2;
+        out += 4;
+        in += 2;
     }
 }
 
 static void
-band216L(UINT8* out, const UINT8* in, int pixels)
-{
+band216L(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
     /* band 2 only, little endian */
     for (i = 0; i < pixels; i++) {
         out[2] = in[1];
-        out += 4; in += 2;
+        out += 4;
+        in += 2;
     }
 }
 
 static void
-band316L(UINT8* out, const UINT8* in, int pixels)
-{
+band316L(UINT8 *out, const UINT8 *in, int pixels) {
     int i;
     /* band 3 only, little endian */
     for (i = 0; i < pixels; i++) {
         out[3] = in[1];
-        out += 4; in += 2;
+        out += 4;
+        in += 2;
     }
 }
 
@@ -1516,7 +1561,7 @@ static struct {
 
     /* flags: "I" inverted data; "R" reversed bit order; "B" big
        endian byte order (default is little endian); "L" line
-       interleave, "S" signed, "F" floating point */
+       interleave, "S" signed, "F" floating point, "Z" inverted alpha */
 
     /* exception: rawmodes "I" and "F" are always native endian byte order */
 
@@ -1560,6 +1605,7 @@ static struct {
     {"P", "P", 8, copy1},
     {"P", "P;R", 8, unpackLR},
     {"P", "L", 8, copy1},
+    {"P", "PX", 16, unpackL16B},
 
     /* palette w. alpha */
     {"PA", "PA", 16, unpackLA},
@@ -1577,13 +1623,18 @@ static struct {
     {"RGB", "BGR;15", 16, ImagingUnpackBGR15},
     {"RGB", "RGB;16", 16, ImagingUnpackRGB16},
     {"RGB", "BGR;16", 16, ImagingUnpackBGR16},
+    {"RGB", "RGBX;16L", 64, unpackRGBA16L},
+    {"RGB", "RGBX;16B", 64, unpackRGBA16B},
     {"RGB", "RGB;4B", 16, ImagingUnpackRGB4B},
     {"RGB", "BGR;5", 16, ImagingUnpackBGR15}, /* compat */
     {"RGB", "RGBX", 32, copy4},
     {"RGB", "RGBX;L", 32, unpackRGBAL},
+    {"RGB", "RGBXX", 40, copy4skip1},
+    {"RGB", "RGBXXX", 48, copy4skip2},
     {"RGB", "RGBA;L", 32, unpackRGBAL},
     {"RGB", "RGBA;15", 16, ImagingUnpackRGBA15},
     {"RGB", "BGRX", 32, ImagingUnpackBGRX},
+    {"RGB", "BGXR", 32, ImagingUnpackBGXR},
     {"RGB", "XRGB", 32, ImagingUnpackXRGB},
     {"RGB", "XBGR", 32, ImagingUnpackXBGR},
     {"RGB", "YCC;P", 24, ImagingUnpackYCC},
@@ -1618,12 +1669,14 @@ static struct {
     {"RGBA", "RGBA;L", 32, unpackRGBAL},
     {"RGBA", "RGBA;15", 16, ImagingUnpackRGBA15},
     {"RGBA", "BGRA;15", 16, ImagingUnpackBGRA15},
+    {"RGBA", "BGRA;15Z", 16, ImagingUnpackBGRA15Z},
     {"RGBA", "RGBA;4B", 16, ImagingUnpackRGBA4B},
     {"RGBA", "RGBA;16L", 64, unpackRGBA16L},
     {"RGBA", "RGBA;16B", 64, unpackRGBA16B},
     {"RGBA", "BGRA", 32, unpackBGRA},
     {"RGBA", "BGRA;16L", 64, unpackBGRA16L},
     {"RGBA", "BGRA;16B", 64, unpackBGRA16B},
+    {"RGBA", "BGAR", 32, unpackBGAR},
     {"RGBA", "ARGB", 32, unpackARGB},
     {"RGBA", "ABGR", 32, unpackABGR},
     {"RGBA", "YCCA;P", 32, ImagingUnpackYCCA},
@@ -1662,7 +1715,6 @@ static struct {
     {"RGB", "G;16N", 16, band116L},
     {"RGB", "B;16N", 16, band216L},
 
-
     {"RGBA", "R;16N", 16, band016L},
     {"RGBA", "G;16N", 16, band116L},
     {"RGBA", "B;16N", 16, band216L},
diff --git a/src/libImaging/UnpackYCC.c b/src/libImaging/UnpackYCC.c
index 0b177bdd4f5..35b0c3b694d 100644
--- a/src/libImaging/UnpackYCC.c
+++ b/src/libImaging/UnpackYCC.c
@@ -34,7 +34,8 @@ static INT16 L[] = {
     261, 262, 264, 265, 266, 268, 269, 270, 272, 273, 274, 276, 277, 278, 280, 281,
     283, 284, 285, 287, 288, 289, 291, 292, 293, 295, 296, 297, 299, 300, 302, 303,
     304, 306, 307, 308, 310, 311, 312, 314, 315, 317, 318, 319, 321, 322, 323, 325,
-    326, 327, 329, 330, 331, 333, 334, 336, 337, 338, 340, 341, 342, 344, 345, 346};
+    326, 327, 329, 330, 331, 333, 334, 336, 337, 338, 340, 341, 342, 344, 345, 346
+};
 
 static INT16 CB[] = {
     -345, -343, -341, -338, -336, -334, -332, -329, -327, -325, -323, -321, -318, -316,
@@ -55,7 +56,8 @@ static INT16 CB[] = {
     120,  122,  124,  126,  129,  131,  133,  135,  138,  140,  142,  144,  146,  149,
     151,  153,  155,  157,  160,  162,  164,  166,  169,  171,  173,  175,  177,  180,
     182,  184,  186,  189,  191,  193,  195,  197,  200,  202,  204,  206,  208,  211,
-    213,  215,  217,  220};
+    213,  215,  217,  220
+};
 
 static INT16 GB[] = {
     67,  67,  66,  66,  65,  65,  65,  64,  64,  63,  63,  62,  62,  62,  61,  61,
@@ -73,7 +75,8 @@ static INT16 GB[] = {
     -14, -15, -15, -16, -16, -17, -17, -18, -18, -18, -19, -19, -20, -20, -21, -21,
     -21, -22, -22, -23, -23, -24, -24, -24, -25, -25, -26, -26, -27, -27, -27, -28,
     -28, -29, -29, -30, -30, -30, -31, -31, -32, -32, -33, -33, -33, -34, -34, -35,
-    -35, -36, -36, -36, -37, -37, -38, -38, -39, -39, -39, -40, -40, -41, -41, -42};
+    -35, -36, -36, -36, -37, -37, -38, -38, -39, -39, -39, -40, -40, -41, -41, -42
+};
 
 static INT16 CR[] = {
     -249, -247, -245, -243, -241, -239, -238, -236, -234, -232, -230, -229, -227, -225,
@@ -94,7 +97,8 @@ static INT16 CR[] = {
     133,  135,  137,  138,  140,  142,  144,  146,  148,  149,  151,  153,  155,  157,
     158,  160,  162,  164,  166,  168,  169,  171,  173,  175,  177,  179,  180,  182,
     184,  186,  188,  189,  191,  193,  195,  197,  199,  200,  202,  204,  206,  208,
-    209,  211,  213,  215};
+    209,  211,  213,  215
+};
 
 static INT16 GR[] = {
     127, 126, 125, 124, 123, 122, 121,  121,  120,  119,  118,  117,  116,  115,  114,
@@ -114,7 +118,8 @@ static INT16 GR[] = {
     -67, -68, -69, -69, -70, -71, -72,  -73,  -74,  -75,  -76,  -77,  -78,  -79,  -80,
     -81, -82, -82, -83, -84, -85, -86,  -87,  -88,  -89,  -90,  -91,  -92,  -93,  -94,
     -94, -95, -96, -97, -98, -99, -100, -101, -102, -103, -104, -105, -106, -107, -107,
-    -108};
+    -108
+};
 
 #define R 0
 #define G 1
diff --git a/src/libImaging/UnsharpMask.c b/src/libImaging/UnsharpMask.c
index 2853ce903fc..e714749effd 100644
--- a/src/libImaging/UnsharpMask.c
+++ b/src/libImaging/UnsharpMask.c
@@ -23,7 +23,8 @@ clip8(int in) {
 
 Imaging
 ImagingUnsharpMask(
-    Imaging imOut, Imaging imIn, float radius, int percent, int threshold) {
+    Imaging imOut, Imaging imIn, float radius, int percent, int threshold
+) {
     ImagingSectionCookie cookie;
     Imaging result;
 
diff --git a/src/libImaging/XbmEncode.c b/src/libImaging/XbmEncode.c
index eec4c0d8462..65cc3c6333c 100644
--- a/src/libImaging/XbmEncode.c
+++ b/src/libImaging/XbmEncode.c
@@ -40,7 +40,8 @@ ImagingXbmEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
         state->shuffle(
             state->buffer,
             (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize,
-            state->xsize);
+            state->xsize
+        );
 
         if (state->y < state->ysize - 1) {
             /* any line but the last */
diff --git a/src/libImaging/ZipDecode.c b/src/libImaging/ZipDecode.c
index 8749678341e..d964ff2ca7d 100644
--- a/src/libImaging/ZipDecode.c
+++ b/src/libImaging/ZipDecode.c
@@ -217,7 +217,8 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
                     state->shuffle(
                         (UINT8 *)im->image[state->y] + col * im->pixelsize,
                         state->buffer + context->prefix + i,
-                        1);
+                        1
+                    );
                     col += COL_INCREMENT[context->pass];
                 }
             } else {
@@ -229,7 +230,8 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
                     UINT8 byte = *(state->buffer + context->prefix + (i / 8));
                     byte <<= (i % 8);
                     state->shuffle(
-                        (UINT8 *)im->image[state->y] + col * im->pixelsize, &byte, 1);
+                        (UINT8 *)im->image[state->y] + col * im->pixelsize, &byte, 1
+                    );
                     col += COL_INCREMENT[context->pass];
                 }
             }
@@ -253,7 +255,8 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
                 (UINT8 *)im->image[state->y + state->yoff] +
                     state->xoff * im->pixelsize,
                 state->buffer + context->prefix,
-                state->xsize);
+                state->xsize
+            );
             state->y++;
         }
 
diff --git a/src/libImaging/ZipEncode.c b/src/libImaging/ZipEncode.c
index edbce36822c..44f2629cc12 100644
--- a/src/libImaging/ZipEncode.c
+++ b/src/libImaging/ZipEncode.c
@@ -98,7 +98,8 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
             15,
             9,
             /* compression strategy (image data are filtered)*/
-            compress_type);
+            compress_type
+        );
         if (err < 0) {
             state->errcode = IMAGING_CODEC_CONFIG;
             return -1;
@@ -108,7 +109,8 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
             err = deflateSetDictionary(
                 &context->z_stream,
                 (unsigned char *)context->dictionary,
-                context->dictionary_size);
+                context->dictionary_size
+            );
             if (err < 0) {
                 state->errcode = IMAGING_CODEC_CONFIG;
                 return -1;
@@ -163,7 +165,8 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                         state->buffer + 1,
                         (UINT8 *)im->image[state->y + state->yoff] +
                             state->xoff * im->pixelsize,
-                        state->xsize);
+                        state->xsize
+                    );
 
                     state->y++;
 
diff --git a/src/map.c b/src/map.c
index c298bd1482a..c66702981d3 100644
--- a/src/map.c
+++ b/src/map.c
@@ -72,7 +72,8 @@ PyImaging_MapBuffer(PyObject *self, PyObject *args) {
             &offset,
             &mode,
             &stride,
-            &ystep)) {
+            &ystep
+        )) {
         return NULL;
     }
 
diff --git a/src/path.c b/src/path.c
index cc0698c4d2a..067f42f62de 100644
--- a/src/path.c
+++ b/src/path.c
@@ -26,6 +26,7 @@
  */
 
 #include "Python.h"
+#include "thirdparty/pythoncapi_compat.h"
 #include "libImaging/Imaging.h"
 
 #include <math.h>
@@ -43,7 +44,7 @@ PyImaging_GetBuffer(PyObject *buffer, Py_buffer *view);
 typedef struct {
     PyObject_HEAD Py_ssize_t count;
     double *xy;
-    int index; /* temporary use, e.g. in decimate */
+    int mapping;
 } PyPathObject;
 
 static PyTypeObject PyPathType;
@@ -91,6 +92,7 @@ path_new(Py_ssize_t count, double *xy, int duplicate) {
 
     path->count = count;
     path->xy = xy;
+    path->mapping = 0;
 
     return path;
 }
@@ -162,31 +164,38 @@ PyPath_Flatten(PyObject *data, double **pxy) {
         return -1;
     }
 
-#define assign_item_to_array(op, decref) \
-if (PyFloat_Check(op)) { \
-    xy[j++] = PyFloat_AS_DOUBLE(op); \
-} else if (PyLong_Check(op)) { \
-    xy[j++] = (float)PyLong_AS_LONG(op); \
-} else if (PyNumber_Check(op)) { \
-    xy[j++] = PyFloat_AsDouble(op); \
-} else if (PyArg_ParseTuple(op, "dd", &x, &y)) { \
-    xy[j++] = x; \
-    xy[j++] = y; \
-} else { \
-    PyErr_SetString(PyExc_ValueError, "incorrect coordinate type"); \
-    if (decref) { \
-        Py_DECREF(op); \
-    } \
-    free(xy); \
-    return -1; \
-}
+#define assign_item_to_array(op, decref)                                \
+    if (PyFloat_Check(op)) {                                            \
+        xy[j++] = PyFloat_AS_DOUBLE(op);                                \
+    } else if (PyLong_Check(op)) {                                      \
+        xy[j++] = (float)PyLong_AS_LONG(op);                            \
+    } else if (PyNumber_Check(op)) {                                    \
+        xy[j++] = PyFloat_AsDouble(op);                                 \
+    } else if (PyArg_ParseTuple(op, "dd", &x, &y)) {                    \
+        xy[j++] = x;                                                    \
+        xy[j++] = y;                                                    \
+    } else {                                                            \
+        PyErr_SetString(PyExc_ValueError, "incorrect coordinate type"); \
+        if (decref) {                                                   \
+            Py_DECREF(op);                                              \
+        }                                                               \
+        free(xy);                                                       \
+        return -1;                                                      \
+    }                                                                   \
+    if (decref) {                                                       \
+        Py_DECREF(op);                                                  \
+    }
 
     /* Copy table to path array */
     if (PyList_Check(data)) {
         for (i = 0; i < n; i++) {
             double x, y;
-            PyObject *op = PyList_GET_ITEM(data, i);
-            assign_item_to_array(op, 0);
+            PyObject *op = PyList_GetItemRef(data, i);
+            if (op == NULL) {
+                free(xy);
+                return -1;
+            }
+            assign_item_to_array(op, 1);
         }
     } else if (PyTuple_Check(data)) {
         for (i = 0; i < n; i++) {
@@ -209,7 +218,6 @@ if (PyFloat_Check(op)) { \
                 }
             }
             assign_item_to_array(op, 1);
-            Py_DECREF(op);
         }
     }
 
@@ -270,6 +278,10 @@ path_compact(PyPathObject *self, PyObject *args) {
 
     double cityblock = 2.0;
 
+    if (self->mapping) {
+        PyErr_SetString(PyExc_ValueError, "Path compacted during mapping");
+        return NULL;
+    }
     if (!PyArg_ParseTuple(args, "|d:compact", &cityblock)) {
         return NULL;
     }
@@ -387,11 +399,13 @@ path_map(PyPathObject *self, PyObject *args) {
     xy = self->xy;
 
     /* apply function to coordinate set */
+    self->mapping = 1;
     for (i = 0; i < self->count; i++) {
         double x = xy[i + i];
         double y = xy[i + i + 1];
         PyObject *item = PyObject_CallFunction(function, "dd", x, y);
         if (!item || !PyArg_ParseTuple(item, "dd", &x, &y)) {
+            self->mapping = 0;
             Py_XDECREF(item);
             return NULL;
         }
@@ -399,6 +413,7 @@ path_map(PyPathObject *self, PyObject *args) {
         xy[i + i + 1] = y;
         Py_DECREF(item);
     }
+    self->mapping = 0;
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -482,7 +497,8 @@ path_transform(PyPathObject *self, PyObject *args) {
     double wrap = 0.0;
 
     if (!PyArg_ParseTuple(
-            args, "(dddddd)|d:transform", &a, &b, &c, &d, &e, &f, &wrap)) {
+            args, "(dddddd)|d:transform", &a, &b, &c, &d, &e, &f, &wrap
+        )) {
         return NULL;
     }
 
@@ -563,7 +579,8 @@ path_subscript(PyPathObject *self, PyObject *item) {
         PyErr_Format(
             PyExc_TypeError,
             "Path indices must be integers, not %.200s",
-            Py_TYPE(item)->tp_name);
+            Py_TYPE(item)->tp_name
+        );
         return NULL;
     }
 }
@@ -579,7 +596,8 @@ static PySequenceMethods path_as_sequence = {
 };
 
 static PyMappingMethods path_as_mapping = {
-    (lenfunc)path_len, (binaryfunc)path_subscript, NULL};
+    (lenfunc)path_len, (binaryfunc)path_subscript, NULL
+};
 
 static PyTypeObject PyPathType = {
     PyVarObject_HEAD_INIT(NULL, 0) "Path", /*tp_name*/
diff --git a/src/thirdparty/pythoncapi_compat.h b/src/thirdparty/pythoncapi_compat.h
new file mode 100644
index 00000000000..51e8c0de752
--- /dev/null
+++ b/src/thirdparty/pythoncapi_compat.h
@@ -0,0 +1,1360 @@
+// Header file providing new C API functions to old Python versions.
+//
+// File distributed under the Zero Clause BSD (0BSD) license.
+// Copyright Contributors to the pythoncapi_compat project.
+//
+// Homepage:
+// https://github.com/python/pythoncapi_compat
+//
+// Latest version:
+// https://raw.githubusercontent.com/python/pythoncapi_compat/master/pythoncapi_compat.h
+//
+// SPDX-License-Identifier: 0BSD
+
+#ifndef PYTHONCAPI_COMPAT
+#define PYTHONCAPI_COMPAT
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <Python.h>
+
+// Python 3.11.0b4 added PyFrame_Back() to Python.h
+#if PY_VERSION_HEX < 0x030b00B4 && !defined(PYPY_VERSION)
+#  include "frameobject.h"        // PyFrameObject, PyFrame_GetBack()
+#endif
+
+
+#ifndef _Py_CAST
+#  define _Py_CAST(type, expr) ((type)(expr))
+#endif
+
+// Static inline functions should use _Py_NULL rather than using directly NULL
+// to prevent C++ compiler warnings. On C23 and newer and on C++11 and newer,
+// _Py_NULL is defined as nullptr.
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ > 201710L) \
+        || (defined(__cplusplus) && __cplusplus >= 201103)
+#  define _Py_NULL nullptr
+#else
+#  define _Py_NULL NULL
+#endif
+
+// Cast argument to PyObject* type.
+#ifndef _PyObject_CAST
+#  define _PyObject_CAST(op) _Py_CAST(PyObject*, op)
+#endif
+
+
+// bpo-42262 added Py_NewRef() to Python 3.10.0a3
+#if PY_VERSION_HEX < 0x030A00A3 && !defined(Py_NewRef)
+static inline PyObject* _Py_NewRef(PyObject *obj)
+{
+    Py_INCREF(obj);
+    return obj;
+}
+#define Py_NewRef(obj) _Py_NewRef(_PyObject_CAST(obj))
+#endif
+
+
+// bpo-42262 added Py_XNewRef() to Python 3.10.0a3
+#if PY_VERSION_HEX < 0x030A00A3 && !defined(Py_XNewRef)
+static inline PyObject* _Py_XNewRef(PyObject *obj)
+{
+    Py_XINCREF(obj);
+    return obj;
+}
+#define Py_XNewRef(obj) _Py_XNewRef(_PyObject_CAST(obj))
+#endif
+
+
+// bpo-39573 added Py_SET_REFCNT() to Python 3.9.0a4
+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_REFCNT)
+static inline void _Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt)
+{
+    ob->ob_refcnt = refcnt;
+}
+#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT(_PyObject_CAST(ob), refcnt)
+#endif
+
+
+// Py_SETREF() and Py_XSETREF() were added to Python 3.5.2.
+// It is excluded from the limited C API.
+#if (PY_VERSION_HEX < 0x03050200 && !defined(Py_SETREF)) && !defined(Py_LIMITED_API)
+#define Py_SETREF(dst, src)                                     \
+    do {                                                        \
+        PyObject **_tmp_dst_ptr = _Py_CAST(PyObject**, &(dst)); \
+        PyObject *_tmp_dst = (*_tmp_dst_ptr);                   \
+        *_tmp_dst_ptr = _PyObject_CAST(src);                    \
+        Py_DECREF(_tmp_dst);                                    \
+    } while (0)
+
+#define Py_XSETREF(dst, src)                                    \
+    do {                                                        \
+        PyObject **_tmp_dst_ptr = _Py_CAST(PyObject**, &(dst)); \
+        PyObject *_tmp_dst = (*_tmp_dst_ptr);                   \
+        *_tmp_dst_ptr = _PyObject_CAST(src);                    \
+        Py_XDECREF(_tmp_dst);                                   \
+    } while (0)
+#endif
+
+
+// bpo-43753 added Py_Is(), Py_IsNone(), Py_IsTrue() and Py_IsFalse()
+// to Python 3.10.0b1.
+#if PY_VERSION_HEX < 0x030A00B1 && !defined(Py_Is)
+#  define Py_Is(x, y) ((x) == (y))
+#endif
+#if PY_VERSION_HEX < 0x030A00B1 && !defined(Py_IsNone)
+#  define Py_IsNone(x) Py_Is(x, Py_None)
+#endif
+#if (PY_VERSION_HEX < 0x030A00B1 || defined(PYPY_VERSION)) && !defined(Py_IsTrue)
+#  define Py_IsTrue(x) Py_Is(x, Py_True)
+#endif
+#if (PY_VERSION_HEX < 0x030A00B1 || defined(PYPY_VERSION)) && !defined(Py_IsFalse)
+#  define Py_IsFalse(x) Py_Is(x, Py_False)
+#endif
+
+
+// bpo-39573 added Py_SET_TYPE() to Python 3.9.0a4
+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE)
+static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
+{
+    ob->ob_type = type;
+}
+#define Py_SET_TYPE(ob, type) _Py_SET_TYPE(_PyObject_CAST(ob), type)
+#endif
+
+
+// bpo-39573 added Py_SET_SIZE() to Python 3.9.0a4
+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_SIZE)
+static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size)
+{
+    ob->ob_size = size;
+}
+#define Py_SET_SIZE(ob, size) _Py_SET_SIZE((PyVarObject*)(ob), size)
+#endif
+
+
+// bpo-40421 added PyFrame_GetCode() to Python 3.9.0b1
+#if PY_VERSION_HEX < 0x030900B1 || defined(PYPY_VERSION)
+static inline PyCodeObject* PyFrame_GetCode(PyFrameObject *frame)
+{
+    assert(frame != _Py_NULL);
+    assert(frame->f_code != _Py_NULL);
+    return _Py_CAST(PyCodeObject*, Py_NewRef(frame->f_code));
+}
+#endif
+
+static inline PyCodeObject* _PyFrame_GetCodeBorrow(PyFrameObject *frame)
+{
+    PyCodeObject *code = PyFrame_GetCode(frame);
+    Py_DECREF(code);
+    return code;
+}
+
+
+// bpo-40421 added PyFrame_GetBack() to Python 3.9.0b1
+#if PY_VERSION_HEX < 0x030900B1 && !defined(PYPY_VERSION)
+static inline PyFrameObject* PyFrame_GetBack(PyFrameObject *frame)
+{
+    assert(frame != _Py_NULL);
+    return _Py_CAST(PyFrameObject*, Py_XNewRef(frame->f_back));
+}
+#endif
+
+#if !defined(PYPY_VERSION)
+static inline PyFrameObject* _PyFrame_GetBackBorrow(PyFrameObject *frame)
+{
+    PyFrameObject *back = PyFrame_GetBack(frame);
+    Py_XDECREF(back);
+    return back;
+}
+#endif
+
+
+// bpo-40421 added PyFrame_GetLocals() to Python 3.11.0a7
+#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION)
+static inline PyObject* PyFrame_GetLocals(PyFrameObject *frame)
+{
+#if PY_VERSION_HEX >= 0x030400B1
+    if (PyFrame_FastToLocalsWithError(frame) < 0) {
+        return NULL;
+    }
+#else
+    PyFrame_FastToLocals(frame);
+#endif
+    return Py_NewRef(frame->f_locals);
+}
+#endif
+
+
+// bpo-40421 added PyFrame_GetGlobals() to Python 3.11.0a7
+#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION)
+static inline PyObject* PyFrame_GetGlobals(PyFrameObject *frame)
+{
+    return Py_NewRef(frame->f_globals);
+}
+#endif
+
+
+// bpo-40421 added PyFrame_GetBuiltins() to Python 3.11.0a7
+#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION)
+static inline PyObject* PyFrame_GetBuiltins(PyFrameObject *frame)
+{
+    return Py_NewRef(frame->f_builtins);
+}
+#endif
+
+
+// bpo-40421 added PyFrame_GetLasti() to Python 3.11.0b1
+#if PY_VERSION_HEX < 0x030B00B1 && !defined(PYPY_VERSION)
+static inline int PyFrame_GetLasti(PyFrameObject *frame)
+{
+#if PY_VERSION_HEX >= 0x030A00A7
+    // bpo-27129: Since Python 3.10.0a7, f_lasti is an instruction offset,
+    // not a bytes offset anymore. Python uses 16-bit "wordcode" (2 bytes)
+    // instructions.
+    if (frame->f_lasti < 0) {
+        return -1;
+    }
+    return frame->f_lasti * 2;
+#else
+    return frame->f_lasti;
+#endif
+}
+#endif
+
+
+// gh-91248 added PyFrame_GetVar() to Python 3.12.0a2
+#if PY_VERSION_HEX < 0x030C00A2 && !defined(PYPY_VERSION)
+static inline PyObject* PyFrame_GetVar(PyFrameObject *frame, PyObject *name)
+{
+    PyObject *locals, *value;
+
+    locals = PyFrame_GetLocals(frame);
+    if (locals == NULL) {
+        return NULL;
+    }
+#if PY_VERSION_HEX >= 0x03000000
+    value = PyDict_GetItemWithError(locals, name);
+#else
+    value = _PyDict_GetItemWithError(locals, name);
+#endif
+    Py_DECREF(locals);
+
+    if (value == NULL) {
+        if (PyErr_Occurred()) {
+            return NULL;
+        }
+#if PY_VERSION_HEX >= 0x03000000
+        PyErr_Format(PyExc_NameError, "variable %R does not exist", name);
+#else
+        PyErr_SetString(PyExc_NameError, "variable does not exist");
+#endif
+        return NULL;
+    }
+    return Py_NewRef(value);
+}
+#endif
+
+
+// gh-91248 added PyFrame_GetVarString() to Python 3.12.0a2
+#if PY_VERSION_HEX < 0x030C00A2 && !defined(PYPY_VERSION)
+static inline PyObject*
+PyFrame_GetVarString(PyFrameObject *frame, const char *name)
+{
+    PyObject *name_obj, *value;
+#if PY_VERSION_HEX >= 0x03000000
+    name_obj = PyUnicode_FromString(name);
+#else
+    name_obj = PyString_FromString(name);
+#endif
+    if (name_obj == NULL) {
+        return NULL;
+    }
+    value = PyFrame_GetVar(frame, name_obj);
+    Py_DECREF(name_obj);
+    return value;
+}
+#endif
+
+
+// bpo-39947 added PyThreadState_GetInterpreter() to Python 3.9.0a5
+#if PY_VERSION_HEX < 0x030900A5 || defined(PYPY_VERSION)
+static inline PyInterpreterState *
+PyThreadState_GetInterpreter(PyThreadState *tstate)
+{
+    assert(tstate != _Py_NULL);
+    return tstate->interp;
+}
+#endif
+
+
+// bpo-40429 added PyThreadState_GetFrame() to Python 3.9.0b1
+#if PY_VERSION_HEX < 0x030900B1 && !defined(PYPY_VERSION)
+static inline PyFrameObject* PyThreadState_GetFrame(PyThreadState *tstate)
+{
+    assert(tstate != _Py_NULL);
+    return _Py_CAST(PyFrameObject *, Py_XNewRef(tstate->frame));
+}
+#endif
+
+#if !defined(PYPY_VERSION)
+static inline PyFrameObject*
+_PyThreadState_GetFrameBorrow(PyThreadState *tstate)
+{
+    PyFrameObject *frame = PyThreadState_GetFrame(tstate);
+    Py_XDECREF(frame);
+    return frame;
+}
+#endif
+
+
+// bpo-39947 added PyInterpreterState_Get() to Python 3.9.0a5
+#if PY_VERSION_HEX < 0x030900A5 || defined(PYPY_VERSION)
+static inline PyInterpreterState* PyInterpreterState_Get(void)
+{
+    PyThreadState *tstate;
+    PyInterpreterState *interp;
+
+    tstate = PyThreadState_GET();
+    if (tstate == _Py_NULL) {
+        Py_FatalError("GIL released (tstate is NULL)");
+    }
+    interp = tstate->interp;
+    if (interp == _Py_NULL) {
+        Py_FatalError("no current interpreter");
+    }
+    return interp;
+}
+#endif
+
+
+// bpo-39947 added PyInterpreterState_Get() to Python 3.9.0a6
+#if 0x030700A1 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x030900A6 && !defined(PYPY_VERSION)
+static inline uint64_t PyThreadState_GetID(PyThreadState *tstate)
+{
+    assert(tstate != _Py_NULL);
+    return tstate->id;
+}
+#endif
+
+// bpo-43760 added PyThreadState_EnterTracing() to Python 3.11.0a2
+#if PY_VERSION_HEX < 0x030B00A2 && !defined(PYPY_VERSION)
+static inline void PyThreadState_EnterTracing(PyThreadState *tstate)
+{
+    tstate->tracing++;
+#if PY_VERSION_HEX >= 0x030A00A1
+    tstate->cframe->use_tracing = 0;
+#else
+    tstate->use_tracing = 0;
+#endif
+}
+#endif
+
+// bpo-43760 added PyThreadState_LeaveTracing() to Python 3.11.0a2
+#if PY_VERSION_HEX < 0x030B00A2 && !defined(PYPY_VERSION)
+static inline void PyThreadState_LeaveTracing(PyThreadState *tstate)
+{
+    int use_tracing = (tstate->c_tracefunc != _Py_NULL
+                       || tstate->c_profilefunc != _Py_NULL);
+    tstate->tracing--;
+#if PY_VERSION_HEX >= 0x030A00A1
+    tstate->cframe->use_tracing = use_tracing;
+#else
+    tstate->use_tracing = use_tracing;
+#endif
+}
+#endif
+
+
+// bpo-37194 added PyObject_CallNoArgs() to Python 3.9.0a1
+// PyObject_CallNoArgs() added to PyPy 3.9.16-v7.3.11
+#if !defined(PyObject_CallNoArgs) && PY_VERSION_HEX < 0x030900A1
+static inline PyObject* PyObject_CallNoArgs(PyObject *func)
+{
+    return PyObject_CallFunctionObjArgs(func, NULL);
+}
+#endif
+
+
+// bpo-39245 made PyObject_CallOneArg() public (previously called
+// _PyObject_CallOneArg) in Python 3.9.0a4
+// PyObject_CallOneArg() added to PyPy 3.9.16-v7.3.11
+#if !defined(PyObject_CallOneArg) && PY_VERSION_HEX < 0x030900A4
+static inline PyObject* PyObject_CallOneArg(PyObject *func, PyObject *arg)
+{
+    return PyObject_CallFunctionObjArgs(func, arg, NULL);
+}
+#endif
+
+
+// bpo-1635741 added PyModule_AddObjectRef() to Python 3.10.0a3
+#if PY_VERSION_HEX < 0x030A00A3
+static inline int
+PyModule_AddObjectRef(PyObject *module, const char *name, PyObject *value)
+{
+    int res;
+
+    if (!value && !PyErr_Occurred()) {
+        // PyModule_AddObject() raises TypeError in this case
+        PyErr_SetString(PyExc_SystemError,
+                        "PyModule_AddObjectRef() must be called "
+                        "with an exception raised if value is NULL");
+        return -1;
+    }
+
+    Py_XINCREF(value);
+    res = PyModule_AddObject(module, name, value);
+    if (res < 0) {
+        Py_XDECREF(value);
+    }
+    return res;
+}
+#endif
+
+
+// bpo-40024 added PyModule_AddType() to Python 3.9.0a5
+#if PY_VERSION_HEX < 0x030900A5
+static inline int PyModule_AddType(PyObject *module, PyTypeObject *type)
+{
+    const char *name, *dot;
+
+    if (PyType_Ready(type) < 0) {
+        return -1;
+    }
+
+    // inline _PyType_Name()
+    name = type->tp_name;
+    assert(name != _Py_NULL);
+    dot = strrchr(name, '.');
+    if (dot != _Py_NULL) {
+        name = dot + 1;
+    }
+
+    return PyModule_AddObjectRef(module, name, _PyObject_CAST(type));
+}
+#endif
+
+
+// bpo-40241 added PyObject_GC_IsTracked() to Python 3.9.0a6.
+// bpo-4688 added _PyObject_GC_IS_TRACKED() to Python 2.7.0a2.
+#if PY_VERSION_HEX < 0x030900A6 && !defined(PYPY_VERSION)
+static inline int PyObject_GC_IsTracked(PyObject* obj)
+{
+    return (PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj));
+}
+#endif
+
+// bpo-40241 added PyObject_GC_IsFinalized() to Python 3.9.0a6.
+// bpo-18112 added _PyGCHead_FINALIZED() to Python 3.4.0 final.
+#if PY_VERSION_HEX < 0x030900A6 && PY_VERSION_HEX >= 0x030400F0 && !defined(PYPY_VERSION)
+static inline int PyObject_GC_IsFinalized(PyObject *obj)
+{
+    PyGC_Head *gc = _Py_CAST(PyGC_Head*, obj) - 1;
+    return (PyObject_IS_GC(obj) && _PyGCHead_FINALIZED(gc));
+}
+#endif
+
+
+// bpo-39573 added Py_IS_TYPE() to Python 3.9.0a4
+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_IS_TYPE)
+static inline int _Py_IS_TYPE(PyObject *ob, PyTypeObject *type) {
+    return Py_TYPE(ob) == type;
+}
+#define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST(ob), type)
+#endif
+
+
+// bpo-46906 added PyFloat_Pack2() and PyFloat_Unpack2() to Python 3.11a7.
+// bpo-11734 added _PyFloat_Pack2() and _PyFloat_Unpack2() to Python 3.6.0b1.
+// Python 3.11a2 moved _PyFloat_Pack2() and _PyFloat_Unpack2() to the internal
+// C API: Python 3.11a2-3.11a6 versions are not supported.
+#if 0x030600B1 <= PY_VERSION_HEX && PY_VERSION_HEX <= 0x030B00A1 && !defined(PYPY_VERSION)
+static inline int PyFloat_Pack2(double x, char *p, int le)
+{ return _PyFloat_Pack2(x, (unsigned char*)p, le); }
+
+static inline double PyFloat_Unpack2(const char *p, int le)
+{ return _PyFloat_Unpack2((const unsigned char *)p, le); }
+#endif
+
+
+// bpo-46906 added PyFloat_Pack4(), PyFloat_Pack8(), PyFloat_Unpack4() and
+// PyFloat_Unpack8() to Python 3.11a7.
+// Python 3.11a2 moved _PyFloat_Pack4(), _PyFloat_Pack8(), _PyFloat_Unpack4()
+// and _PyFloat_Unpack8() to the internal C API: Python 3.11a2-3.11a6 versions
+// are not supported.
+#if PY_VERSION_HEX <= 0x030B00A1 && !defined(PYPY_VERSION)
+static inline int PyFloat_Pack4(double x, char *p, int le)
+{ return _PyFloat_Pack4(x, (unsigned char*)p, le); }
+
+static inline int PyFloat_Pack8(double x, char *p, int le)
+{ return _PyFloat_Pack8(x, (unsigned char*)p, le); }
+
+static inline double PyFloat_Unpack4(const char *p, int le)
+{ return _PyFloat_Unpack4((const unsigned char *)p, le); }
+
+static inline double PyFloat_Unpack8(const char *p, int le)
+{ return _PyFloat_Unpack8((const unsigned char *)p, le); }
+#endif
+
+
+// gh-92154 added PyCode_GetCode() to Python 3.11.0b1
+#if PY_VERSION_HEX < 0x030B00B1 && !defined(PYPY_VERSION)
+static inline PyObject* PyCode_GetCode(PyCodeObject *code)
+{
+    return Py_NewRef(code->co_code);
+}
+#endif
+
+
+// gh-95008 added PyCode_GetVarnames() to Python 3.11.0rc1
+#if PY_VERSION_HEX < 0x030B00C1 && !defined(PYPY_VERSION)
+static inline PyObject* PyCode_GetVarnames(PyCodeObject *code)
+{
+    return Py_NewRef(code->co_varnames);
+}
+#endif
+
+// gh-95008 added PyCode_GetFreevars() to Python 3.11.0rc1
+#if PY_VERSION_HEX < 0x030B00C1 && !defined(PYPY_VERSION)
+static inline PyObject* PyCode_GetFreevars(PyCodeObject *code)
+{
+    return Py_NewRef(code->co_freevars);
+}
+#endif
+
+// gh-95008 added PyCode_GetCellvars() to Python 3.11.0rc1
+#if PY_VERSION_HEX < 0x030B00C1 && !defined(PYPY_VERSION)
+static inline PyObject* PyCode_GetCellvars(PyCodeObject *code)
+{
+    return Py_NewRef(code->co_cellvars);
+}
+#endif
+
+
+// Py_UNUSED() was added to Python 3.4.0b2.
+#if PY_VERSION_HEX < 0x030400B2 && !defined(Py_UNUSED)
+#  if defined(__GNUC__) || defined(__clang__)
+#    define Py_UNUSED(name) _unused_ ## name __attribute__((unused))
+#  else
+#    define Py_UNUSED(name) _unused_ ## name
+#  endif
+#endif
+
+
+// gh-105922 added PyImport_AddModuleRef() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A0
+static inline PyObject* PyImport_AddModuleRef(const char *name)
+{
+    return Py_XNewRef(PyImport_AddModule(name));
+}
+#endif
+
+
+// gh-105927 added PyWeakref_GetRef() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D0000
+static inline int PyWeakref_GetRef(PyObject *ref, PyObject **pobj)
+{
+    PyObject *obj;
+    if (ref != NULL && !PyWeakref_Check(ref)) {
+        *pobj = NULL;
+        PyErr_SetString(PyExc_TypeError, "expected a weakref");
+        return -1;
+    }
+    obj = PyWeakref_GetObject(ref);
+    if (obj == NULL) {
+        // SystemError if ref is NULL
+        *pobj = NULL;
+        return -1;
+    }
+    if (obj == Py_None) {
+        *pobj = NULL;
+        return 0;
+    }
+    *pobj = Py_NewRef(obj);
+    return (*pobj != NULL);
+}
+#endif
+
+
+// bpo-36974 added PY_VECTORCALL_ARGUMENTS_OFFSET to Python 3.8b1
+#ifndef PY_VECTORCALL_ARGUMENTS_OFFSET
+#  define PY_VECTORCALL_ARGUMENTS_OFFSET (_Py_CAST(size_t, 1) << (8 * sizeof(size_t) - 1))
+#endif
+
+// bpo-36974 added PyVectorcall_NARGS() to Python 3.8b1
+#if PY_VERSION_HEX < 0x030800B1
+static inline Py_ssize_t PyVectorcall_NARGS(size_t n)
+{
+    return n & ~PY_VECTORCALL_ARGUMENTS_OFFSET;
+}
+#endif
+
+
+// gh-105922 added PyObject_Vectorcall() to Python 3.9.0a4
+#if PY_VERSION_HEX < 0x030900A4
+static inline PyObject*
+PyObject_Vectorcall(PyObject *callable, PyObject *const *args,
+                     size_t nargsf, PyObject *kwnames)
+{
+#if PY_VERSION_HEX >= 0x030800B1 && !defined(PYPY_VERSION)
+    // bpo-36974 added _PyObject_Vectorcall() to Python 3.8.0b1
+    return _PyObject_Vectorcall(callable, args, nargsf, kwnames);
+#else
+    PyObject *posargs = NULL, *kwargs = NULL;
+    PyObject *res;
+    Py_ssize_t nposargs, nkwargs, i;
+
+    if (nargsf != 0 && args == NULL) {
+        PyErr_BadInternalCall();
+        goto error;
+    }
+    if (kwnames != NULL && !PyTuple_Check(kwnames)) {
+        PyErr_BadInternalCall();
+        goto error;
+    }
+
+    nposargs = (Py_ssize_t)PyVectorcall_NARGS(nargsf);
+    if (kwnames) {
+        nkwargs = PyTuple_GET_SIZE(kwnames);
+    }
+    else {
+        nkwargs = 0;
+    }
+
+    posargs = PyTuple_New(nposargs);
+    if (posargs == NULL) {
+        goto error;
+    }
+    if (nposargs) {
+        for (i=0; i < nposargs; i++) {
+            PyTuple_SET_ITEM(posargs, i, Py_NewRef(*args));
+            args++;
+        }
+    }
+
+    if (nkwargs) {
+        kwargs = PyDict_New();
+        if (kwargs == NULL) {
+            goto error;
+        }
+
+        for (i = 0; i < nkwargs; i++) {
+            PyObject *key = PyTuple_GET_ITEM(kwnames, i);
+            PyObject *value = *args;
+            args++;
+            if (PyDict_SetItem(kwargs, key, value) < 0) {
+                goto error;
+            }
+        }
+    }
+    else {
+        kwargs = NULL;
+    }
+
+    res = PyObject_Call(callable, posargs, kwargs);
+    Py_DECREF(posargs);
+    Py_XDECREF(kwargs);
+    return res;
+
+error:
+    Py_DECREF(posargs);
+    Py_XDECREF(kwargs);
+    return NULL;
+#endif
+}
+#endif
+
+
+// gh-106521 added PyObject_GetOptionalAttr() and
+// PyObject_GetOptionalAttrString() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int
+PyObject_GetOptionalAttr(PyObject *obj, PyObject *attr_name, PyObject **result)
+{
+    // bpo-32571 added _PyObject_LookupAttr() to Python 3.7.0b1
+#if PY_VERSION_HEX >= 0x030700B1 && !defined(PYPY_VERSION)
+    return _PyObject_LookupAttr(obj, attr_name, result);
+#else
+    *result = PyObject_GetAttr(obj, attr_name);
+    if (*result != NULL) {
+        return 1;
+    }
+    if (!PyErr_Occurred()) {
+        return 0;
+    }
+    if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
+        PyErr_Clear();
+        return 0;
+    }
+    return -1;
+#endif
+}
+
+static inline int
+PyObject_GetOptionalAttrString(PyObject *obj, const char *attr_name, PyObject **result)
+{
+    PyObject *name_obj;
+    int rc;
+#if PY_VERSION_HEX >= 0x03000000
+    name_obj = PyUnicode_FromString(attr_name);
+#else
+    name_obj = PyString_FromString(attr_name);
+#endif
+    if (name_obj == NULL) {
+        *result = NULL;
+        return -1;
+    }
+    rc = PyObject_GetOptionalAttr(obj, name_obj, result);
+    Py_DECREF(name_obj);
+    return rc;
+}
+#endif
+
+
+// gh-106307 added PyObject_GetOptionalAttr() and
+// PyMapping_GetOptionalItemString() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int
+PyMapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result)
+{
+    *result = PyObject_GetItem(obj, key);
+    if (*result) {
+        return 1;
+    }
+    if (!PyErr_ExceptionMatches(PyExc_KeyError)) {
+        return -1;
+    }
+    PyErr_Clear();
+    return 0;
+}
+
+static inline int
+PyMapping_GetOptionalItemString(PyObject *obj, const char *key, PyObject **result)
+{
+    PyObject *key_obj;
+    int rc;
+#if PY_VERSION_HEX >= 0x03000000
+    key_obj = PyUnicode_FromString(key);
+#else
+    key_obj = PyString_FromString(key);
+#endif
+    if (key_obj == NULL) {
+        *result = NULL;
+        return -1;
+    }
+    rc = PyMapping_GetOptionalItem(obj, key_obj, result);
+    Py_DECREF(key_obj);
+    return rc;
+}
+#endif
+
+// gh-108511 added PyMapping_HasKeyWithError() and
+// PyMapping_HasKeyStringWithError() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int
+PyMapping_HasKeyWithError(PyObject *obj, PyObject *key)
+{
+    PyObject *res;
+    int rc = PyMapping_GetOptionalItem(obj, key, &res);
+    Py_XDECREF(res);
+    return rc;
+}
+
+static inline int
+PyMapping_HasKeyStringWithError(PyObject *obj, const char *key)
+{
+    PyObject *res;
+    int rc = PyMapping_GetOptionalItemString(obj, key, &res);
+    Py_XDECREF(res);
+    return rc;
+}
+#endif
+
+
+// gh-108511 added PyObject_HasAttrWithError() and
+// PyObject_HasAttrStringWithError() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int
+PyObject_HasAttrWithError(PyObject *obj, PyObject *attr)
+{
+    PyObject *res;
+    int rc = PyObject_GetOptionalAttr(obj, attr, &res);
+    Py_XDECREF(res);
+    return rc;
+}
+
+static inline int
+PyObject_HasAttrStringWithError(PyObject *obj, const char *attr)
+{
+    PyObject *res;
+    int rc = PyObject_GetOptionalAttrString(obj, attr, &res);
+    Py_XDECREF(res);
+    return rc;
+}
+#endif
+
+
+// gh-106004 added PyDict_GetItemRef() and PyDict_GetItemStringRef()
+// to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int
+PyDict_GetItemRef(PyObject *mp, PyObject *key, PyObject **result)
+{
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *item = PyDict_GetItemWithError(mp, key);
+#else
+    PyObject *item = _PyDict_GetItemWithError(mp, key);
+#endif
+    if (item != NULL) {
+        *result = Py_NewRef(item);
+        return 1;  // found
+    }
+    if (!PyErr_Occurred()) {
+        *result = NULL;
+        return 0;  // not found
+    }
+    *result = NULL;
+    return -1;
+}
+
+static inline int
+PyDict_GetItemStringRef(PyObject *mp, const char *key, PyObject **result)
+{
+    int res;
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *key_obj = PyUnicode_FromString(key);
+#else
+    PyObject *key_obj = PyString_FromString(key);
+#endif
+    if (key_obj == NULL) {
+        *result = NULL;
+        return -1;
+    }
+    res = PyDict_GetItemRef(mp, key_obj, result);
+    Py_DECREF(key_obj);
+    return res;
+}
+#endif
+
+
+// gh-106307 added PyModule_Add() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int
+PyModule_Add(PyObject *mod, const char *name, PyObject *value)
+{
+    int res = PyModule_AddObjectRef(mod, name, value);
+    Py_XDECREF(value);
+    return res;
+}
+#endif
+
+
+// gh-108014 added Py_IsFinalizing() to Python 3.13.0a1
+// bpo-1856 added _Py_Finalizing to Python 3.2.1b1.
+// _Py_IsFinalizing() was added to PyPy 7.3.0.
+#if (0x030201B1 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x030D00A1) \
+        && (!defined(PYPY_VERSION_NUM) || PYPY_VERSION_NUM >= 0x7030000)
+static inline int Py_IsFinalizing(void)
+{
+#if PY_VERSION_HEX >= 0x030700A1
+    // _Py_IsFinalizing() was added to Python 3.7.0a1.
+    return _Py_IsFinalizing();
+#else
+    return (_Py_Finalizing != NULL);
+#endif
+}
+#endif
+
+
+// gh-108323 added PyDict_ContainsString() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int PyDict_ContainsString(PyObject *op, const char *key)
+{
+    PyObject *key_obj = PyUnicode_FromString(key);
+    if (key_obj == NULL) {
+        return -1;
+    }
+    int res = PyDict_Contains(op, key_obj);
+    Py_DECREF(key_obj);
+    return res;
+}
+#endif
+
+
+// gh-108445 added PyLong_AsInt() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int PyLong_AsInt(PyObject *obj)
+{
+#ifdef PYPY_VERSION
+    long value = PyLong_AsLong(obj);
+    if (value == -1 && PyErr_Occurred()) {
+        return -1;
+    }
+    if (value < (long)INT_MIN || (long)INT_MAX < value) {
+        PyErr_SetString(PyExc_OverflowError,
+                        "Python int too large to convert to C int");
+        return -1;
+    }
+    return (int)value;
+#else
+    return _PyLong_AsInt(obj);
+#endif
+}
+#endif
+
+
+// gh-107073 added PyObject_VisitManagedDict() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int
+PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg)
+{
+    PyObject **dict = _PyObject_GetDictPtr(obj);
+    if (*dict == NULL) {
+        return -1;
+    }
+    Py_VISIT(*dict);
+    return 0;
+}
+
+static inline void
+PyObject_ClearManagedDict(PyObject *obj)
+{
+    PyObject **dict = _PyObject_GetDictPtr(obj);
+    if (*dict == NULL) {
+        return;
+    }
+    Py_CLEAR(*dict);
+}
+#endif
+
+// gh-108867 added PyThreadState_GetUnchecked() to Python 3.13.0a1
+// Python 3.5.2 added _PyThreadState_UncheckedGet().
+#if PY_VERSION_HEX >= 0x03050200 && PY_VERSION_HEX < 0x030D00A1
+static inline PyThreadState*
+PyThreadState_GetUnchecked(void)
+{
+    return _PyThreadState_UncheckedGet();
+}
+#endif
+
+// gh-110289 added PyUnicode_EqualToUTF8() and PyUnicode_EqualToUTF8AndSize()
+// to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+static inline int
+PyUnicode_EqualToUTF8AndSize(PyObject *unicode, const char *str, Py_ssize_t str_len)
+{
+    Py_ssize_t len;
+    const void *utf8;
+    PyObject *exc_type, *exc_value, *exc_tb;
+    int res;
+
+    // API cannot report errors so save/restore the exception
+    PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
+
+    // Python 3.3.0a1 added PyUnicode_AsUTF8AndSize()
+#if PY_VERSION_HEX >= 0x030300A1
+    if (PyUnicode_IS_ASCII(unicode)) {
+        utf8 = PyUnicode_DATA(unicode);
+        len = PyUnicode_GET_LENGTH(unicode);
+    }
+    else {
+        utf8 = PyUnicode_AsUTF8AndSize(unicode, &len);
+        if (utf8 == NULL) {
+            // Memory allocation failure. The API cannot report error,
+            // so ignore the exception and return 0.
+            res = 0;
+            goto done;
+        }
+    }
+
+    if (len != str_len) {
+        res = 0;
+        goto done;
+    }
+    res = (memcmp(utf8, str, (size_t)len) == 0);
+#else
+    PyObject *bytes = PyUnicode_AsUTF8String(unicode);
+    if (bytes == NULL) {
+        // Memory allocation failure. The API cannot report error,
+        // so ignore the exception and return 0.
+        res = 0;
+        goto done;
+    }
+
+#if PY_VERSION_HEX >= 0x03000000
+    len = PyBytes_GET_SIZE(bytes);
+    utf8 = PyBytes_AS_STRING(bytes);
+#else
+    len = PyString_GET_SIZE(bytes);
+    utf8 = PyString_AS_STRING(bytes);
+#endif
+    if (len != str_len) {
+        Py_DECREF(bytes);
+        res = 0;
+        goto done;
+    }
+
+    res = (memcmp(utf8, str, (size_t)len) == 0);
+    Py_DECREF(bytes);
+#endif
+
+done:
+    PyErr_Restore(exc_type, exc_value, exc_tb);
+    return res;
+}
+
+static inline int
+PyUnicode_EqualToUTF8(PyObject *unicode, const char *str)
+{
+    return PyUnicode_EqualToUTF8AndSize(unicode, str, (Py_ssize_t)strlen(str));
+}
+#endif
+
+
+// gh-111138 added PyList_Extend() and PyList_Clear() to Python 3.13.0a2
+#if PY_VERSION_HEX < 0x030D00A2
+static inline int
+PyList_Extend(PyObject *list, PyObject *iterable)
+{
+    return PyList_SetSlice(list, PY_SSIZE_T_MAX, PY_SSIZE_T_MAX, iterable);
+}
+
+static inline int
+PyList_Clear(PyObject *list)
+{
+    return PyList_SetSlice(list, 0, PY_SSIZE_T_MAX, NULL);
+}
+#endif
+
+// gh-111262 added PyDict_Pop() and PyDict_PopString() to Python 3.13.0a2
+#if PY_VERSION_HEX < 0x030D00A2
+static inline int
+PyDict_Pop(PyObject *dict, PyObject *key, PyObject **result)
+{
+    PyObject *value;
+
+    if (!PyDict_Check(dict)) {
+        PyErr_BadInternalCall();
+        if (result) {
+            *result = NULL;
+        }
+        return -1;
+    }
+
+    // bpo-16991 added _PyDict_Pop() to Python 3.5.0b2.
+    // Python 3.6.0b3 changed _PyDict_Pop() first argument type to PyObject*.
+    // Python 3.13.0a1 removed _PyDict_Pop().
+#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x030500b2 || PY_VERSION_HEX >= 0x030D0000
+    value = PyObject_CallMethod(dict, "pop", "O", key);
+#elif PY_VERSION_HEX < 0x030600b3
+    value = _PyDict_Pop(_Py_CAST(PyDictObject*, dict), key, NULL);
+#else
+    value = _PyDict_Pop(dict, key, NULL);
+#endif
+    if (value == NULL) {
+        if (result) {
+            *result = NULL;
+        }
+        if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_KeyError)) {
+            return -1;
+        }
+        PyErr_Clear();
+        return 0;
+    }
+    if (result) {
+        *result = value;
+    }
+    else {
+        Py_DECREF(value);
+    }
+    return 1;
+}
+
+static inline int
+PyDict_PopString(PyObject *dict, const char *key, PyObject **result)
+{
+    PyObject *key_obj = PyUnicode_FromString(key);
+    if (key_obj == NULL) {
+        if (result != NULL) {
+            *result = NULL;
+        }
+        return -1;
+    }
+
+    int res = PyDict_Pop(dict, key_obj, result);
+    Py_DECREF(key_obj);
+    return res;
+}
+#endif
+
+
+#if PY_VERSION_HEX < 0x030200A4
+// Python 3.2.0a4 added Py_hash_t type
+typedef Py_ssize_t Py_hash_t;
+#endif
+
+
+// gh-111545 added Py_HashPointer() to Python 3.13.0a3
+#if PY_VERSION_HEX < 0x030D00A3
+static inline Py_hash_t Py_HashPointer(const void *ptr)
+{
+#if PY_VERSION_HEX >= 0x030900A4 && !defined(PYPY_VERSION)
+    return _Py_HashPointer(ptr);
+#else
+    return _Py_HashPointer(_Py_CAST(void*, ptr));
+#endif
+}
+#endif
+
+
+// Python 3.13a4 added a PyTime API.
+// Use the private API added to Python 3.5.
+#if PY_VERSION_HEX < 0x030D00A4 && PY_VERSION_HEX  >= 0x03050000
+typedef _PyTime_t PyTime_t;
+#define PyTime_MIN _PyTime_MIN
+#define PyTime_MAX _PyTime_MAX
+
+static inline double PyTime_AsSecondsDouble(PyTime_t t)
+{ return _PyTime_AsSecondsDouble(t); }
+
+static inline int PyTime_Monotonic(PyTime_t *result)
+{ return _PyTime_GetMonotonicClockWithInfo(result, NULL); }
+
+static inline int PyTime_Time(PyTime_t *result)
+{ return _PyTime_GetSystemClockWithInfo(result, NULL); }
+
+static inline int PyTime_PerfCounter(PyTime_t *result)
+{
+#if PY_VERSION_HEX >= 0x03070000 && !defined(PYPY_VERSION)
+    return _PyTime_GetPerfCounterWithInfo(result, NULL);
+#elif PY_VERSION_HEX >= 0x03070000
+    // Call time.perf_counter_ns() and convert Python int object to PyTime_t.
+    // Cache time.perf_counter_ns() function for best performance.
+    static PyObject *func = NULL;
+    if (func == NULL) {
+        PyObject *mod = PyImport_ImportModule("time");
+        if (mod == NULL) {
+            return -1;
+        }
+
+        func = PyObject_GetAttrString(mod, "perf_counter_ns");
+        Py_DECREF(mod);
+        if (func == NULL) {
+            return -1;
+        }
+    }
+
+    PyObject *res = PyObject_CallNoArgs(func);
+    if (res == NULL) {
+        return -1;
+    }
+    long long value = PyLong_AsLongLong(res);
+    Py_DECREF(res);
+
+    if (value == -1 && PyErr_Occurred()) {
+        return -1;
+    }
+
+    Py_BUILD_ASSERT(sizeof(value) >= sizeof(PyTime_t));
+    *result = (PyTime_t)value;
+    return 0;
+#else
+    // Call time.perf_counter() and convert C double to PyTime_t.
+    // Cache time.perf_counter() function for best performance.
+    static PyObject *func = NULL;
+    if (func == NULL) {
+        PyObject *mod = PyImport_ImportModule("time");
+        if (mod == NULL) {
+            return -1;
+        }
+
+        func = PyObject_GetAttrString(mod, "perf_counter");
+        Py_DECREF(mod);
+        if (func == NULL) {
+            return -1;
+        }
+    }
+
+    PyObject *res = PyObject_CallNoArgs(func);
+    if (res == NULL) {
+        return -1;
+    }
+    double d = PyFloat_AsDouble(res);
+    Py_DECREF(res);
+
+    if (d == -1.0 && PyErr_Occurred()) {
+        return -1;
+    }
+
+    // Avoid floor() to avoid having to link to libm
+    *result = (PyTime_t)(d * 1e9);
+    return 0;
+#endif
+}
+
+#endif
+
+// gh-111389 added hash constants to Python 3.13.0a5. These constants were
+// added first as private macros to Python 3.4.0b1 and PyPy 7.3.9.
+#if (!defined(PyHASH_BITS) \
+     && ((!defined(PYPY_VERSION) && PY_VERSION_HEX >= 0x030400B1) \
+         || (defined(PYPY_VERSION) && PY_VERSION_HEX >= 0x03070000 \
+             && PYPY_VERSION_NUM >= 0x07090000)))
+#  define PyHASH_BITS _PyHASH_BITS
+#  define PyHASH_MODULUS _PyHASH_MODULUS
+#  define PyHASH_INF _PyHASH_INF
+#  define PyHASH_IMAG _PyHASH_IMAG
+#endif
+
+
+// gh-111545 added Py_GetConstant() and Py_GetConstantBorrowed()
+// to Python 3.13.0a6
+#if PY_VERSION_HEX < 0x030D00A6 && !defined(Py_CONSTANT_NONE)
+
+#define Py_CONSTANT_NONE 0
+#define Py_CONSTANT_FALSE 1
+#define Py_CONSTANT_TRUE 2
+#define Py_CONSTANT_ELLIPSIS 3
+#define Py_CONSTANT_NOT_IMPLEMENTED 4
+#define Py_CONSTANT_ZERO 5
+#define Py_CONSTANT_ONE 6
+#define Py_CONSTANT_EMPTY_STR 7
+#define Py_CONSTANT_EMPTY_BYTES 8
+#define Py_CONSTANT_EMPTY_TUPLE 9
+
+static inline PyObject* Py_GetConstant(unsigned int constant_id)
+{
+    static PyObject* constants[Py_CONSTANT_EMPTY_TUPLE + 1] = {NULL};
+
+    if (constants[Py_CONSTANT_NONE] == NULL) {
+        constants[Py_CONSTANT_NONE] = Py_None;
+        constants[Py_CONSTANT_FALSE] = Py_False;
+        constants[Py_CONSTANT_TRUE] = Py_True;
+        constants[Py_CONSTANT_ELLIPSIS] = Py_Ellipsis;
+        constants[Py_CONSTANT_NOT_IMPLEMENTED] = Py_NotImplemented;
+
+        constants[Py_CONSTANT_ZERO] = PyLong_FromLong(0);
+        if (constants[Py_CONSTANT_ZERO] == NULL) {
+            goto fatal_error;
+        }
+
+        constants[Py_CONSTANT_ONE] = PyLong_FromLong(1);
+        if (constants[Py_CONSTANT_ONE] == NULL) {
+            goto fatal_error;
+        }
+
+        constants[Py_CONSTANT_EMPTY_STR] = PyUnicode_FromStringAndSize("", 0);
+        if (constants[Py_CONSTANT_EMPTY_STR] == NULL) {
+            goto fatal_error;
+        }
+
+        constants[Py_CONSTANT_EMPTY_BYTES] = PyBytes_FromStringAndSize("", 0);
+        if (constants[Py_CONSTANT_EMPTY_BYTES] == NULL) {
+            goto fatal_error;
+        }
+
+        constants[Py_CONSTANT_EMPTY_TUPLE] = PyTuple_New(0);
+        if (constants[Py_CONSTANT_EMPTY_TUPLE] == NULL) {
+            goto fatal_error;
+        }
+        // goto dance to avoid compiler warnings about Py_FatalError()
+        goto init_done;
+
+fatal_error:
+        // This case should never happen
+        Py_FatalError("Py_GetConstant() failed to get constants");
+    }
+
+init_done:
+    if (constant_id <= Py_CONSTANT_EMPTY_TUPLE) {
+        return Py_NewRef(constants[constant_id]);
+    }
+    else {
+        PyErr_BadInternalCall();
+        return NULL;
+    }
+}
+
+static inline PyObject* Py_GetConstantBorrowed(unsigned int constant_id)
+{
+    PyObject *obj = Py_GetConstant(constant_id);
+    Py_XDECREF(obj);
+    return obj;
+}
+#endif
+
+
+// gh-114329 added PyList_GetItemRef() to Python 3.13.0a4
+#if PY_VERSION_HEX < 0x030D00A4
+static inline PyObject *
+PyList_GetItemRef(PyObject *op, Py_ssize_t index)
+{
+    PyObject *item = PyList_GetItem(op, index);
+    Py_XINCREF(item);
+    return item;
+}
+#endif
+
+
+// gh-114329 added PyList_GetItemRef() to Python 3.13.0a4
+#if PY_VERSION_HEX < 0x030D00A4
+static inline int
+PyDict_SetDefaultRef(PyObject *d, PyObject *key, PyObject *default_value,
+                     PyObject **result)
+{
+    PyObject *value;
+    if (PyDict_GetItemRef(d, key, &value) < 0) {
+        // get error
+        if (result) {
+            *result = NULL;
+        }
+        return -1;
+    }
+    if (value != NULL) {
+        // present
+        if (result) {
+            *result = value;
+        }
+        else {
+            Py_DECREF(value);
+        }
+        return 1;
+    }
+
+    // missing: set the item
+    if (PyDict_SetItem(d, key, default_value) < 0) {
+        // set error
+        if (result) {
+            *result = NULL;
+        }
+        return -1;
+    }
+    if (result) {
+        *result = Py_NewRef(default_value);
+    }
+    return 0;
+}
+#endif
+
+
+// gh-116560 added PyLong_GetSign() to Python 3.14.0a0
+#if PY_VERSION_HEX < 0x030E00A0
+static inline int PyLong_GetSign(PyObject *obj, int *sign)
+{
+    if (!PyLong_Check(obj)) {
+        PyErr_Format(PyExc_TypeError, "expect int, got %s", Py_TYPE(obj)->tp_name);
+        return -1;
+    }
+
+    *sign = _PyLong_Sign(obj);
+    return 0;
+}
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif  // PYTHONCAPI_COMPAT
diff --git a/tox.ini b/tox.ini
index d89d017e45c..e79d8850097 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,11 +3,10 @@ requires =
     tox>=4.2
 env_list =
     lint
-    py{py3, 312, 311, 310, 39, 38}
+    py{py3, 313, 312, 311, 310, 39}
 
 [testenv]
 deps =
-    cffi
     numpy
 extras =
     tests
@@ -33,9 +32,8 @@ commands =
 [testenv:mypy]
 skip_install = true
 deps =
-    mypy==1.7.1
-    numpy
+    -r .ci/requirements-mypy.txt
 extras =
     typing
 commands =
-    mypy src {posargs}
+    mypy conftest.py selftest.py setup.py docs src winbuild Tests {posargs}
diff --git a/wheels/README.md b/wheels/README.md
index 8b412b7fe32..1175616e147 100644
--- a/wheels/README.md
+++ b/wheels/README.md
@@ -1,11 +1,11 @@
 README
 ------
 
-[cibuildwheel](https://github.com/pypa/cibuildwheel) is used to build macOS and Linux
-wheels for tagged versions of Pillow.
+[cibuildwheel](https://github.com/pypa/cibuildwheel) is used to build wheels for tagged
+versions of Pillow.
 
 This directory contains [multibuild](https://github.com/multi-build/multibuild) to
-build dependencies for the wheels, and dependency licenses to be included.
+build dependencies for macOS and Linux wheels, and dependency licenses to be included.
 
 Archives
 --------
@@ -30,6 +30,3 @@ Wheels
 
 Wheels are
 [GitHub Actions artifacts created for tags, relevant changes or manual builds](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml).
-
-Windows wheels are created separately. They are
-[GitHub Actions artifacts created on each run of the Windows workflow](https://github.com/python-pillow/Pillow/actions/workflows/test-windows.yml?query=branch%3Amain).
diff --git a/winbuild/README.md b/winbuild/README.md
index 7e81abcb0e5..f6111c79b0e 100644
--- a/winbuild/README.md
+++ b/winbuild/README.md
@@ -11,12 +11,12 @@ For more extensive info, see the [Windows build instructions](build.rst).
 * Requires Microsoft Visual Studio 2017 or newer with C++ component.
 * Requires NASM for libjpeg-turbo, a required dependency when using this script.
 * Requires CMake 3.15 or newer (available as Visual Studio component).
-* Tested on Windows Server 2016 with Visual Studio 2017 Community, and Windows Server 2019 with Visual Studio 2022 Community (AppVeyor).
+* Tested on Windows Server 2019 with Visual Studio 2019 Community and Visual Studio 2022 Community (AppVeyor).
 * Tested on Windows Server 2022 with Visual Studio 2022 Enterprise (GitHub Actions).
 
 The following is a simplified version of the script used on AppVeyor:
 ```
-set PYTHON=C:\Python38\bin
+set PYTHON=C:\Python39\bin
 cd /D C:\Pillow\winbuild
 %PYTHON%\python.exe build_prepare.py -v --depends=C:\pillow-depends
 build\build_dep_all.cmd
diff --git a/winbuild/build.rst b/winbuild/build.rst
index a8e4ebaa6cc..96b8803b477 100644
--- a/winbuild/build.rst
+++ b/winbuild/build.rst
@@ -27,7 +27,7 @@ Download and install:
 * `Ninja <https://ninja-build.org/>`_
   (optional, use ``--nmake`` if not available; bundled in Visual Studio CMake component)
 
-* x86/x64: `Netwide Assembler (NASM) <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_
+* x86/AMD64: `Netwide Assembler (NASM) <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_
 
 Any version of Visual Studio 2017 or newer should be supported,
 including Visual Studio 2017 Community, or Build Tools for Visual Studio 2019.
@@ -42,7 +42,7 @@ Run ``build_prepare.py`` to configure the build::
 
     usage: winbuild\build_prepare.py [-h] [-v] [-d PILLOW_BUILD]
                                      [--depends PILLOW_DEPS]
-                                     [--architecture {x86,x64,ARM64}] [--nmake]
+                                     [--architecture {x86,AMD64,ARM64}] [--nmake]
                                      [--no-imagequant] [--no-fribidi]
 
     Download and generate build scripts for Pillow dependencies.
@@ -55,7 +55,7 @@ Run ``build_prepare.py`` to configure the build::
       --depends PILLOW_DEPS
                             directory used to store cached dependencies (default:
                             'winbuild\depends')
-      --architecture {x86,x64,ARM64}
+      --architecture {x86,AMD64,ARM64}
                             build architecture (default: same as host Python)
       --nmake               build dependencies using NMake instead of Ninja
       --no-imagequant       skip GPL-licensed optional dependency libimagequant
@@ -87,11 +87,18 @@ are set by running ``winbuild\build\build_env.cmd`` and install Pillow with pip:
     winbuild\build\build_env.cmd
     python.exe -m pip install -v -C raqm=vendor -C fribidi=vendor .
 
-To build a wheel instead, run::
+You can also install Pillow in `editable mode`_::
+
+    winbuild\build\build_env.cmd
+    python.exe -m pip install -v -C raqm=vendor -C fribidi=vendor -e .
+
+To build a binary wheel instead, run::
 
     winbuild\build\build_env.cmd
     python.exe -m pip wheel -v -C raqm=vendor -C fribidi=vendor .
 
+.. _editable mode: https://setuptools.pypa.io/en/stable/userguide/development_mode.html
+
 Testing Pillow
 --------------
 
@@ -107,7 +114,7 @@ Example
 
 The following is a simplified version of the script used on AppVeyor::
 
-    set PYTHON=C:\Python38\bin
+    set PYTHON=C:\Python39\bin
     cd /D C:\Pillow\winbuild
     %PYTHON%\python.exe build_prepare.py -v --depends C:\pillow-depends
     build\build_dep_all.cmd
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 8e3757ca89e..a21fbef9148 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -7,6 +7,7 @@
 import shutil
 import struct
 import subprocess
+from typing import Any
 
 
 def cmd_cd(path: str) -> str:
@@ -43,21 +44,19 @@ def cmd_nmake(
     target: str = "",
     params: list[str] | None = None,
 ) -> str:
-    params = "" if params is None else " ".join(params)
-
     return " ".join(
         [
             "{nmake}",
             "-nologo",
             f'-f "{makefile}"' if makefile is not None else "",
-            f"{params}",
+            f'{" ".join(params)}' if params is not None else "",
             f'"{target}"',
         ]
     )
 
 
 def cmds_cmake(
-    target: str | tuple[str, ...] | list[str], *params, build_dir: str = "."
+    target: str | tuple[str, ...] | list[str], *params: str, build_dir: str = "."
 ) -> list[str]:
     if not isinstance(target, str):
         target = " ".join(target)
@@ -87,7 +86,7 @@ def cmd_msbuild(
     file: str,
     configuration: str = "Release",
     target: str = "Build",
-    platform: str = "{msbuild_arch}",
+    plat: str = "{msbuild_arch}",
 ) -> str:
     return " ".join(
         [
@@ -95,7 +94,7 @@ def cmd_msbuild(
             f"{file}",
             f'/t:"{target}"',
             f'/p:Configuration="{configuration}"',
-            f"/p:Platform={platform}",
+            f"/p:Platform={plat}",
             "/m",
         ]
     )
@@ -105,17 +104,36 @@ def cmd_msbuild(
 
 ARCHITECTURES = {
     "x86": {"vcvars_arch": "x86", "msbuild_arch": "Win32"},
-    "x64": {"vcvars_arch": "x86_amd64", "msbuild_arch": "x64"},
+    "AMD64": {"vcvars_arch": "x86_amd64", "msbuild_arch": "x64"},
     "ARM64": {"vcvars_arch": "x86_arm64", "msbuild_arch": "ARM64"},
 }
 
+V = {
+    "BROTLI": "1.1.0",
+    "FREETYPE": "2.13.3",
+    "FRIBIDI": "1.0.16",
+    "HARFBUZZ": "10.0.1",
+    "JPEGTURBO": "3.0.4",
+    "LCMS2": "2.16",
+    "LIBPNG": "1.6.44",
+    "LIBWEBP": "1.4.0",
+    "OPENJPEG": "2.5.2",
+    "TIFF": "4.6.0",
+    "XZ": "5.6.3",
+    "ZLIB": "1.3.1",
+}
+V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "")
+V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])
+V["ZLIB_DOTLESS"] = V["ZLIB"].replace(".", "")
+
+
 # dependencies, listed in order of compilation
-DEPS = {
+DEPS: dict[str, dict[str, Any]] = {
     "libjpeg": {
-        "url": SF_PROJECTS
-        + "/libjpeg-turbo/files/3.0.1/libjpeg-turbo-3.0.1.tar.gz/download",
-        "filename": "libjpeg-turbo-3.0.1.tar.gz",
-        "dir": "libjpeg-turbo-3.0.1",
+        "url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/"
+        f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz/download",
+        "filename": f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz",
+        "dir": f"libjpeg-turbo-{V['JPEGTURBO']}",
         "license": ["README.ijg", "LICENSE.md"],
         "license_pattern": (
             "(LEGAL ISSUES\n============\n\n.+?)\n\nREFERENCES\n=========="
@@ -143,9 +161,9 @@ def cmd_msbuild(
         "bins": ["cjpeg.exe", "djpeg.exe"],
     },
     "zlib": {
-        "url": "https://zlib.net/zlib13.zip",
-        "filename": "zlib13.zip",
-        "dir": "zlib-1.3",
+        "url": f"https://zlib.net/zlib{V['ZLIB_DOTLESS']}.zip",
+        "filename": f"zlib{V['ZLIB_DOTLESS']}.zip",
+        "dir": f"zlib-{V['ZLIB']}",
         "license": "README",
         "license_pattern": "Copyright notice:\n\n(.+)$",
         "build": [
@@ -157,9 +175,9 @@ def cmd_msbuild(
         "libs": [r"*.lib"],
     },
     "xz": {
-        "url": SF_PROJECTS + "/lzmautils/files/xz-5.4.5.tar.gz/download",
-        "filename": "xz-5.4.5.tar.gz",
-        "dir": "xz-5.4.5",
+        "url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/xz-{V['XZ']}.tar.gz",
+        "filename": f"xz-{V['XZ']}.tar.gz",
+        "dir": f"xz-{V['XZ']}",
         "license": "COPYING",
         "build": [
             *cmds_cmake("liblzma", "-DBUILD_SHARED_LIBS:BOOL=OFF"),
@@ -167,44 +185,43 @@ def cmd_msbuild(
             cmd_copy(r"src\liblzma\api\lzma\*.h", r"{inc_dir}\lzma"),
         ],
         "headers": [r"src\liblzma\api\lzma.h"],
-        "libs": [r"liblzma.lib"],
+        "libs": [r"lzma.lib"],
     },
     "libwebp": {
-        "url": "http://downloads.webmproject.org/releases/webp/libwebp-1.3.2.tar.gz",
-        "filename": "libwebp-1.3.2.tar.gz",
-        "dir": "libwebp-1.3.2",
+        "url": f"http://downloads.webmproject.org/releases/webp/libwebp-{V['LIBWEBP']}.tar.gz",
+        "filename": f"libwebp-{V['LIBWEBP']}.tar.gz",
+        "dir": f"libwebp-{V['LIBWEBP']}",
         "license": "COPYING",
+        "patch": {
+            r"src\enc\picture_csp_enc.c": {
+                # link against libsharpyuv.lib
+                '#include "sharpyuv/sharpyuv.h"': '#include "sharpyuv/sharpyuv.h"\n#pragma comment(lib, "libsharpyuv.lib")',  # noqa: E501
+            }
+        },
         "build": [
-            cmd_rmdir(r"output\release-static"),  # clean
-            cmd_nmake(
-                "Makefile.vc",
-                "all",
-                [
-                    "CFG=release-static",
-                    "RTLIBCFG=dynamic",
-                    "OBJDIR=output",
-                    "ARCH={architecture}",
-                    "LIBWEBP_BASENAME=webp",
-                ],
+            *cmds_cmake(
+                "webp webpmux webpdemux",
+                "-DBUILD_SHARED_LIBS:BOOL=OFF",
+                "-DWEBP_LINK_STATIC:BOOL=OFF",
             ),
             cmd_mkdir(r"{inc_dir}\webp"),
             cmd_copy(r"src\webp\*.h", r"{inc_dir}\webp"),
         ],
-        "libs": [r"output\release-static\{architecture}\lib\*.lib"],
+        "libs": [r"libsharpyuv.lib", r"libwebp*.lib"],
     },
     "libtiff": {
-        "url": "https://download.osgeo.org/libtiff/tiff-4.6.0.tar.gz",
-        "filename": "tiff-4.6.0.tar.gz",
-        "dir": "tiff-4.6.0",
+        "url": f"https://download.osgeo.org/libtiff/tiff-{V['TIFF']}.tar.gz",
+        "filename": f"tiff-{V['TIFF']}.tar.gz",
+        "dir": f"tiff-{V['TIFF']}",
         "license": "LICENSE.md",
         "patch": {
             r"libtiff\tif_lzma.c": {
-                # link against liblzma.lib
-                "#ifdef LZMA_SUPPORT": '#ifdef LZMA_SUPPORT\n#pragma comment(lib, "liblzma.lib")',  # noqa: E501
+                # link against lzma.lib
+                "#ifdef LZMA_SUPPORT": '#ifdef LZMA_SUPPORT\n#pragma comment(lib, "lzma.lib")',  # noqa: E501
             },
             r"libtiff\tif_webp.c": {
-                # link against webp.lib
-                "#ifdef WEBP_SUPPORT": '#ifdef WEBP_SUPPORT\n#pragma comment(lib, "webp.lib")',  # noqa: E501
+                # link against libwebp.lib
+                "#ifdef WEBP_SUPPORT": '#ifdef WEBP_SUPPORT\n#pragma comment(lib, "libwebp.lib")',  # noqa: E501
             },
             r"test\CMakeLists.txt": {
                 "add_executable(test_write_read_tags ../placeholder.h)": "",
@@ -217,6 +234,7 @@ def cmd_msbuild(
             *cmds_cmake(
                 "tiff",
                 "-DBUILD_SHARED_LIBS:BOOL=OFF",
+                "-DWebP_LIBRARY=libwebp",
                 '-DCMAKE_C_FLAGS="-nologo -DLZMA_API_STATIC"',
             )
         ],
@@ -224,21 +242,24 @@ def cmd_msbuild(
         "libs": [r"libtiff\*.lib"],
     },
     "libpng": {
-        "url": SF_PROJECTS + "/libpng/files/libpng16/1.6.39/lpng1639.zip/download",
-        "filename": "lpng1639.zip",
-        "dir": "lpng1639",
+        "url": f"{SF_PROJECTS}/libpng/files/libpng{V['LIBPNG_XY']}/{V['LIBPNG']}/"
+        f"lpng{V['LIBPNG_DOTLESS']}.zip/download",
+        "filename": f"lpng{V['LIBPNG_DOTLESS']}.zip",
+        "dir": f"lpng{V['LIBPNG_DOTLESS']}",
         "license": "LICENSE",
         "build": [
             *cmds_cmake("png_static", "-DPNG_SHARED:BOOL=OFF", "-DPNG_TESTS:BOOL=OFF"),
-            cmd_copy("libpng16_static.lib", "libpng16.lib"),
+            cmd_copy(
+                f"libpng{V['LIBPNG_XY']}_static.lib", f"libpng{V['LIBPNG_XY']}.lib"
+            ),
         ],
         "headers": [r"png*.h"],
-        "libs": [r"libpng16.lib"],
+        "libs": [f"libpng{V['LIBPNG_XY']}.lib"],
     },
     "brotli": {
-        "url": "https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz",
-        "filename": "brotli-1.1.0.tar.gz",
-        "dir": "brotli-1.1.0",
+        "url": f"https://github.com/google/brotli/archive/refs/tags/v{V['BROTLI']}.tar.gz",
+        "filename": f"brotli-{V['BROTLI']}.tar.gz",
+        "dir": f"brotli-{V['BROTLI']}",
         "license": "LICENSE",
         "build": [
             *cmds_cmake(("brotlicommon", "brotlidec"), "-DBUILD_SHARED_LIBS:BOOL=OFF"),
@@ -247,9 +268,9 @@ def cmd_msbuild(
         "libs": ["*.lib"],
     },
     "freetype": {
-        "url": "https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.gz",
-        "filename": "freetype-2.13.2.tar.gz",
-        "dir": "freetype-2.13.2",
+        "url": f"https://download.savannah.gnu.org/releases/freetype/freetype-{V['FREETYPE']}.tar.gz",
+        "filename": f"freetype-{V['FREETYPE']}.tar.gz",
+        "dir": f"freetype-{V['FREETYPE']}",
         "license": ["LICENSE.TXT", r"docs\FTL.TXT", r"docs\GPLv2.TXT"],
         "patch": {
             r"builds\windows\vc2010\freetype.vcxproj": {
@@ -262,7 +283,7 @@ def cmd_msbuild(
                 "<UserDefines></UserDefines>": "<UserDefines>FT_CONFIG_OPTION_SYSTEM_ZLIB;FT_CONFIG_OPTION_USE_PNG;FT_CONFIG_OPTION_USE_HARFBUZZ;FT_CONFIG_OPTION_USE_BROTLI</UserDefines>",  # noqa: E501
                 "<UserIncludeDirectories></UserIncludeDirectories>": r"<UserIncludeDirectories>{dir_harfbuzz}\src;{inc_dir}</UserIncludeDirectories>",  # noqa: E501
                 "<UserLibraryDirectories></UserLibraryDirectories>": "<UserLibraryDirectories>{lib_dir}</UserLibraryDirectories>",  # noqa: E501
-                "<UserDependencies></UserDependencies>": "<UserDependencies>zlib.lib;libpng16.lib;brotlicommon.lib;brotlidec.lib</UserDependencies>",  # noqa: E501
+                "<UserDependencies></UserDependencies>": f"<UserDependencies>zlib.lib;libpng{V['LIBPNG_XY']}.lib;brotlicommon.lib;brotlidec.lib</UserDependencies>",  # noqa: E501
             },
             r"src/autofit/afshaper.c": {
                 # link against harfbuzz.lib
@@ -272,19 +293,19 @@ def cmd_msbuild(
         "build": [
             cmd_rmdir("objs"),
             cmd_msbuild(
-                r"builds\windows\vc2010\freetype.sln", "Release Static", "Clean"
+                r"builds\windows\vc2010\freetype.vcxproj", "Release Static", "Clean"
             ),
             cmd_msbuild(
-                r"builds\windows\vc2010\freetype.sln", "Release Static", "Build"
+                r"builds\windows\vc2010\freetype.vcxproj", "Release Static", "Build"
             ),
             cmd_xcopy("include", "{inc_dir}"),
         ],
         "libs": [r"objs\{msbuild_arch}\Release Static\freetype.lib"],
     },
     "lcms2": {
-        "url": SF_PROJECTS + "/lcms/files/lcms/2.16/lcms2-2.16.tar.gz/download",
-        "filename": "lcms2-2.16.tar.gz",
-        "dir": "lcms2-2.16",
+        "url": f"{SF_PROJECTS}/lcms/files/lcms/{V['LCMS2']}/lcms2-{V['LCMS2']}.tar.gz/download",  # noqa: E501
+        "filename": f"lcms2-{V['LCMS2']}.tar.gz",
+        "dir": f"lcms2-{V['LCMS2']}",
         "license": "LICENSE",
         "patch": {
             r"Projects\VC2022\lcms2_static\lcms2_static.vcxproj": {
@@ -308,21 +329,16 @@ def cmd_msbuild(
         "libs": [r"Lib\MS\*.lib"],
     },
     "openjpeg": {
-        "url": "https://github.com/uclouvain/openjpeg/archive/v2.5.0.tar.gz",
-        "filename": "openjpeg-2.5.0.tar.gz",
-        "dir": "openjpeg-2.5.0",
+        "url": f"https://github.com/uclouvain/openjpeg/archive/v{V['OPENJPEG']}.tar.gz",
+        "filename": f"openjpeg-{V['OPENJPEG']}.tar.gz",
+        "dir": f"openjpeg-{V['OPENJPEG']}",
         "license": "LICENSE",
-        "patch": {
-            r"src\lib\openjp2\ht_dec.c": {
-                "#ifdef OPJ_COMPILER_MSVC\n    return (OPJ_UINT32)__popcnt(val);": "#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64))\n    return (OPJ_UINT32)__popcnt(val);",  # noqa: E501
-            }
-        },
         "build": [
             *cmds_cmake(
                 "openjp2", "-DBUILD_CODEC:BOOL=OFF", "-DBUILD_SHARED_LIBS:BOOL=OFF"
             ),
-            cmd_mkdir(r"{inc_dir}\openjpeg-2.5.0"),
-            cmd_copy(r"src\lib\openjp2\*.h", r"{inc_dir}\openjpeg-2.5.0"),
+            cmd_mkdir(rf"{{inc_dir}}\openjpeg-{V['OPENJPEG']}"),
+            cmd_copy(r"src\lib\openjp2\*.h", rf"{{inc_dir}}\openjpeg-{V['OPENJPEG']}"),
         ],
         "libs": [r"bin\*.lib"],
     },
@@ -348,9 +364,9 @@ def cmd_msbuild(
         "libs": [r"imagequant.lib"],
     },
     "harfbuzz": {
-        "url": "https://github.com/harfbuzz/harfbuzz/archive/8.3.0.zip",
-        "filename": "harfbuzz-8.3.0.zip",
-        "dir": "harfbuzz-8.3.0",
+        "url": f"https://github.com/harfbuzz/harfbuzz/archive/{V['HARFBUZZ']}.zip",
+        "filename": f"harfbuzz-{V['HARFBUZZ']}.zip",
+        "dir": f"harfbuzz-{V['HARFBUZZ']}",
         "license": "COPYING",
         "build": [
             *cmds_cmake(
@@ -363,12 +379,12 @@ def cmd_msbuild(
         "libs": [r"*.lib"],
     },
     "fribidi": {
-        "url": "https://github.com/fribidi/fribidi/archive/v1.0.13.zip",
-        "filename": "fribidi-1.0.13.zip",
-        "dir": "fribidi-1.0.13",
+        "url": f"https://github.com/fribidi/fribidi/archive/v{V['FRIBIDI']}.zip",
+        "filename": f"fribidi-{V['FRIBIDI']}.zip",
+        "dir": f"fribidi-{V['FRIBIDI']}",
         "license": "COPYING",
         "build": [
-            cmd_copy(r"COPYING", r"{bin_dir}\fribidi-1.0.13-COPYING"),
+            cmd_copy(r"COPYING", rf"{{bin_dir}}\fribidi-{V['FRIBIDI']}-COPYING"),
             cmd_copy(r"{winbuild_dir}\fribidi.cmake", r"CMakeLists.txt"),
             # generated tab.i files cannot be cross-compiled
             " ^&^& ".join(
@@ -445,6 +461,7 @@ def find_msvs(architecture: str) -> dict[str, str] | None:
 
 
 def download_dep(url: str, file: str) -> None:
+    import urllib.error
     import urllib.request
 
     ex = None
@@ -461,11 +478,14 @@ def download_dep(url: str, file: str) -> None:
         raise RuntimeError(ex)
 
 
-def extract_dep(url: str, filename: str) -> None:
+def extract_dep(url: str, filename: str, prefs: dict[str, str]) -> None:
     import tarfile
     import zipfile
 
-    file = os.path.join(args.depends_dir, filename)
+    depends_dir = prefs["depends_dir"]
+    sources_dir = prefs["src_dir"]
+
+    file = os.path.join(depends_dir, filename)
     if not os.path.exists(file):
         # First try our mirror
         mirror_url = (
@@ -504,18 +524,20 @@ def extract_dep(url: str, filename: str) -> None:
         raise RuntimeError(msg)
 
 
-def write_script(name: str, lines: list[str]) -> None:
-    name = os.path.join(args.build_dir, name)
+def write_script(
+    name: str, lines: list[str], prefs: dict[str, str], verbose: bool
+) -> None:
+    name = os.path.join(prefs["build_dir"], name)
     lines = [line.format(**prefs) for line in lines]
     print("Writing " + name)
     with open(name, "w", newline="") as f:
         f.write(os.linesep.join(lines))
-    if args.verbose:
+    if verbose:
         for line in lines:
             print("    " + line)
 
 
-def get_footer(dep: dict) -> list[str]:
+def get_footer(dep: dict[str, Any]) -> list[str]:
     lines = []
     for out in dep.get("headers", []):
         lines.append(cmd_copy(out, "{inc_dir}"))
@@ -526,7 +548,7 @@ def get_footer(dep: dict) -> list[str]:
     return lines
 
 
-def build_env() -> None:
+def build_env(prefs: dict[str, str], verbose: bool) -> None:
     lines = [
         "if defined DISTUTILS_USE_SDK goto end",
         cmd_set("INCLUDE", "{inc_dir}"),
@@ -539,33 +561,36 @@ def build_env() -> None:
         ":end",
         "@echo on",
     ]
-    write_script("build_env.cmd", lines)
+    write_script("build_env.cmd", lines, prefs, verbose)
 
 
-def build_dep(name: str) -> str:
+def build_dep(name: str, prefs: dict[str, str], verbose: bool) -> str:
     dep = DEPS[name]
-    dir = dep["dir"]
+    directory = dep["dir"]
     file = f"build_dep_{name}.cmd"
+    license_dir = prefs["license_dir"]
+    sources_dir = prefs["src_dir"]
 
-    extract_dep(dep["url"], dep["filename"])
+    extract_dep(dep["url"], dep["filename"], prefs)
 
     licenses = dep["license"]
     if isinstance(licenses, str):
         licenses = [licenses]
     license_text = ""
     for license_file in licenses:
-        with open(os.path.join(sources_dir, dir, license_file)) as f:
+        with open(os.path.join(sources_dir, directory, license_file)) as f:
             license_text += f.read()
     if "license_pattern" in dep:
         match = re.search(dep["license_pattern"], license_text, re.DOTALL)
+        assert match is not None
         license_text = "\n".join(match.groups())
     assert len(license_text) > 50
-    with open(os.path.join(license_dir, f"{dir}.txt"), "w") as f:
-        print(f"Writing license {dir}.txt")
+    with open(os.path.join(license_dir, f"{directory}.txt"), "w") as f:
+        print(f"Writing license {directory}.txt")
         f.write(license_text)
 
     for patch_file, patch_list in dep.get("patch", {}).items():
-        patch_file = os.path.join(sources_dir, dir, patch_file.format(**prefs))
+        patch_file = os.path.join(sources_dir, directory, patch_file.format(**prefs))
         with open(patch_file) as f:
             text = f.read()
         for patch_from, patch_to in patch_list.items():
@@ -577,22 +602,22 @@ def build_dep(name: str) -> str:
             print(f"Patching {patch_file}")
             f.write(text)
 
-    banner = f"Building {name} ({dir})"
+    banner = f"Building {name} ({directory})"
     lines = [
         r'call "{build_dir}\build_env.cmd"',
         "@echo " + ("=" * 70),
         f"@echo ==== {banner:<60} ====",
         "@echo " + ("=" * 70),
-        cmd_cd(os.path.join(sources_dir, dir)),
+        cmd_cd(os.path.join(sources_dir, directory)),
         *dep.get("build", []),
         *get_footer(dep),
     ]
 
-    write_script(file, lines)
+    write_script(file, lines, prefs, verbose)
     return file
 
 
-def build_dep_all() -> None:
+def build_dep_all(disabled: list[str], prefs: dict[str, str], verbose: bool) -> None:
     lines = [r'call "{build_dir}\build_env.cmd"']
     gha_groups = "GITHUB_ACTIONS" in os.environ
     for dep_name in DEPS:
@@ -600,7 +625,7 @@ def build_dep_all() -> None:
         if dep_name in disabled:
             print(f"Skipping disabled dependency {dep_name}")
             continue
-        script = build_dep(dep_name)
+        script = build_dep(dep_name, prefs, verbose)
         if gha_groups:
             lines.append(f"@echo ::group::Running {script}")
         lines.append(rf'cmd.exe /c "{{build_dir}}\{script}"')
@@ -609,12 +634,11 @@ def build_dep_all() -> None:
             lines.append("@echo ::endgroup::")
     print()
     lines.append("@echo All Pillow dependencies built successfully!")
-    write_script("build_dep_all.cmd", lines)
+    write_script("build_dep_all.cmd", lines, prefs, verbose)
 
 
-if __name__ == "__main__":
+def main() -> None:
     winbuild_dir = os.path.dirname(os.path.realpath(__file__))
-    pillow_dir = os.path.realpath(os.path.join(winbuild_dir, ".."))
 
     parser = argparse.ArgumentParser(
         prog="winbuild\\build_prepare.py",
@@ -651,7 +675,7 @@ def build_dep_all() -> None:
             (
                 "ARM64"
                 if platform.machine() == "ARM64"
-                else ("x86" if struct.calcsize("P") == 4 else "x64")
+                else ("x86" if struct.calcsize("P") == 4 else "AMD64")
             ),
         ),
         help="build architecture (default: same as host Python)",
@@ -720,15 +744,15 @@ def build_dep_all() -> None:
         "architecture": args.architecture,
         **arch_prefs,
         # Pillow paths
-        "pillow_dir": pillow_dir,
         "winbuild_dir": winbuild_dir,
         # Build paths
+        "bin_dir": bin_dir,
         "build_dir": args.build_dir,
+        "depends_dir": args.depends_dir,
         "inc_dir": inc_dir,
         "lib_dir": lib_dir,
-        "bin_dir": bin_dir,
-        "src_dir": sources_dir,
         "license_dir": license_dir,
+        "src_dir": sources_dir,
         # Compilers / Tools
         **msvs,
         "cmake": "cmake.exe",  # TODO find CMAKE automatically
@@ -741,6 +765,10 @@ def build_dep_all() -> None:
 
     print()
 
-    write_script(".gitignore", ["*"])
-    build_env()
-    build_dep_all()
+    write_script(".gitignore", ["*"], prefs, args.verbose)
+    build_env(prefs, args.verbose)
+    build_dep_all(disabled, prefs, args.verbose)
+
+
+if __name__ == "__main__":
+    main()