From 6596e31605b7916610a69c491d76114f2058fede Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 5 Aug 2021 01:06:01 +1000
Subject: [PATCH] Determine mode purely from ihdr header box

---
 Tests/images/balloon_eciRGBv2_aware.jp2 | Bin 0 -> 7419 bytes
 Tests/test_file_jpeg2k.py               |  10 +++++
 src/PIL/Jpeg2KImagePlugin.py            |  49 ++++++------------------
 3 files changed, 21 insertions(+), 38 deletions(-)
 create mode 100644 Tests/images/balloon_eciRGBv2_aware.jp2

diff --git a/Tests/images/balloon_eciRGBv2_aware.jp2 b/Tests/images/balloon_eciRGBv2_aware.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..18fd1e1723de3237802ecf53839ac530d5321822
GIT binary patch
literal 7419
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

literal 0
HcmV?d00001

diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
index 2abb2bcfb..0b4af4524 100644
--- a/Tests/test_file_jpeg2k.py
+++ b/Tests/test_file_jpeg2k.py
@@ -159,6 +159,16 @@ def test_load_dpi():
         assert "dpi" not in im.info
 
 
+def test_restricted_icc_profile():
+    ImageFile.LOAD_TRUNCATED_IMAGES = True
+    try:
+        # JPEG2000 image with a restricted ICC profile and a known colorspace
+        with Image.open("Tests/images/balloon_eciRGBv2_aware.jp2") as im:
+            assert im.mode == "RGB"
+    finally:
+        ImageFile.LOAD_TRUNCATED_IMAGES = False
+
+
 def test_header_errors():
     for path in (
         "Tests/images/invalid_header_length.jp2",
diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py
index 0904b241b..cc7980278 100644
--- a/src/PIL/Jpeg2KImagePlugin.py
+++ b/src/PIL/Jpeg2KImagePlugin.py
@@ -159,50 +159,23 @@ def _parse_jp2_header(fp):
     bpc = None
     nc = None
     dpi = None  # 2-tuple of DPI info, or None
-    unkc = 0  # Colorspace information unknown
 
     while header.has_next_box():
         tbox = header.next_box_type()
 
         if tbox == b"ihdr":
-            height, width, nc, bpc, c, unkc, ipr = header.read_fields(">IIHBBBB")
+            height, width, nc, bpc = header.read_fields(">IIHB")
             size = (width, height)
-            if unkc:
-                if nc == 1 and (bpc & 0x7F) > 8:
-                    mode = "I;16"
-                elif nc == 1:
-                    mode = "L"
-                elif nc == 2:
-                    mode = "LA"
-                elif nc == 3:
-                    mode = "RGB"
-                elif nc == 4:
-                    mode = "RGBA"
-        elif tbox == b"colr":
-            meth, prec, approx = header.read_fields(">BBB")
-            if meth == 1 and unkc == 0:
-                cs = header.read_fields(">I")[0]
-                if cs == 16:  # sRGB
-                    if nc == 1 and (bpc & 0x7F) > 8:
-                        mode = "I;16"
-                    elif nc == 1:
-                        mode = "L"
-                    elif nc == 3:
-                        mode = "RGB"
-                    elif nc == 4:
-                        mode = "RGBA"
-                elif cs == 17:  # grayscale
-                    if nc == 1 and (bpc & 0x7F) > 8:
-                        mode = "I;16"
-                    elif nc == 1:
-                        mode = "L"
-                    elif nc == 2:
-                        mode = "LA"
-                elif cs == 18:  # sYCC
-                    if nc == 3:
-                        mode = "RGB"
-                    elif nc == 4:
-                        mode = "RGBA"
+            if nc == 1 and (bpc & 0x7F) > 8:
+                mode = "I;16"
+            elif nc == 1:
+                mode = "L"
+            elif nc == 2:
+                mode = "LA"
+            elif nc == 3:
+                mode = "RGB"
+            elif nc == 4:
+                mode = "RGBA"
         elif tbox == b"res ":
             res = header.read_boxes()
             while res.has_next_box():