large-image 1.26.3.dev34__tar.gz → 1.26.3.dev38__tar.gz

{large-image-1.26.3.dev34/large_image.egg-info → large-image-1.26.3.dev38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image
-Version: 1.26.3.dev34
+Version: 1.26.3.dev38
 Summary: Python modules to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

{large-image-1.26.3.dev34 → large-image-1.26.3.dev38}/large_image/tilesource/base.py

@@ -285,7 +285,7 @@ class TileSource(IPyLeafletMixin):
     @property
     def bandCount(self):
         if not self._bandCount:
-            if not self._dtype or str(self._dtype) == 'check':
+            if not self._dtype or (isinstance(self._dtype, str) and self._dtype == 'check'):
                 return None
         return self._bandCount
 
@@ -1134,20 +1134,6 @@ class TileSource(IPyLeafletMixin):
                     entry['hist'] = entry['hist'].astype(float) / entry['samples']
         return results
 
-    def _unstyledClassKey(self):
-        """
-        Create a class key that doesn't use style.  If already created, just
-        return the created value.
-        """
-        if not hasattr(self, '_classkey_unstyled'):
-            key = self._classkey
-            if '__STYLEEND__' in key:
-                parts = key.split('__STYLEEND__', 1)
-                key = key.split('__STYLESTART__', 1)[0] + parts[1]
-            key += '__unstyled'
-            self._classkey_unstyled = key
-        return self._classkey_unstyled
-
     def _scanForMinMax(self, dtype, frame=None, analysisSize=1024, onlyMinMax=True, **kwargs):
         """
         Scan the image at a lower resolution to find the minimum and maximum
@@ -1597,7 +1583,10 @@ class TileSource(IPyLeafletMixin):
         :returns: a numpy array and a target PIL image mode.
         """
         tile, mode = _imageToNumpy(tile)
-        if applyStyle and (getattr(self, 'style', None) or hasattr(self, '_iccprofiles')):
+        # if applyStyle and (getattr(self, 'style', None) or hasattr(self, '_iccprofiles')):
+        if (applyStyle and (getattr(self, 'style', None) or hasattr(self, '_iccprofiles')) and
+                (not getattr(self, 'style', None) or len(self.style) != 1 or
+                 self.style.get('icc') is not False)):
             tile = self._applyStyle(tile, getattr(self, 'style', None), x, y, z, frame)
         if tile.shape[0] != self.tileHeight or tile.shape[1] != self.tileWidth:
             extend = np.zeros(
@@ -1641,7 +1630,7 @@ class TileSource(IPyLeafletMixin):
                 not isEdge and (not applyStyle or not hasStyle)):
             return tile
 
-        if self._dtype is None or str(self._dtype) == 'check':
+        if self._dtype is None or (isinstance(self._dtype, str) and self._dtype == 'check'):
             if tileEncoding == TILE_FORMAT_NUMPY:
                 self._dtype = tile.dtype
                 self._bandCount = tile.shape[-1] if len(tile.shape) == 3 else 1

{large-image-1.26.3.dev34 → large-image-1.26.3.dev38}/large_image/tilesource/jupyter.py

@@ -14,6 +14,7 @@ Please note that this webserver will not work with Classic Notebook and will
 likely lead to crashes. This is only for use in JupyterLab.
 
 """
+import importlib.util
 import json
 import os
 import weakref
@@ -21,10 +22,7 @@ import weakref
 from large_image.exceptions import TileSourceXYZRangeError
 from large_image.tilesource.utilities import JSONDict
 
-try:
-    import ipyleaflet
-except ImportError:  # pragma: no cover
-    ipyleaflet = None
+ipyleafletPresent = importlib.util.find_spec('ipyleaflet') is not None
 
 
 def launch_tile_server(tile_source, port=0):
@@ -146,7 +144,7 @@ class Map:
             self._layer = self.make_layer(metadata, url)
             self._map = self.make_map(metadata)
 
-    if ipyleaflet:
+    if ipyleafletPresent:
         def _ipython_display_(self):
             from IPython.display import display
 
@@ -382,7 +380,7 @@ class IPyLeafletMixin:
     def __init__(self, *args, **kwargs):
         self._jupyter_server_manager = None
         self._map = Map()
-        if ipyleaflet:
+        if ipyleafletPresent:
             self.to_map = self._map.to_map
             self.from_map = self._map.from_map
 
@@ -411,7 +409,7 @@ class IPyLeafletMixin:
         return self._map.make_layer(self.metadata, f'{base_url}/{endpoint}')
 
     # Only make _ipython_display_ available if ipyleaflet is installed
-    if ipyleaflet:
+    if ipyleafletPresent:
 
         def _ipython_display_(self):
             from IPython.display import display

{large-image-1.26.3.dev34 → large-image-1.26.3.dev38}/large_image/tilesource/tiledict.py

@@ -173,10 +173,11 @@ class LazyTileDict(dict):
             else:
                 tileData = self._retileTile()
 
-            pilData = _imageToPIL(tileData)
-
+            pilData = None
             # resample if needed
             if self.resample not in (False, None) and self.requestedScale:
+                pilData = _imageToPIL(tileData)
+
                 self['width'] = max(1, int(
                     pilData.size[0] / self.requestedScale))
                 self['height'] = max(1, int(
@@ -206,7 +207,7 @@ class LazyTileDict(dict):
                     tileData, _ = _imageToNumpy(tileData)
                     tileFormat = TILE_FORMAT_NUMPY
                 elif TILE_FORMAT_PIL in self.format:
-                    tileData = pilData
+                    tileData = pilData if pilData is not None else _imageToPIL(tileData)
                     tileFormat = TILE_FORMAT_PIL
                 elif TILE_FORMAT_IMAGE in self.format:
                     tileData, mimeType = _encodeImage(
@@ -217,7 +218,7 @@ class LazyTileDict(dict):
                         'Cannot yield tiles in desired format %r' % (
                             self.format, ))
             else:
-                tileData = pilData
+                tileData = pilData if pilData is not None else _imageToPIL(tileData)
                 tileFormat = TILE_FORMAT_PIL
 
             self['tile'] = tileData

{large-image-1.26.3.dev34 → large-image-1.26.3.dev38}/large_image/tilesource/utilities.py

@@ -32,6 +32,7 @@ colormap = {
     'GREEN': '#00ff00',
     'BLUE': '#0000ff',
 }
+modesBySize = ['L', 'LA', 'RGB', 'RGBA']
 
 
 class ImageBytes(bytes):
@@ -187,7 +188,7 @@ def _imageToPIL(image, setMode=None):
             # Fallback for hyperspectral data to just use the first three bands
             if image.shape[2] > 4:
                 image = image[:, :, :3]
-            mode = ['L', 'LA', 'RGB', 'RGBA'][image.shape[2] - 1]
+            mode = modesBySize[image.shape[2] - 1]
         if len(image.shape) == 3 and image.shape[2] == 1:
             image = np.resize(image, image.shape[:2])
         if image.dtype == np.uint32:
@@ -220,6 +221,17 @@ def _imageToNumpy(image):
     :param image: input image.
     :returns: a numpy array and a target PIL image mode.
     """
+    if isinstance(image, np.ndarray) and len(image.shape) == 3 and 1 <= image.shape[2] <= 4:
+        return image, modesBySize[image.shape[2] - 1]
+    if (simplejpeg and isinstance(image, bytes) and image[:3] == b'\xff\xd8\xff' and
+            b'\xff\xc0' in image[:1024]):
+        idx = image.index(b'\xff\xc0')
+        if image[idx + 9:idx + 10] in {b'\x01', b'\x03'}:
+            try:
+                image = simplejpeg.decode_jpeg(
+                    image, colorspace='GRAY' if image[idx + 9:idx + 10] == b'\x01' else 'RGB')
+            except Exception:
+                pass
     if not isinstance(image, np.ndarray):
         if not isinstance(image, PIL.Image.Image):
             image = PIL.Image.open(io.BytesIO(image))
@@ -232,7 +244,8 @@ def _imageToNumpy(image):
             image = np.asarray(image)
     else:
         if len(image.shape) == 3:
-            mode = ['L', 'LA', 'RGB', 'RGBA'][(image.shape[2] - 1) if image.shape[2] <= 4 else 3]
+            mode = modesBySize[(image.shape[2] - 1) if image.shape[2] <= 4 else 3]
+            return image, mode
         else:
             mode = 'L'
     if len(image.shape) == 2:

{large-image-1.26.3.dev34 → large-image-1.26.3.dev38/large_image.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image
-Version: 1.26.3.dev34
+Version: 1.26.3.dev38
 Summary: Python modules to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

large-image-1.26.3.dev38/large_image.egg-info/requires.txt

@@ -0,0 +1,143 @@
+cachetools
+palettable
+Pillow
+numpy
+
+[all]
+large-image-source-openslide>=1.26.3.dev38
+large-image-source-gdal>=1.26.3.dev38
+large-image-source-tiff>=1.26.3.dev38
+large-image-source-nd2>=1.26.3.dev38
+large-image-source-ometiff>=1.26.3.dev38
+psutil>=4.2.0
+pyvips
+large-image-source-openjpeg>=1.26.3.dev38
+large-image-source-dummy>=1.26.3.dev38
+large-image-source-test>=1.26.3.dev38
+large-image-converter>=1.26.3.dev38
+large-image-source-zarr>=1.26.3.dev38
+large-image-source-rasterio>=1.26.3.dev38
+simplejpeg
+large-image-source-vips>=1.26.3.dev38
+large-image-source-rasterio[all]>=1.26.3.dev38
+large-image-source-bioformats>=1.26.3.dev38
+large-image-source-tifffile>=1.26.3.dev38
+matplotlib
+large-image-source-mapnik>=1.26.3.dev38
+large-image-source-multi>=1.26.3.dev38
+large-image-source-pil[all]>=1.26.3.dev38
+large-image-source-deepzoom>=1.26.3.dev38
+large-image-source-pil>=1.26.3.dev38
+large-image-source-dicom>=1.26.3.dev38
+
+[all:platform_system != "Windows"]
+pylibmc>=1.5.1
+
+[bioformats]
+large-image-source-bioformats>=1.26.3.dev38
+
+[colormaps]
+matplotlib
+
+[common]
+simplejpeg
+large-image-source-nd2>=1.26.3.dev38
+large-image-source-rasterio[all]>=1.26.3.dev38
+matplotlib
+psutil>=4.2.0
+large-image-source-tifffile>=1.26.3.dev38
+large-image-source-test>=1.26.3.dev38
+large-image-source-multi>=1.26.3.dev38
+large-image-source-pil[all]>=1.26.3.dev38
+large-image-source-deepzoom>=1.26.3.dev38
+large-image-source-dicom>=1.26.3.dev38
+large-image-source-zarr>=1.26.3.dev38
+
+[common:platform_system != "Windows"]
+pylibmc>=1.5.1
+
+[converter]
+large-image-converter>=1.26.3.dev38
+
+[deepzoom]
+large-image-source-deepzoom>=1.26.3.dev38
+
+[dicom]
+large-image-source-dicom>=1.26.3.dev38
+
+[dummy]
+large-image-source-dummy>=1.26.3.dev38
+
+[gdal]
+large-image-source-gdal>=1.26.3.dev38
+
+[mapnik]
+large-image-source-mapnik>=1.26.3.dev38
+
+[memcached]
+
+[memcached:platform_system != "Windows"]
+pylibmc>=1.5.1
+
+[multi]
+large-image-source-multi>=1.26.3.dev38
+
+[nd2]
+large-image-source-nd2>=1.26.3.dev38
+
+[ometiff]
+large-image-source-ometiff>=1.26.3.dev38
+
+[openjpeg]
+large-image-source-openjpeg>=1.26.3.dev38
+
+[openslide]
+large-image-source-openslide>=1.26.3.dev38
+
+[performance]
+psutil>=4.2.0
+simplejpeg
+
+[pil]
+large-image-source-pil>=1.26.3.dev38
+
+[rasterio]
+large-image-source-rasterio>=1.26.3.dev38
+
+[sources]
+large-image-source-openslide>=1.26.3.dev38
+large-image-source-gdal>=1.26.3.dev38
+large-image-source-rasterio>=1.26.3.dev38
+large-image-source-tiff>=1.26.3.dev38
+large-image-source-nd2>=1.26.3.dev38
+large-image-source-vips>=1.26.3.dev38
+large-image-source-ometiff>=1.26.3.dev38
+large-image-source-bioformats>=1.26.3.dev38
+large-image-source-openjpeg>=1.26.3.dev38
+large-image-source-test>=1.26.3.dev38
+large-image-source-tifffile>=1.26.3.dev38
+large-image-source-dummy>=1.26.3.dev38
+large-image-source-mapnik>=1.26.3.dev38
+large-image-source-multi>=1.26.3.dev38
+large-image-source-deepzoom>=1.26.3.dev38
+large-image-source-pil>=1.26.3.dev38
+large-image-source-dicom>=1.26.3.dev38
+large-image-source-zarr>=1.26.3.dev38
+
+[test]
+large-image-source-test>=1.26.3.dev38
+
+[tiff]
+large-image-source-tiff>=1.26.3.dev38
+
+[tifffile]
+large-image-source-tifffile>=1.26.3.dev38
+
+[tiledoutput]
+pyvips
+
+[vips]
+large-image-source-vips>=1.26.3.dev38
+
+[zarr]
+large-image-source-zarr>=1.26.3.dev38

large-image-1.26.3.dev34/large_image.egg-info/requires.txt

@@ -1,143 +0,0 @@
-cachetools
-palettable
-Pillow
-numpy
-
-[all]
-large-image-source-test>=1.26.3.dev34
-large-image-converter>=1.26.3.dev34
-large-image-source-rasterio[all]>=1.26.3.dev34
-large-image-source-multi>=1.26.3.dev34
-large-image-source-dicom>=1.26.3.dev34
-simplejpeg
-matplotlib
-large-image-source-pil>=1.26.3.dev34
-large-image-source-deepzoom>=1.26.3.dev34
-large-image-source-mapnik>=1.26.3.dev34
-pyvips
-large-image-source-zarr>=1.26.3.dev34
-large-image-source-tiff>=1.26.3.dev34
-large-image-source-openslide>=1.26.3.dev34
-psutil>=4.2.0
-large-image-source-bioformats>=1.26.3.dev34
-large-image-source-rasterio>=1.26.3.dev34
-large-image-source-ometiff>=1.26.3.dev34
-large-image-source-tifffile>=1.26.3.dev34
-large-image-source-gdal>=1.26.3.dev34
-large-image-source-openjpeg>=1.26.3.dev34
-large-image-source-dummy>=1.26.3.dev34
-large-image-source-pil[all]>=1.26.3.dev34
-large-image-source-vips>=1.26.3.dev34
-large-image-source-nd2>=1.26.3.dev34
-
-[all:platform_system != "Windows"]
-pylibmc>=1.5.1
-
-[bioformats]
-large-image-source-bioformats>=1.26.3.dev34
-
-[colormaps]
-matplotlib
-
-[common]
-large-image-source-test>=1.26.3.dev34
-psutil>=4.2.0
-large-image-source-rasterio[all]>=1.26.3.dev34
-large-image-source-multi>=1.26.3.dev34
-large-image-source-dicom>=1.26.3.dev34
-simplejpeg
-matplotlib
-large-image-source-deepzoom>=1.26.3.dev34
-large-image-source-zarr>=1.26.3.dev34
-large-image-source-tifffile>=1.26.3.dev34
-large-image-source-pil[all]>=1.26.3.dev34
-large-image-source-nd2>=1.26.3.dev34
-
-[common:platform_system != "Windows"]
-pylibmc>=1.5.1
-
-[converter]
-large-image-converter>=1.26.3.dev34
-
-[deepzoom]
-large-image-source-deepzoom>=1.26.3.dev34
-
-[dicom]
-large-image-source-dicom>=1.26.3.dev34
-
-[dummy]
-large-image-source-dummy>=1.26.3.dev34
-
-[gdal]
-large-image-source-gdal>=1.26.3.dev34
-
-[mapnik]
-large-image-source-mapnik>=1.26.3.dev34
-
-[memcached]
-
-[memcached:platform_system != "Windows"]
-pylibmc>=1.5.1
-
-[multi]
-large-image-source-multi>=1.26.3.dev34
-
-[nd2]
-large-image-source-nd2>=1.26.3.dev34
-
-[ometiff]
-large-image-source-ometiff>=1.26.3.dev34
-
-[openjpeg]
-large-image-source-openjpeg>=1.26.3.dev34
-
-[openslide]
-large-image-source-openslide>=1.26.3.dev34
-
-[performance]
-psutil>=4.2.0
-simplejpeg
-
-[pil]
-large-image-source-pil>=1.26.3.dev34
-
-[rasterio]
-large-image-source-rasterio>=1.26.3.dev34
-
-[sources]
-large-image-source-test>=1.26.3.dev34
-large-image-source-multi>=1.26.3.dev34
-large-image-source-dicom>=1.26.3.dev34
-large-image-source-bioformats>=1.26.3.dev34
-large-image-source-ometiff>=1.26.3.dev34
-large-image-source-deepzoom>=1.26.3.dev34
-large-image-source-mapnik>=1.26.3.dev34
-large-image-source-pil>=1.26.3.dev34
-large-image-source-rasterio>=1.26.3.dev34
-large-image-source-tifffile>=1.26.3.dev34
-large-image-source-zarr>=1.26.3.dev34
-large-image-source-tiff>=1.26.3.dev34
-large-image-source-gdal>=1.26.3.dev34
-large-image-source-openjpeg>=1.26.3.dev34
-large-image-source-dummy>=1.26.3.dev34
-large-image-source-openslide>=1.26.3.dev34
-large-image-source-vips>=1.26.3.dev34
-large-image-source-nd2>=1.26.3.dev34
-
-[test]
-large-image-source-test>=1.26.3.dev34
-
-[tiff]
-large-image-source-tiff>=1.26.3.dev34
-
-[tifffile]
-large-image-source-tifffile>=1.26.3.dev34
-
-[tiledoutput]
-pyvips
-
-[vips]
-large-image-source-vips>=1.26.3.dev34
-
-[zarr]
-large-image-source-zarr>=1.26.3.dev34