large-image-source-tiff 1.27.1.dev3__tar.gz → 1.27.1.dev5__tar.gz

{large-image-source-tiff-1.27.1.dev3 → large-image-source-tiff-1.27.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.27.1.dev3
+Version: 1.27.1.dev5
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

{large-image-source-tiff-1.27.1.dev3 → large-image-source-tiff-1.27.1.dev5}/large_image_source_tiff/__init__.py

@@ -645,7 +645,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                 allowStyle = False
                 format = TILE_FORMAT_PIL
             else:
-                tile = dir.getTile(x, y)
+                tile = dir.getTile(x, y, asarray=numpyAllowed == 'always')
                 format = 'JPEG'
             if isinstance(tile, PIL.Image.Image):
                 format = TILE_FORMAT_PIL

{large-image-source-tiff-1.27.1.dev3 → large-image-source-tiff-1.27.1.dev5}/large_image_source_tiff/tiff_reader.py

@@ -754,7 +754,7 @@ class TiledTiffDirectory:
     def pixelInfo(self):
         return self._pixelInfo
 
-    def getTile(self, x, y):
+    def getTile(self, x, y, asarray=False):
         """
         Get the complete JPEG image from a tile.
 
@@ -762,6 +762,8 @@ class TiledTiffDirectory:
         :type x: int
         :param y: The row index of the desired tile.
         :type y: int
+        :param asarray: If True, read jpeg compressed images as arrays.
+        :type asarray: boolean
         :return: either a buffer with a JPEG or a PIL image.
         :rtype: bytes
         :raises: InvalidOperationTiffError or IOTiffError
@@ -774,11 +776,14 @@ class TiledTiffDirectory:
         tileNum = self._toTileNum(x, y)
 
         if (not self._tiffInfo.get('istiled') or
-                self._tiffInfo.get('compression') not in (
-                    libtiff_ctypes.COMPRESSION_JPEG, 33003, 33005, 34712) or
+                self._tiffInfo.get('compression') not in {
+                    libtiff_ctypes.COMPRESSION_JPEG, 33003, 33005, 34712} or
                 self._tiffInfo.get('bitspersample') != 8 or
                 self._tiffInfo.get('sampleformat') not in {
-                    None, libtiff_ctypes.SAMPLEFORMAT_UINT}):
+                    None, libtiff_ctypes.SAMPLEFORMAT_UINT} or
+                (asarray and self._tiffInfo.get('compression') not in {33003, 33005, 34712} and (
+                    self._tiffInfo.get('compression') != libtiff_ctypes.COMPRESSION_JPEG or
+                    self._tiffInfo.get('photometric') != libtiff_ctypes.PHOTOMETRIC_YCBCR))):
             return self._getUncompressedTile(tileNum)
 
         imageBuffer = io.BytesIO()

{large-image-source-tiff-1.27.1.dev3 → large-image-source-tiff-1.27.1.dev5}/large_image_source_tiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.27.1.dev3
+Version: 1.27.1.dev5
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

large-image-source-tiff-1.27.1.dev5/large_image_source_tiff.egg-info/requires.txt

@@ -0,0 +1,6 @@
+large-image>=1.27.1.dev5
+pylibtiff
+tifftools>=1.2.0
+
+[girder]
+girder-large-image>=1.27.1.dev5

large-image-source-tiff-1.27.1.dev3/large_image_source_tiff.egg-info/requires.txt

@@ -1,6 +0,0 @@
-large-image>=1.27.1.dev3
-pylibtiff
-tifftools>=1.2.0
-
-[girder]
-girder-large-image>=1.27.1.dev3