matplotlib
diff --git a/‎lib/matplotlib/image.py
Lines changed: 6 additions & 5 deletions b/‎lib/matplotlib/image.py
Lines changed: 6 additions & 5 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf
-1.05 KB b/‎lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf
-1.05 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.svg
Lines changed: 19 additions & 24 deletions b/‎lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.svg
Lines changed: 19 additions & 24 deletions
diff --git a/‎lib/matplotlib/tests/test_image.py
Lines changed: 12 additions & 0 deletions b/‎lib/matplotlib/tests/test_image.py
Lines changed: 12 additions & 0 deletions
@@ -149,7 +149,8 @@ def flush_images():
             del image_group[:]
 
         for a in artists:
-            if isinstance(a, _ImageBase) and a.can_composite():
+            if (isinstance(a, _ImageBase) and a.can_composite() and
+                    a.get_clip_on()):
                 image_group.append(a)
             else:
                 flush_images()
@@ -886,10 +887,10 @@ def make_image(self, renderer, magnification=1.0, unsampled=False):
         x1, x2, y1, y2 = self.get_extent()
         bbox = Bbox(np.array([[x1, y1], [x2, y2]]))
         transformed_bbox = TransformedBbox(bbox, trans)
-        return self._make_image(
-            self._A, bbox, transformed_bbox,
-            self.get_clip_box() or self.axes.bbox,
-            magnification, unsampled=unsampled)
+        clip = ((self.get_clip_box() or self.axes.bbox) if self.get_clip_on()
+                else self.figure.bbox)
+        return self._make_image(self._A, bbox, transformed_bbox, clip,
+                                magnification, unsampled=unsampled)
 
     def _check_unsampled_image(self):
         """Return whether the image would be better drawn unsampled."""
 
@@ -1031,6 +1031,18 @@ def test_relim():
     assert ax.get_xlim() == ax.get_ylim() == (0, 1)
 
 
+def test_unclipped():
+    fig, ax = plt.subplots()
+    im = ax.imshow([[0, 0], [0, 0]], aspect="auto", extent=(-10, 10, -10, 10),
+                   cmap='gray', clip_on=False)
+    ax.set(xlim=(0, 1), ylim=(0, 1))
+    fig.canvas.draw()
+    # The unclipped image should fill the *entire* figure and be black.
+    # Ignore alpha for this comparison.
+    assert (np.array(fig.canvas.buffer_rgba())[..., :3] == 0).all()
+
+
 def test_respects_bbox():
     fig, axs = plt.subplots(2)
     for ax in axs: