Merge pull request #13415 from meeseeksmachine/auto-backport-of-pr-13405-on-v2.2.x

timhoffm · web-flow · commit 0e25859863ac · 2019-02-12T07:35:03.000Z
Backport PR #13405 on branch v2.2.x (Fix imshow()ing PIL-opened images.)
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -635,15 +635,7 @@ def set_data(self, A):
 
         Note that this function does *not* update the normalization used.
         """
-        # check if data is PIL Image without importing Image
-        if hasattr(A, 'getpixel'):
-            if A.mode == 'L':
-                # greyscale image, but our logic assumes rgba:
-                self._A = pil_to_array(A.convert('RGBA'))
-            else:
-                self._A = pil_to_array(A)
-        else:
-            self._A = cbook.safe_masked_invalid(A, copy=True)
+        self._A = cbook.safe_masked_invalid(A, copy=True)
 
         if (self._A.dtype != np.uint8 and
                 not np.can_cast(self._A.dtype, float, "same_kind")):
