Merge branch 'main' into jpeg2000_l

.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

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_font_crash.py

@@ -2,8 +2,6 @@ from __future__ import annotations
 
 from PIL import Image, ImageDraw, ImageFont
 
-from .helper import skip_unless_feature_version
-
 
 class TestFontCrash:
     def _fuzz_font(self, font: ImageFont.FreeTypeFont) -> None:
@@ -16,7 +14,6 @@ class TestFontCrash:
             draw.multiline_textbbox((10, 10), "ABC\nAaaa", font, stroke_width=2)
             draw.text((10, 10), "Test Text", font=font, fill="#000")
 
-    @skip_unless_feature_version("freetype2", "2.12.0")
     def test_segfault(self) -> None:
         font = ImageFont.truetype("Tests/fonts/fuzz_font-5203009437302784")
         self._fuzz_font(font)

src/PIL/ExifTags.py

@@ -289,6 +289,7 @@ class Base(IntEnum):
     OpcodeList2 = 0xC741
     OpcodeList3 = 0xC74E
     NoiseProfile = 0xC761
+    FrameRate = 0xC764
 
 
 """Maps EXIF tags to tag names."""