Merge pull request #958 from girder/reduce-tiff-restriction

Reduce a restriction on reading some tiff files.
girder · Sep 7, 2022 · a05f9b9 · a05f9b9
2 parents 2f4ed61 + c5b9902
commit a05f9b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Reduce rest calls to get settings ([953](../../pull/953))
 - Add an endpoint to delete all annotations in a folder ([954](../../pull/954))
 - Support relabeling axes in the multi source ([957](../../pull/957))
+- Reduce a restriction on reading some tiff files ([958](../../pull/958))
 
 ### Bug Fixes
 - Harden adding images to the item list ([955](../../pull/955))

diff --git a/sources/tiff/large_image_source_tiff/tiff_reader.py b/sources/tiff/large_image_source_tiff/tiff_reader.py
@@ -229,8 +229,7 @@ def _validate(self):  # noqa
         # should only be done if necessary, which would require the conversion
         # job to check output and perform subsequent processing as needed.
         if (not self._tiffInfo.get('samplesperpixel') or
-                (self._tiffInfo.get('samplesperpixel') != 1 and
-                 self._tiffInfo.get('samplesperpixel') < 3)):
+                self._tiffInfo.get('samplesperpixel') < 1):
             raise ValidationTiffException(
                 'Only RGB and greyscale TIFF files are supported')