Merge pull request #15521 from meeseeksmachine/auto-backport-of-pr-15519-on-v3.2.x

jklymak · web-flow · commit ba518b049a72 · 2019-10-25T15:34:27.000-07:00
Backport PR #15519 on branch v3.2.x (FIX: fix anti-aliasing zoom bug)
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -178,11 +178,10 @@ def _resample(
     if interpolation == 'antialiased':
         # don't antialias if upsampling by an integer number or
         # if zooming in more than a factor of 3
-        shape = list(data.shape)
-        if image_obj.origin == 'upper':
-            shape[0] = 0
-        dispx, dispy = transform.transform([shape[1], shape[0]])
-
+        pos = np.array([[0, 0], [data.shape[1], data.shape[0]]])
+        disp = transform.transform(pos)
+        dispx = np.abs(np.diff(disp[:, 0]))
+        dispy = np.abs(np.diff(disp[:, 1]))
         if ((dispx > 3 * data.shape[1] or
                 dispx == data.shape[1] or
                 dispx == 2 * data.shape[1]) and
@@ -192,7 +191,6 @@ def _resample(
             interpolation = 'nearest'
         else:
             interpolation = 'hanning'
-
     out = np.zeros(out_shape + data.shape[2:], data.dtype)  # 2D->2D, 3D->3D.
     if resample is None:
         resample = image_obj.get_resample()
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -199,6 +199,24 @@ def test_imshow_upsample3(fig_test, fig_ref):
     axs.imshow(A, interpolation='nearest')
 
 
+@check_figures_equal(extensions=['png'])
+def test_imshow_zoom(fig_test, fig_ref):
+    # should be less than 3 upsample, so should be nearest...
+    np.random.seed(19680801)
+    dpi = 100
+    A = np.random.rand(int(dpi * 3), int(dpi * 3))
+    for fig in [fig_test, fig_ref]:
+        fig.set_size_inches(2.9, 2.9)
+    axs = fig_test.subplots()
+    axs.imshow(A, interpolation='nearest')
+    axs.set_xlim([10, 20])
+    axs.set_ylim([10, 20])
+    axs = fig_ref.subplots()
+    axs.imshow(A, interpolation='antialiased')
+    axs.set_xlim([10, 20])
+    axs.set_ylim([10, 20])
+
+
 @check_figures_equal()
 def test_imshow_pil(fig_test, fig_ref):
     style.use("default")
