Make clip and force vmin and vmax to float64

jklymak · jklymak · commit 2dd9d54f7424 · 2018-02-26T14:48:34.000-08:00
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -402,16 +402,22 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 # a norm first would be good, but ruins the interpolation
                 # of over numbers.
                 if self.norm.vmin is not None and self.norm.vmax is not None:
-                    dv = self.norm.vmax - self.norm.vmin
+                    dv = (np.float64(self.norm.vmax) -
+                            np.float64(self.norm.vmin))
                     vmid = self.norm.vmin + dv / 2
                     newmin = vmid - dv * 1.e7
-                    if newmin > a_min:
-                        A_scaled[A_scaled < newmin ] = newmin
+                    if newmin < a_min:
+                        newmin = None
+                    else:
                         a_min = np.float64(newmin)
                     newmax = vmid + dv * 1.e7
-                    if newmax < a_max:
-                        A_scaled[A_scaled > newmax] = newmax
+                    if newmax > a_max:
+                        newmax = None
+                    else:
                         a_max = np.float64(newmax)
+                    if newmax is not None or newmin is not None:
+                        A_scaled = np.clip(A_scaled, newmin, newmax)
+
                 A_scaled -= a_min
                 # a_min and a_max might be ndarray subclasses so use
                 # asscalar to ensure they are scalars to avoid errors
