large-image 1.22.3.dev16__tar.gz → 1.22.3.dev18__tar.gz

{large-image-1.22.3.dev16/large_image.egg-info → large-image-1.22.3.dev18}/PKG-INFO

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

{large-image-1.22.3.dev16 → large-image-1.22.3.dev18}/docs/tilesource_options.rst

@@ -33,7 +33,7 @@ Style
 
 Often tiles are desired as 8-bit-per-sample images.  However, if the tile source is more than 8 bits per sample or has more than 3 channels, some data will be lost.  Similarly, if the data is returned as a numpy array, the range of values returned can vary by tile source.  The ``style`` parameter can remap samples values and determine how channels are composited.
 
-If ``style`` is not specified or None, the default style for the file is used.  Otherwise, this is a json-encoded string that contains an object with a key of ``bands`` consisting of an array of band definitions.  If only one band is needed, a json-encoded string of just the band definition can be used.
+If ``style`` is ``{}``, the default style for the file is used.  If it is not specified or None, it will be the default style for non-geospatial tile sources and a default style consisting of the visible bands for geospatial sources.  Otherwise, this is a json-encoded string that contains an object with a key of ``bands`` consisting of an array of band definitions.  If only one band is needed, a json-encoded string of just the band definition can be used.
 
 A band definition is an object which can contain the following keys:
 

{large-image-1.22.3.dev16 → large-image-1.22.3.dev18}/large_image/tilesource/base.py

@@ -192,7 +192,7 @@ class TileSource:
                 pass
         self._bandRanges = {}
         self._jsonstyle = style
-        if style:
+        if style is not None:
             if isinstance(style, dict):
                 self._style = JSONDict(style)
                 self._jsonstyle = json.dumps(style, sort_keys=True, separators=(',', ':'))
@@ -1382,7 +1382,7 @@ class TileSource:
         sc = types.SimpleNamespace(
             image=image, originalStyle=style, x=x, y=y, z=z, frame=frame,
             mainImage=image, mainFrame=frame, dtype=None, axis=None)
-        if style is None or ('icc' in style and len(style) == 1):
+        if not style or ('icc' in style and len(style) == 1):
             sc.style = {'icc': (style or {}).get(
                 'icc', config.getConfig('icc_correction', True)), 'bands': []}
         else:
@@ -1392,7 +1392,7 @@ class TileSource:
         if hasattr(self, '_iccprofiles') and sc.style.get(
                 'icc', config.getConfig('icc_correction', True)):
             image = self._applyICCProfile(sc, frame)
-        if style is None or ('icc' in style and len(style) == 1):
+        if not style or ('icc' in style and len(style) == 1):
             sc.output = image
         else:
             sc.output = numpy.zeros((image.shape[0], image.shape[1], 4), float)

{large-image-1.22.3.dev16 → large-image-1.22.3.dev18}/large_image/tilesource/geo.py

@@ -169,7 +169,14 @@ class GDALBaseFileTileSource(GeoBaseFileTileSource):
         return style
 
     def _setDefaultStyle(self):
-        """If not style was specified, create a default style."""
+        """If no style was specified, create a default style."""
+        self._bandNames = {}
+        for idx, band in self.getBandInformation().items():
+            if band.get('interpretation'):
+                self._bandNames[band['interpretation'].lower()] = idx
+        if isinstance(getattr(self, '_style', None), dict) and (
+                not self._style or 'icc' in self._style and len(self._style) == 1):
+            return
         if hasattr(self, '_style'):
             styleBands = self.style['bands'] if 'bands' in self.style else [self.style]
             if not len(styleBands) or (len(styleBands) == 1 and isinstance(
@@ -205,10 +212,6 @@ class GDALBaseFileTileSource(GeoBaseFileTileSource):
                 })
             self.logger.debug('Using style %r', style)
             self._style = JSONDict({'bands': style})
-        self._bandNames = {}
-        for idx, band in self.getBandInformation().items():
-            if band.get('interpretation'):
-                self._bandNames[band['interpretation'].lower()] = idx
 
     @staticmethod
     def getHexColors(palette):

{large-image-1.22.3.dev16 → large-image-1.22.3.dev18/large_image.egg-info}/PKG-INFO

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

large-image-1.22.3.dev18/large_image.egg-info/requires.txt

