Do not detect Ultra HDR images as MPO

radarhere · May 13, 2024 · 631ed34 · 631ed34
1 parent e39ee95
commit 631ed34
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/Tests/images/ultrahdr.jpg b/Tests/images/ultrahdr.jpg
diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py
@@ -225,6 +225,10 @@ def test_eoferror() -> None:
         # Test that seeking to the last frame does not raise an error
         im.seek(n_frames - 1)
 
+def test_ultra_hdr() -> None:
+    with Image.open("Tests/images/ultrahdr.jpg") as im:
+        assert im.format == "JPEG"
+
 
 @pytest.mark.parametrize("test_file", test_files)
 def test_image_grab(test_file: str) -> None:

diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
@@ -843,6 +843,10 @@ def jpeg_factory(fp=None, filename=None):
     try:
         mpheader = im._getmp()
         if mpheader[45057] > 1:
+            for segment, content in im.applist:
+                if segment == "APP1" and b' hdrgm:Version="' in content:
+                    # Ultra HDR images are not yet supported
+                    return im
             # It's actually an MPO
             from .MpoImagePlugin import MpoImageFile