large-image-source-tiff 1.28.2__tar.gz → 1.28.2.dev2__tar.gz

{large-image-source-tiff-1.28.2 → large-image-source-tiff-1.28.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.28.2
+Version: 1.28.2.dev2
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,11 +17,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: large-image>=1.28.2
+Requires-Dist: large-image>=1.28.2.dev2
 Requires-Dist: pylibtiff
 Requires-Dist: tifftools>=1.2.0
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.28.2; extra == "girder"
+Requires-Dist: girder-large-image>=1.28.2.dev2; extra == "girder"
 
 A TIFF tilesource for large_image.
 

{large-image-source-tiff-1.28.2 → large-image-source-tiff-1.28.2.dev2}/large_image_source_tiff/__init__.py

@@ -73,7 +73,6 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
     }
 
     _maxAssociatedImageSize = 8192
-    _maxUntiledImage = 4096
 
     def __init__(self, path, **kwargs):  # noqa
         """
@@ -86,18 +85,18 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
 
         self._largeImagePath = str(self._getLargeImagePath())
 
-        lastException = None
         try:
             self._initWithTiffTools()
             return
         except Exception as exc:
             self.logger.debug('Cannot read with tifftools route; %r', exc)
-            lastException = exc
 
         alldir = []
         try:
             if hasattr(self, '_info'):
                 alldir = self._scanDirectories()
+            else:
+                lastException = 'Could not parse file with tifftools'
         except IOOpenTiffError:
             msg = 'File cannot be opened via tiff source.'
             raise TileSourceError(msg)
@@ -158,7 +157,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             tifftools.constants.SampleFormat[sampleformat or 1].name,
             bitspersample,
         ))
-        self._bandCount = highest._tiffInfo.get('samplesperpixel', 1)
+        self._bandCount = highest._tiffInfo.get('samplesperpixel')
         # Sort the directories so that the highest resolution is the last one;
         # if a level is missing, put a None value in its place.
         self._tiffDirectories = [directories.get(key) for key in
@@ -253,13 +252,8 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         """
         sizeX = ifd['tags'][tifftools.Tag.ImageWidth.value]['data'][0]
         sizeY = ifd['tags'][tifftools.Tag.ImageLength.value]['data'][0]
