Merge pull request #26335 from eendebakpt/imshow

greglucas · web-flow · commit 4e988f563b38 · 2023-07-27T20:15:21.000-06:00
Optimize imshow
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -731,8 +731,7 @@ def safe_masked_invalid(x, copy=False):
         # copy with the byte order swapped.
         x = x.byteswap(inplace=copy).newbyteorder('N')  # Swap to native order.
     try:
-        xm = np.ma.masked_invalid(x, copy=False)
-        xm.shrink_mask()
+        xm = np.ma.masked_where(~(np.isfinite(x)), x, copy=False)
     except TypeError:
         return x
     return xm
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -735,5 +735,6 @@ def _ensure_cmap(cmap):
     cmap_name = cmap if cmap is not None else mpl.rcParams["image.cmap"]
     # use check_in_list to ensure type stability of the exception raised by
     # the internal usage of this (ValueError vs KeyError)
-    _api.check_in_list(sorted(_colormaps), cmap=cmap_name)
+    if cmap_name not in _colormaps:
+        _api.check_in_list(sorted(_colormaps), cmap=cmap_name)
     return mpl.colormaps[cmap_name]
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1390,6 +1390,12 @@ def autoscale(self, A):
     def autoscale_None(self, A):
         """If vmin or vmax are not set, use the min/max of *A* to set them."""
         A = np.asanyarray(A)
+
+        if isinstance(A, np.ma.MaskedArray):
+            # we need to make the distinction between an array, False, np.bool_(False)
+            if A.mask is False or not A.mask.shape:
+                A = A.data
+
         if self.vmin is None and A.size:
             self.vmin = A.min()
         if self.vmax is None and A.size:
