large-image-source-tiff 1.30.6.dev14__py3-none-any.whl → 1.30.6.dev18__py3-none-any.whl

large_image_source_tiff/__init__.py

@@ -327,12 +327,19 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         self._info = info
         frames = []
         associated = []  # for now, a list of directories
+        used_subifd = False
         for idx, ifd in enumerate(info['ifds']):
             # if not tiles, add to associated images
             if tifftools.Tag.tileWidth.value not in ifd['tags']:
-                associated.append(idx)
+                associated.append((idx, False))
                 continue
-            level = self._levelFromIfd(ifd, info['ifds'][0])
+            try:
+                level = self._levelFromIfd(ifd, info['ifds'][0])
+            except TileSourceError:
+                if idx and used_subifd:
+                    associated.append((idx, True))
+                    continue
+                raise
             # if the same resolution as the main image, add a frame
             if level == self.levels - 1:
                 frames.append({'dirs': [None] * self.levels})
@@ -371,9 +378,13 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                             tifftools.Tag.TileOffsets.value not in subifds[0]['tags']):
                         msg = 'Subifd has no strip or tile offsets.'
                         raise TileSourceMalformedError(msg)
-                    level = self._levelFromIfd(subifds[0], info['ifds'][0])
+                    try:
+                        level = self._levelFromIfd(subifds[0], info['ifds'][0])
+                    except Exception:
+                        break
                     if level < self.levels - 1 and frames[-1]['dirs'][level] is None:
                         frames[-1]['dirs'][level] = (idx, subidx + 1)
+                        used_subifd = True
                     else:
                         msg = 'Tile layers are in a surprising order'
                         raise TileSourceError(msg)
@@ -407,8 +418,8 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                 self._iccprofiles.append(ifd['tags'][
                     tifftools.Tag.ICCProfile.value]['data'])
         self._associatedImages = {}