-        if tifftools.Tag.TileWidth.value in baseifd['tags']:
-            tileWidth = baseifd['tags'][tifftools.Tag.TileWidth.value]['data'][0]
-            tileHeight = baseifd['tags'][tifftools.Tag.TileLength.value]['data'][0]
-        else:
-            tileWidth = sizeX
-            tileHeight = baseifd['tags'][tifftools.Tag.RowsPerStrip.value]['data'][0]
-
+        tileWidth = baseifd['tags'][tifftools.Tag.TileWidth.value]['data'][0]
+        tileHeight = baseifd['tags'][tifftools.Tag.TileLength.value]['data'][0]
         for tag in {
                 tifftools.Tag.SamplesPerPixel.value,
                 tifftools.Tag.BitsPerSample.value,
@@ -304,7 +298,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         directories are the same size and format; all non-tiled directories are
         treated as associated images.
         """
-        dir0 = self.getTiffDir(0, mustBeTiled=None)
+        dir0 = self.getTiffDir(0)
         self.tileWidth = dir0.tileWidth
         self.tileHeight = dir0.tileHeight
         self.sizeX = dir0.imageWidth
@@ -318,11 +312,12 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             tifftools.constants.SampleFormat[sampleformat or 1].name,
             bitspersample,
         ))
-        self._bandCount = dir0._tiffInfo.get('samplesperpixel', 1)
+        self._bandCount = dir0._tiffInfo.get('samplesperpixel')
         info = _cached_read_tiff(self._largeImagePath)
         self._info = info
         frames = []
         associated = []  # for now, a list of directories
+        curframe = -1
         for idx, ifd in enumerate(info['ifds']):
             # if not tiles, add to associated images
             if tifftools.Tag.tileWidth.value not in ifd['tags']:
@@ -331,6 +326,7 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             level = self._levelFromIfd(ifd, info['ifds'][0])
             # if the same resolution as the main image, add a frame
             if level == self.levels - 1:
+                curframe += 1
                 frames.append({'dirs': [None] * self.levels})
                 frames[-1]['dirs'][-1] = (idx, 0)
                 try:
@@ -369,35 +365,6 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                     else:
                         msg = 'Tile layers are in a surprising order'
                         raise TileSourceError(msg)
-        # If we have a single untiled ifd that is "small", use it
-        if tifftools.Tag.tileWidth.value not in info['ifds'][0]['tags']:
-            if (
-                self.sizeX > self._maxUntiledImage or self.sizeY > self._maxUntiledImage or
-                (len(info['ifds']) != 1 or tifftools.Tag.SubIfd.value in ifd['tags']) or
-                (tifftools.Tag.ImageDescription.value in ifd['tags'] and
-                 'ImageJ' in ifd['tags'][tifftools.Tag.ImageDescription.value]['data'])
-            ):
-                msg = 'A tiled TIFF is required.'
-                raise ValidationTiffError(msg)
-            associated = []
-            level = self._levelFromIfd(ifd, info['ifds'][0])
-            frames.append({'dirs': [None] * self.levels})
-            frames[-1]['dirs'][-1] = (idx, 0)
-            try:
-                frameMetadata = json.loads(
-                    ifd['tags'][tifftools.Tag.ImageDescription.value]['data'])
-                for key in {'channels', 'frame'}:
-                    if key in frameMetadata:
-                        frames[-1][key] = frameMetadata[key]
-            except Exception:
-                pass
-            if tifftools.Tag.ICCProfile.value in ifd['tags']:
-                if not hasattr(self, '_iccprofiles'):
-                    self._iccprofiles = []
-                while len(self._iccprofiles) < len(frames) - 1:
-                    self._iccprofiles.append(None)
-                self._iccprofiles.append(ifd['tags'][
-                    tifftools.Tag.ICCProfile.value]['data'])
         self._associatedImages = {}
         for dirNum in associated:
             self._addAssociatedImage(dirNum)

{large-image-source-tiff-1.28.2 → large-image-source-tiff-1.28.2.dev2}/large_image_source_tiff/tiff_reader.py

@@ -207,8 +207,8 @@ class TiledTiffDirectory:
         # the create_image.py script, such as flatten or colourspace.  These
         # 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', 1) or
-                self._tiffInfo.get('samplesperpixel', 1) < 1):
+        if (not self._tiffInfo.get('samplesperpixel') or
+                self._tiffInfo.get('samplesperpixel') < 1):
             msg = 'Only RGB and greyscale TIFF files are supported'
             raise ValidationTiffError(msg)
 
@@ -607,7 +607,7 @@ class TiledTiffDirectory:
             self._tiffInfo.get('bitspersample'),
             self._tiffInfo.get('sampleformat') if self._tiffInfo.get(
                 'sampleformat') is not None else libtiff_ctypes.SAMPLEFORMAT_UINT)
-        image = np.empty((th, tw, self._tiffInfo.get('samplesperpixel', 1)),
+        image = np.empty((th, tw, self._tiffInfo['samplesperpixel']),
                          dtype=_ctypesFormattbl[format])
         imageBuffer = image.ctypes.data_as(ctypes.POINTER(ctypes.c_char))
         if self._tiffInfo.get('istiled'):
@@ -635,7 +635,7 @@ class TiledTiffDirectory:
             raise IOTiffError(
                 'Read an unexpected number of bytes from an encoded tile' if readSize >= 0 else
                 'Failed to read from an encoded tile')
-        if (self._tiffInfo.get('samplesperpixel', 1) == 3 and
+        if (self._tiffInfo.get('samplesperpixel') == 3 and
                 self._tiffInfo.get('photometric') == libtiff_ctypes.PHOTOMETRIC_YCBCR):
             if self._tiffInfo.get('bitspersample') == 16:
                 image = np.floor_divide(image, 256).astype(np.uint8)

{large-image-source-tiff-1.28.2 → large-image-source-tiff-1.28.2.dev2}/large_image_source_tiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.28.2
+Version: 1.28.2.dev2
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,11 +17,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: large-image>=1.28.2
+Requires-Dist: large-image>=1.28.2.dev2
 Requires-Dist: pylibtiff
 Requires-Dist: tifftools>=1.2.0
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.28.2; extra == "girder"
+Requires-Dist: girder-large-image>=1.28.2.dev2; extra == "girder"
 
 A TIFF tilesource for large_image.
 

large-image-source-tiff-1.28.2.dev2/large_image_source_tiff.egg-info/requires.txt

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

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

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