large-image 1.30.6.dev35__tar.gz → 1.30.6.dev38__tar.gz

{large_image-1.30.6.dev35/large_image.egg-info → large_image-1.30.6.dev38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image
-Version: 1.30.6.dev35
+Version: 1.30.6.dev38
 Summary: Python modules to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -30,7 +30,7 @@ Requires-Dist: pylibmc>=1.5.1; platform_system != "Windows" and extra == "memcac
 Provides-Extra: redis
 Requires-Dist: redis>=4.5.5; extra == "redis"
 Provides-Extra: converter
-Requires-Dist: large-image-converter>=1.30.6.dev35; extra == "converter"
+Requires-Dist: large-image-converter>=1.30.6.dev38; extra == "converter"
 Provides-Extra: colormaps
 Requires-Dist: matplotlib; extra == "colormaps"
 Requires-Dist: tol_colors; extra == "colormaps"
@@ -40,108 +40,108 @@ Provides-Extra: performance
 Requires-Dist: psutil>=4.2.0; extra == "performance"
 Requires-Dist: simplejpeg; extra == "performance"
 Provides-Extra: bioformats
-Requires-Dist: large-image-source-bioformats>=1.30.6.dev35; extra == "bioformats"
+Requires-Dist: large-image-source-bioformats>=1.30.6.dev38; extra == "bioformats"
 Provides-Extra: deepzoom
-Requires-Dist: large-image-source-deepzoom>=1.30.6.dev35; extra == "deepzoom"
+Requires-Dist: large-image-source-deepzoom>=1.30.6.dev38; extra == "deepzoom"
 Provides-Extra: dicom
-Requires-Dist: large-image-source-dicom>=1.30.6.dev35; extra == "dicom"
+Requires-Dist: large-image-source-dicom>=1.30.6.dev38; extra == "dicom"
 Provides-Extra: dummy
-Requires-Dist: large-image-source-dummy>=1.30.6.dev35; extra == "dummy"
+Requires-Dist: large-image-source-dummy>=1.30.6.dev38; extra == "dummy"
 Provides-Extra: gdal
-Requires-Dist: large-image-source-gdal>=1.30.6.dev35; extra == "gdal"
+Requires-Dist: large-image-source-gdal>=1.30.6.dev38; extra == "gdal"
 Provides-Extra: mapnik
-Requires-Dist: large-image-source-mapnik>=1.30.6.dev35; extra == "mapnik"
+Requires-Dist: large-image-source-mapnik>=1.30.6.dev38; extra == "mapnik"
 Provides-Extra: multi
-Requires-Dist: large-image-source-multi>=1.30.6.dev35; extra == "multi"
+Requires-Dist: large-image-source-multi>=1.30.6.dev38; extra == "multi"
 Provides-Extra: nd2
-Requires-Dist: large-image-source-nd2>=1.30.6.dev35; extra == "nd2"
+Requires-Dist: large-image-source-nd2>=1.30.6.dev38; extra == "nd2"
 Provides-Extra: ometiff
-Requires-Dist: large-image-source-ometiff>=1.30.6.dev35; extra == "ometiff"
+Requires-Dist: large-image-source-ometiff>=1.30.6.dev38; extra == "ometiff"
 Provides-Extra: openjpeg
-Requires-Dist: large-image-source-openjpeg>=1.30.6.dev35; extra == "openjpeg"
+Requires-Dist: large-image-source-openjpeg>=1.30.6.dev38; extra == "openjpeg"
 Provides-Extra: openslide
-Requires-Dist: large-image-source-openslide>=1.30.6.dev35; extra == "openslide"
+Requires-Dist: large-image-source-openslide>=1.30.6.dev38; extra == "openslide"
 Provides-Extra: pil
-Requires-Dist: large-image-source-pil>=1.30.6.dev35; extra == "pil"
+Requires-Dist: large-image-source-pil>=1.30.6.dev38; extra == "pil"
 Provides-Extra: rasterio
-Requires-Dist: large-image-source-rasterio>=1.30.6.dev35; extra == "rasterio"
+Requires-Dist: large-image-source-rasterio>=1.30.6.dev38; extra == "rasterio"
 Provides-Extra: test
-Requires-Dist: large-image-source-test>=1.30.6.dev35; extra == "test"
+Requires-Dist: large-image-source-test>=1.30.6.dev38; extra == "test"
 Provides-Extra: tiff
-Requires-Dist: large-image-source-tiff>=1.30.6.dev35; extra == "tiff"
+Requires-Dist: large-image-source-tiff>=1.30.6.dev38; extra == "tiff"
 Provides-Extra: tifffile
-Requires-Dist: large-image-source-tifffile>=1.30.6.dev35; extra == "tifffile"
+Requires-Dist: large-image-source-tifffile>=1.30.6.dev38; extra == "tifffile"
 Provides-Extra: vips
-Requires-Dist: large-image-source-vips>=1.30.6.dev35; extra == "vips"
+Requires-Dist: large-image-source-vips>=1.30.6.dev38; extra == "vips"
 Provides-Extra: zarr
-Requires-Dist: large-image-source-zarr>=1.30.6.dev35; extra == "zarr"
+Requires-Dist: large-image-source-zarr>=1.30.6.dev38; extra == "zarr"
 Provides-Extra: sources
-Requires-Dist: large-image-source-deepzoom>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-openslide>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-rasterio>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-vips>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-gdal>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-pil>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-multi>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-openjpeg>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-test>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-zarr>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-tifffile>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-dicom>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-nd2>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-tiff>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-dummy>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-ometiff>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-bioformats>=1.30.6.dev35; extra == "sources"
-Requires-Dist: large-image-source-mapnik>=1.30.6.dev35; extra == "sources"
+Requires-Dist: large-image-source-bioformats>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-dicom>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-mapnik>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-rasterio>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-test>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-tiff>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-pil>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-ometiff>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-multi>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-deepzoom>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-gdal>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-tifffile>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-openslide>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-nd2>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-openjpeg>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-dummy>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-vips>=1.30.6.dev38; extra == "sources"
+Requires-Dist: large-image-source-zarr>=1.30.6.dev38; extra == "sources"
 Provides-Extra: all
-Requires-Dist: large-image-source-deepzoom>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-openslide>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-tiff[all]>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-gdal>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-pil>=1.30.6.dev35; extra == "all"
-Requires-Dist: psutil>=4.2.0; extra == "all"
-Requires-Dist: large-image-source-multi>=1.30.6.dev35; extra == "all"
+Requires-Dist: large-image-source-bioformats>=1.30.6.dev38; extra == "all"
 Requires-Dist: matplotlib; extra == "all"
-Requires-Dist: simplejpeg; extra == "all"
-Requires-Dist: large-image-source-tifffile>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-multi[all]>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-dicom>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-pil[all]>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-converter>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-dummy>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-ometiff>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-bioformats>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-tiff>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-rasterio>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-vips>=1.30.6.dev35; extra == "all"
-Requires-Dist: tol_colors; extra == "all"
+Requires-Dist: large-image-source-dicom>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-mapnik>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-pil[all]>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-test>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-multi>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-rasterio[all]>=1.30.6.dev38; extra == "all"
+Requires-Dist: psutil>=4.2.0; extra == "all"
+Requires-Dist: large-image-source-tifffile>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-gdal>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-openjpeg>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-nd2>=1.30.6.dev38; extra == "all"
+Requires-Dist: pylibmc>=1.5.1; platform_system != "Windows" and extra == "all"
 Requires-Dist: pyvips; extra == "all"
-Requires-Dist: large-image-source-zarr>=1.30.6.dev35; extra == "all"
+Requires-Dist: large-image-source-multi[all]>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-vips>=1.30.6.dev38; extra == "all"
+Requires-Dist: tol_colors; extra == "all"
+Requires-Dist: large-image-converter>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-zarr>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-tiff>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-rasterio>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-pil>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-ometiff>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-tiff[all]>=1.30.6.dev38; extra == "all"
+Requires-Dist: large-image-source-deepzoom>=1.30.6.dev38; extra == "all"
+Requires-Dist: simplejpeg; extra == "all"
+Requires-Dist: large-image-source-openslide>=1.30.6.dev38; extra == "all"
 Requires-Dist: redis>=4.5.5; extra == "all"
-Requires-Dist: large-image-source-rasterio[all]>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-nd2>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-mapnik>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-openjpeg>=1.30.6.dev35; extra == "all"
-Requires-Dist: large-image-source-test>=1.30.6.dev35; extra == "all"
-Requires-Dist: pylibmc>=1.5.1; platform_system != "Windows" and extra == "all"
+Requires-Dist: large-image-source-dummy>=1.30.6.dev38; extra == "all"
 Provides-Extra: common
-Requires-Dist: large-image-source-deepzoom>=1.30.6.dev35; extra == "common"
-Requires-Dist: large-image-source-openslide>=1.30.6.dev35; extra == "common"
-Requires-Dist: tol_colors; extra == "common"
-Requires-Dist: large-image-source-zarr>=1.30.6.dev35; extra == "common"
-Requires-Dist: large-image-source-test>=1.30.6.dev35; extra == "common"
-Requires-Dist: large-image-source-multi>=1.30.6.dev35; extra == "common"
-Requires-Dist: redis>=4.5.5; extra == "common"
 Requires-Dist: matplotlib; extra == "common"
-Requires-Dist: simplejpeg; extra == "common"
-Requires-Dist: large-image-source-tifffile>=1.30.6.dev35; extra == "common"
-Requires-Dist: large-image-source-rasterio[all]>=1.30.6.dev35; extra == "common"
-Requires-Dist: large-image-source-dicom>=1.30.6.dev35; extra == "common"
-Requires-Dist: large-image-source-nd2>=1.30.6.dev35; extra == "common"
-Requires-Dist: large-image-source-pil[all]>=1.30.6.dev35; extra == "common"
+Requires-Dist: large-image-source-dicom>=1.30.6.dev38; extra == "common"
+Requires-Dist: redis>=4.5.5; extra == "common"
+Requires-Dist: large-image-source-test>=1.30.6.dev38; extra == "common"
+Requires-Dist: large-image-source-pil[all]>=1.30.6.dev38; extra == "common"
+Requires-Dist: large-image-source-multi>=1.30.6.dev38; extra == "common"
+Requires-Dist: large-image-source-deepzoom>=1.30.6.dev38; extra == "common"
+Requires-Dist: large-image-source-rasterio[all]>=1.30.6.dev38; extra == "common"
 Requires-Dist: psutil>=4.2.0; extra == "common"
+Requires-Dist: large-image-source-tifffile>=1.30.6.dev38; extra == "common"
+Requires-Dist: simplejpeg; extra == "common"
+Requires-Dist: large-image-source-openslide>=1.30.6.dev38; extra == "common"
+Requires-Dist: large-image-source-nd2>=1.30.6.dev38; extra == "common"
 Requires-Dist: pylibmc>=1.5.1; platform_system != "Windows" and extra == "common"
+Requires-Dist: tol_colors; extra == "common"
+Requires-Dist: large-image-source-zarr>=1.30.6.dev38; extra == "common"
 
 Large Image
 ===========

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/docs/generate_format_table.py

@@ -89,9 +89,8 @@ def combine_rows(results):
                     result['tilesource'],
                 ]
                 break
