From 0a8e6dbedb84b50ca2ca8762ae1279a66c385bad Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Sat, 31 Aug 2024 20:41:37 +0400
Subject: [PATCH 01/58] Use im.has_transparency_data for webp._save_all

Also:
remove _VALID_WEBP_MODES and _VALID_WEBP_LEGACY_MODES consts
RGBX is not faster RGB since demands more bandwidth
Do not convert to str paths in tests
---
 Tests/test_file_webp.py    | 27 ++++++++++++---------------
 src/PIL/WebPImagePlugin.py | 25 +++++--------------------
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py
index e75e3ddd2..719831db9 100644
--- a/Tests/test_file_webp.py
+++ b/Tests/test_file_webp.py
@@ -72,7 +72,7 @@ class TestFileWebp:
     def _roundtrip(
         self, tmp_path: Path, mode: str, epsilon: float, args: dict[str, Any] = {}
     ) -> None:
-        temp_file = str(tmp_path / "temp.webp")
+        temp_file = tmp_path / "temp.webp"
 
         hopper(mode).save(temp_file, **args)
         with Image.open(temp_file) as image:
@@ -116,7 +116,7 @@ class TestFileWebp:
         assert buffer_no_args.getbuffer() != buffer_method.getbuffer()
 
     def test_save_all(self, tmp_path: Path) -> None:
-        temp_file = str(tmp_path / "temp.webp")
+        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])
@@ -151,18 +151,16 @@ class TestFileWebp:
 
     @pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system")
     def test_write_encoding_error_message(self, tmp_path: Path) -> None:
-        temp_file = str(tmp_path / "temp.webp")
         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"
 
     @pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system")
     def test_write_encoding_error_bad_dimension(self, tmp_path: Path) -> None:
-        temp_file = str(tmp_path / "temp.webp")
         im = Image.new("L", (16384, 16384))
         with pytest.raises(ValueError) as e:
-            im.save(temp_file)
+            im.save(tmp_path / "temp.webp")
         assert (
             str(e.value)
             == "encoding error 5: Image size exceeds WebP limit of 16383 pixels"
@@ -187,9 +185,8 @@ class TestFileWebp:
     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) -> None:
         file_path = "Tests/images/hopper.webp"
@@ -204,15 +201,16 @@ class TestFileWebp:
     def test_invalid_background(
         self, background: int | tuple[int, ...], tmp_path: Path
     ) -> None:
-        temp_file = str(tmp_path / "temp.webp")
+        temp_file = tmp_path / "temp.webp"
         im = hopper()
         with pytest.raises(OSError):
             im.save(temp_file, save_all=True, append_images=[im], background=background)
 
     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
@@ -220,11 +218,10 @@ class TestFileWebp:
             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)
 
@@ -234,10 +231,10 @@ class TestFileWebp:
         assert difference < 5
 
     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:
@@ -245,7 +242,7 @@ class TestFileWebp:
             assert reloaded.info["duration"] == 1000
 
     def test_roundtrip_rgba_palette(self, tmp_path: Path) -> None:
-        temp_file = str(tmp_path / "temp.webp")
+        temp_file = tmp_path / "temp.webp"
         im = Image.new("RGBA", (1, 1)).convert("P")
         assert im.mode == "P"
         assert im.palette is not None
diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
index f8d6168ba..3754d784a 100644
--- a/src/PIL/WebPImagePlugin.py
+++ b/src/PIL/WebPImagePlugin.py
@@ -13,10 +13,6 @@ except ImportError:
     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",
@@ -247,27 +243,16 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
 
                 # 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"
+                if frame.mode not in ("RGBX", "RGBA", "RGB"):
+                    frame = frame.convert("RGBA" if im.has_transparency_data else "RGB")
 
                 # Append the frame to the animation encoder
                 enc.add(
-                    frame.tobytes("raw", rawmode),
+                    frame.tobytes(),
                     round(timestamp),
                     frame.size[0],
                     frame.size[1],
-                    rawmode,
+                    frame.mode,
                     lossless,
                     quality,
                     alpha_quality,
@@ -310,7 +295,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     method = im.encoderinfo.get("method", 4)
     exact = 1 if im.encoderinfo.get("exact") else 0
 
-    if im.mode not in _VALID_WEBP_LEGACY_MODES:
+    if im.mode not in ("RGB", "RGBA"):
         im = im.convert("RGBA" if im.has_transparency_data else "RGB")
 
     data = _webp.WebPEncode(

From 8bb3134b1d2fa2a13111a6555e09bbc26b96ff7a Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Sun, 1 Sep 2024 19:41:45 +0400
Subject: [PATCH 02/58] call _webp.WebPEncode with ptr

---
 src/PIL/WebPImagePlugin.py |  7 +---
 src/_webp.c                | 75 ++++++++++++++++++++++++--------------
 2 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
index 3754d784a..3eeba9400 100644
--- a/src/PIL/WebPImagePlugin.py
+++ b/src/PIL/WebPImagePlugin.py
@@ -295,17 +295,14 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     method = im.encoderinfo.get("method", 4)
     exact = 1 if im.encoderinfo.get("exact") else 0
 
-    if im.mode not in ("RGB", "RGBA"):
+    if im.mode not in ("RGBX", "RGBA", "RGB"):
         im = im.convert("RGBA" if im.has_transparency_data else "RGB")
 
     data = _webp.WebPEncode(
-        im.tobytes(),
-        im.size[0],
-        im.size[1],
+        im.im.ptr,
         lossless,
         float(quality),
         float(alpha_quality),
-        im.mode,
         icc_profile,
         method,
         exact,
diff --git a/src/_webp.c b/src/_webp.c
index f59ad3036..bfd9de5c0 100644
--- a/src/_webp.c
+++ b/src/_webp.c
@@ -566,32 +566,65 @@ static PyTypeObject WebPAnimDecoder_Type = {
     0,                                 /*tp_getset*/
 };
 
+/* -------------------------------------------------------------------- */
+/* Frame import                                                         */
+/* -------------------------------------------------------------------- */
+
+static int
+import_frame_libwebp(WebPPicture *frame, Imaging im) {
+    UINT32 mask = 0;
+
+    if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") && strcmp(im->mode, "RGBX")) {
+        PyErr_SetString(PyExc_ValueError, "unsupported image mode");
+        return -1;
+    }
+
+    if (strcmp(im->mode, "RGBA")) {
+        mask = MASK_UINT32_CHANNEL_3;
+    }
+
+    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;
+    }
+
+    for (int y = 0; y < im->ysize; ++y) {
+        UINT8 *src = (UINT8 *)im->image32[y];
+        UINT32 *dst = frame->argb + frame->argb_stride * y;
+        for (int x = 0; x < im->xsize; ++x) {
+            UINT32 pix = MAKE_UINT32(src[x * 4 + 2], src[x * 4 + 1], src[x * 4], src[x * 4 + 3]);
+            dst[x] = pix | mask;
+        }
+    }
+
+    return 0;
+}
+
 /* -------------------------------------------------------------------- */
 /* 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;
@@ -600,15 +633,11 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "y#iiiffss#iis#s#",
-            (char **)&rgb,
-            &size,
-            &width,
-            &height,
+            "Oiffs#iis#s#",
+            &i0,
             &lossless,
             &quality_factor,
             &alpha_quality_factor,
-            &mode,
             &icc_bytes,
             &icc_size,
             &method,
@@ -621,15 +650,12 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) {
         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)) {
@@ -652,14 +678,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);

From 0962b468b71ea9cdb99417d091c75e86c29f768a Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Tue, 3 Sep 2024 13:47:31 +0400
Subject: [PATCH 03/58] ImagingSectionEnter for WebPAnimEncoder

---
 src/_webp.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/_webp.c b/src/_webp.c
index bfd9de5c0..ede261df6 100644
--- a/src/_webp.c
+++ b/src/_webp.c
@@ -190,6 +190,7 @@ _anim_encoder_add(PyObject *self, PyObject *args) {
     float quality_factor;
     float alpha_quality_factor;
     int method;
+    ImagingSectionCookie cookie;
     WebPConfig config;
     WebPAnimEncoderObject *encp = (WebPAnimEncoderObject *)self;
     WebPAnimEncoder *enc = encp->enc;
@@ -246,8 +247,11 @@ _anim_encoder_add(PyObject *self, PyObject *args) {
         WebPPictureImportRGB(frame, rgb, 3 * width);
     }
 
-    // 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;
     }

From 4d271c8ec87355962e0345a00d9e4032007a13c5 Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Tue, 3 Sep 2024 13:58:40 +0400
Subject: [PATCH 04/58] import_frame for anim_encoder_add

---
 src/PIL/WebPImagePlugin.py |   7 +--
 src/_webp.c                | 114 ++++++++++++++++++-------------------
 2 files changed, 56 insertions(+), 65 deletions(-)

diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
index 3eeba9400..8251316d3 100644
--- a/src/PIL/WebPImagePlugin.py
+++ b/src/PIL/WebPImagePlugin.py
@@ -248,11 +248,8 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
 
                 # Append the frame to the animation encoder
                 enc.add(
-                    frame.tobytes(),
+                    frame.im.ptr,
                     round(timestamp),
-                    frame.size[0],
-                    frame.size[1],
-                    frame.mode,
                     lossless,
                     quality,
                     alpha_quality,
@@ -270,7 +267,7 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
         im.seek(cur_idx)
 
     # Force encoder to flush frames
-    enc.add(None, round(timestamp), 0, 0, "", lossless, quality, alpha_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)
diff --git a/src/_webp.c b/src/_webp.c
index ede261df6..9717b9bc0 100644
--- a/src/_webp.c
+++ b/src/_webp.c
@@ -83,6 +83,46 @@ HandleMuxError(WebPMuxError err, char *chunk) {
     return NULL;
 }
 
+/* -------------------------------------------------------------------- */
+/* Frame import                                                         */
+/* -------------------------------------------------------------------- */
+
+static int
+import_frame_libwebp(WebPPicture *frame, Imaging im) {
+    UINT32 mask = 0;
+
+    if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") &&
+        strcmp(im->mode, "RGBX")) {
+        PyErr_SetString(PyExc_ValueError, "unsupported image mode");
+        return -1;
+    }
+
+    if (strcmp(im->mode, "RGBA")) {
+        mask = MASK_UINT32_CHANNEL_3;
+    }
+
+    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;
+    }
+
+    for (int y = 0; y < im->ysize; ++y) {
+        UINT8 *src = (UINT8 *)im->image32[y];
+        UINT32 *dst = frame->argb + frame->argb_stride * y;
+        for (int x = 0; x < im->xsize; ++x) {
+            UINT32 pix =
+                MAKE_UINT32(src[x * 4 + 2], src[x * 4 + 1], src[x * 4], src[x * 4 + 3]);
+            dst[x] = pix | mask;
+        }
+    }
+
+    return 0;
+}
+
 /* -------------------------------------------------------------------- */
 /* WebP Animation Support                                               */
 /* -------------------------------------------------------------------- */