@@ -0,0 +1,148 @@
+cachetools>=3.0.0
+palettable
+Pillow
+numpy>=1.10.4
+
+[:python_version < "3.8"]
+importlib-metadata<5
+
+[all]
+large-image-source-tiff>=1.22.3.dev18
+large-image-source-openslide>=1.22.3.dev18
+large-image-source-openjpeg>=1.22.3.dev18
+pyvips
+matplotlib
+large-image-source-ometiff>=1.22.3.dev18
+large-image-source-pil[all]>=1.22.3.dev18
+large-image-source-deepzoom>=1.22.3.dev18
+large-image-source-mapnik>=1.22.3.dev18
+large-image-source-bioformats>=1.22.3.dev18
+large-image-converter>=1.22.3.dev18
+large-image-source-test>=1.22.3.dev18
+large-image-source-multi>=1.22.3.dev18
+psutil>=4.2.0
+large-image-source-dummy>=1.22.3.dev18
+large-image-source-vips>=1.22.3.dev18
+large-image-source-pil>=1.22.3.dev18
+large-image-source-gdal>=1.22.3.dev18
+
+[all:platform_system != "Windows"]
+pylibmc>=1.5.1
+
+[all:python_version < "3.7"]
+simplejpeg<1.6.6
+
+[all:python_version >= "3.7"]
+large-image-source-tifffile>=1.22.3.dev18
+large-image-source-nd2>=1.22.3.dev18
+simplejpeg
+
+[all:python_version >= "3.8"]
+large-image-source-dicom>=1.22.3.dev18
+large-image-source-rasterio>=1.22.3.dev18
+large-image-source-rasterio[all]>=1.22.3.dev18
+
+[bioformats]
+large-image-source-bioformats>=1.22.3.dev18
+
+[colormaps]
+matplotlib
+
+[converter]
+large-image-converter>=1.22.3.dev18
+
+[deepzoom]
+large-image-source-deepzoom>=1.22.3.dev18
+
+[dicom]
+
+[dicom:python_version >= "3.8"]
+large-image-source-dicom>=1.22.3.dev18
+
+[dummy]
+large-image-source-dummy>=1.22.3.dev18
+
+[gdal]
+large-image-source-gdal>=1.22.3.dev18
+
+[mapnik]
+large-image-source-mapnik>=1.22.3.dev18
+
+[memcached]
+
+[memcached:platform_system != "Windows"]
+pylibmc>=1.5.1
+
+[multi]
+large-image-source-multi>=1.22.3.dev18
+
+[nd2]
+
+[nd2:python_version >= "3.7"]
+large-image-source-nd2>=1.22.3.dev18
+
+[ometiff]
+large-image-source-ometiff>=1.22.3.dev18
+
+[openjpeg]
+large-image-source-openjpeg>=1.22.3.dev18
+
+[openslide]
+large-image-source-openslide>=1.22.3.dev18
+
+[performance]
+psutil>=4.2.0
+
+[performance:python_version < "3.7"]
+simplejpeg<1.6.6
+
+[performance:python_version >= "3.7"]
+simplejpeg
+
+[pil]
+large-image-source-pil>=1.22.3.dev18
+
+[rasterio]
+
+[rasterio:python_version >= "3.8"]
+large-image-source-rasterio>=1.22.3.dev18
+
+[sources]
+large-image-source-bioformats>=1.22.3.dev18
+large-image-source-mapnik>=1.22.3.dev18
+large-image-source-test>=1.22.3.dev18
+large-image-source-tiff>=1.22.3.dev18
+large-image-source-multi>=1.22.3.dev18
+large-image-source-openslide>=1.22.3.dev18
+large-image-source-dummy>=1.22.3.dev18
+large-image-source-openjpeg>=1.22.3.dev18
+large-image-source-vips>=1.22.3.dev18
+large-image-source-pil>=1.22.3.dev18
+large-image-source-ometiff>=1.22.3.dev18
+large-image-source-gdal>=1.22.3.dev18
+large-image-source-deepzoom>=1.22.3.dev18
+
+[sources:python_version >= "3.7"]
+large-image-source-tifffile>=1.22.3.dev18
+large-image-source-nd2>=1.22.3.dev18
+
+[sources:python_version >= "3.8"]
+large-image-source-rasterio>=1.22.3.dev18
+large-image-source-dicom>=1.22.3.dev18
+
+[test]
+large-image-source-test>=1.22.3.dev18
+
+[tiff]
+large-image-source-tiff>=1.22.3.dev18
+
+[tifffile]
+
+[tifffile:python_version >= "3.7"]
+large-image-source-tifffile>=1.22.3.dev18
+
+[tiledoutput]
+pyvips
+
+[vips]
+large-image-source-vips>=1.22.3.dev18

large-image-1.22.3.dev16/large_image.egg-info/requires.txt