-            else:
-                row_key_index += 1
-                row_key = f'{row_base_key}_{row_key_index}'
+            row_key_index += 1
+            row_key = f'{row_base_key}_{row_key_index}'
         if row_key not in table_rows:
             table_rows[row_key] = result
     return table_rows

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/cache_util/base.py

@@ -30,7 +30,7 @@ class BaseCache(cachetools.Cache):
         """
         curtime = time.time()
         key = (err, func)
-        if (curtime - self.lastError.get(key, {}).get('time', 0) > self.throttleErrors):
+        if curtime - self.lastError.get(key, {}).get('time', 0) > self.throttleErrors:
             skipped = self.lastError.get(key, {}).get('skipped', 0)
             if skipped:
                 msg += '  (%d similar messages)' % skipped

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/cache_util/cache.py

@@ -125,7 +125,7 @@ class LruCacheMetaclass(type):
     namedCaches: Dict[str, Any] = {}
     classCaches: Dict[type, Any] = {}
 
-    def __new__(metacls, name, bases, namespace, **kwargs):
+    def __new__(mcs, name, bases, namespace, **kwargs):
         # Get metaclass parameters by finding and removing them from the class
         # namespace (necessary for Python 2), or preferentially as metaclass
         # arguments (only in Python 3).
@@ -151,7 +151,7 @@ class LruCacheMetaclass(type):
         timeout = kwargs.get('cacheTimeout', timeout)
 
         cls = super().__new__(
-            metacls, name, bases, namespace)
+            mcs, name, bases, namespace)
         if not cacheName:
             cacheName = cls
 

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/cache_util/rediscache.py

@@ -125,8 +125,7 @@ class RedisCache(BaseCache):
         maxmemory = self._getStat('maxmemory')
         if maxmemory:
             return maxmemory
-        else:
-            return self._getStat('total_system_memory')
+        return self._getStat('total_system_memory')
 
     def _reconnect(self) -> None:
         try:

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/config.py

@@ -135,7 +135,7 @@ def _ignoreSourceNames(
     """
     ignored_names = getConfig('source_%s_ignored_names' % configKey) or default
     if not ignored_names or not os.path.isfile(path):
