Merge pull request #1447 from girder/multisource-scaling-bypass

Bypass some scaling code when compositing multi sources

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.27.2
+
+### Improvements
+- Support range requests when downloading DICOMweb files ([#1444](../../pull/1444))
+- Bypass some scaling code when compositing multi sources ([#1447](../../pull/1447))
+
 ## 1.27.1
 
 ### Improvements

sources/multi/large_image_source_multi/__init__.py

@@ -1112,7 +1112,8 @@ def _addSourceToTile(self, tile, sourceEntry, corners, scale):
                 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 and (scaleY % scale) == 0):
+                ((scaleX % scale) == 0 or math.log(scaleX, 2).is_integer) and
+                ((scaleY % scale) == 0 or math.log(scaleY, 2).is_integer)) and False:
             srccorners = (
                 list(np.dot(bbox['inverse'], np.array(corners).T).T)
                 if transform is not None else corners)