large-image-source-tiff 1.29.1.dev16__tar.gz → 1.29.1.dev20__tar.gz

{large-image-source-tiff-1.29.1.dev16 → large-image-source-tiff-1.29.1.dev20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.29.1.dev16
+Version: 1.29.1.dev20
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,11 +17,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: large-image>=1.29.1.dev16
+Requires-Dist: large-image>=1.29.1.dev20
 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.29.1.dev16; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.1.dev20; extra == "girder"
 
 A TIFF tilesource for large_image.
 

{large-image-source-tiff-1.29.1.dev16 → large-image-source-tiff-1.29.1.dev20}/large_image_source_tiff/tiff_reader.py

@@ -803,9 +803,18 @@ class TiledTiffDirectory:
             # Write JPEG End Of Image marker
             imageBuffer.write(b'\xff\xd9')
             return imageBuffer.getvalue()
-        # Get the whole frame, which is in a JPEG or JPEG 2000 format, and
+        # 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}:
+            try:
+                import openjpeg
+
+                return openjpeg.decode(frame)
+            except Exception:
+                pass
         # convert it to a PIL image
-        imageBuffer.write(self._getJpegFrame(tileNum, True))
+        imageBuffer.write(frame)
         image = PIL.Image.open(imageBuffer)
         # Converting the image mode ensures that it gets loaded once and is in
         # a form we expect.  If this isn't done, then PIL can load the image

{large-image-source-tiff-1.29.1.dev16 → large-image-source-tiff-1.29.1.dev20}/large_image_source_tiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.29.1.dev16
+Version: 1.29.1.dev20
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,11 +17,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: large-image>=1.29.1.dev16
+Requires-Dist: large-image>=1.29.1.dev20
 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.29.1.dev16; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.1.dev20; extra == "girder"
 
 A TIFF tilesource for large_image.
 

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

@@ -0,0 +1,9 @@
+large-image>=1.29.1.dev20
+pylibtiff
+tifftools>=1.2.0
+
+[all]
+pylibjpeg-openjpeg
+
+[girder]
+girder-large-image>=1.29.1.dev20

{large-image-source-tiff-1.29.1.dev16 → large-image-source-tiff-1.29.1.dev20}/setup.py

@@ -56,6 +56,9 @@ setup(
         'tifftools>=1.2.0',
     ],
     extras_require={
+        'all': [
+            'pylibjpeg-openjpeg',
+        ],
         'girder': f'girder-large-image{limit_version}',
     },
     keywords='large_image, tile source',

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

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