@@ -180,12 +220,9 @@ _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;
@@ -198,13 +235,9 @@ _anim_encoder_add(PyObject *self, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "z#iiisiffi",
-            (char **)&rgb,
-            &size,
+            "Oiiffi",
+            &i0,
             &timestamp,
-            &width,
-            &height,
-            &mode,
             &lossless,
             &quality_factor,
             &alpha_quality_factor,
@@ -214,11 +247,18 @@ _anim_encoder_add(PyObject *self, PyObject *args) {
     }
 
     // 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!");
@@ -235,16 +275,8 @@ _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;
     }
 
     ImagingSectionEnter(&cookie);
@@ -570,44 +602,6 @@ static PyTypeObject WebPAnimDecoder_Type = {
     0,                                 /*tp_getset*/
 };
 
-/* -------------------------------------------------------------------- */
-/* Frame import                                                         */
-/* -------------------------------------------------------------------- */
-
-static int
-import_frame_libwebp(WebPPicture *frame, Imaging im) {
-    UINT32 mask = 0;
-
-    if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") && strcmp(im->mode, "RGBX")) {
-        PyErr_SetString(PyExc_ValueError, "unsupported image mode");
-        return -1;
-    }
-
-    if (strcmp(im->mode, "RGBA")) {
-        mask = MASK_UINT32_CHANNEL_3;
-    }
-
-    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;
-    }
-
-    for (int y = 0; y < im->ysize; ++y) {
-        UINT8 *src = (UINT8 *)im->image32[y];
-        UINT32 *dst = frame->argb + frame->argb_stride * y;
-        for (int x = 0; x < im->xsize; ++x) {
-            UINT32 pix = MAKE_UINT32(src[x * 4 + 2], src[x * 4 + 1], src[x * 4], src[x * 4 + 3]);
-            dst[x] = pix | mask;
-        }
-    }
-
-    return 0;
-}
-
 /* -------------------------------------------------------------------- */
 /* Legacy WebP Support                                                  */
 /* -------------------------------------------------------------------- */

From d1f40a94ffe783aceb7050d85fa5c17ecc4961a7 Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Mon, 16 Sep 2024 10:52:06 +0200
Subject: [PATCH 05/58] Use Image.getim() instead of ImagingCore.ptr

---
 src/PIL/WebPImagePlugin.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
index 8251316d3..ab545563f 100644
--- a/src/PIL/WebPImagePlugin.py
+++ b/src/PIL/WebPImagePlugin.py
@@ -239,7 +239,6 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
 
             for idx in range(nfr):
                 ims.seek(idx)
-                ims.load()
 
                 # Make sure image mode is supported
                 frame = ims
