Merge branch 'main' into raqm-sheenbidi

Author: radarhere

Tests/test_file_jpeg.py

@@ -734,7 +734,8 @@ def test_restart_markers(self, blocks: int, rows: int, markers: int) -> None:
     def test_load_djpeg(self) -> None:
         with Image.open(TEST_FILE) as img:
             assert isinstance(img, JpegImagePlugin.JpegImageFile)
-            img.load_djpeg()
+            with pytest.warns(DeprecationWarning, match="load_djpeg"):
+                img.load_djpeg()
             assert_image_similar_tofile(img, TEST_FILE, 5)
 
     def test_no_duplicate_0x1001_tag(self) -> None:

Tests/test_file_png.py

@@ -717,6 +717,34 @@ def test_truncated_chunks(
             monkeypatch.setattr(ImageFile, "LOAD_TRUNCATED_IMAGES", True)
             png.call(cid, 0, 0)
 
+    @pytest.mark.parametrize("mode", ("1", "L", "I;16", "RGB"))
+    def test_truncated_trns_chunk(
+        self, mode: str, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        fp = BytesIO()
+        with PngImagePlugin.PngStream(fp) as png:
+            png.im_mode = mode
+            with pytest.raises(ValueError, match="Truncated tRNS chunk"):
+                png.call(b"tRNS", 0, 0)
+
+            monkeypatch.setattr(ImageFile, "LOAD_TRUNCATED_IMAGES", True)
+            png.call(b"tRNS", 0, 0)
+
+    def test_truncated_trns_chunk_in_file(
+        self, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        # HEAD declares a truecolour image, so tRNS must carry 6 bytes
+        data = HEAD + chunk(b"tRNS", bytes(4)) + TAIL
+
+        with pytest.raises(ValueError, match="Truncated tRNS chunk"):
+            with Image.open(BytesIO(data)):
+                pass
+
+        monkeypatch.setattr(ImageFile, "LOAD_TRUNCATED_IMAGES", True)
+        with Image.open(BytesIO(data)) as im:
+            assert im.mode == "RGB"
+            assert "transparency" not in im.info
+
     @pytest.mark.parametrize("save_all", (True, False))
     def test_specify_bits(self, save_all: bool, tmp_path: Path) -> None:
         im = hopper("P")

Tests/test_shell_injection.py

@@ -44,7 +44,8 @@ def test_load_djpeg_filename(self, tmp_path: Path) -> None:
 
             with Image.open(src_file) as im:
                 assert isinstance(im, JpegImagePlugin.JpegImageFile)
-                im.load_djpeg()
+                with pytest.warns(DeprecationWarning, match="load_djpeg"):
+                    im.load_djpeg()
 
     @pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
     def test_save_netpbm_filename_bmp_mode(self, tmp_path: Path) -> None:

docs/deprecations.rst

@@ -39,6 +39,17 @@ fribidi and harfbuzz features
 own bidirectional text and shaping libraries when it is built, so Pillow cannot
 reliably report which ones are in use.
 
+JpegImageFile.load_djpeg
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 13.0.0
+
+``JpegImageFile.load_djpeg`` has been deprecated, and will be removed in Pillow 14
+(2027-10-15).
+
+Use the built-in JPEG decoder instead, or call ``djpeg`` directly and decode the
+resulting image with Pillow.
+
 Removed features
 ----------------
 

docs/releasenotes/13.0.0.rst

@@ -55,7 +55,7 @@ and so child images could only be retrieved from an :py:class:`PIL.ImageFile.Ima
 instance.
 
 Image._show
-~~~~~~~~~~~
+^^^^^^^^^^^
 
 ``Image._show`` has been removed. Use :py:meth:`~PIL.ImageShow.show` instead.
 
@@ -90,6 +90,15 @@ raqm=vendor and fribidi=vendor config settings
 The ``-C raqm=vendor`` and ``-C fribidi=vendor`` build config settings are deprecated
 and ignored. Raqm is no longer bundled, so there is nothing to vendor.
 
+JpegImageFile.load_djpeg
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+``JpegImageFile.load_djpeg`` has been deprecated, and will be removed in Pillow 14
+(2027-10-15).
+
+Use the built-in JPEG decoder instead, or call ``djpeg`` directly and decode the
+resulting image with Pillow.
+
 API changes
 ===========
 
@@ -110,6 +119,13 @@ namespace URI prefix as before. If set to ``False``, each tag's full
 ``{namespace-uri}local-name`` form is kept instead, avoiding collisions between tags
 that share a local name across different namespaces.
 
+New resizing filters
+^^^^^^^^^^^^^^^^^^^^
+
+Two new filters are available for :py:meth:`~PIL.Image.Image.resize` and
+:py:meth:`~PIL.Image.Image.thumbnail`: ``Image.Resampling.MKS2013`` and
+``Image.Resampling.MKS2021``. These are versions of the Magic Kernel Sharp filter.
+
 Other changes
 =============
 

src/PIL/ImageGrab.py

@@ -79,7 +79,7 @@ def grab(
                         scale = 1 if scale_down else 2
                         im_cropped = im.resize(
                             ((right - left) * scale, (bottom - top) * scale),
-                            box=tuple(coord * 2 for coord in bbox),
+                            box=(left * 2, top * 2, right * 2, bottom * 2),
                         )
                     else:
                         im_cropped = im.crop(bbox)

src/PIL/JpegImagePlugin.py

@@ -48,6 +48,7 @@
 from ._binary import i32be as i32
 from ._binary import o8
 from ._binary import o16be as o16
+from ._deprecate import deprecate
 from .JpegPresets import presets
 
 TYPE_CHECKING = False
@@ -467,6 +468,11 @@ def draft(
 
     def load_djpeg(self) -> None:
         # ALTERNATIVE: handle JPEGs via the IJG command line utilities
+        deprecate(
+            "load_djpeg",
+            14,
+            action="Use the built-in JPEG decoder instead, or call djpeg yourself.",
+        )
 
         f, path = tempfile.mkstemp()
         os.close(f)

src/PIL/PngImagePlugin.py

@@ -509,12 +509,19 @@ def chunk_tRNS(self, pos: int, length: int) -> bytes:
                 # otherwise, we have a byte string with one alpha value
                 # for each palette entry
                 self.im_info["transparency"] = s
-        elif self.im_mode == "1":
-            self.im_info["transparency"] = 255 if i16(s) else 0
-        elif self.im_mode in ("L", "I;16"):
-            self.im_info["transparency"] = i16(s)
-        elif self.im_mode == "RGB":
-            self.im_info["transparency"] = i16(s), i16(s, 2), i16(s, 4)
+        elif self.im_mode in ("1", "L", "I;16", "RGB"):
+            # 2 bytes for greyscale, 6 for truecolour
+            if length < (6 if self.im_mode == "RGB" else 2):
+                if ImageFile.LOAD_TRUNCATED_IMAGES:
+                    return s
+                msg = "Truncated tRNS chunk"
+                raise ValueError(msg)
+            if self.im_mode == "1":
+                self.im_info["transparency"] = 255 if i16(s) else 0
+            elif self.im_mode in ("L", "I;16"):
+                self.im_info["transparency"] = i16(s)
+            elif self.im_mode == "RGB":
+                self.im_info["transparency"] = i16(s), i16(s, 2), i16(s, 4)
         return s
 
     def chunk_gAMA(self, pos: int, length: int) -> bytes: