large-image-source-tiff 1.29.1__tar.gz → 1.29.1.dev4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-tiff
-Version: 1.29.1
+Version: 1.29.1.dev4
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,13 +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.29.1
+Requires-Dist: large-image>=1.29.1.dev4
 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; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.1.dev4; extra == "girder"
 
 A TIFF tilesource for large_image.
 

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

@@ -803,18 +803,9 @@ 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
-        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
+        # Get the whole frame, which is in a JPEG or JPEG 2000 format, and
         # convert it to a PIL image
-        imageBuffer.write(frame)
+        imageBuffer.write(self._getJpegFrame(tileNum, True))
         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 → large-image-source-tiff-1.29.1.dev4}/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
+Version: 1.29.1.dev4
 Summary: A TIFF tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,13 +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.29.1
+Requires-Dist: large-image>=1.29.1.dev4
 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; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.1.dev4; extra == "girder"
 
 A TIFF tilesource for large_image.
 

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

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

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

@@ -56,9 +56,6 @@ 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/large_image_source_tiff.egg-info/requires.txt

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