@@ -248,7 +247,7 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
 
                 # Append the frame to the animation encoder
                 enc.add(
-                    frame.im.ptr,
+                    frame.getim(),
                     round(timestamp),
                     lossless,
                     quality,
@@ -296,7 +295,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
         im = im.convert("RGBA" if im.has_transparency_data else "RGB")
 
     data = _webp.WebPEncode(
-        im.im.ptr,
+        im.getim(),
         lossless,
         float(quality),
         float(alpha_quality),

From 31d36e6b70e1e835bcc6d70f363cda49d3bc9e98 Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Mon, 16 Sep 2024 11:04:00 +0200
Subject: [PATCH 06/58] Use current frame for transparency detection

---
 Tests/test_file_webp.py    | 2 +-
 src/PIL/WebPImagePlugin.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py
index 719831db9..e7c887279 100644
--- a/Tests/test_file_webp.py
+++ b/Tests/test_file_webp.py
@@ -208,7 +208,7 @@ class TestFileWebp:
 
     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:
             im.save(out_webp, save_all=True)
diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
index ab545563f..1a714d7ea 100644
--- a/src/PIL/WebPImagePlugin.py
+++ b/src/PIL/WebPImagePlugin.py
@@ -243,7 +243,9 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
                 # Make sure image mode is supported
                 frame = ims
                 if frame.mode not in ("RGBX", "RGBA", "RGB"):
-                    frame = frame.convert("RGBA" if im.has_transparency_data else "RGB")
+                    frame = frame.convert(
+                        "RGBA" if frame.has_transparency_data else "RGB"
+                    )
 
                 # Append the frame to the animation encoder
                 enc.add(

From 1d5b330758c1e9210a8c00c457b03a1f19903939 Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Mon, 16 Sep 2024 15:37:57 +0200
Subject: [PATCH 07/58] Move common conversion in _convert_frame

---
 src/PIL/WebPImagePlugin.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
index 1a714d7ea..64188f28c 100644
--- a/src/PIL/WebPImagePlugin.py
+++ b/src/PIL/WebPImagePlugin.py
@@ -149,6 +149,13 @@ class WebPImageFile(ImageFile.ImageFile):
         return self.__logical_frame
 
 
+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", []))
@@ -240,12 +247,7 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
             for idx in range(nfr):
                 ims.seek(idx)
 
-                # Make sure image mode is supported
-                frame = ims
-                if frame.mode not in ("RGBX", "RGBA", "RGB"):
-                    frame = frame.convert(
-                        "RGBA" if frame.has_transparency_data else "RGB"
-                    )
+                frame = _convert_frame(ims)
 
                 # Append the frame to the animation encoder
                 enc.add(
@@ -293,8 +295,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
     method = im.encoderinfo.get("method", 4)
     exact = 1 if im.encoderinfo.get("exact") else 0
 
-    if im.mode not in ("RGBX", "RGBA", "RGB"):
-        im = im.convert("RGBA" if im.has_transparency_data else "RGB")
+    im = _convert_frame(im)
 
     data = _webp.WebPEncode(
         im.getim(),

From a988750595af555e07af0e937ab6f6697a5bb1e1 Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Mon, 16 Sep 2024 16:37:39 +0200
Subject: [PATCH 08/58] Try fix bigendian

---
 src/_webp.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/_webp.c b/src/_webp.c
index 9717b9bc0..92d5c20fe 100644
--- a/src/_webp.c
+++ b/src/_webp.c
@@ -89,7 +89,7 @@ HandleMuxError(WebPMuxError err, char *chunk) {
 
 static int
 import_frame_libwebp(WebPPicture *frame, Imaging im) {
-    UINT32 mask = 0;
+    int drop_alpha = strcmp(im->mode, "RGBA");
 
     if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") &&
         strcmp(im->mode, "RGBX")) {
@@ -97,10 +97,6 @@ import_frame_libwebp(WebPPicture *frame, Imaging im) {
         return -1;
     }
 
-    if (strcmp(im->mode, "RGBA")) {
-        mask = MASK_UINT32_CHANNEL_3;
-    }
-
     frame->width = im->xsize;
     frame->height = im->ysize;
     frame->use_argb = 1;  // Don't convert RGB pixels to YUV
@@ -113,10 +109,18 @@ import_frame_libwebp(WebPPicture *frame, Imaging im) {
     for (int y = 0; y < im->ysize; ++y) {
         UINT8 *src = (UINT8 *)im->image32[y];
         UINT32 *dst = frame->argb + frame->argb_stride * y;
-        for (int x = 0; x < im->xsize; ++x) {
-            UINT32 pix =
-                MAKE_UINT32(src[x * 4 + 2], src[x * 4 + 1], src[x * 4], src[x * 4 + 3]);
-            dst[x] = pix | mask;
+        if (drop_alpha) {
+            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));
+            }
         }
     }
 

From e33d8bb32bd04c5b29afa3dca52bce9cb2bbffbd Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:19:53 +0300
Subject: [PATCH 09/58] Generate and upload attestations to PyPI

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

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 11564c142..35ea0496d 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -296,3 +296,5 @@ jobs:
           merge-multiple: true
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          attestations: true

From e57da68190ee685ae8aac898623d3c52963816d2 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 20 Sep 2024 19:20:53 +1000
Subject: [PATCH 10/58] Check image value before use

---
 src/libImaging/Geometry.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libImaging/Geometry.c b/src/libImaging/Geometry.c
index 84aa442f0..1e2abd7e7 100644
--- a/src/libImaging/Geometry.c
+++ b/src/libImaging/Geometry.c
@@ -791,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);

From 83c7043471df575e446c44a4d384df56cd76538b Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 21 Sep 2024 15:54:27 +1000
Subject: [PATCH 11/58] Rename variable, since alpha channel is not dropped

---
 src/_webp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/_webp.c b/src/_webp.c
index 92d5c20fe..dfda7048d 100644
--- a/src/_webp.c
+++ b/src/_webp.c
@@ -89,8 +89,6 @@ HandleMuxError(WebPMuxError err, char *chunk) {
 
 static int
 import_frame_libwebp(WebPPicture *frame, Imaging im) {
-    int drop_alpha = strcmp(im->mode, "RGBA");
-
     if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") &&
         strcmp(im->mode, "RGBX")) {
         PyErr_SetString(PyExc_ValueError, "unsupported image mode");
@@ -106,10 +104,11 @@ import_frame_libwebp(WebPPicture *frame, Imaging im) {
         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 (drop_alpha) {
+        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) |

From 75cb1c1b87ae4be028f3e15141c14c28dd0d04a0 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 21 Sep 2024 16:02:23 +1000
Subject: [PATCH 12/58] Test unsupported image mode

---
 Tests/test_file_webp.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py
index e7c887279..79f6bb4e0 100644
--- a/Tests/test_file_webp.py
+++ b/Tests/test_file_webp.py
@@ -127,6 +127,11 @@ class TestFileWebp:
             reloaded.seek(1)
             assert_image_similar(im2, reloaded, 1)
 
+    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})
         self._roundtrip(

From d8e3572caad2f3dce65db6951909f161a4021687 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:52:29 +1000
Subject: [PATCH 13/58] Updated fribidi to 1.0.16

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

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 84ad6417e..026d9d306 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -111,7 +111,7 @@ ARCHITECTURES = {
 V = {
     "BROTLI": "1.1.0",
     "FREETYPE": "2.13.3",
-    "FRIBIDI": "1.0.15",
+    "FRIBIDI": "1.0.16",
     "HARFBUZZ": "10.0.1",
     "JPEGTURBO": "3.0.4",
     "LCMS2": "2.16",

From 4ca2b92503ed0250d7e48bf4c187c4fd1dbbdc54 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:59:27 +1000
Subject: [PATCH 14/58] Use $IS_ALPINE instead of $MB_ML_LIBC

---
 .github/workflows/wheels-dependencies.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
index b5fbdc421..5175a2a92 100755
--- a/.github/workflows/wheels-dependencies.sh
+++ b/.github/workflows/wheels-dependencies.sh
@@ -156,12 +156,10 @@ if [[ -n "$IS_MACOS" ]]; then
   fi
 
   brew install meson pkg-config
-elif [[ "$MB_ML_LIBC" == "manylinux" ]]; then
-  if [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then
-    yum install -y meson
-  fi
-else
+elif [[ -n "$IS_ALPINE" ]]; then
   apk add meson
+elif [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then
+  yum install -y meson
 fi
 
 wrap_wheel_builder build

From 71da6d8952c174fa0a465fa6caf98989d6eff9c9 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:37:10 +1000
Subject: [PATCH 15/58] Downgrade harfbuzz on OSS Fuzz

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

diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
index 5175a2a92..4289afdf3 100755
--- a/.github/workflows/wheels-dependencies.sh
+++ b/.github/workflows/wheels-dependencies.sh
@@ -16,7 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main
 
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.13.2
-if [[ "$MB_ML_VER" != 2014 ]]; then
+if [[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]; then
     HARFBUZZ_VERSION=10.0.1
 else
     HARFBUZZ_VERSION=8.5.0

From fb8db83122a2f942958fc93103ad7b043cca3a3b Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:35:06 +1000
Subject: [PATCH 16/58] Updated harfbuzz to 10.0.1 on macOS

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

diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
index 4289afdf3..bb0f8a307 100755
--- a/.github/workflows/wheels-dependencies.sh
+++ b/.github/workflows/wheels-dependencies.sh
@@ -16,7 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main
 
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.13.2
-if [[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]; then
+if [[ -n "$IS_MACOS" ]] || ([[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]); then
     HARFBUZZ_VERSION=10.0.1
 else
     HARFBUZZ_VERSION=8.5.0

From 485a062010d0942f88686dbf7ece6a765d329e53 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 27 Sep 2024 23:13:03 +1000
Subject: [PATCH 17/58] Update CHANGES.rst [ci skip]

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

diff --git a/CHANGES.rst b/CHANGES.rst
index ae7370a79..6ff35ea4f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,9 @@ Changelog (Pillow)
 11.0.0 (unreleased)
 -------------------
 
+- Use Capsule for WebP saving #8386
+  [homm, radarhere]
+
 - Fixed writing multiple StripOffsets to TIFF #8317
   [Yay295, radarhere]
 

From bda62c1ac52f6a843263d2e195025d204a094f78 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 27 Sep 2024 22:11:03 +1000
Subject: [PATCH 18/58] Revert "Temporarily disable cifuzz"

This reverts commit 31469407166026ec6d74d2df07196ef2d4e32ab4.
---
 .github/workflows/cifuzz.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 033ff98ce..eb73fc6a7 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -24,8 +24,6 @@ concurrency:
 
 jobs:
   Fuzzing:
-    # Disabled until google/oss-fuzz#11419 upgrades Python to 3.9+
-    if: false
     runs-on: ubuntu-latest
     steps:
     - name: Build Fuzzers

From 04a00d273c6fe72f8a2f4099950831deb8ad5407 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 28 Sep 2024 14:27:40 +1000
Subject: [PATCH 19/58] Support all resampling filters when resizing I;16*
 images

---
 Tests/test_image_resize.py | 16 ++++++--
 src/_imaging.c             | 10 ++---
 src/libImaging/Resample.c  | 84 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py
index d9ddf5009..1cd9c3800 100644
--- a/Tests/test_image_resize.py
+++ b/Tests/test_image_resize.py
@@ -44,9 +44,19 @@ class TestImagingCoreResize:
             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
diff --git a/src/_imaging.c b/src/_imaging.c
index 07d9a64cc..426036335 100644
--- a/src/_imaging.c
+++ b/src/_imaging.c
@@ -1579,16 +1579,12 @@ _putdata(ImagingObject *self, PyObject *args) {
                 int bigendian = 0;
                 if (image->type == IMAGING_TYPE_SPECIAL) {
                     // I;16*
-                    if (strcmp(image->mode, "I;16N") == 0) {
+                    if (strcmp(image->mode, "I;16B") == 0
 #ifdef WORDS_BIGENDIAN
-                        bigendian = 1;
-#else
-                        bigendian = 0;
+                        || strcmp(image->mode, "I;16N") == 0
 #endif
-                    } else if (strcmp(image->mode, "I;16B") == 0) {
+                    ) {
                         bigendian = 1;
-                    } else {
-                        bigendian = 0;
                     }
                 }
                 for (i = x = y = 0; i < n; i++) {
diff --git a/src/libImaging/Resample.c b/src/libImaging/Resample.c
index 222d6bca4..f5e386dc2 100644
--- a/src/libImaging/Resample.c
+++ b/src/libImaging/Resample.c
@@ -460,6 +460,83 @@ 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
@@ -574,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;

From e306546bf18b01c9bfa68ea397f2f5d5690113e0 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 28 Sep 2024 15:10:16 +1000
Subject: [PATCH 20/58] Use ruff check

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 94f7565d8..ec4159627 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ 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:

From 2e73ffe7034457461b13da71b05645999dd3c0ef Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 28 Sep 2024 15:29:09 +1000
Subject: [PATCH 21/58] Exclude multibuild from black and ruff

---
 pyproject.toml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 228c344e8..0d0a6f170 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,9 +97,13 @@ config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable"
 test-command = "cd {project} && .github/workflows/wheels-test.sh"
 test-extras = "tests"
 
-[tool.ruff]
-fix = true
+[tool.black]
+exclude = "wheels/multibuild"
 
+[tool.ruff]
+exclude = [ "wheels/multibuild" ]
+
+fix = true
 lint.select = [
   "C4",     # flake8-comprehensions
   "E",      # pycodestyle errors

From d33270ab51f6b62710b227394f2dadf913370d96 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 28 Sep 2024 15:35:42 +1000
Subject: [PATCH 22/58] Set default resize sampling for I;16* images to BICUBIC

---
 Tests/test_image_resize.py   | 8 ++++----
 docs/releasenotes/11.0.0.rst | 7 ++++---
 src/PIL/Image.py             | 8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py
index 1cd9c3800..8548fb5da 100644
--- a/Tests/test_image_resize.py
+++ b/Tests/test_image_resize.py
@@ -315,14 +315,14 @@ class TestImageResize:
             im = im.resize((64, 64))
             assert im.size == (64, 64)
 
-    @pytest.mark.parametrize("mode", ("L", "RGB", "I", "F"))
+    @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")
-    )
+    @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/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst
index 36334e39f..1218c5014 100644
--- a/docs/releasenotes/11.0.0.rst
+++ b/docs/releasenotes/11.0.0.rst
@@ -119,10 +119,11 @@ Specific WebP Feature Checks
 API Changes
 ===========
 
-TODO
-^^^^
+Default resampling filter for I;16* image modes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-TODO
+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
 =============
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
index 3f94cef38..bf9079f8b 100644
--- a/src/PIL/Image.py
+++ b/src/PIL/Image.py
@@ -2278,8 +2278,8 @@ class Image:
            :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
@@ -2302,8 +2302,8 @@ class Image:
         """
 
         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,

From 30fca7a1d62a8b41f3536adb35355f5aa81c6a2f Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 28 Sep 2024 18:38:45 +1000
Subject: [PATCH 23/58] Install meson through pip

---
 .github/workflows/wheels-dependencies.sh | 36 ++++++++----------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
index bb0f8a307..b3996d5a1 100755
--- a/.github/workflows/wheels-dependencies.sh
+++ b/.github/workflows/wheels-dependencies.sh
@@ -16,11 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main
 
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.13.2
-if [[ -n "$IS_MACOS" ]] || ([[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]); then
-    HARFBUZZ_VERSION=10.0.1
-else
-    HARFBUZZ_VERSION=8.5.0
-fi
+HARFBUZZ_VERSION=10.0.1
 LIBPNG_VERSION=1.6.44
 JPEGTURBO_VERSION=3.0.4
 OPENJPEG_VERSION=2.5.2
@@ -65,21 +61,15 @@ function build_brotli {
 }
 
 function build_harfbuzz {
-    if [[ "$HARFBUZZ_VERSION" == 8.5.0 ]]; then
-        export FREETYPE_LIBS=-lfreetype
-        export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/
-        build_simple harfbuzz $HARFBUZZ_VERSION https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION tar.xz --with-freetype=yes --with-glib=no
-        export FREETYPE_LIBS=""
-        export FREETYPE_CFLAGS=""
-    else
-        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
+    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
 }
 
@@ -155,11 +145,7 @@ if [[ -n "$IS_MACOS" ]]; then
     brew remove --ignore-dependencies webp
   fi
 
-  brew install meson pkg-config
-elif [[ -n "$IS_ALPINE" ]]; then
-  apk add meson
-elif [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then
-  yum install -y meson
+  brew install pkg-config
 fi
 
 wrap_wheel_builder build

From e976096c2eda0a41c49e0f06e6f84f6b3d0c99b0 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:39:04 +1000
Subject: [PATCH 24/58] Allow libimagequant shared library path to change

---
 depends/install_imagequant.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh
index 060d9840e..8d62d5ac7 100755
--- a/depends/install_imagequant.sh
+++ b/depends/install_imagequant.sh
@@ -23,19 +23,14 @@ else
     cargo cinstall --prefix=/usr --destdir=.
 
     # Copy into place
-    if [ -d "usr/lib64" ]; then
-        lib="lib64"
-    else
-        lib="lib"
-    fi
-    sudo cp usr/$lib/libimagequant.so* /usr/lib/
+    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
-        cp usr/lib/libimagequant.so* ~/cache-$archive_name/
+        find usr -name libimagequant.so* -exec cp {} ~/cache-$archive_name/ \;
         cp usr/include/libimagequant.h ~/cache-$archive_name/
     fi
 

From ed143f5fec816c7164ff2d8a76deef6a8abfaf77 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 29 Sep 2024 06:40:50 +1000
Subject: [PATCH 25/58] Update CHANGES.rst [ci skip]

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 6ff35ea4f..b4644c541 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,15 +5,15 @@ Changelog (Pillow)
 11.0.0 (unreleased)
 -------------------
 
+- Improved copying imagequant libraries #8420
+  [radarhere]
+
 - Use Capsule for WebP saving #8386
   [homm, radarhere]
 
 - Fixed writing multiple StripOffsets to TIFF #8317
   [Yay295, radarhere]
 
-- Shared imagequant libraries may be located within usr/lib64 #8407
-  [radarhere]
-
 - Fix dereference before checking for NULL in ImagingTransformAffine #8398
   [PavlNekrasov]
 

From 3a734b5d4b2ee9d602e4d7d3e89530498bac5e68 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 29 Sep 2024 05:19:39 +0000
Subject: [PATCH 26/58] Update scientific-python/upload-nightly-action action
 to v0.6.0

---
 .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 d3c2ac44c..ee0c33166 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -278,7 +278,7 @@ jobs:
           path: dist
           merge-multiple: true
       - name: Upload wheels to scientific-python-nightly-wheels
-        uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
+        uses: scientific-python/upload-nightly-action@ccf29c805b5d0c1dc31fa97fcdb962be074cade3 # 0.6.0
         with:
           artifacts_path: dist
           anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}

From 21ab53e0c0f81427c45e4b4205d5d6d07008ee81 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:38:13 +1000
Subject: [PATCH 27/58] Updated test environment documentation

---
 docs/installation/platform-support.rst | 2 +-
 winbuild/README.md                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
index f2ef9cacb..9216248a0 100644
--- a/docs/installation/platform-support.rst
+++ b/docs/installation/platform-support.rst
@@ -48,7 +48,7 @@ These platforms are built and tested for every change.
 | Ubuntu Linux 24.04 LTS (Noble)   | 3.12                       | x86-64, ppc64le,    |
 |                                  |                            | s390x               |
 +----------------------------------+----------------------------+---------------------+
-| Windows Server 2016              | 3.9                        | x86-64              |
+| Windows Server 2019              | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | Windows Server 2022              | 3.9, 3.10, 3.11,           | x86-64              |
 |                                  | 3.12, 3.13, PyPy3          |                     |
diff --git a/winbuild/README.md b/winbuild/README.md
index c8048bcc9..f6111c79b 100644
--- a/winbuild/README.md
+++ b/winbuild/README.md
@@ -11,7 +11,7 @@ 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:

From 7a62c788edb77e6c0c11f31a180018411d3955f6 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:42:39 +1000
Subject: [PATCH 28/58] Updated tested Python versions

---
 docs/installation/platform-support.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
index 9216248a0..4cd3f2814 100644
--- a/docs/installation/platform-support.rst
+++ b/docs/installation/platform-support.rst
@@ -17,13 +17,13 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | Operating system                 | Tested Python versions     | Tested architecture |
 +==================================+============================+=====================+
-| Alpine                           | 3.9                        | x86-64              |
+| Alpine                           | 3.12                       | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | Amazon Linux 2                   | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | Amazon Linux 2023                | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| Arch                             | 3.9                        | x86-64              |
+| Arch                             | 3.12                       | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | CentOS Stream 9                  | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
@@ -33,7 +33,7 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | Fedora 40                        | 3.12                       | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| Gentoo                           | 3.9                        | x86-64              |
+| Gentoo                           | 3.12                       | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | macOS 13 Ventura                 | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+

From b94c5c5e3474f915e817d77cd984f62f8fd4399b Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 30 Sep 2024 19:32:21 +1000
Subject: [PATCH 29/58] Updated macOS tested Pillow versions

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

diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
index f2ef9cacb..28f749867 100644
--- a/docs/installation/platform-support.rst
+++ b/docs/installation/platform-support.rst
@@ -75,6 +75,8 @@ These platforms have been reported to work at the versions mentioned.
 | 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           |

From cc0b6b9de94e7c632efb0a10cf985dd7aab74e2a Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 24 Sep 2024 07:56:45 +1000
Subject: [PATCH 30/58] Cast int before potentially exceeding INT_MAX

---
 src/libImaging/SgiRleDecode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libImaging/SgiRleDecode.c b/src/libImaging/SgiRleDecode.c
index a8db11740..a4ee2e10d 100644
--- a/src/libImaging/SgiRleDecode.c
+++ b/src/libImaging/SgiRleDecode.c
@@ -183,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;
     }

From fc65e437cfc6ccc381792ca1f35c6afb44c66ec3 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:25:42 +1000
Subject: [PATCH 31/58] Prevent division by zero

---
 src/libImaging/FliDecode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libImaging/FliDecode.c b/src/libImaging/FliDecode.c
index 6b2518d35..130ecb7f7 100644
--- a/src/libImaging/FliDecode.c
+++ b/src/libImaging/FliDecode.c
@@ -224,7 +224,7 @@ 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;

From 851449edfc1746a3ad63260db825ab3a2b23d331 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:14:26 +1000
Subject: [PATCH 32/58] Free memory on early return

---
 src/libImaging/SgiRleDecode.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libImaging/SgiRleDecode.c b/src/libImaging/SgiRleDecode.c
index a8db11740..c285637dd 100644
--- a/src/libImaging/SgiRleDecode.c
+++ b/src/libImaging/SgiRleDecode.c
@@ -195,6 +195,7 @@ 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;
     }

From a99361a38f4c0830205ccbe5d58f1f0ba6c7312c Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 13 Sep 2024 23:21:35 +1000
Subject: [PATCH 33/58] Raise an error if path is compacted during mapping

---
 Tests/test_imagepath.py | 11 +++++++++++
 src/path.c              |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/Tests/test_imagepath.py b/Tests/test_imagepath.py
index cda2584e7..76bdf1e5f 100644
--- a/Tests/test_imagepath.py
+++ b/Tests/test_imagepath.py
@@ -204,6 +204,17 @@ def test_overflow_segfault() -> None:
             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) -> None:
         self.corrupt = Image.core.path(0x4000000000000000)
diff --git a/src/path.c b/src/path.c
index f4f4287f3..067f42f62 100644
--- a/src/path.c
+++ b/src/path.c
@@ -44,6 +44,7 @@ PyImaging_GetBuffer(PyObject *buffer, Py_buffer *view);
 typedef struct {
     PyObject_HEAD Py_ssize_t count;
     double *xy;
+    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;
 }
@@ -276,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;
     }
@@ -393,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;
         }
@@ -405,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;

From c6b08ef32c39dc6517e9140c92dde7e10999da5e Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 30 Sep 2024 22:13:24 +1000
Subject: [PATCH 34/58] Update CHANGES.rst [ci skip]

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

diff --git a/CHANGES.rst b/CHANGES.rst
index b4644c541..08c2f26bc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,9 @@ Changelog (Pillow)
 11.0.0 (unreleased)
 -------------------
 
+- Check image value before use #8400
+  [radarhere]
+
 - Improved copying imagequant libraries #8420
   [radarhere]
 

From 6fe4375f28015f0c1a7c3cb6fbc9ea3c4f405679 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Sat, 3 Aug 2024 11:13:38 -0500
Subject: [PATCH 35/58] move eps test images to their own folder

Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
---
 Tests/images/{ => eps}/1.eps                  | Bin
 Tests/images/{ => eps}/binary_preview_map.eps | Bin
 Tests/images/{ => eps}/create_eps.gnuplot     |   0
 Tests/images/{ => eps}/illu10_no_preview.eps  | Bin
 Tests/images/{ => eps}/illu10_preview.eps     | Bin
 Tests/images/{ => eps}/illuCS6_no_preview.eps | Bin
 Tests/images/{ => eps}/illuCS6_preview.eps    | Bin
 Tests/images/{ => eps}/non_zero_bb.eps        | Bin
 Tests/images/{ => eps}/non_zero_bb.png        | Bin
 Tests/images/{ => eps}/non_zero_bb_scale2.png | Bin
 Tests/images/{ => eps}/pil_sample_cmyk.eps    | Bin
 Tests/images/{ => eps}/reqd_showpage.eps      | Bin
 Tests/images/{ => eps}/reqd_showpage.png      | Bin
 .../{ => eps}/reqd_showpage_transparency.png  | Bin
 ...75703545fee17acab56e5fec644c19979175de.eps | Bin
 Tests/images/{ => eps}/zero_bb.eps            | Bin
 Tests/images/{ => eps}/zero_bb.png            | Bin
 Tests/images/{ => eps}/zero_bb_emptyline.eps  | Bin
 .../zero_bb_eof_before_boundingbox.eps        | Bin
 Tests/images/{ => eps}/zero_bb_scale2.png     | Bin
 Tests/images/{ => eps}/zero_bb_trailer.eps    | Bin
 Tests/test_file_eps.py                        |  48 +++++++++---------
 Tests/test_pickle.py                          |   8 +--
 23 files changed, 29 insertions(+), 27 deletions(-)
 rename Tests/images/{ => eps}/1.eps (100%)
 rename Tests/images/{ => eps}/binary_preview_map.eps (100%)
 rename Tests/images/{ => eps}/create_eps.gnuplot (100%)
 rename Tests/images/{ => eps}/illu10_no_preview.eps (100%)
 rename Tests/images/{ => eps}/illu10_preview.eps (100%)
 rename Tests/images/{ => eps}/illuCS6_no_preview.eps (100%)
 rename Tests/images/{ => eps}/illuCS6_preview.eps (100%)
 rename Tests/images/{ => eps}/non_zero_bb.eps (100%)
 rename Tests/images/{ => eps}/non_zero_bb.png (100%)
 rename Tests/images/{ => eps}/non_zero_bb_scale2.png (100%)
 rename Tests/images/{ => eps}/pil_sample_cmyk.eps (100%)
 rename Tests/images/{ => eps}/reqd_showpage.eps (100%)
 rename Tests/images/{ => eps}/reqd_showpage.png (100%)
 rename Tests/images/{ => eps}/reqd_showpage_transparency.png (100%)
 rename Tests/images/{ => eps}/timeout-d675703545fee17acab56e5fec644c19979175de.eps (100%)
 rename Tests/images/{ => eps}/zero_bb.eps (100%)
 rename Tests/images/{ => eps}/zero_bb.png (100%)
 rename Tests/images/{ => eps}/zero_bb_emptyline.eps (100%)
 rename Tests/images/{ => eps}/zero_bb_eof_before_boundingbox.eps (100%)
 rename Tests/images/{ => eps}/zero_bb_scale2.png (100%)
 rename Tests/images/{ => eps}/zero_bb_trailer.eps (100%)

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/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 100%
rename from Tests/images/create_eps.gnuplot
rename to Tests/images/eps/create_eps.gnuplot
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/test_file_eps.py b/Tests/test_file_eps.py
index d54deb515..89471fb5a 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -19,18 +19,18 @@ from .helper import (
 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
@@ -187,7 +187,7 @@ def test_load_long_binary_data(prefix: bytes) -> None:
 )
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
 def test_cmyk() -> None:
-    with Image.open("Tests/images/pil_sample_cmyk.eps") as cmyk_image:
+    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"
@@ -204,8 +204,8 @@ def test_cmyk() -> None:
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
 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
@@ -214,11 +214,11 @@ def test_showpage() -> None:
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
 def test_transparency() -> None:
-    with Image.open("Tests/images/reqd_showpage.eps") as plot_image:
+    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)
 
@@ -246,7 +246,7 @@ def test_bytesio_object() -> None:
 
 
 def test_1_mode() -> None:
-    with Image.open("Tests/images/1.eps") as im:
+    with Image.open("Tests/images/eps/1.eps") as im:
         assert im.mode == "1"
 
 
@@ -302,7 +302,9 @@ def test_render_scale2() -> None:
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-@pytest.mark.parametrize("filename", (FILE1, FILE2, "Tests/images/illu10_preview.eps"))
+@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)
@@ -344,10 +346,10 @@ def test_readline(prefix: bytes, line_ending: bytes) -> None:
 @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: str) -> None:
@@ -359,7 +361,7 @@ def test_open_eps(filename: str) -> None:
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
 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()
@@ -371,7 +373,7 @@ def test_emptyline() -> None:
 @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: str) -> None:
     with open(test_file, "rb") as f:
@@ -384,7 +386,7 @@ 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("Tests/images/eps/zero_bb_trailer.eps") as trailer_image,
         Image.open(FILE1) as header_image,
     ):
         assert trailer_image.size == header_image.size
@@ -392,12 +394,12 @@ def test_bounding_box_in_trailer() -> None:
 
 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/illuCS6_preview.eps", "rb") as f:
+    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:
diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py
index be143e9c6..d250ba369 100644
--- a/Tests/test_pickle.py
+++ b/Tests/test_pickle.py
@@ -56,10 +56,10 @@ def helper_pickle_string(protocol: int, test_file: str, mode: str | None) -> Non
         ),
         ("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),

From 283b41afa033c64ce5baf9643356599240ff6367 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Sat, 3 Aug 2024 11:47:34 -0500
Subject: [PATCH 36/58] test 1.eps size and data

---
 Tests/images/eps/1.bmp | Bin 0 -> 1202 bytes
 Tests/test_file_eps.py |   6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 Tests/images/eps/1.bmp

diff --git a/Tests/images/eps/1.bmp b/Tests/images/eps/1.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..194c85784c51ac3e30ea62381102eeca429fe63e
GIT binary patch
literal 1202
zcmZ|PZERCj7zgnGIlJA?O3~Y{V_O;Vu5@!VzEn35gb%0fWo&GkZt!8mC3a&%L`cAw
z1RcgpH?TFE>7*Jn&33my7z%Mgqr{h_4ieBQ8H?zQi7CbpMh&1W;e#yoIc59k={>jS
z_dL(ZxjpBm;m6Nt$hSD%_fYSl9-+?Yqgrq=uf}|_1G%M3g>&J}?a!;hVv|b)`u@Lh
zz9g5+AzgDm72)2kpOgz`P;_7dVXhsT9<6leYq;=)k=*&2tGlEmND;rgC2p1%Ze9D*
zRH-TmYa(_)9A0<cn}J2<@oi0M*7o+1y_%+M4bB#J3^m>5`1VXA5z^^6B(}_LI(p%m
zVoCNl6^sjC`zujrc9qK8kPfYR;$)yQtB4Fu=`8rwbK`hwmn1tehLNB%J+=N#wH+w7
zMTy?A{~9Z<>etENz$n8bT6*l(I>RP2Lqy82W$O9#Ss3IM7CX&fJ$i{HSBHr3OIWe%
zK41G;bD6RWiDZq-SND41zGKQCjk&uj%zrM*i9~}kEWNAh#d|LItgL-sQB={bbM5ua
zTW^S{vd+ZkBJxFlKtv@OhHhMCqq!a2UOLJCHul<F-O9e*2Bl4))f?P!;o|)xFR1eJ
zTHWpGdii#bFas)2ZMoTe_3OVIH+HDs#{g}zrut@fq@JeI<It4tv#u}a(~Y`8=8$e~
zxRyWg;Ik(t$>72<Xy|1N$9W*8%rKvn?9txp6?~sEu<d)hXzu0@LjjxM7l8&(#gz@0
zH%@Ghkx|I>(i!K6KPQHs%PIr9Bf>{-ub1y;2om(3L|qHsOC@$nWg&jA+QaVd?4R8m
z%^Tb4AfE31VECZQOK5V9zIs>oPxRVkhPr_r=6!$s_)~~alEHY&m(Wk$FhhO8yftC|
z((=TW-%c`18C-taQuJ?8Vrax73A#K7!w&^MKKG<f)=(HpBp+)&FvAAbdek;mTMOe~
zokObvgWJOH)3-`fJ{T$h4?GX={L3`>y?1Of`JKlZN2vRbA$`Tu<0-`3Evk+i91Sz`
zEkRiIMCf)wlbvC$63naCqw{gKkF9Z9IA+;oX&_W~YFRbqYKe$LIDGFF_{q9*Y@i!;
z&fzXX-jYGzkKu%bNaq6(JORy1rFlB&kKw7{Dvj(=^Mlmm=$Fz$g>n|bBNpv4H9bEe
z8L|Z4F-2Ij3<_rG5d}w;VX3nK+73sxIiP{!w3R@Y1-%1(l~Jmb<QQ$Z7gJG6sx|Q+
DTKM^6

literal 0
HcmV?d00001

diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index 89471fb5a..f0f235f81 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -8,6 +8,7 @@ import pytest
 from PIL import EpsImagePlugin, Image, UnidentifiedImageError, features
 
 from .helper import (
+    assert_image_equal_tofile,
     assert_image_similar,
     assert_image_similar_tofile,
     hopper,
@@ -245,9 +246,10 @@ def test_bytesio_object() -> None:
         assert_image_similar(img, image1_scale1_compare, 5)
 
 
-def test_1_mode() -> None:
+@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
+def test_1() -> None:
     with Image.open("Tests/images/eps/1.eps") as im:
-        assert im.mode == "1"
+        assert_image_equal_tofile(im, "Tests/images/eps/1.bmp")
 
 
 def test_image_mode_not_supported(tmp_path: Path) -> None:

From 3ccecd91cea6625612ef7e05d485058a7783bf07 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Sat, 3 Aug 2024 18:04:05 -0500
Subject: [PATCH 37/58] convert eps using pnmraw instead of ppmraw This lets
 Ghostscript choose the best device to use (pbmraw, pgmraw, ppmraw) based on
 the image data.

---
 Tests/test_file_eps.py    | 2 +-
 src/PIL/EpsImagePlugin.py | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index f0f235f81..bca516a78 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -178,7 +178,7 @@ 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"
 
diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index dd6ae4a77..f6c1ea2a5 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -121,7 +121,13 @@ def Ghostscript(
                 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 = [

From 00bbd4a5b99447aad9def172a05ab768fe428dd6 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Sun, 4 Aug 2024 00:48:12 -0500
Subject: [PATCH 38/58] use "with Image" instead of closing manually

---
 src/PIL/EpsImagePlugin.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index f6c1ea2a5..cbf48de18 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -157,8 +157,9 @@ def Ghostscript(
             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)
@@ -167,10 +168,6 @@ def Ghostscript(
         except OSError:
             pass
 
-    im = out_im.im.copy()
-    out_im.close()
-    return im
-
 
 def _accept(prefix: bytes) -> bool:
     return prefix[:4] == b"%!PS" or (len(prefix) >= 4 and i32(prefix) == 0xC6D3D0C5)

From 6b168a3e2bafe1c957de8e9705ec9a17dd62fd84 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Tue, 6 Aug 2024 21:02:46 -0500
Subject: [PATCH 39/58] add EPS test for image with ImageData and BoundingBox
 (atend)

---
 Tests/images/eps/1_atend.eps | Bin 0 -> 45867 bytes
 Tests/test_file_eps.py       |  40 +++++++++++++--------
 src/PIL/EpsImagePlugin.py    |  65 ++++++++++++++++++++++-------------
 3 files changed, 66 insertions(+), 39 deletions(-)
 create mode 100644 Tests/images/eps/1_atend.eps

diff --git a/Tests/images/eps/1_atend.eps b/Tests/images/eps/1_atend.eps
new file mode 100644
index 0000000000000000000000000000000000000000..08f8c4681a90908a2ca3d7695d19f150a5787816
GIT binary patch
literal 45867
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

literal 0
HcmV?d00001

diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index bca516a78..94ab5d327 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -127,6 +127,15 @@ def test_binary_header_only() -> None:
         EpsImagePlugin.EpsImageFile(data)
 
 
+@pytest.mark.parametrize("prefix", (b"", simple_binary_header))
+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))
@@ -142,23 +151,19 @@ def test_missing_boundingbox_comment(prefix: bytes) -> None:
 
 
 @pytest.mark.parametrize("prefix", (b"", simple_binary_header))
-def test_invalid_boundingbox_comment(prefix: bytes) -> None:
-    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: list[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: bytes) -> None:
-    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: bytes) -> None:
     data = io.BytesIO(prefix + b"\n".join(simple_eps_file_with_long_ascii_comment))
@@ -247,8 +252,13 @@ def test_bytesio_object() -> None:
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-def test_1() -> None:
-    with Image.open("Tests/images/eps/1.eps") as im:
+@pytest.mark.parametrize(
+    # These images have an "ImageData" descriptor.
+    "filename",
+    ("Tests/images/eps/1.eps", "Tests/images/eps/1_atend.eps"),
+)
+def test_1(filename: str) -> None:
+    with Image.open(filename) as im:
         assert_image_equal_tofile(im, "Tests/images/eps/1.bmp")
 
 
diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index cbf48de18..ce8e54908 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -194,6 +194,11 @@ class EpsImageFile(ImageFile.ImageFile):
 
         self._mode = "RGB"
 
+        # 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)
         bytes_read = 0
@@ -214,8 +219,8 @@ class EpsImageFile(ImageFile.ImageFile):
                 msg = 'EPS header missing "%%BoundingBox" comment'
                 raise SyntaxError(msg)
 
-        def _read_comment(s: str) -> bool:
-            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:
@@ -230,18 +235,12 @@ class EpsImageFile(ImageFile.ImageFile):
             if k == "BoundingBox":
                 if v == "(atend)":
                     reading_trailer_comments = True
-                elif not self.tile or (trailer_reached and reading_trailer_comments):
+                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.
-                        box = [int(float(i)) for i in v.split()]
-                        self._size = box[2] - box[0], box[3] - box[1]
-                        self.tile = [
-                            ImageFile._Tile(
-                                "eps", (0, 0) + self.size, offset, (length, box)
-                            )
-                        ]
+                        bounding_box = [int(float(i)) for i in v.split()]
                     except Exception:
                         pass
             return True
@@ -292,7 +291,7 @@ class EpsImageFile(ImageFile.ImageFile):
                     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)
@@ -326,32 +325,50 @@ class EpsImageFile(ImageFile.ImageFile):
                     int(value) for value in image_data_values[:4]
                 )
 
-                if bit_depth == 1:
-                    self._mode = "1"
-                elif bit_depth == 8:
-                    try:
-                        self._mode = self.mode_map[mode_id]
-                    except ValueError:
-                        break
-                else:
-                    break
+                if not imagedata_size:
+                    imagedata_size = columns, rows
 
-                self._size = columns, rows
-                return
+                    if bit_depth == 1:
+                        self._mode = "1"
+                    elif bit_depth == 8:
+                        try:
+                            self._mode = self.mode_map[mode_id]
+                        except ValueError:
+                            pass
             elif bytes_mv[:5] == b"%%EOF":
                 break
             elif trailer_reached and reading_trailer_comments:
                 # Load EPS trailer
                 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
 
-        if not self.tile:
+        # 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)
 
+        # An "ImageData" size takes precedence over the "BoundingBox".
+        if imagedata_size:
+            self._size = imagedata_size
+        else:
+            self._size = (
+                bounding_box[2] - bounding_box[0],
+                bounding_box[3] - bounding_box[1],
+            )
+
+        self.tile = [
+            ImageFile._Tile(
+                codec_name="eps",
+                extents=(0, 0) + self._size,
+                offset=offset,
+                args=(length, bounding_box),
+            )
+        ]
+
     def _find_offset(self, fp: IO[bytes]) -> tuple[int, int]:
         s = fp.read(4)
 

From 56e4ad0dea6bcfcfa5ce8e0af07a512fd7f5a392 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Mon, 19 Aug 2024 19:24:30 -0500
Subject: [PATCH 40/58] don't name positional arguments

---
 src/PIL/EpsImagePlugin.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index ce8e54908..44391fcb1 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -361,12 +361,7 @@ class EpsImageFile(ImageFile.ImageFile):
             )
 
         self.tile = [
-            ImageFile._Tile(
-                codec_name="eps",
-                extents=(0, 0) + self._size,
-                offset=offset,
-                args=(length, bounding_box),
-            )
+            ImageFile._Tile("eps", (0, 0) + self._size, offset, (length, bounding_box))
         ]
 
     def _find_offset(self, fp: IO[bytes]) -> tuple[int, int]:

From f3fe22d2f2345ed0e3eed9dc89a0cd1df728af9e Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 3 Sep 2024 23:22:35 +1000
Subject: [PATCH 41/58] Break if the bit depth or mode id are unknown

---
 src/PIL/EpsImagePlugin.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index 44391fcb1..c7b1f2164 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -320,21 +320,26 @@ class EpsImageFile(ImageFile.ImageFile):
                 # binary/ascii (1: binary, 2: ascii)
                 # data start identifier (the image data follows after a single line
                 #   consisting only of this quoted value)
+                if imagedata_size:
+                    bytes_read = 0
+                    continue
+
                 image_data_values = byte_arr[11:bytes_read].split(None, 7)
                 columns, rows, bit_depth, mode_id = (
                     int(value) for value in image_data_values[:4]
                 )
 
-                if not imagedata_size:
-                    imagedata_size = columns, rows
+                if bit_depth == 1:
+                    self._mode = "1"
+                elif bit_depth == 8:
+                    try:
+                        self._mode = self.mode_map[mode_id]
+                    except ValueError:
+                        break
+                else:
+                    break
 
-                    if bit_depth == 1:
-                        self._mode = "1"
-                    elif bit_depth == 8:
-                        try:
-                            self._mode = self.mode_map[mode_id]
-                        except ValueError:
-                            pass
+                imagedata_size = columns, rows
             elif bytes_mv[:5] == b"%%EOF":
                 break
             elif trailer_reached and reading_trailer_comments:

From 75286a4e408f363ee8befc36d0ba082fa25fbd32 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Tue, 3 Sep 2024 09:03:37 -0500
Subject: [PATCH 42/58] add some comments

---
 src/PIL/EpsImagePlugin.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index c7b1f2164..da0bf3153 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -310,6 +310,12 @@ class EpsImageFile(ImageFile.ImageFile):
                 # 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
@@ -320,10 +326,6 @@ class EpsImageFile(ImageFile.ImageFile):
                 # binary/ascii (1: binary, 2: ascii)
                 # data start identifier (the image data follows after a single line
                 #   consisting only of this quoted value)
-                if imagedata_size:
-                    bytes_read = 0
-                    continue
-
                 image_data_values = byte_arr[11:bytes_read].split(None, 7)
                 columns, rows, bit_depth, mode_id = (
                     int(value) for value in image_data_values[:4]
@@ -339,6 +341,8 @@ class EpsImageFile(ImageFile.ImageFile):
                 else:
                     break
 
+                # Read 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

From 782f0e8a5a8e61073ea2686e722e0575bbe09b6b Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@users.noreply.github.com>
Date: Tue, 10 Sep 2024 08:31:01 -0500
Subject: [PATCH 43/58] change "Read" to "Parse" in comment

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
---
 src/PIL/EpsImagePlugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index da0bf3153..1c1b6e0b5 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -341,7 +341,7 @@ class EpsImageFile(ImageFile.ImageFile):
                 else:
                     break
 
-                # Read the columns and rows after checking the bit depth and mode
+                # 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":

From 4bfc77a1b12198d1f8b688fc2037e26059f80ab3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 20:19:02 +0000
Subject: [PATCH 44/58] Update scientific-python/upload-nightly-action action
 to v0.6.1

---
 .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 ee0c33166..1f5265bf5 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -278,7 +278,7 @@ jobs:
           path: dist
           merge-multiple: true
       - name: Upload wheels to scientific-python-nightly-wheels
-        uses: scientific-python/upload-nightly-action@ccf29c805b5d0c1dc31fa97fcdb962be074cade3 # 0.6.0
+        uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b # 0.6.1
         with:
           artifacts_path: dist
           anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}

From 749bec097ca48bb70f12bf3b5a78cd4d64e91fc9 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 1 Oct 2024 07:11:24 +1000
Subject: [PATCH 45/58] Do not convert image unnecessarily

---
 src/PIL/ImageEnhance.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/PIL/ImageEnhance.py b/src/PIL/ImageEnhance.py
index d7e99a968..0e7e6dd8a 100644
--- a/src/PIL/ImageEnhance.py
+++ b/src/PIL/ImageEnhance.py
@@ -55,7 +55,9 @@ class Color(_Enhance):
         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):
@@ -68,11 +70,15 @@ class Contrast(_Enhance):
 
     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):

From 84b167dfd53fe726a61953040ddbfa0e4e3e3359 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 1 Oct 2024 21:11:56 +1000
Subject: [PATCH 46/58] Update CHANGES.rst [ci skip]

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 08c2f26bc..36266421a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,15 @@ Changelog (Pillow)
 11.0.0 (unreleased)
 -------------------
 
+- 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]
 

From c0d04e8b34f759797e45bccac74f49bddfaa7a41 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:33:33 -0500
Subject: [PATCH 47/58] use .size instead of ._size

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
---
 src/PIL/EpsImagePlugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index 1c1b6e0b5..27582f2a8 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -370,7 +370,7 @@ class EpsImageFile(ImageFile.ImageFile):
             )
 
         self.tile = [
-            ImageFile._Tile("eps", (0, 0) + self._size, offset, (length, bounding_box))
+            ImageFile._Tile("eps", (0, 0) + self.size, offset, (length, bounding_box))
         ]
 
     def _find_offset(self, fp: IO[bytes]) -> tuple[int, int]:

From f9c69deaae2e029601dddba48268fadf630a18eb Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:35:22 -0500
Subject: [PATCH 48/58] simplify setting self._size

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
---
 src/PIL/EpsImagePlugin.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index 27582f2a8..fb1e301c0 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -361,13 +361,10 @@ class EpsImageFile(ImageFile.ImageFile):
             raise OSError(msg)
 
         # An "ImageData" size takes precedence over the "BoundingBox".
-        if imagedata_size:
-            self._size = imagedata_size
-        else:
-            self._size = (
-                bounding_box[2] - bounding_box[0],
-                bounding_box[3] - bounding_box[1],
-            )
+        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))

From baf2d8160a5c1ec0c1ce1c64ea70ded2e5581495 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:48:09 +1000
Subject: [PATCH 49/58] Updated xz to 5.6.3

---
 .github/workflows/wheels-dependencies.sh | 2 +-
 winbuild/build_prepare.py                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
index b3996d5a1..19eb91cbb 100755
--- a/.github/workflows/wheels-dependencies.sh
+++ b/.github/workflows/wheels-dependencies.sh
@@ -20,7 +20,7 @@ HARFBUZZ_VERSION=10.0.1
 LIBPNG_VERSION=1.6.44
 JPEGTURBO_VERSION=3.0.4
 OPENJPEG_VERSION=2.5.2
-XZ_VERSION=5.6.2
+XZ_VERSION=5.6.3
 TIFF_VERSION=4.6.0
 LCMS2_VERSION=2.16
 if [[ -n "$IS_MACOS" ]]; then
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 026d9d306..a21fbef91 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -119,7 +119,7 @@ V = {
     "LIBWEBP": "1.4.0",
     "OPENJPEG": "2.5.2",
     "TIFF": "4.6.0",
-    "XZ": "5.6.2",
+    "XZ": "5.6.3",
     "ZLIB": "1.3.1",
 }
 V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "")
@@ -185,7 +185,7 @@ DEPS: dict[str, dict[str, Any]] = {
             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": f"http://downloads.webmproject.org/releases/webp/libwebp-{V['LIBWEBP']}.tar.gz",
@@ -216,8 +216,8 @@ DEPS: dict[str, dict[str, Any]] = {
         "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 libwebp.lib

From 547e7dcc5df0e9bbd05119c9accc9295bfaa0cec Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 2 Oct 2024 19:17:13 +1000
Subject: [PATCH 50/58] Test cifuzz when wheel dependencies change

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

diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index eb73fc6a7..0456bbaba 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:

From 33f065eb5e458724cdd76dc6074445b4fad9fd7f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 00:41:31 +0000
Subject: [PATCH 51/58] Update dependency cibuildwheel to v2.21.2

---
 .ci/requirements-cibw.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt
index 7dc3a53fe..a1424ecc0 100644
--- a/.ci/requirements-cibw.txt
+++ b/.ci/requirements-cibw.txt
@@ -1 +1 @@
-cibuildwheel==2.21.1
+cibuildwheel==2.21.2

From 8e6d518ea89035077fb4a855f61f3b5bab26a9c4 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@users.noreply.github.com>
Date: Sat, 5 Oct 2024 08:05:00 -0500
Subject: [PATCH 52/58] change parameter type from list to tuple

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
---
 Tests/test_file_eps.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index 94ab5d327..7ae0900fd 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -158,7 +158,9 @@ def test_missing_boundingbox_comment(prefix: bytes) -> None:
         simple_eps_file_with_invalid_boundingbox_valid_imagedata,
     ),
 )
-def test_invalid_boundingbox_comment(prefix: bytes, file_lines: list[bytes]) -> None:
+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)

From d4fedc852c2a78b9dc93b67f93d6211f7337ca43 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 5 Oct 2024 15:21:42 +1000
Subject: [PATCH 53/58] Rename test image

---
 ..._atend.eps => 1_boundingbox_after_imagedata.eps} | Bin
 Tests/test_file_eps.py                              |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Tests/images/eps/{1_atend.eps => 1_boundingbox_after_imagedata.eps} (100%)

diff --git a/Tests/images/eps/1_atend.eps b/Tests/images/eps/1_boundingbox_after_imagedata.eps
similarity index 100%
rename from Tests/images/eps/1_atend.eps
rename to Tests/images/eps/1_boundingbox_after_imagedata.eps
diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index 7ae0900fd..0a69ee6e5 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -257,7 +257,7 @@ def test_bytesio_object() -> None:
 @pytest.mark.parametrize(
     # These images have an "ImageData" descriptor.
     "filename",
-    ("Tests/images/eps/1.eps", "Tests/images/eps/1_atend.eps"),
+    ("Tests/images/eps/1.eps", "Tests/images/eps/1_boundingbox_after_imagedata.eps"),
 )
 def test_1(filename: str) -> None:
     with Image.open(filename) as im:

From a9cbf6d5a71013124305f05d09b344e3698f2c0c Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Sun, 18 Aug 2024 20:41:01 +0300
Subject: [PATCH 54/58] Test Python 3.13 on AppVeyor

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 41a5725b2..781ad4a4b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -18,7 +18,7 @@ environment:
   TEST_OPTIONS:
   DEPLOY: YES
   matrix:
-  - PYTHON: C:/Python312
+  - PYTHON: C:/Python313
     ARCHITECTURE: x86
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
   - PYTHON: C:/Python39-x64

From 1b57b32caf99f7fb5b9c6b83e439832f5a55dc83 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 6 Oct 2024 08:02:17 +1100
Subject: [PATCH 55/58] Test ignoring second ImageData

---
 Tests/images/eps/1_second_imagedata.eps | Bin 0 -> 45834 bytes
 Tests/test_file_eps.py                  |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 Tests/images/eps/1_second_imagedata.eps

diff --git a/Tests/images/eps/1_second_imagedata.eps b/Tests/images/eps/1_second_imagedata.eps
new file mode 100644
index 0000000000000000000000000000000000000000..e6309a3b4ede316d83a2bb84388f1d29140b433f
GIT binary patch
literal 45834
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

literal 0
HcmV?d00001

diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index 0a69ee6e5..672c04a4d 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -257,7 +257,11 @@ def test_bytesio_object() -> None:
 @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.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:

From e2f996e2bd9b933a7a88b9ed47e6065a6d5a28b8 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 6 Oct 2024 08:55:15 +1100
Subject: [PATCH 56/58] Updated CI target

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

diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
index 0e46ef0c7..00dec41d1 100644
--- a/docs/installation/platform-support.rst
+++ b/docs/installation/platform-support.rst
@@ -53,7 +53,7 @@ These platforms are built and tested for every change.
 | Windows Server 2022              | 3.9, 3.10, 3.11,           | x86-64              |
 |                                  | 3.12, 3.13, PyPy3          |                     |
 |                                  +----------------------------+---------------------+
-|                                  | 3.12                       | x86                 |
+|                                  | 3.13                       | x86                 |
 |                                  +----------------------------+---------------------+
 |                                  | 3.9 (MinGW)                | x86-64              |
 |                                  +----------------------------+---------------------+

From b77cd009e210cefae9424206f80ed5dc65b53fdf Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 6 Oct 2024 11:30:27 +1100
Subject: [PATCH 57/58] Use transparency when combining P frames

---
 Tests/test_file_apng.py   | 4 ++--
 src/PIL/PngImagePlugin.py | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Tests/test_file_apng.py b/Tests/test_file_apng.py
index e95850212..ee6c867c3 100644
--- a/Tests/test_file_apng.py
+++ b/Tests/test_file_apng.py
@@ -258,8 +258,8 @@ def test_apng_mode() -> None:
         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"
diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py
index 28ade293e..4e1227204 100644
--- a/src/PIL/PngImagePlugin.py
+++ b/src/PIL/PngImagePlugin.py
@@ -1063,6 +1063,12 @@ class PngImageFile(ImageFile.ImageFile):
                         "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

From 27c1bb265432cb5a1138e39165f0610e2d8a4e94 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 7 Oct 2024 07:48:32 +1100
Subject: [PATCH 58/58] Update CHANGES.rst [ci skip]

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 36266421a..cc891ed1d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,12 @@ Changelog (Pillow)
 11.0.0 (unreleased)
 -------------------
 
+- 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]