Merge branch 'main' into jxl-support2

Author: radarhere

.github/workflows/test-windows.yml

@@ -98,8 +98,8 @@ jobs:
         choco install nasm --no-progress
         echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
 
-        choco install ghostscript --version=10.6.0 --no-progress
-        echo "C:\Program Files\gs\gs10.06.0\bin" >> $env:GITHUB_PATH
+        choco install ghostscript --version=10.7.0 --no-progress
+        echo "C:\Program Files\gs\gs10.07.0\bin" >> $env:GITHUB_PATH
 
         # Install extra test images
         xcopy /S /Y Tests\test-images\* Tests\images

.github/workflows/wheels-dependencies.sh

@@ -91,7 +91,7 @@ ARCHIVE_SDIR=pillow-depends-main
 
 # Package versions for fresh source builds.
 FREETYPE_VERSION=2.14.2
-HARFBUZZ_VERSION=13.0.1
+HARFBUZZ_VERSION=13.2.1
 LIBPNG_VERSION=1.6.55
 JPEGTURBO_VERSION=3.1.3
 OPENJPEG_VERSION=2.5.4

Tests/fonts/fuzz_font-5203009437302784

@@ -1,10 +1,10 @@
 STARTFONT
 FONT �
 SIZE 10
-FONTBOUNDINGBOX
-CHARS
+FONTBOUNDINGBOX 1 1 0 0
+CHARS 1
 STARTCHAR 
-ENCODING
+ENCODING 65
 BBX 2 5
 ENDCHAR
 ENDFONT

Tests/test_file_gif.py

@@ -314,7 +314,7 @@ def test_roundtrip_save_all_1(tmp_path: Path) -> None:
 def test_save_zero(size: tuple[int, int]) -> None:
     b = BytesIO()
     im = Image.new("RGB", size)
-    with pytest.raises(SystemError):
+    with pytest.raises(ValueError, match="cannot write empty image"):
         im.save(b, "GIF")
 
 

Tests/test_file_jpeg.py

@@ -85,7 +85,7 @@ def test_sanity(self) -> None:
     def test_zero(self, size: tuple[int, int], tmp_path: Path) -> None:
         f = tmp_path / "temp.jpg"
         im = Image.new("RGB", size)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="cannot write empty image"):
             im.save(f)
 
     def test_app(self) -> None:

Tests/test_file_jpeg2k.py

@@ -445,6 +445,7 @@ def test_pclr() -> None:
     ) as im:
         assert im.mode == "P"
         assert im.palette is not None
+        assert im.palette.mode == "CMYK"
         assert len(im.palette.colors) == 139
         assert im.palette.colors[(0, 0, 0, 0)] == 0
 

Tests/test_file_libtiff.py

@@ -1244,7 +1244,7 @@ def test_save_single_strip(
     def test_save_zero(self, compression: str | None, tmp_path: Path) -> None:
         im = Image.new("RGB", (0, 0))
         out = tmp_path / "temp.tif"
-        with pytest.raises(SystemError):
+        with pytest.raises(ValueError, match="cannot write empty image"):
             im.save(out, compression=compression)
 
     def test_save_many_compressed(self, tmp_path: Path) -> None:

Tests/test_file_png.py

@@ -707,6 +707,16 @@ def test_plte_length(self, tmp_path: Path) -> None:
             assert reloaded.png.im_palette is not None
             assert len(reloaded.png.im_palette[1]) == 3
 
+    def test_plte_cmyk(self, tmp_path: Path) -> None:
+        im = Image.new("P", (1, 1))
+        im.putpalette((0, 100, 150, 200), "CMYK")
+
+        out = tmp_path / "temp.png"
+        im.save(out)
+
+        with Image.open(out) as reloaded:
+            assert reloaded.convert("CMYK").getpixel((0, 0)) == (200, 222, 232, 0)
+
     def test_getxmp(self) -> None:
         with Image.open("Tests/images/color_snakes.png") as im:
             if ElementTree is None:

Tests/test_file_spider.py

@@ -72,7 +72,7 @@ def test_save(tmp_path: Path) -> None:
 def test_save_zero(size: tuple[int, int]) -> None:
     b = BytesIO()
     im = Image.new("1", size)
-    with pytest.raises(SystemError):
+    with pytest.raises(ValueError, match="cannot write empty image"):
         im.save(b, "SPIDER")
 
 

Tests/test_file_tga.py

@@ -13,8 +13,6 @@
 _TGA_DIR_COMMON = os.path.join(_TGA_DIR, "common")
 
 
-_ORIGINS = ("tl", "bl")
-
 _ORIGIN_TO_ORIENTATION = {"tl": 1, "bl": -1}
 
 
@@ -29,7 +27,7 @@
         ("200x32", "RGBA"),
     ),
 )
-@pytest.mark.parametrize("origin", _ORIGINS)
+@pytest.mark.parametrize("origin", _ORIGIN_TO_ORIENTATION)
 @pytest.mark.parametrize("rle", (True, False))
 def test_sanity(
     size_mode: tuple[str, str], origin: str, rle: str, tmp_path: Path