Simplified conditions

br-Zhang · br-Zhang · commit 94c63045d162 · 2018-03-14T19:17:26.000-04:00
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -363,11 +363,12 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 if inp_dtype.kind == 'f':
                     scaled_dtype = A.dtype
                     # Cast to float64
-                    if A.dtype not in (np.float32, np.float16):
-                        if A.dtype != np.float64:
-                            warnings.warn(
-                                "Casting input data from '{0}' to 'float64'"
-                                "for imshow".format(A.dtype))
+                    # It is important to set scaled_dtype to be float64 even
+                    # if it already scaled_dtype == float64 (on some
+                    # platforms).
+                    if A.dtype not in (np.float64, np.float32, np.float16):
+                        warnings.warn("Casting input data from '{0}' to"
+                                      "'float64' for imshow".format(A.dtype))
                         scaled_dtype = np.float64
                 else:
                     # probably an integer of some type.
