large-image-source-tiff 1.32.1.dev2__tar.gz → 1.33.5.dev6__tar.gz

{large_image_source_tiff-1.32.1.dev2 → large_image_source_tiff-1.33.5.dev6}/PKG-INFO

@@ -1,31 +1,42 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: large-image-source-tiff
-Version: 1.32.1.dev2
+Version: 1.33.5.dev6
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
 Author-email: kitware@kitware.com
-License: Apache Software License 2.0
+License: Apache-2.0
 Keywords: large_image,tile source
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.32.1.dev2
+Requires-Dist: large-image>=1.33.5.dev6
 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.32.1.dev2; extra == "girder"
+Requires-Dist: girder-large-image>=1.33.5.dev6; extra == "girder"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 A TIFF tilesource for large_image.
 

{large_image_source_tiff-1.32.1.dev2 → large_image_source_tiff-1.33.5.dev6}/README.rst

@@ -154,13 +154,15 @@ There is also cache management to balance memory use and speed of response in Gi
 
 Most tile sources can be used with Girder Large Image.  You can specify an extras_require of ``girder`` to install the following packages:
 
-  - ``girder-large-image``: Large Image as a Girder 3.x plugin.
-    You can install ``large-image[tasks]`` to install a Girder Worker task that can convert otherwise unreadable images to pyramidal tiff files.
+- ``girder-large-image``: Large Image as a Girder 3.x plugin.
 
-  - ``girder-large-image-annotation``: Adds models to the Girder database for supporting annotating large images.  These annotations can be rendered on images. Annotations can include polygons, points, image overlays, and other types. Each annotation can have a label and metadata.
+  You can install ``large-image[tasks]`` to install a Girder Worker task that can convert otherwise unreadable images to pyramidal tiff files.
 
-  - ``large-image-tasks``: A utility for running the converter via Girder Worker.
-    You can specify an extras_require of ``girder`` to include modules needed to work with the Girder remote worker or ``worker`` to include modules needed on the remote side of the Girder remote worker.  If neither is specified, some conversion tasks can be run using Girder local jobs.
+- ``girder-large-image-annotation``: Adds models to the Girder database for supporting annotating large images.  These annotations can be rendered on images. Annotations can include polygons, points, image overlays, and other types. Each annotation can have a label and metadata.
+
+- ``large-image-tasks``: A utility for running the converter via Girder Worker.
+
+  You can specify an extras_require of ``girder`` to include modules needed to work with the Girder remote worker or ``worker`` to include modules needed on the remote side of the Girder remote worker.  If neither is specified, some conversion tasks can be run using Girder local jobs.
 
 
 

{large_image_source_tiff-1.32.1.dev2 → large_image_source_tiff-1.33.5.dev6}/large_image_source_tiff/__init__.py

@@ -59,9 +59,9 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
     cacheName = 'tilesource'
     name = 'tiff'
     extensions = {
-        None: SourcePriority.MEDIUM,
-        'tif': SourcePriority.HIGH,
-        'tiff': SourcePriority.HIGH,
+        None: SourcePriority.HIGH,
+        'tif': SourcePriority.PREFERRED,
+        'tiff': SourcePriority.PREFERRED,
         'ptif': SourcePriority.PREFERRED,
         'ptiff': SourcePriority.PREFERRED,
         'qptiff': SourcePriority.PREFERRED,
@@ -514,6 +514,9 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
            image.
         :param imageId: if specified, use this as the image name.
         """
+        if not hasattr(self, '_associatedImagesDir'):
+            self._associatedImagesDir = {'images': {}, 'dirs': {}}
+        self._associatedImagesDir['dirs'][directoryNum] = None
         try:
             associated = self.getTiffDir(directoryNum, mustBeTiled)
             id = ''
@@ -548,6 +551,8 @@ class TiffFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                     return
                 image = self._reorient_numpy_image(image, associated._tiffInfo.get('orientation'))
                 self._associatedImages[id] = image
+                self._associatedImagesDir['images'][id] = directoryNum
+                self._associatedImagesDir['dirs'][directoryNum] = id
         except (TiffError, AttributeError):
             # If we can't validate or read an associated image or it has no
             # useful imagedescription, fail quietly without adding an

{large_image_source_tiff-1.32.1.dev2 → large_image_source_tiff-1.33.5.dev6}/large_image_source_tiff/tiff_reader.py

@@ -80,6 +80,8 @@ def patchLibtiff():
     libtiff_ctypes.TIFFDataType.TIFF_SLONG8 = 17
     # BigTIFF 64-bit unsigned integer (offset)
     libtiff_ctypes.TIFFDataType.TIFF_IFD8 = 18
+    # Some versions of pylibtiff specify an argtypes where they shouldn't
+    libtiff_ctypes.libtiff.TIFFGetField.argtypes = None
 
 
 patchLibtiff()
@@ -796,7 +798,10 @@ class TiledTiffDirectory:
                 } and (
                     self._tiffInfo.get('compression') != libtiff_ctypes.COMPRESSION_JPEG or
                     self._tiffInfo.get('photometric') != libtiff_ctypes.PHOTOMETRIC_YCBCR))):
-            return self._getUncompressedTile(tileNum)
+            try:
+                return self._getUncompressedTile(tileNum)
+            except Exception:
+                pass
 
         imageBuffer = io.BytesIO()
 

{large_image_source_tiff-1.32.1.dev2 → large_image_source_tiff-1.33.5.dev6}/large_image_source_tiff.egg-info/PKG-INFO

@@ -1,31 +1,42 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: large-image-source-tiff
-Version: 1.32.1.dev2
+Version: 1.33.5.dev6
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
 Author-email: kitware@kitware.com
-License: Apache Software License 2.0
+License: Apache-2.0
 Keywords: large_image,tile source
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.32.1.dev2
+Requires-Dist: large-image>=1.33.5.dev6
 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.32.1.dev2; extra == "girder"
+Requires-Dist: girder-large-image>=1.33.5.dev6; extra == "girder"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 A TIFF tilesource for large_image.
 

{large_image_source_tiff-1.32.1.dev2 → large_image_source_tiff-1.33.5.dev6}/large_image_source_tiff.egg-info/requires.txt

@@ -1,4 +1,4 @@
-large-image>=1.32.1.dev2
+large-image>=1.33.5.dev6
 pylibtiff
 tifftools>=1.2.0
 
@@ -6,4 +6,4 @@ tifftools>=1.2.0
 pylibjpeg-openjpeg
 
 [girder]
-girder-large-image>=1.32.1.dev2
+girder-large-image>=1.33.5.dev6

{large_image_source_tiff-1.32.1.dev2 → large_image_source_tiff-1.33.5.dev6}/pyproject.toml

@@ -1,3 +1,7 @@
 [build-system]
 requires = ["setuptools", "setuptools-scm"]
 build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+fallback_version = "0.0.0"
+root = "../.."

{large_image_source_tiff-1.32.1.dev2 → large_image_source_tiff-1.33.5.dev6}/setup.py

@@ -16,25 +16,22 @@ except (ImportError, LookupError):
 
 setup(
     name='large-image-source-tiff',
-    use_scm_version={'root': '../..',
-                     'fallback_version': '0.0.0'},
     description=description,
     long_description=long_description,
     long_description_content_type='text/x-rst',
-    license='Apache Software License 2.0',
+    license='Apache-2.0',
     author='Kitware, Inc.',
     author_email='kitware@kitware.com',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
-        'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
     ],
+    python_requires='>=3.9',
     install_requires=[
         f'large-image{limit_version}',
         'pylibtiff',
@@ -49,7 +46,6 @@ setup(
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),
     url='https://github.com/girder/large_image',
-    python_requires='>=3.8',
     entry_points={
         'large_image.source': [
             'tiff = large_image_source_tiff:TiffFileTileSource',