FIX: image respect norm limits w/ None

jklymak · jklymak · commit 8d53a8aef661 · 2018-05-09T13:32:27.000-07:00
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -394,12 +394,13 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 dv = (np.float64(self.norm.vmax) -
                       np.float64(self.norm.vmin))
                 vmid = self.norm.vmin + dv / 2
-                newmin = vmid - dv * 1.e7
+                fact = 1e7 if scaled_dtype == np.float64 else 1e4
+                newmin = vmid - dv * fact
                 if newmin < a_min:
                     newmin = None
                 else:
                     a_min = np.float64(newmin)
-                newmax = vmid + dv * 1.e7
+                newmax = vmid + dv * fact
                 if newmax > a_max:
                     newmax = None
                 else:
@@ -409,7 +410,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
 
                 A_scaled -= a_min
                 # a_min and a_max might be ndarray subclasses so use
-                # asscalar to ensure they are scalars to avoid errors
+                # asscalar to avoid errors
                 a_min = np.asscalar(a_min.astype(scaled_dtype))
                 a_max = np.asscalar(a_max.astype(scaled_dtype))
 
