Add unsampled kwarg everywhere

matplotlib · tacaswell · Feb 18, 2016 · Dec 22, 2015 · Dec 22, 2015 · Dec 22, 2015
commit 2d2a126baa8e2f015ed76304a043f15fc8ad6cf8
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -369,7 +369,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,

        return output, clipped_bbox.x0, clipped_bbox.y0, t

-    def make_image(self, renderer, magnification=1.0):
+    def make_image(self, renderer, magnification=1.0, unsampled=False):
        raise RuntimeError('The make_image method must be overridden.')

    def _draw_unsampled_image(self, renderer, gc):
@@ -715,10 +715,13 @@ def _check_unsampled_image(self, renderer):
        """
        return False

-    def make_image(self, renderer, magnification=1.0):
+    def make_image(self, renderer, magnification=1.0, unsampled=False):
        if self._A is None:
            raise RuntimeError('You must first set the image array')

+        if unsampled:
+            raise ValueError('unsampled not supported on NonUniformImage')
+
        A = self._A
        if A.ndim == 2:
            if A.dtype != np.uint8:
@@ -847,9 +850,11 @@ def __init__(self, ax,
        self.update(kwargs)
        self.set_data(x, y, A)

-    def make_image(self, renderer, magnification=1.0):
+    def make_image(self, renderer, magnification=1.0, unsampled=False):
        if self._A is None:
            raise RuntimeError('You must first set the image array')
+        if unsampled:
+            raise ValueError('unsampled not supported on PColorImage')
        fc = self.axes.patch.get_facecolor()
        bg = mcolors.colorConverter.to_rgba(fc, 0)
        bg = (np.array(bg)*255).astype(np.uint8)