Do 2D->1D mapping in call method of colormap

patniharshit · patniharshit · commit 4d0355293f82 · 2017-08-27T15:00:04.000+05:30
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -473,6 +473,11 @@ def __call__(self, X, alpha=None, bytes=False):
             xa = np.array([X])
         else:
             vtype = 'array'
+            if isinstance(self, BivariateColormap):
+                X[0] = X[0] * 256
+                X[1] = X[1] * 256
+                X = X.astype(int)
+                X = X[0] + X[1] * 256
             xma = np.ma.array(X, copy=True)  # Copy here to avoid side effects.
             mask_bad = xma.mask              # Mask will be used below.
             xa = xma.filled()                # Fill to avoid infs, etc.
@@ -1427,14 +1432,9 @@ def __call__(self, values, clip=None):
         if clip is None:
             clip = [self.norm1.clip, self.norm2.clip]
 
-        temp = np.asarray([self.norm1(values[0], clip=clip[0]),
+        return np.asarray([self.norm1(values[0], clip=clip[0]),
                           self.norm2(values[1], clip=clip[1])])
 
-        temp[0] = temp[0] * (256)
-        temp[1] = temp[1] * (256)
-        temp = temp.astype(int)
-        return temp[0] + temp[1] * 256
-
     def autoscale(self, A):
         """
         Set *vmin*, *vmax* to min, max of *A*.
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -375,7 +375,8 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
             if A.ndim == 2 or (A.ndim == 3 and
                                isinstance(self.norm, mcolors.BivariateNorm)):
                 A = self.norm(A)
-                if A.dtype.kind == 'f':
+                if (A.dtype.kind == 'f' and
+                        not isinstance(self.norm, mcolors.BivariateNorm)):
                     # If the image is greyscale, convert to RGBA and
                     # use the extra channels for resizing the over,
                     # under, and bad pixels.  This is needed because
@@ -421,7 +422,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
 
             if not created_rgba_mask:
                 # Always convert to RGBA, even if only RGB input
-                isBivari = (A.ndim == 2 and A.shape[0] == 2)
+                isBivari = (A.ndim == 3 and A.shape[0] == 2)
                 if A.shape[2] == 3:
                     A = _rgb_to_rgba(A)
                 elif A.shape[2] != 4 and not isBivari:
