remove cmap in imshow and pcolorfast

patniharshit · patniharshit · commit f9dc4b1fd48f · 2017-08-27T15:00:04.000+05:30
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5140,8 +5140,7 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
 
         temp = np.asarray(X)
         if temp.ndim == 3 and isinstance(norm, mcolors.BivariateNorm):
-                    temp = norm(temp)
-                    X = cmap(temp, alpha=self.get_alpha(), bytes=True)
+                    X = norm(temp)
 
         if not self._hold:
             self.cla()
@@ -5775,7 +5774,6 @@ def pcolorfast(self, *args, **kwargs):
         if (C.ndim == 3 and isBivari):
             C = norm(C)
             nr, nc = C.shape
-            C = cmap(C, alpha=alpha, bytes=True)
         else:
             nr, nc = C.shape
         if len(args) == 1:
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -862,18 +862,18 @@ def reversed(self, name=None):
 class BivariateColormap(Colormap):
     def __init__(self, name='bivariate', N=256):
         Colormap.__init__(self, name, N)
+        self.N = self.N * self.N
 
     def _init(self):
-        red = np.linspace(0, 1, self.N)
-        green = np.linspace(0, 1, self.N)
+        red = np.linspace(0, 1, np.sqrt(self.N))
+        green = np.linspace(0, 1, np.sqrt(self.N))
         red_mesh, green_mesh = np.meshgrid(red, green)
         blue_mesh = np.zeros_like(red_mesh)
         alpha_mesh = np.ones_like(red_mesh)
         bivariate_cmap = np.dstack((red_mesh, green_mesh, blue_mesh,
                                     alpha_mesh))
         self._lut = np.vstack(bivariate_cmap)
         self._isinit = True
-        self.N = self.N * self.N
         self._set_extremes()
 
     def _resample(self, lutsize):
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -363,7 +363,8 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 raise ValueError("Invalid dimensions, got {}".format(A.shape))
 
             if A.ndim == 2:
-                A = self.norm(A)
+                if not isinstance(self.norm, mcolors.BivariateNorm):
+                    A = self.norm(A)
                 if A.dtype.kind == 'f':
                     # If the image is greyscale, convert to RGBA and
                     # use the extra channels for resizing the over,
