From 30015f6236ee3165e06b78ff7dced956e21e24d5 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Wed, 27 Dec 2023 16:16:25 +0100
Subject: [PATCH 01/31] simplify decompression bomb check in
 FreeTypeFont.render

---
 src/PIL/ImageFont.py | 17 +++--------------
 src/_imagingft.c     | 14 ++++----------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
index 6db7cc4eccb..c8d834f91d4 100644
--- a/src/PIL/ImageFont.py
+++ b/src/PIL/ImageFont.py
@@ -582,22 +582,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
-
             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,
@@ -610,8 +601,6 @@ 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
diff --git a/src/_imagingft.c b/src/_imagingft.c
index 68c66ac2c60..6e24fcf95ed 100644
--- a/src/_imagingft.c
+++ b/src/_imagingft.c
@@ -880,7 +880,7 @@ font_render(FontObject *self, PyObject *args) {
     image = PyObject_CallFunction(fill, "ii", width, height);
     if (image == Py_None) {
         PyMem_Del(glyph_info);
-        return Py_BuildValue("ii", 0, 0);
+        return Py_BuildValue("N(ii)", image, 0, 0);
     } else if (image == NULL) {
         PyMem_Del(glyph_info);
         return NULL;
@@ -894,7 +894,7 @@ font_render(FontObject *self, PyObject *args) {
     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) {
@@ -1130,18 +1130,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);
     }

From 90991428fa4ca39076efa6329792f30b962d7d49 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Mon, 1 Jan 2024 20:05:16 +0100
Subject: [PATCH 02/31] add LCMS2 flags to ImageCms

---
 Tests/test_imagecms.py | 10 +++++++
 src/PIL/ImageCms.py    | 63 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py
index 0dde82bd748..fec482f4393 100644
--- a/Tests/test_imagecms.py
+++ b/Tests/test_imagecms.py
@@ -90,6 +90,16 @@ def test_sanity():
     hopper().point(t)
 
 
+def test_flags():
+    assert ImageCms.Flags.NONE == 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():
     skip_missing()
     # get profile information for file
diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py
index 643fce830ba..eafafd58333 100644
--- a/src/PIL/ImageCms.py
+++ b/src/PIL/ImageCms.py
@@ -16,8 +16,10 @@
 # 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 . import Image
 
@@ -119,6 +121,48 @@ class Direction(IntEnum):
 #
 # flags
 
+
+class Flags(IntFlag):
+    # These are taken from lcms2.h (including comments)
+    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
+        return Flags.NONE | ((n & 0xFF) << 16)
+
+
+_MAX_FLAG = reduce(operator.or_, Flags)
+
+
 FLAGS = {
     "MATRIXINPUT": 1,
     "MATRIXOUTPUT": 2,
@@ -142,11 +186,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
@@ -218,7 +257,7 @@ def __init__(
         intent=Intent.PERCEPTUAL,
         proof=None,
         proof_intent=Intent.ABSOLUTE_COLORIMETRIC,
-        flags=0,
+        flags=Flags.NONE,
     ):
         if proof is None:
             self.transform = core.buildTransform(
@@ -303,7 +342,7 @@ def profileToProfile(
     renderingIntent=Intent.PERCEPTUAL,
     outputMode=None,
     inPlace=False,
-    flags=0,
+    flags=Flags.NONE,
 ):
     """
     (pyCMS) Applies an ICC transformation to a given image, mapping from
@@ -420,7 +459,7 @@ def buildTransform(
     inMode,
     outMode,
     renderingIntent=Intent.PERCEPTUAL,
-    flags=0,
+    flags=Flags.NONE,
 ):
     """
     (pyCMS) Builds an ICC transform mapping from the ``inputProfile`` to the
@@ -482,7 +521,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:
@@ -505,7 +544,7 @@ def buildProofTransform(
     outMode,
     renderingIntent=Intent.PERCEPTUAL,
     proofRenderingIntent=Intent.ABSOLUTE_COLORIMETRIC,
-    flags=FLAGS["SOFTPROOFING"],
+    flags=Flags.SOFTPROOFING,
 ):
     """
     (pyCMS) Builds an ICC transform mapping from the ``inputProfile`` to the
@@ -586,7 +625,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:

From 26b2aa5165c62ee38664e291206f8ff28a30bb39 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Mon, 1 Jan 2024 02:07:59 +0100
Subject: [PATCH 03/31] document ImageCms.{ImageCmsProfile,Intent,Direction};
 fix ImageCms.core.CmsProfile references

(cherry picked from commit f2b1bbcf65b327c14646d4113302e3df59555110)
---
 docs/deprecations.rst       |  4 ++--
 docs/reference/ImageCms.rst | 21 ++++++++++++++++++++-
 docs/releasenotes/8.0.0.rst |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/docs/deprecations.rst b/docs/deprecations.rst
index a42dc555fea..0f9c75756ee 100644
--- a/docs/deprecations.rst
+++ b/docs/deprecations.rst
@@ -338,8 +338,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
diff --git a/docs/reference/ImageCms.rst b/docs/reference/ImageCms.rst
index 9b9b5e7b29e..9b6be40b106 100644
--- a/docs/reference/ImageCms.rst
+++ b/docs/reference/ImageCms.rst
@@ -8,9 +8,26 @@ 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:
 .. autoexception:: PyCMSError
 
+Constants
+---------
+
+.. autoclass:: Intent
+    :members:
+    :member-order: bysource
+    :undoc-members:
+.. autoclass:: Direction
+    :members:
+    :member-order: bysource
+    :undoc-members:
+
 Functions
 ---------
 
@@ -37,13 +54,15 @@ 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]
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

From 0b2e2b224fe430c74995664c0d8eec9df789727e Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Mon, 1 Jan 2024 21:38:29 +0100
Subject: [PATCH 04/31] document ImageCms.Flags

---
 docs/reference/ImageCms.rst |  4 +++
 src/PIL/ImageCms.py         | 57 +++++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/docs/reference/ImageCms.rst b/docs/reference/ImageCms.rst
index 9b6be40b106..4ef5ac77456 100644
--- a/docs/reference/ImageCms.rst
+++ b/docs/reference/ImageCms.rst
@@ -27,6 +27,10 @@ Constants
     :members:
     :member-order: bysource
     :undoc-members:
+.. autoclass:: Flags
+    :members:
+    :member-order: bysource
+    :undoc-members:
 
 Functions
 ---------
diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py
index eafafd58333..9a7afe81f2b 100644
--- a/src/PIL/ImageCms.py
+++ b/src/PIL/ImageCms.py
@@ -123,26 +123,43 @@ class Direction(IntEnum):
 
 
 class Flags(IntFlag):
-    # These are taken from lcms2.h (including comments)
+    """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
+    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
+    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()
+    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
@@ -156,7 +173,11 @@ class Flags(IntFlag):
 
     @staticmethod
     def GRIDPOINTS(n: int) -> Flags:
-        # Fine-tune control over number of gridpoints
+        """
+        Fine-tune control over number of gridpoints
+
+        :param n: :py:class:`int` in range ``0 <= n <= 255``
+        """
         return Flags.NONE | ((n & 0xFF) << 16)
 
 

From fd148246499bfd5c7d55f871e3f1f6e608a9bc3f Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 2 Jan 2024 19:15:13 +1100
Subject: [PATCH 05/31] bbox on macOS is not 2x on retina screens

---
 docs/reference/ImageGrab.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/reference/ImageGrab.rst b/docs/reference/ImageGrab.rst
index 0b94032d5f8..5c365132f5e 100644
--- a/docs/reference/ImageGrab.rst
+++ b/docs/reference/ImageGrab.rst
@@ -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 OS, 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

From ec6a57f69d45c0444d7e38df57af6761524463fa Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 2 Jan 2024 21:27:12 +1100
Subject: [PATCH 06/31] Updated description

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 docs/reference/ImageGrab.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/reference/ImageGrab.rst b/docs/reference/ImageGrab.rst
index 5c365132f5e..e0e8d5a2f1b 100644
--- a/docs/reference/ImageGrab.rst
+++ b/docs/reference/ImageGrab.rst
@@ -22,10 +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.
-                 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 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

From 75015e9859183e426012aa59309473c479b59a59 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 2 Jan 2024 22:43:56 +1100
Subject: [PATCH 07/31] Skip PyPy3.8 Windows wheel

---
 .github/workflows/wheels.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 060fc497ea7..5adff7ec1c4 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -143,6 +143,7 @@ jobs:
           CIBW_ARCHS: ${{ matrix.cibw_arch }}
           CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd"
           CIBW_CACHE_PATH: "C:\\cibw"
+          CIBW_SKIP: pp38-*
           CIBW_TEST_SKIP: "*-win_arm64"
           CIBW_TEST_COMMAND: 'docker run --rm
             -v {project}:C:\pillow

From 5ddcf4d11493524627dbf4b65ad0ed76b7625168 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 2 Jan 2024 20:33:48 +1100
Subject: [PATCH 08/31] Package name is now lowercase in wheel filenames

---
 RELEASING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASING.md b/RELEASING.md
index b3fd72a520e..97f4f8dcd18 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -87,7 +87,7 @@ Released as needed privately to individual vendors for critical security-related
   and copy into `dist`. Check and upload them e.g.:
   ```bash
   python3 -m twine check --strict dist/*
-  python3 -m twine upload dist/Pillow-5.2.0*
+  python3 -m twine upload dist/pillow-5.2.0*
   ```
 
 ## Publicize Release

From 81ea98e4941af0940b4725a7cc187c689a3726e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Baranovi=C4=8D?= <nulano@nulano.eu>
Date: Tue, 2 Jan 2024 14:10:07 +0100
Subject: [PATCH 09/31] document ImageCmsTransform's base class

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
---
 docs/reference/ImageCms.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/reference/ImageCms.rst b/docs/reference/ImageCms.rst
index 4ef5ac77456..22ed516ce58 100644
--- a/docs/reference/ImageCms.rst
+++ b/docs/reference/ImageCms.rst
@@ -14,6 +14,7 @@ Cazabon's PyCMS library.
 .. autoclass:: ImageCmsTransform
     :members:
     :undoc-members:
+    :show-inheritance:
 .. autoexception:: PyCMSError
 
 Constants

From fc7088a561554aec8b6a4cf6517fdcc11554cb6b Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Tue, 2 Jan 2024 14:52:12 +0100
Subject: [PATCH 10/31] improve ImageTransform documentation

---
 docs/PIL.rst                      |  8 -------
 docs/reference/ImageTransform.rst | 35 +++++++++++++++++++++++++++++++
 docs/reference/index.rst          |  1 +
 src/PIL/Image.py                  |  4 ++++
 src/PIL/ImageTransform.py         | 13 +++++++-----
 5 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 docs/reference/ImageTransform.rst

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/reference/ImageTransform.rst b/docs/reference/ImageTransform.rst
new file mode 100644
index 00000000000..1278801821d
--- /dev/null
+++ b/docs/reference/ImageTransform.rst
@@ -0,0 +1,35 @@
+
+.. 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:: 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/index.rst b/docs/reference/index.rst
index 5d6affa94ad..82c75e373ad 100644
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@@ -25,6 +25,7 @@ Reference
    ImageShow
    ImageStat
    ImageTk
+   ImageTransform
    ImageWin
    ExifTags
    TiffTags
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
index 1bba9aad2c1..c56da545803 100644
--- a/src/PIL/Image.py
+++ b/src/PIL/Image.py
@@ -2666,6 +2666,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::
 
diff --git a/src/PIL/ImageTransform.py b/src/PIL/ImageTransform.py
index 84c81f1844f..4f79500e64e 100644
--- a/src/PIL/ImageTransform.py
+++ b/src/PIL/ImageTransform.py
@@ -20,12 +20,14 @@
 
 
 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:
         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(
@@ -34,6 +36,7 @@ def transform(
         image: Image.Image,
         **options: dict[str, str | int | tuple[int, ...] | list[int]],
     ) -> 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 +54,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.
@@ -73,7 +76,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 +92,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 +107,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.
     """

From b4a82712887e14b7ff1fc6302fdd9b1a48ac2280 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Tue, 2 Jan 2024 17:26:11 +0100
Subject: [PATCH 11/31] update Windows 11 tested versions

---
 docs/installation.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index fbcfbb90724..4c58b4ebb27 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -581,9 +581,9 @@ These platforms have been reported to work at the versions mentioned.
 +----------------------------------+----------------------------+------------------+--------------+
 | 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                       | 3.9, 3.10, 3.11, 3.12      | 10.2.0           |arm64         |
 +----------------------------------+----------------------------+------------------+--------------+
-| Windows 11 Pro                   | 3.11, 3.12                 | 10.1.0           |x86-64        |
+| Windows 11 Pro                   | 3.11, 3.12                 | 10.2.0           |x86-64        |
 +----------------------------------+----------------------------+------------------+--------------+
 | Windows 10                       | 3.7                        | 7.1.0            |x86-64        |
 +----------------------------------+----------------------------+------------------+--------------+

From d134110ace31194f5fab4a9c3a62563a5d2a91bd Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 3 Jan 2024 09:01:35 +1100
Subject: [PATCH 12/31] If bbox is omitted, screenshot is taken at 2x on Retina
 screens

---
 docs/reference/ImageGrab.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/reference/ImageGrab.rst b/docs/reference/ImageGrab.rst
index e0e8d5a2f1b..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

From 424737ef4906b5005f53b1642e5b538cadf391ed Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 3 Jan 2024 11:18:16 +1100
Subject: [PATCH 13/31] Updated macOS tested Pillow versions

---
 docs/installation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index 4c58b4ebb27..922720b9d05 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -510,7 +510,7 @@ These platforms have been reported to work at the versions mentioned.
 | 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 14 Sonoma                  | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.2.0           |arm           |
 +----------------------------------+----------------------------+------------------+--------------+
 | macOS 13 Ventura                 | 3.8, 3.9, 3.10, 3.11       | 10.0.1           |arm           |
 |                                  +----------------------------+------------------+              |

From 05e73702f2651897efbdc0ad39551f1a99b371d4 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:51:10 +1100
Subject: [PATCH 14/31] Updated matrix variable name on Linux and macOS to
 match Windows

---
 .github/workflows/wheels.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 5adff7ec1c4..85d9eba1c3e 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -39,18 +39,18 @@ jobs:
         include:
           - name: "macOS x86_64"
             os: macos-latest
-            archs: x86_64
+            cibw_arch: x86_64
             macosx_deployment_target: "10.10"
           - 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:
@@ -67,7 +67,7 @@ jobs:
           python3 -m pip install -r .ci/requirements-cibw.txt
           python3 -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_ARCHS: ${{ matrix.archs }}
+          CIBW_ARCHS: ${{ matrix.cibw_arch }}
           CIBW_BUILD: ${{ matrix.build }}
           CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }}
           CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
@@ -77,7 +77,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: dist-${{ matrix.os }}-${{ matrix.archs }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }}
+          name: dist-${{ matrix.os }}-${{ matrix.cibw_arch }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }}
           path: ./wheelhouse/*.whl
 
   windows:

From 85c552934af5ed378b034560ace23107bb4ec497 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Wed, 3 Jan 2024 17:45:41 +0200
Subject: [PATCH 15/31] Goodbye Travis CI

---
 .github/workflows/test-cygwin.yml  |  2 --
 .github/workflows/test-docker.yml  |  2 --
 .github/workflows/test-mingw.yml   |  2 --
 .github/workflows/test-windows.yml |  2 --
 .github/workflows/test.yml         |  2 --
 .travis.yml                        | 52 ------------------------------
 README.md                          |  3 --
 RELEASING.md                       |  8 +----
 docs/about.rst                     |  3 +-
 docs/index.rst                     |  4 ---
 10 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
index 32ac6f65e76..7244315ac15 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:
diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index eb27b4bf75b..3bb6856f6e8 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:
diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml
index 115c2e9bebc..cdd51e2bb3f 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:
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 86cd5b5fa1e..a0ef1c3f1ec 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -6,7 +6,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   pull_request:
@@ -14,7 +13,6 @@ on:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"
       - ".gitmodules"
-      - ".travis.yml"
       - "docs/**"
       - "wheels/**"
   workflow_dispatch:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b7e112f4364..05f78704bcd 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:
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/README.md b/README.md
index e11bd2faa1d..6982676f518 100644
--- a/README.md
+++ b/README.md
@@ -48,9 +48,6 @@ 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>
diff --git a/RELEASING.md b/RELEASING.md
index 97f4f8dcd18..62f3627de19 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.
@@ -83,12 +83,6 @@ Released as needed privately to individual vendors for critical security-related
 * [ ] 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.:
-  ```bash
-  python3 -m twine check --strict dist/*
-  python3 -m twine upload dist/pillow-5.2.0*
-  ```
 
 ## Publicize Release
 
diff --git a/docs/about.rst b/docs/about.rst
index 872ac0ea690..da351ce2c56 100644
--- a/docs/about.rst
+++ b/docs/about.rst
@@ -6,13 +6,12 @@ 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/
 
diff --git a/docs/index.rst b/docs/index.rst
index 4f577fe9c22..053d55c3c39 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -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

From df37b47fd87a5b2b7fe66cbc7c5e66bfbcbb4c78 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Tue, 2 Jan 2024 18:11:52 +0200
Subject: [PATCH 16/31] Build QEMU-emulated Linux aarch64 wheels on GitHub
 Actions

---
 .github/workflows/wheels.yml | 77 +++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 85d9eba1c3e..6ebf9a4c029 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -30,7 +30,80 @@ env:
   FORCE_COLOR: 1
 
 jobs:
-  build:
+  build-1-QEMU-emulated-wheels:
+    name: QEMU ${{ matrix.python-version }} ${{ matrix.spec }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - pp39
+          - pp310
+          - cp38
+          - cp39
+          - cp310
+          - cp311
+          - cp312
+        spec:
+          - manylinux2014
+          - manylinux_2_28
+          - musllinux
+        exclude:
+          - { python-version: pp39, spec: musllinux }
+          - { 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
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Install cibuildwheel
+        run: |
+          python3 -m pip install -r .ci/requirements-cibw.txt
+
+      - name: Build wheels (manylinux)
+        if: matrix.spec != 'musllinux'
+        run: |
+          python3 -m cibuildwheel --output-dir wheelhouse
+        env:
+          # Build only the currently selected Linux architecture (so we can
+          # parallelise for speed).
+          CIBW_ARCHS_LINUX: "aarch64"
+          # Likewise, select only one Python version per job to speed this up.
+          CIBW_BUILD: "${{ matrix.python-version }}-manylinux*"
+          # Extra options for manylinux.
+          CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.spec }}
+          CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.spec }}
+
+      - name: Build wheels (musllinux)
+        if: matrix.spec == 'musllinux'
+        run: |
+          python3 -m cibuildwheel --output-dir wheelhouse
+        env:
+          # Build only the currently selected Linux architecture (so we can
+          # parallelise for speed).
+          CIBW_ARCHS_LINUX: "aarch64"
+          # Likewise, select only one Python version per job to speed this up.
+          CIBW_BUILD: "${{ matrix.python-version }}-${{ matrix.spec }}*"
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist-qemu-${{ matrix.python-version }}-${{ matrix.spec }}
+          path: ./wheelhouse/*.whl
+
+  build-2-native-wheels:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
@@ -187,7 +260,7 @@ jobs:
 
   pypi-publish:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-    needs: [build, windows, sdist]
+    needs: [build-1-QEMU-emulated-wheels, build-2-native-wheels, windows, sdist]
     runs-on: ubuntu-latest
     name: Upload release to PyPI
     environment:

From 55944860a5dd4a38d786df035346b9d5ddf3aa1e Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:50:06 +0200
Subject: [PATCH 17/31] Remove unused docker/setup-buildx-action

---
 .github/workflows/wheels.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 6ebf9a4c029..4de599b810b 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -65,10 +65,6 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Install cibuildwheel
         run: |
           python3 -m pip install -r .ci/requirements-cibw.txt

From 32ae1bd08a6e3d8b9d266a2e7c8b265ec3d5ad18 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:52:22 +0200
Subject: [PATCH 18/31] Use aarch64 instead of QEMU in job name

---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 4de599b810b..d7a93c70ce6 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -31,7 +31,7 @@ env:
 
 jobs:
   build-1-QEMU-emulated-wheels:
-    name: QEMU ${{ matrix.python-version }} ${{ matrix.spec }}
+    name: aarch64 ${{ matrix.python-version }} ${{ matrix.spec }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

From fd37d86accff55d366950b3f9d286c7174ebe9b4 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:55:04 +0200
Subject: [PATCH 19/31] Skip non-wheel CI runs for tags

---
 .github/workflows/test-windows.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 86cd5b5fa1e..94c2d4d70b8 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -2,6 +2,8 @@ name: Test Windows
 
 on:
   push:
+    branches:
+      - "**"
     paths-ignore:
       - ".github/workflows/docs.yml"
       - ".github/workflows/wheels*"

From bc3cf97649d76bc231ec99d41dfd6eb2be72b175 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:00:11 +1100
Subject: [PATCH 20/31] Use general arch setting instead of platform-specific
 setting

---
 .github/workflows/wheels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d7a93c70ce6..8a9f81dfd09 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -76,7 +76,7 @@ jobs:
         env:
           # Build only the currently selected Linux architecture (so we can
           # parallelise for speed).
-          CIBW_ARCHS_LINUX: "aarch64"
+          CIBW_ARCHS: "aarch64"
           # Likewise, select only one Python version per job to speed this up.
           CIBW_BUILD: "${{ matrix.python-version }}-manylinux*"
           # Extra options for manylinux.
@@ -90,7 +90,7 @@ jobs:
         env:
           # Build only the currently selected Linux architecture (so we can
           # parallelise for speed).
-          CIBW_ARCHS_LINUX: "aarch64"
+          CIBW_ARCHS: "aarch64"
           # Likewise, select only one Python version per job to speed this up.
           CIBW_BUILD: "${{ matrix.python-version }}-${{ matrix.spec }}*"
 

From e84b0a401509325c7e5e553a9f1a4591256b4b45 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:38:41 +1100
Subject: [PATCH 21/31] Combine build steps

---
 .github/workflows/wheels.yml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 8a9f81dfd09..e2bc78b983c 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -69,8 +69,7 @@ jobs:
         run: |
           python3 -m pip install -r .ci/requirements-cibw.txt
 
-      - name: Build wheels (manylinux)
-        if: matrix.spec != 'musllinux'
+      - name: Build wheels
         run: |
           python3 -m cibuildwheel --output-dir wheelhouse
         env:
@@ -78,22 +77,11 @@ jobs:
           # parallelise for speed).
           CIBW_ARCHS: "aarch64"
           # Likewise, select only one Python version per job to speed this up.
-          CIBW_BUILD: "${{ matrix.python-version }}-manylinux*"
+          CIBW_BUILD: "${{ matrix.python-version }}-${{ matrix.spec == 'musllinux' && 'musllinux' || 'manylinux' }}*"
           # Extra options for manylinux.
           CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.spec }}
           CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.spec }}
 
-      - name: Build wheels (musllinux)
-        if: matrix.spec == 'musllinux'
-        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 }}*"
-
       - uses: actions/upload-artifact@v4
         with:
           name: dist-qemu-${{ matrix.python-version }}-${{ matrix.spec }}

From 60e82e5a3f21b25e1b54ebc1104e972290201a85 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 4 Jan 2024 17:24:09 +1100
Subject: [PATCH 22/31] Separate cibuildwheel install

---
 .github/workflows/wheels.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index e2bc78b983c..50e47f19853 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -119,9 +119,11 @@ 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
           python3 -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ARCHS: ${{ matrix.cibw_arch }}
@@ -163,6 +165,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
@@ -171,8 +177,6 @@ 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 }}
         shell: pwsh
 

From 46db79abe1b8ada6f980e01cee633f9c8f6fbbdf Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Thu, 4 Jan 2024 00:30:46 -0700
Subject: [PATCH 23/31] Fix syntax

---
 .github/workflows/wheels.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 50e47f19853..77c1489dfcd 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -124,6 +124,7 @@ jobs:
           python3 -m pip install -r .ci/requirements-cibw.txt
 
       - name: Build wheels
+        run: |
           python3 -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ARCHS: ${{ matrix.cibw_arch }}

From f184775cd3a2410ad326572d2b1d9a75ac481790 Mon Sep 17 00:00:00 2001
From: Andrew Murray <3112309+radarhere@users.noreply.github.com>
Date: Thu, 4 Jan 2024 23:32:54 +1100
Subject: [PATCH 24/31] Removed leading ampersand

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 77c1489dfcd..be8f652447c 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -168,7 +168,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          & python.exe -m pip install -r .ci/requirements-cibw.txt
+          python.exe -m pip install -r .ci/requirements-cibw.txt
 
       - name: Prepare for build
         run: |

From 2dd00de1f36d0e5dfd15f28048c2e2b7550bb232 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Thu, 4 Jan 2024 20:26:14 +0100
Subject: [PATCH 25/31] rename x64 to AMD64 in winbuild/build_prepare.py

---
 .appveyor.yml                |  2 +-
 .github/workflows/wheels.yml | 17 +++++++----------
 winbuild/build.rst           |  6 +++---
 winbuild/build_prepare.py    |  4 ++--
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 0f5dea9c515..4c5a7f9ee47 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -14,7 +14,7 @@ environment:
     ARCHITECTURE: x86
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
   - PYTHON: C:/Python38-x64
-    ARCHITECTURE: x64
+    ARCHITECTURE: AMD64
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
 
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 85d9eba1c3e..36e98aa554a 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -81,18 +81,15 @@ jobs:
           path: ./wheelhouse/*.whl
 
   windows:
-    name: Windows ${{ matrix.arch }}
+    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
 
@@ -116,7 +113,7 @@ jobs:
 
           & 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
@@ -157,13 +154,13 @@ 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:
diff --git a/winbuild/build.rst b/winbuild/build.rst
index a8e4ebaa6cc..cd3b559e7f0 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
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 8e3757ca89e..440e64d9851 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -105,7 +105,7 @@ 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"},
 }
 
@@ -651,7 +651,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)",

From 5e2ebaface37ff71e1b8e4e9b5708ff3eec3a909 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Thu, 4 Jan 2024 21:00:06 +0100
Subject: [PATCH 26/31] winbuild: build libwebp using cmake

---
 winbuild/build_prepare.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 440e64d9851..1615abbdb82 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -175,22 +175,15 @@ def cmd_msbuild(
         "dir": "libwebp-1.3.2",
         "license": "COPYING",
         "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 webpdemux webpmux",
+                "-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"libwebp*.lib"],
     },
     "libtiff": {
         "url": "https://download.osgeo.org/libtiff/tiff-4.6.0.tar.gz",
@@ -204,7 +197,7 @@ def cmd_msbuild(
             },
             r"libtiff\tif_webp.c": {
                 # link against webp.lib
-                "#ifdef WEBP_SUPPORT": '#ifdef WEBP_SUPPORT\n#pragma comment(lib, "webp.lib")',  # noqa: E501
+                "#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 +210,7 @@ def cmd_msbuild(
             *cmds_cmake(
                 "tiff",
                 "-DBUILD_SHARED_LIBS:BOOL=OFF",
+                "-DWebP_LIBRARY=libwebp",
                 '-DCMAKE_C_FLAGS="-nologo -DLZMA_API_STATIC"',
             )
         ],

From 4094edd12f32a432309d279d7c7b90d068f3bdb1 Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Thu, 4 Jan 2024 21:26:47 +0100
Subject: [PATCH 27/31] winbuild: fix libwebp linking libsharpyuv

---
 winbuild/build_prepare.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 1615abbdb82..84284ae10f4 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -174,6 +174,11 @@ def cmd_msbuild(
         "filename": "libwebp-1.3.2.tar.gz",
         "dir": "libwebp-1.3.2",
         "license": "COPYING",
+        "patch": {
+            r"src\enc\picture_csp_enc.c": {
+                '#include "sharpyuv/sharpyuv.h"': '#include "sharpyuv/sharpyuv.h"\n#pragma comment(lib, "libsharpyuv.lib")',  # noqa: E501
+            }
+        },
         "build": [
             *cmds_cmake(
                 "webp webpdemux webpmux",
@@ -183,7 +188,7 @@ def cmd_msbuild(
             cmd_mkdir(r"{inc_dir}\webp"),
             cmd_copy(r"src\webp\*.h", r"{inc_dir}\webp"),
         ],
-        "libs": [r"libwebp*.lib"],
+        "libs": [r"libsharpyuv.lib", r"libwebp*.lib"],
     },
     "libtiff": {
         "url": "https://download.osgeo.org/libtiff/tiff-4.6.0.tar.gz",

From eff9f06f0dac6521d89938aa5a93ab03a77fd50d Mon Sep 17 00:00:00 2001
From: Nulano <nulano@nulano.eu>
Date: Thu, 4 Jan 2024 22:10:11 +0100
Subject: [PATCH 28/31] fix comments

---
 winbuild/build_prepare.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 84284ae10f4..df33ea493e6 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -176,6 +176,7 @@ def cmd_msbuild(
         "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
             }
         },
@@ -201,7 +202,7 @@ def cmd_msbuild(
                 "#ifdef LZMA_SUPPORT": '#ifdef LZMA_SUPPORT\n#pragma comment(lib, "liblzma.lib")',  # noqa: E501
             },
             r"libtiff\tif_webp.c": {
-                # link against webp.lib
+                # link against libwebp.lib
                 "#ifdef WEBP_SUPPORT": '#ifdef WEBP_SUPPORT\n#pragma comment(lib, "libwebp.lib")',  # noqa: E501
             },
             r"test\CMakeLists.txt": {

From d329207e62125ee3dcda0b2a82112757e9ef6fbd Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 6 Jan 2024 07:03:40 +1100
Subject: [PATCH 29/31] Update CHANGES.rst [ci skip]

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 85036f6425b..ac961a680a3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 Changelog (Pillow)
 ==================
 
+10.3.0 (unreleased)
+-------------------
+
+- Rename x64 to AMD64 in winbuild #7693
+  [nulano]
+
 10.2.0 (2024-01-02)
 -------------------
 

From 2d6ad5868dac031a8b4eeda41116b3da3fd1be58 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 6 Jan 2024 12:07:55 +1100
Subject: [PATCH 30/31] Use "non-zero" consistently

---
 Tests/test_file_eps.py       | 4 ++--
 Tests/test_image_resample.py | 2 +-
 src/libImaging/GifEncode.c   | 2 +-
 src/libImaging/Jpeg.h        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index c479c384a76..8b48e83ad2c 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -270,7 +270,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:
@@ -292,7 +292,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:
diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py
index b4bf6c8df3a..5a578dba5c4 100644
--- a/Tests/test_image_resample.py
+++ b/Tests/test_image_resample.py
@@ -403,7 +403,7 @@ def test_reduce(self):
             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):
         # 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))
diff --git a/src/libImaging/GifEncode.c b/src/libImaging/GifEncode.c
index f232454052a..e37301df765 100644
--- a/src/libImaging/GifEncode.c
+++ b/src/libImaging/GifEncode.c
@@ -105,7 +105,7 @@ static int glzwe(GIFENCODERSTATE *st, const UINT8 *in_ptr, UINT8 *out_ptr,
                 st->head = st->codes[st->probe] >> 20;
                 goto encode_loop;
             } else {
-        /* Reprobe decrement must be nonzero and relatively prime to table
+        /* 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;
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) */

From d9ec2fd4bb4acb049d27cf0a66bd663bdb66274a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Baranovi=C4=8D?= <nulano@nulano.eu>
Date: Sat, 6 Jan 2024 14:33:11 +0100
Subject: [PATCH 31/31] Add code formatting to ImageCms.Flags docstrings

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 src/PIL/ImageCms.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py
index 9a7afe81f2b..62b010f4512 100644
--- a/src/PIL/ImageCms.py
+++ b/src/PIL/ImageCms.py
@@ -147,7 +147,7 @@ class Flags(IntFlag):
     USE_8BITS_DEVICELINK = 0x0008
     """Create 8 bits devicelinks"""
     GUESSDEVICECLASS = 0x0020
-    """Guess device class (for transform2devicelink)"""
+    """Guess device class (for ``transform2devicelink``)"""
     KEEP_SEQUENCE = 0x0080
     """Keep profile sequence for devicelink creation"""
     FORCE_CLUT = 0x0002
@@ -159,7 +159,7 @@ class Flags(IntFlag):
     NONEGATIVES = 0x8000
     """Prevent negative numbers in floating point transforms"""
     COPY_ALPHA = 0x04000000
-    """Alpha channels are copied on cmsDoTransform()"""
+    """Alpha channels are copied on ``cmsDoTransform()``"""
     NODEFAULTRESOURCEDEF = 0x01000000
 
     _GRIDPOINTS_1 = 1 << 16