Merge pull request #514 from girder/better-jp2k-support

For the tiff tile source, allow decoding jp2k tiles.
girder · Jan 15, 2021 · 5f47231 · 5f47231
2 parents d5c2ac0 + dce5a1c
commit 5f47231
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@
 - Better handling of tiff files with JPEG compression and RGB colorspace (#503)
 - The openjpeg tile source can decode with parallelism (#511)
 - Geospatial tile sources are preferred for geospatial files (#512)
+- Support decoding JP2k compressed tiles in the tiff tile source (#514)
+>>>>>>> For the tiff tile source, allow decoding jp2k tiles.
 
 ### Bug Fixes
 - Harden updates of the item view after making a large image (#508)

diff --git a/sources/tiff/large_image_source_tiff/tiff_reader.py b/sources/tiff/large_image_source_tiff/tiff_reader.py
@@ -765,7 +765,7 @@ def getTile(self, x, y):
 
         if (not self._tiffInfo.get('istiled') or
                 self._tiffInfo.get('compression') not in (
-                    libtiff_ctypes.COMPRESSION_JPEG, 33003, 33005) or
+                    libtiff_ctypes.COMPRESSION_JPEG, 33003, 33005, 34712) or
                 self._tiffInfo.get('bitspersample') != 8):
             return self._getUncompressedTile(tileNum)