@@ -1,148 +0,0 @@
-cachetools>=3.0.0
-palettable
-Pillow
-numpy>=1.10.4
-
-[:python_version < "3.8"]
-importlib-metadata<5
-
-[all]
-large-image-converter>=1.22.3.dev16
-large-image-source-multi>=1.22.3.dev16
-matplotlib
-large-image-source-vips>=1.22.3.dev16
-psutil>=4.2.0
-large-image-source-openjpeg>=1.22.3.dev16
-large-image-source-mapnik>=1.22.3.dev16
-large-image-source-dummy>=1.22.3.dev16
-large-image-source-tiff>=1.22.3.dev16
-large-image-source-gdal>=1.22.3.dev16
-large-image-source-ometiff>=1.22.3.dev16
-large-image-source-deepzoom>=1.22.3.dev16
-large-image-source-test>=1.22.3.dev16
-large-image-source-openslide>=1.22.3.dev16
-large-image-source-bioformats>=1.22.3.dev16
-large-image-source-pil>=1.22.3.dev16
-large-image-source-pil[all]>=1.22.3.dev16
-pyvips
-
-[all:platform_system != "Windows"]
-pylibmc>=1.5.1
-
-[all:python_version < "3.7"]
-simplejpeg<1.6.6
-
-[all:python_version >= "3.7"]
-simplejpeg
-large-image-source-tifffile>=1.22.3.dev16
-large-image-source-nd2>=1.22.3.dev16
-
-[all:python_version >= "3.8"]
-large-image-source-dicom>=1.22.3.dev16
-large-image-source-rasterio>=1.22.3.dev16
-large-image-source-rasterio[all]>=1.22.3.dev16
-
-[bioformats]
-large-image-source-bioformats>=1.22.3.dev16
-
-[colormaps]
-matplotlib
-
-[converter]
-large-image-converter>=1.22.3.dev16
-
-[deepzoom]
-large-image-source-deepzoom>=1.22.3.dev16
-
-[dicom]
-
-[dicom:python_version >= "3.8"]
-large-image-source-dicom>=1.22.3.dev16
-
-[dummy]
-large-image-source-dummy>=1.22.3.dev16
-
-[gdal]
-large-image-source-gdal>=1.22.3.dev16
-
-[mapnik]
-large-image-source-mapnik>=1.22.3.dev16
-
-[memcached]
-
-[memcached:platform_system != "Windows"]
-pylibmc>=1.5.1
-
-[multi]
-large-image-source-multi>=1.22.3.dev16
-
-[nd2]
-
-[nd2:python_version >= "3.7"]
-large-image-source-nd2>=1.22.3.dev16
-
-[ometiff]
-large-image-source-ometiff>=1.22.3.dev16
-
-[openjpeg]
-large-image-source-openjpeg>=1.22.3.dev16
-
-[openslide]
-large-image-source-openslide>=1.22.3.dev16
-
-[performance]
-psutil>=4.2.0
-
-[performance:python_version < "3.7"]
-simplejpeg<1.6.6
-
-[performance:python_version >= "3.7"]
-simplejpeg
-
-[pil]
-large-image-source-pil>=1.22.3.dev16
-
-[rasterio]
-
-[rasterio:python_version >= "3.8"]
-large-image-source-rasterio>=1.22.3.dev16
-
-[sources]
-large-image-source-gdal>=1.22.3.dev16
-large-image-source-multi>=1.22.3.dev16
-large-image-source-deepzoom>=1.22.3.dev16
-large-image-source-ometiff>=1.22.3.dev16
-large-image-source-vips>=1.22.3.dev16
-large-image-source-test>=1.22.3.dev16
-large-image-source-openslide>=1.22.3.dev16
-large-image-source-bioformats>=1.22.3.dev16
-large-image-source-openjpeg>=1.22.3.dev16
-large-image-source-pil>=1.22.3.dev16
-large-image-source-mapnik>=1.22.3.dev16
-large-image-source-dummy>=1.22.3.dev16
-large-image-source-tiff>=1.22.3.dev16
-
-[sources:python_version >= "3.7"]
-large-image-source-tifffile>=1.22.3.dev16
-large-image-source-nd2>=1.22.3.dev16
-
-[sources:python_version >= "3.8"]
-large-image-source-dicom>=1.22.3.dev16
-large-image-source-rasterio>=1.22.3.dev16
-
-[test]
-large-image-source-test>=1.22.3.dev16
-
-[tiff]
-large-image-source-tiff>=1.22.3.dev16
-
-[tifffile]
-
-[tifffile:python_version >= "3.7"]
-large-image-source-tifffile>=1.22.3.dev16
-
-[tiledoutput]
-pyvips
-
-[vips]
-large-image-source-vips>=1.22.3.dev16