Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix scaling small images in the multi source #1633

Merged
merged 1 commit into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 1.29.9

- Fix scaling small images in the multi source ([#1633](../../pull/1633))

## 1.29.8

### Improvements
Expand Down
2 changes: 1 addition & 1 deletion sources/multi/large_image_source_multi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1119,8 +1119,8 @@ def _getTransformedTile(self, ts, transform, corners, scale, frame, crop=None):
# Recompute where the source corners will land
destcorners = (np.dot(transform, regioncorners.T).T).tolist()
destShape = [
max(max(math.ceil(c[0]) for c in destcorners), srcImage.shape[1]),
max(max(math.ceil(c[1]) for c in destcorners), srcImage.shape[0]),
max(max(math.ceil(c[0]) for c in destcorners), srcImage.shape[1]),
]
if max(0, -x) or max(0, -y):
transform[0][2] -= max(0, -x)
Expand Down
20 changes: 10 additions & 10 deletions test/test_source_multi.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,13 @@ def testMultiAffineTransform():
source = large_image_source_multi.open(imagePath)
frameval = [
[243, 243, 49065],
[3924, 3924, 47676],
[13, 13, 49148],
[2592, 2592, 48093],
[235, 235, 49062],
[942, 942, 48785],
[1014, 1014, 48872],
[198, 198, 49063],
[3920, 3920, 47672],
[13, 13, 49149],
[3943, 3943, 47695],
[246, 246, 49063],
[972, 972, 48785],
[1455, 1455, 48597],
[204, 204, 49059],
]
for frame in range(8):
thumbs = {}
Expand All @@ -292,9 +292,9 @@ def testMultiAffineTransform():
r = np.sum(img[:, :, 0] >= 128)
g = np.sum(img[:, :, 1] >= 128)
b = np.sum(img[:, :, 2] >= 128)
assert abs(r - frameval[frame][0]) < 250
assert abs(g - frameval[frame][1]) < 250
assert abs(b - frameval[frame][2]) < 250
assert abs(r - frameval[frame][0]) < 200
assert abs(g - frameval[frame][1]) < 200
assert abs(b - frameval[frame][2]) < 200
assert abs(np.average(thumbs[2048] - thumbs[256])) < 7
assert abs(np.average(thumbs[1024] - thumbs[256])) < 7
assert abs(np.average(thumbs[512] - thumbs[256])) < 7
Expand Down