Merge pull request #1245 from girder/guard-bad-icc

Guard against ICC profiles that won't parse
girder · Jul 26, 2023 · 5be0651 · 5be0651
2 parents d46f9a9 + 1e6c25c
commit 5be0651
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.23.3
+
+### Improvements
+- Frame selection presets ([#1237](../../pull/1237))
+
+### Bug Fixes
+- Guard against ICC profiles that won't parse ([#1245](../../pull/1245))
+
 ## 1.23.2
 
 ### Improvements

diff --git a/large_image/tilesource/base.py b/large_image/tilesource/base.py
@@ -1315,7 +1315,10 @@ def getICCProfiles(self, idx=None, onlyInfo=False):
             if hasattr(self, '_iccprofilesObjects') and self._iccprofilesObjects[pidx] is not None:
                 prof = self._iccprofilesObjects[pidx]['profile']
             elif not isinstance(prof, PIL.ImageCms.ImageCmsProfile):
-                prof = PIL.ImageCms.getOpenProfile(io.BytesIO(prof))
+                try:
+                    prof = PIL.ImageCms.getOpenProfile(io.BytesIO(prof))
+                except PIL.ImageCms.PyCMSError:
+                    continue
             if idx == pidx:
                 return prof
             results.append(prof)