-        for dirNum in associated:
-            self._addAssociatedImage(dirNum)
+        for dirNum, isTiled in associated:
+            self._addAssociatedImage(dirNum, isTiled)
         self._frames = frames
         self._tiffDirectories = [
             self.getTiffDir(
@@ -490,7 +501,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                 frame.setdefault('frame', {})
                 frame['frame']['IndexC'] = idx
 
-    def _addAssociatedImage(self, directoryNum, mustBeTiled=False, topImage=None):
+    def _addAssociatedImage(self, directoryNum, mustBeTiled=False, topImage=None, imageId=None):
         """
         Check if the specified TIFF directory contains an image with a sensible
         image description that can be used as an ID.  If so, and if the image
@@ -501,6 +512,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
            untiled images.
         :param topImage: if specified, add image-embedded metadata to this
            image.
+        :param imageId: if specified, use this as the image name.
         """
         try:
             associated = self.getTiffDir(directoryNum, mustBeTiled)
@@ -514,6 +526,8 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                 id = 'dir%d' % directoryNum
                 if not len(self._associatedImages):
                     id = 'macro'
+            if imageId:
+                id = imageId
             if not id and not mustBeTiled:
                 id = {1: 'label', 9: 'macro'}.get(associated._tiffInfo.get('subfiletype'))
             if not isinstance(id, str):
@@ -765,7 +779,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         """
         imageList = set(self._associatedImages)
         for td in self._tiffDirectories:
-            if td is not None:
+            if td is not None and td is not False:
                 imageList |= set(td._embeddedImages)
         return sorted(imageList)
 
@@ -784,7 +798,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         # with seemingly bad associated images, we may need to read them with a
         # more complex process than read_image.
         for td in self._tiffDirectories:
-            if td is not None and imageKey in td._embeddedImages:
+            if td is not None and td is not False and imageKey in td._embeddedImages:
                 return PIL.Image.open(io.BytesIO(base64.b64decode(td._embeddedImages[imageKey])))
         if imageKey in self._associatedImages:
             return PIL.Image.fromarray(self._associatedImages[imageKey])

large_image_source_tiff/tiff_reader.py

@@ -788,11 +788,13 @@ class TiledTiffDirectory:
 
         if (not self._tiffInfo.get('istiled') or
                 self._tiffInfo.get('compression') not in {
-                    libtiff_ctypes.COMPRESSION_JPEG, 33003, 33005, 34712} or
+                    libtiff_ctypes.COMPRESSION_JPEG, 33003, 33004, 33005, 34712} or
                 self._tiffInfo.get('bitspersample') != 8 or
                 self._tiffInfo.get('sampleformat') not in {
                     None, libtiff_ctypes.SAMPLEFORMAT_UINT} or
-                (asarray and self._tiffInfo.get('compression') not in {33003, 33005, 34712} and (
+                (asarray and self._tiffInfo.get('compression') not in {
+                    33003, 33004, 33005, 34712,
+                } and (
                     self._tiffInfo.get('compression') != libtiff_ctypes.COMPRESSION_JPEG or
                     self._tiffInfo.get('photometric') != libtiff_ctypes.PHOTOMETRIC_YCBCR))):
             return self._getUncompressedTile(tileNum)
@@ -811,7 +813,7 @@ class TiledTiffDirectory:
         # Get the whole frame, which is in a JPEG or JPEG 2000 format
         frame = self._getJpegFrame(tileNum, True)
         # For JP2K, see if we can convert it faster than PIL
-        if self._tiffInfo.get('compression') in {33003, 33005}:
+        if self._tiffInfo.get('compression') in {33003, 33004, 33005, 34712}:
             try:
                 import openjpeg
 

{large_image_source_tiff-1.30.6.dev14.dist-info → large_image_source_tiff-1.30.6.dev18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.30.6.dev14
+Version: 1.30.6.dev18
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,13 +19,13 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.30.6.dev14
+Requires-Dist: large-image>=1.30.6.dev18
 Requires-Dist: pylibtiff
 Requires-Dist: tifftools>=1.2.0
 Provides-Extra: all
 Requires-Dist: pylibjpeg-openjpeg; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.30.6.dev14; extra == "girder"
+Requires-Dist: girder-large-image>=1.30.6.dev18; extra == "girder"
 
 A TIFF tilesource for large_image.
 

large_image_source_tiff-1.30.6.dev18.dist-info/RECORD

@@ -0,0 +1,10 @@
+large_image_source_tiff/__init__.py,sha256=F3mCl2eWSg4Lmqi5EXhpLTsjjjYJn-qrP4OgxndFEtk,36627
+large_image_source_tiff/exceptions.py,sha256=NgdwloaDCtbtUMe2BU2lXEU8IwQSYtaokIwGIFypCps,617
+large_image_source_tiff/girder_source.py,sha256=Dp2e3O4VTANYXZI_eybgzs5BcyuMcw2-MAzCUJ8zzPg,1031
+large_image_source_tiff/tiff_reader.py,sha256=lsE00vLYi93cnoit66dq1S9N8f194JC5L66_5HVCV1w,39210
+large_image_source_tiff-1.30.6.dev18.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+large_image_source_tiff-1.30.6.dev18.dist-info/METADATA,sha256=4pA3UxzYcKgety1sBrHuMeFZAKgW7TXfzdxXMb9udII,1188
+large_image_source_tiff-1.30.6.dev18.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+large_image_source_tiff-1.30.6.dev18.dist-info/entry_points.txt,sha256=iZ43sIcj98SND7nDUC-_4qroBL6apyXN4iSbPXZ8LE4,166
+large_image_source_tiff-1.30.6.dev18.dist-info/top_level.txt,sha256=QRx_D2oeiOOz_5FlBOAoDPF-E4Q-aFmerUWlaeP14B8,24
+large_image_source_tiff-1.30.6.dev18.dist-info/RECORD,,

large_image_source_tiff-1.30.6.dev14.dist-info/RECORD

@@ -1,10 +0,0 @@
-large_image_source_tiff/__init__.py,sha256=lUgwD58vyfM3QOGY3913jfneHUzSYIkui0YlB2-bhzY,36060
-large_image_source_tiff/exceptions.py,sha256=NgdwloaDCtbtUMe2BU2lXEU8IwQSYtaokIwGIFypCps,617
-large_image_source_tiff/girder_source.py,sha256=Dp2e3O4VTANYXZI_eybgzs5BcyuMcw2-MAzCUJ8zzPg,1031
-large_image_source_tiff/tiff_reader.py,sha256=Gqzv3ct5YDicho9l23a0Gjoyln7TJNEbqAov4RnHRGI,39143
-large_image_source_tiff-1.30.6.dev14.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-large_image_source_tiff-1.30.6.dev14.dist-info/METADATA,sha256=n2EL5cY23RI_we7HZ8VHbShrmHDrr102XmUiZ0Snee8,1188
-large_image_source_tiff-1.30.6.dev14.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-large_image_source_tiff-1.30.6.dev14.dist-info/entry_points.txt,sha256=iZ43sIcj98SND7nDUC-_4qroBL6apyXN4iSbPXZ8LE4,166
-large_image_source_tiff-1.30.6.dev14.dist-info/top_level.txt,sha256=QRx_D2oeiOOz_5FlBOAoDPF-E4Q-aFmerUWlaeP14B8,24
-large_image_source_tiff-1.30.6.dev14.dist-info/RECORD,,