large-image-source-multi 1.27.2.dev6__tar.gz → 1.27.2.dev10__tar.gz

{large-image-source-multi-1.27.2.dev6/large_image_source_multi.egg-info → large-image-source-multi-1.27.2.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-multi
-Version: 1.27.2.dev6
+Version: 1.27.2.dev10
 Summary: A tilesource for large_image to composite other tile sources
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

{large-image-source-multi-1.27.2.dev6 → large-image-source-multi-1.27.2.dev10}/large_image_source_multi/__init__.py

@@ -743,6 +743,7 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         # construct a frame list.  Each frame is a list of sources that affect
         # it along with the frame number from that source.
         lastSource = None
+        bandCount = 0
         for sourceIdx, source in enumerate(sources):
             path = source['path']
             if os.path.abspath(path) == absLargeImagePath:
@@ -766,11 +767,14 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                             self._nativeMagnification[key] or tsMag.get(key))
                 numChecked += 1
                 tsMeta = ts.getMetadata()
+                bandCount = max(bandCount, ts.bandCount or 0)
                 if 'bands' in tsMeta and self._info.get('singleBand') is not True:
                     if not hasattr(self, '_bands'):
                         self._bands = {}
                     self._bands.update(tsMeta['bands'])
                 lastSource = source
+            self._bandcount = 1 if self._info.get('singleBand') else (
+                len(self._bands) if hasattr(self, '_bands') else (bandCount or None))
             bbox = self._sourceBoundingBox(source, tsMeta['sizeX'], tsMeta['sizeY'])
             computedWidth = max(computedWidth, int(math.ceil(bbox['right'])))
             computedHeight = max(computedHeight, int(math.ceil(bbox['bottom'])))
@@ -934,19 +938,19 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             vfill = np.zeros(
                 (tile.shape[0] + y - base.shape[0], base.shape[1], base.shape[2]),
                 dtype=base.dtype)
-            if base.shape[2] == 2 or base.shape[2] == 4:
+            if base.shape[2] in {2, 4}:
                 vfill[:, :, -1] = fullAlphaValue(base)
             base = np.vstack((base, vfill))
         if base.shape[1] < tile.shape[1] + x:
             hfill = np.zeros(
                 (base.shape[0], tile.shape[1] + x - base.shape[1], base.shape[2]),
                 dtype=base.dtype)
-            if base.shape[2] == 2 or base.shape[2] == 4:
+            if base.shape[2] in {2, 4}:
                 hfill[:, :, -1] = fullAlphaValue(base)
             base = np.hstack((base, hfill))
         if base.flags.writeable is False:
             base = base.copy()
-        if base.shape[2] == 2 or base.shape[2] == 4:
+        if base.shape[2] in {2, 4}:
             baseA = base[y:y + tile.shape[0], x:x + tile.shape[1], -1].astype(
                 float) / fullAlphaValue(base)
             tileA = tile[:, :, -1].astype(float) / fullAlphaValue(tile)
@@ -1112,8 +1116,8 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                 transform[0][0] > 0 and transform[0][1] == 0 and
                 transform[1][0] == 0 and transform[1][1] > 0 and
                 transform[0][2] % scaleX == 0 and transform[1][2] % scaleY == 0)) and
-                ((scaleX % scale) == 0 or math.log(scaleX, 2).is_integer) and
-                ((scaleY % scale) == 0 or math.log(scaleY, 2).is_integer)) and False:
+                ((scaleX % scale) == 0 or math.log(scaleX, 2).is_integer()) and
+                ((scaleY % scale) == 0 or math.log(scaleY, 2).is_integer())):
             srccorners = (
                 list(np.dot(bbox['inverse'], np.array(corners).T).T)
                 if transform is not None else corners)
@@ -1208,6 +1212,10 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
                                dtype=getattr(self, '_firstdtype', np.uint8))
         if self._info.get('singleBand'):
             tile = tile[:, :, 0]
+        elif tile.shape[2] in {2, 4} and (self._bandCount or tile.shape[2]) < tile.shape[2]:
+            # remove a needless alpha channel
+            if np.all(tile[:, :, -1] == fullAlphaValue(tile)):
+                tile = tile[:, :, :-1]
         # We should always have a tile
         return self._outputTile(tile, TILE_FORMAT_NUMPY, x, y, z,
                                 pilImageAllowed, numpyAllowed, **kwargs)

{large-image-source-multi-1.27.2.dev6 → large-image-source-multi-1.27.2.dev10/large_image_source_multi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-multi
-Version: 1.27.2.dev6
+Version: 1.27.2.dev10
 Summary: A tilesource for large_image to composite other tile sources
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

large-image-source-multi-1.27.2.dev10/large_image_source_multi.egg-info/requires.txt

@@ -0,0 +1,9 @@
+jsonschema
+large-image>=1.27.2.dev10
+pyyaml
+
+[all]
+scikit-image
+
+[girder]
+girder-large-image>=1.27.2.dev10

large-image-source-multi-1.27.2.dev6/large_image_source_multi.egg-info/requires.txt

@@ -1,9 +0,0 @@
-jsonschema
-large-image>=1.27.2.dev6
-pyyaml
-
-[all]
-scikit-image
-
-[girder]
-girder-large-image>=1.27.2.dev6