Merge pull request #1382 from girder/icc-profile-key

Fix an issue applying ICC profile adjustments to multiple image modes
girder · Nov 21, 2023 · 01b17a3 · 01b17a3
2 parents 61ace0f + 4712080
commit 01b17a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Improvements
 - Fix the DICOM limit to say "Series" instead of "Studies" ([#1379](../../pull/1379))
 
+### Bug Fixes
+- Fix an issue applying ICC profile adjustments to multiple image modes ([#1382](../../pull/1382))
+
 ## 1.26.1
 
 ### Improvements

diff --git a/large_image/tilesource/base.py b/large_image/tilesource/base.py
@@ -1408,14 +1408,14 @@ def _applyICCProfile(self, sc, frame):
                 self._iccprofilesObjects[profileIdx] = {
                     'profile': self.getICCProfiles(profileIdx),
                 }
-                if key not in self._iccprofilesObjects[profileIdx]:
-                    self._iccprofilesObjects[profileIdx][key] = \
-                        PIL.ImageCms.buildTransformFromOpenProfiles(
-                            self._iccprofilesObjects[profileIdx]['profile'],
-                            self._iccsrgbprofile, mode, mode,
-                            renderingIntent=intent)
-                    self.logger.debug(
-                        'Created an ICC profile transform for mode %s, intent %s', mode, intent)
+            if key not in self._iccprofilesObjects[profileIdx]:
+                self._iccprofilesObjects[profileIdx][key] = \
+                    PIL.ImageCms.buildTransformFromOpenProfiles(
+                        self._iccprofilesObjects[profileIdx]['profile'],
+                        self._iccsrgbprofile, mode, mode,
+                        renderingIntent=intent)
+                self.logger.debug(
+                    'Created an ICC profile transform for mode %s, intent %s', mode, intent)
             transform = self._iccprofilesObjects[profileIdx][key]
 
             PIL.ImageCms.applyTransform(image, transform, inPlace=True)