Merge pull request #14397 from anntzer/pcolorfast-clip_path

efiring · web-flow · commit 0edc9af051d6 · 2019-06-02T17:04:53.000-10:00
Correctly set clip_path on pcolorfast return artist.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6309,6 +6309,9 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
             ret.set_clim(vmin, vmax)
         elif np.ndim(C) == 2:  # C.ndim == 3 is RGB(A) so doesn't need scaling.
             ret.autoscale_None()
+        if ret.get_clip_path() is None:
+            # image does not already have clipping set, clip to axes patch
+            ret.set_clip_path(self.patch)
 
         ret.sticky_edges.x[:] = [xl, xr]
         ret.sticky_edges.y[:] = [yb, yt]
diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py
@@ -90,9 +90,21 @@ def test_bbox_inches_tight_raster():
 
 
 def test_only_on_non_finite_bbox():
-
     fig, ax = plt.subplots()
     ax.annotate("", xy=(0, float('nan')))
     ax.set_axis_off()
     # we only need to test that it does not error out on save
     fig.savefig(BytesIO(), bbox_inches='tight', format='png')
+
+
+def test_tight_pcolorfast():
+    fig, ax = plt.subplots()
+    ax.pcolorfast(np.arange(4).reshape((2, 2)))
+    ax.set(ylim=(0, .1))
+    buf = BytesIO()
+    fig.savefig(buf, bbox_inches="tight")
+    buf.seek(0)
+    height, width, _ = plt.imread(buf).shape
+    # Previously, the bbox would include the area of the image clipped out by
+    # the axes, resulting in a very tall image given the y limits of (0, 0.1).
+    assert width > height
