Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commite0d192d

Browse files
committed
Fix an off-by-half-pixel bug when resampling under a nonaffine transform
1 parenta916809 commite0d192d

File tree

2 files changed

+39
-4
lines changed

2 files changed

+39
-4
lines changed

‎lib/matplotlib/tests/test_image.py

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
importurllib.request
1010

1111
importnumpyasnp
12-
fromnumpy.testingimportassert_array_equal
12+
fromnumpy.testingimportassert_allclose,assert_array_equal
1313
fromPILimportImage
1414

1515
importmatplotlibasmpl
@@ -18,7 +18,7 @@
1818
frommatplotlib.imageimport (AxesImage,BboxImage,FigureImage,
1919
NonUniformImage,PcolorImage)
2020
frommatplotlib.testing.decoratorsimportcheck_figures_equal,image_comparison
21-
frommatplotlib.transformsimportBbox,Affine2D,TransformedBbox
21+
frommatplotlib.transformsimportBbox,Affine2D,Transform,TransformedBbox
2222
importmatplotlib.tickerasmticker
2323

2424
importpytest
@@ -1641,6 +1641,41 @@ def test__resample_valid_output():
16411641
resample(np.zeros((9,9)),out)
16421642

16431643

1644+
@pytest.mark.parametrize("data, interpolation, expected",
1645+
[(np.array([[0.1,0.3,0.2]]),mpl._image.NEAREST,
1646+
np.array([[0.1,0.1,0.1,0.3,0.3,0.3,0.3,0.2,0.2,0.2]])),
1647+
(np.array([[0.1,0.3,0.2]]),mpl._image.BILINEAR,
1648+
np.array([[0.1,0.1,0.15078125,0.21096191,0.27033691,
1649+
0.28476562,0.2546875,0.22460938,0.20002441,0.20002441]])),
1650+
]
1651+
)
1652+
deftest__resample_nonaffine(data,interpolation,expected):
1653+
# Test that equivalent affine and nonaffine transforms resample the same
1654+
1655+
# Create a simple affine transform for scaling the input array
1656+
affine_transform=Affine2D().scale(sx=expected.shape[1]/data.shape[1],sy=1)
1657+
1658+
affine_result=np.empty_like(expected)
1659+
mpl._image.resample(data,affine_result,affine_transform,
1660+
interpolation=interpolation)
1661+
assert_allclose(affine_result,expected)
1662+
1663+
# Create a nonaffine version of the same transform
1664+
# by compositing with a nonaffine identity transform
1665+
classNonAffineIdentityTransform(Transform):
1666+
input_dims=2
1667+
output_dims=2
1668+
1669+
definverted(self):
1670+
returnself
1671+
nonaffine_transform=NonAffineIdentityTransform()+affine_transform
1672+
1673+
nonaffine_result=np.empty_like(expected)
1674+
mpl._image.resample(data,nonaffine_result,nonaffine_transform,
1675+
interpolation=interpolation)
1676+
assert_allclose(nonaffine_result,expected)
1677+
1678+
16441679
deftest_axesimage_get_shape():
16451680
# generate dummy image to test get_shape method
16461681
ax=plt.gca()

‎src/_image_wrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ _get_transform_mesh(const py::object& transform, const py::ssize_t *dims)
6666

6767
for (auto y =0; y < dims[0]; ++y) {
6868
for (auto x =0; x < dims[1]; ++x) {
69-
*p++ = (double)x;
70-
*p++ = (double)y;
69+
*p++ = (double)x +0.5;
70+
*p++ = (double)y +0.5;
7171
}
7272
}
7373

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp