Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix imshow()ing PIL-opened images.#13405

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.

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

Already on GitHub?Sign in to your account

Merged
jklymak merged 1 commit intomatplotlib:masterfromanntzer:pil_imshow
Feb 12, 2019
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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 deletionslib/matplotlib/image.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -649,15 +649,7 @@ def set_data(self, A):
----------
A : array-like
"""
# 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
11 changes: 10 additions & 1 deletionlib/matplotlib/tests/test_image.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
from matplotlib.cbook import MatplotlibDeprecationWarning
from matplotlib.image import (AxesImage, BboxImage, FigureImage,
NonUniformImage, PcolorImage)
from matplotlib.testing.decorators import image_comparison
from matplotlib.testing.decorators importcheck_figures_equal,image_comparison
from matplotlib.transforms import Bbox, Affine2D, TransformedBbox

import pytest
Expand DownExpand Up@@ -106,6 +106,15 @@ def test_image_python_io():
plt.imread(buffer)


@check_figures_equal()
def test_imshow_pil(fig_test, fig_ref):
pytest.importorskip("PIL")
img = plt.imread(os.path.join(os.path.dirname(__file__),
'baseline_images', 'test_image', 'uint16.tif'))
fig_test.subplots().imshow(img)
fig_ref.subplots().imshow(np.asarray(img))


def test_imread_pil_uint16():
pytest.importorskip("PIL")
img = plt.imread(os.path.join(os.path.dirname(__file__),
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp