python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-26 17:24:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5572 from t-vi/__array__-dtype

Browse Source 
Make Image.__array__ take optional dtype argument
This commit is contained in:
Andrew Murray 2021-07-05 22:05:37 +10:00 committed by GitHub
commit d43d446997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/test_image_array.py
View File

@ -14,6 +14,10 @@ def test_toarray():
ai = numpy.array(im.convert(mode))
return ai.shape, ai.dtype.str, ai.nbytes
def test_with_dtype(dtype):
ai = numpy.array(im, dtype=dtype)
assert ai.dtype == dtype
# assert test("1") == ((100, 128), '|b1', 1600))
assert test("L") == ((100, 128), "|u1", 12800)
@ -27,6 +31,9 @@ def test_toarray():
assert test("RGBA") == ((100, 128, 4), "|u1", 51200)
assert test("RGBX") == ((100, 128, 4), "|u1", 51200)
test_with_dtype(numpy.float64)
test_with_dtype(numpy.uint8)
with Image.open("Tests/images/truncated_jpeg.jpg") as im_truncated:
with pytest.raises(OSError):
numpy.array(im_truncated)

4
src/PIL/Image.py
View File

@ -681,7 +681,7 @@ class Image:
raise ValueError("Could not save to PNG for display") from e
return b.getvalue()
def __array__(self):
def __array__(self, dtype=None):
# numpy array interface support
import numpy as np
@ -700,7 +700,7 @@ class Image:
class ArrayData:
__array_interface__ = new
return np.array(ArrayData())
return np.array(ArrayData(), dtype)
def __getstate__(self):
return [self.info, self.mode, self.size, self.getpalette(), self.tobytes()]