-        return None
+        return
     if re.search(ignored_names, os.path.basename(path), flags=re.IGNORECASE):
         raise exceptions.TileSourceError('File will not be opened by %s reader' % configKey)
 
@@ -157,12 +157,8 @@ def cpu_count(logical: bool = True) -> int:
         count = min(count, len(os.sched_getaffinity(0)))
     except AttributeError:
         pass
-    try:
-        import psutil
-
+    if HAS_PSUTIL:
         count = min(count, psutil.cpu_count(logical) or count)
-    except ImportError:
-        pass
     return max(1, count)
 
 

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/tilesource/__init__.py

@@ -321,7 +321,7 @@ def listMimeTypes(
 
 __all__ = [
     'TileSource', 'FileTileSource',
-    'exceptions', 'TileGeneralError', 'TileSourceError',
+    'TileGeneralError', 'TileSourceError',
     'TileSourceAssetstoreError', 'TileSourceFileNotFoundError',
     'TileGeneralException', 'TileSourceException', 'TileSourceAssetstoreException',
     'TileOutputMimeTypes', 'TILE_FORMAT_IMAGE', 'TILE_FORMAT_PIL', 'TILE_FORMAT_NUMPY',

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/tilesource/base.py

@@ -183,7 +183,7 @@ class TileSource(IPyLeafletMixin):
         We reconstruct our state via the creation caused by the inverse of
         reduce, so we don't report state here.
         """
-        return None
+        return
 
     def __reduce__(self) -> Tuple[functools.partial, Tuple[str]]:
         """
@@ -192,7 +192,6 @@ class TileSource(IPyLeafletMixin):
         Reduce can pass the args but not the kwargs, so use a partial class
         call to reconstruct kwargs.
         """
-        import functools
         import pickle
 
         if not hasattr(self, '_initValues') or hasattr(self, '_unpickleable'):
@@ -316,7 +315,7 @@ class TileSource(IPyLeafletMixin):
             kwargs.get('encoding', 'JPEG'), kwargs.get('jpegQuality', 95),
             kwargs.get('jpegSubsampling', 0), kwargs.get('tiffCompression', 'raw'),
             kwargs.get('edge', False),
-            '__STYLESTART__', kwargs.get('style', None), '__STYLEEND__')
+            '__STYLESTART__', kwargs.get('style'), '__STYLEEND__')
 
     def getState(self) -> str:
         """
@@ -2481,7 +2480,7 @@ class TileSource(IPyLeafletMixin):
         width = kwargs.get('width')
         height = kwargs.get('height')
         if width or height:
-            width, height, calcScale = utilities._calculateWidthHeight(
+            width, height, _ = utilities._calculateWidthHeight(
                 width, height, imageWidth, imageHeight)
             image = image.resize(
                 (width, height),
@@ -2561,7 +2560,7 @@ class FileTileSource(TileSource):
             args[0], kwargs.get('encoding', 'JPEG'), kwargs.get('jpegQuality', 95),
             kwargs.get('jpegSubsampling', 0), kwargs.get('tiffCompression', 'raw'),
             kwargs.get('edge', False),
-            '__STYLESTART__', kwargs.get('style', None), '__STYLEEND__')
+            '__STYLESTART__', kwargs.get('style'), '__STYLEEND__')
 
     def getState(self) -> str:
         if hasattr(self, '_classkey'):

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/tilesource/jupyter.py

@@ -112,7 +112,7 @@ class IPyLeafletMixin:
             base_url = f'http://{self.JUPYTER_HOST}:{port}'
 
         # Use repr in URL params to prevent caching across sources/styles
-        endpoint = f'tile?z={{z}}&x={{x}}&y={{y}}&encoding=png&repr={self.__repr__()}'
+        endpoint = f'tile?z={{z}}&x={{x}}&y={{y}}&encoding=png&repr={self!r}'
         return self._map.make_layer(
             self.metadata,  # type: ignore[attr-defined]
             f'{base_url}/{endpoint}')

large_image-1.30.6.dev38/large_image/tilesource/resample.py

@@ -0,0 +1,125 @@
+from enum import Enum
+from typing import Dict
+
+import numpy as np
+from PIL import Image
+
+
+class ResampleMethod(Enum):
+    PIL_NEAREST = Image.Resampling.NEAREST  # 0
+    PIL_LANCZOS = Image.Resampling.LANCZOS  # 1
+    PIL_BILINEAR = Image.Resampling.BILINEAR  # 2
+    PIL_BICUBIC = Image.Resampling.BICUBIC  # 3
+    PIL_BOX = Image.Resampling.BOX  # 4
+    PIL_HAMMING = Image.Resampling.HAMMING  # 5
+    PIL_MAX_ENUM = 5
+    NP_MEAN = 6
+    NP_MEDIAN = 7
+    NP_MODE = 8
+    NP_MAX = 9
+    NP_MIN = 10
+    NP_NEAREST = 11
+    NP_MAX_COLOR = 12
+    NP_MIN_COLOR = 13
+
+
+def pilResize(
+    tile: np.ndarray,
+    new_shape: Dict,
+    resample_method: ResampleMethod,
+) -> np.ndarray:
+    # Only NEAREST works for 16 bit images
+    img = Image.fromarray(tile)
+    resized_img = img.resize(
+        (new_shape['width'], new_shape['height']),
+        resample=resample_method.value,
+    )
+    result = np.array(resized_img).astype(tile.dtype)
+    return result
+
+
+def numpyResize(
+    tile: np.ndarray,
+    new_shape: Dict,
+    resample_method: ResampleMethod,
+) -> np.ndarray:
+    if resample_method == ResampleMethod.NP_NEAREST:
+        return tile[::2, ::2]
+    if tile.shape[0] % 2 != 0:
+        tile = np.append(tile, np.expand_dims(tile[-1], axis=0), axis=0)
+    if tile.shape[1] % 2 != 0:
+        tile = np.append(tile, np.expand_dims(tile[:, -1], axis=1), axis=1)
+
+    pixel_selection = None
+    subarrays = np.asarray(
+        [
+            tile[0::2, 0::2],
+            tile[1::2, 0::2],
+            tile[0::2, 1::2],
+            tile[1::2, 1::2],
+        ],
+    )
+
+    if resample_method == ResampleMethod.NP_MEAN:
+        return np.mean(subarrays, axis=0).astype(tile.dtype)
+    if resample_method == ResampleMethod.NP_MEDIAN:
+        return np.median(subarrays, axis=0).astype(tile.dtype)
+    if resample_method == ResampleMethod.NP_MAX:
+        return np.max(subarrays, axis=0).astype(tile.dtype)
+    if resample_method == ResampleMethod.NP_MIN:
+        return np.min(subarrays, axis=0).astype(tile.dtype)
+    if resample_method == ResampleMethod.NP_MAX_COLOR:
+        summed = np.sum(subarrays, axis=3)
+        pixel_selection = np.argmax(summed, axis=0)
+    elif resample_method == ResampleMethod.NP_MIN_COLOR:
+        summed = np.sum(subarrays, axis=3)
+        pixel_selection = np.argmin(summed, axis=0)
+    elif resample_method == ResampleMethod.NP_MODE:
+        # if a pixel occurs twice in a set of four, it is a mode
+        # if no mode, default to pixel 0. check for minimal matches 1=2, 1=3, 2=3
+        pixel_selection = np.where(
+            (
+                (subarrays[1] == subarrays[2]).all(axis=2) |
+                (subarrays[1] == subarrays[3]).all(axis=2)
+            ),
+            1, np.where(
+                (subarrays[2] == subarrays[3]).all(axis=2),
+                2, 0,
+            ),
+        )
+
+    if pixel_selection is not None:
+        if len(tile.shape) > 2:
+            pixel_selection = np.expand_dims(pixel_selection, axis=2)
+            pixel_selection = np.repeat(pixel_selection, tile.shape[2], axis=2)
+        return np.choose(pixel_selection, subarrays).astype(tile.dtype)
+    msg = f'Unknown resample method {resample_method}.'
+    raise ValueError(msg)
+
+
+def downsampleTileHalfRes(
+    tile: np.ndarray,
+    resample_method: ResampleMethod,
+) -> np.ndarray:
+    new_shape = {
+        'height': (tile.shape[0] + 1) // 2,
+        'width': (tile.shape[1] + 1) // 2,
+        'bands': 1,
+    }
+    if len(tile.shape) > 2:
+        new_shape['bands'] = tile.shape[-1]
+    if resample_method.value <= ResampleMethod.PIL_MAX_ENUM.value:
+        if new_shape['bands'] > 4:
+            result = np.empty(
+                (new_shape['height'], new_shape['width'], new_shape['bands']),
+                dtype=tile.dtype,
+            )
+            for band_index in range(new_shape['bands']):
+                result[(..., band_index)] = pilResize(
+                    tile[(..., band_index)],
+                    new_shape,
+                    resample_method,
+                )
+            return result
+        return pilResize(tile, new_shape, resample_method)
+    return numpyResize(tile, new_shape, resample_method)

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/tilesource/tiledict.py

@@ -254,8 +254,7 @@ class LazyTileDict(dict):
                     tileData = pilData if pilData is not None else _imageToPIL(tileData)
                     tileFormat = TILE_FORMAT_PIL
                 elif TILE_FORMAT_IMAGE in self.format:
-                    tileData, mimeType = _encodeImage(
-                        tileData, **self.imageKwargs)
+                    tileData, _ = _encodeImage(tileData, **self.imageKwargs)
                     tileFormat = TILE_FORMAT_IMAGE
                 if tileFormat not in self.format:
                     raise exceptions.TileSourceError(

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/tilesource/tileiterator.py

@@ -44,12 +44,9 @@ class TileIterator:
     def __next__(self) -> LazyTileDict:
         if self._iter is None:
             raise StopIteration
-        try:
-            tile = next(self._iter)
-            tile.setFormat(self.format, bool(self.resample), self._kwargs)
-            return tile
-        except StopIteration:
-            raise
+        tile = next(self._iter)
+        tile.setFormat(self.format, bool(self.resample), self._kwargs)
+        return tile
 
     def __repr__(self) -> str:
         repr = f'TileIterator<{self.source}'

{large_image-1.30.6.dev35 → large_image-1.30.6.dev38}/large_image/tilesource/utilities.py

@@ -276,8 +276,7 @@ def _imageToNumpy(
         if len(image.shape) == 3:
             mode = modesBySize[(image.shape[2] - 1) if image.shape[2] <= 4 else 3]
             return image, mode
-        else:
-            mode = 'L'
+        mode = 'L'
     if len(image.shape) == 2:
         image = np.resize(image, (image.shape[0], image.shape[1], 1))
     return image, mode
@@ -335,7 +334,7 @@ def _vipsCast(image: Any, mustBe8Bit: bool = False) -> Any:
     if image.format not in formats or (image.format == pyvips.BandFormat.USHORT and not mustBe8Bit):
         return image
     target, offset, multiplier = formats[image.format]
-    if image.format == pyvips.BandFormat.DOUBLE or image.format == pyvips.BandFormat.FLOAT:
+    if image.format in {pyvips.BandFormat.DOUBLE, pyvips.BandFormat.FLOAT}:
         maxVal = image.max()
         # These thresholds are higher than 256 and 65536 because bicubic and
         # other interpolations can cause value spikes
@@ -388,7 +387,8 @@ def _rasterioParameters(
 
     # add the remaining options
     options.update(tiled=True, bigtiff='IF_SAFER')
-    'predictor' not in options or options.update(predictor=predictor[str(options['predictor'])])
+    if 'predictor' in options:
+        options.update(predictor=predictor[str(options['predictor'])])
 
     return options
 
@@ -997,7 +997,7 @@ def _calculateWidthHeight(
     scaledHeight = max(1, int(regionHeight * cast(float, width) / regionWidth))
     if scaledWidth == width or (
             cast(float, width) * regionHeight > cast(float, height) * regionWidth and
-            not scaledHeight == height):
+            scaledHeight != height):
         scale = float(regionHeight) / cast(float, height)
         width = scaledWidth
     else: