Skip to content

Backport PR #13405 on branch v2.2.x (Fix imshow()ing PIL-opened images.) #13415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2019
Merged

Backport PR #13405 on branch v2.2.x (Fix imshow()ing PIL-opened images.) #13415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb7364
Backport PR #13405: Fix imshow()ing PIL-opened images.
jklymak Feb 12, 2019
f6eac94
TST: remove test that relies of tools not backported to v2.2.x
tacaswell Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions lib/matplotlib/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")):
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy