python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-23 23:30:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7105 from bigcat88/load-before-deepcopy

Browse Source 
Load before getting size in __getstate__
This commit is contained in:
Andrew Murray 2023-04-24 07:47:36 +10:00 committed by GitHub
commit 48a6c3f072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/test_image_copy.py
View File

@ -4,7 +4,7 @@ import pytest
from PIL import Image from PIL import Image
from .helper import hopper from .helper import hopper, skip_unless_feature
@pytest.mark.parametrize("mode", ("1", "P", "L", "RGB", "I", "F")) @pytest.mark.parametrize("mode", ("1", "P", "L", "RGB", "I", "F"))
@ -42,3 +42,10 @@ def test_copy_zero():
out = im.copy() out = im.copy()
assert out.mode == im.mode assert out.mode == im.mode
assert out.size == im.size assert out.size == im.size
@skip_unless_feature("libtiff")
def test_deepcopy():
with Image.open("Tests/images/g4_orientation_5.tif") as im:
out = copy.deepcopy(im)
assert out.size == (590, 88)

3
src/PIL/Image.py
View File

@ -672,7 +672,8 @@ class Image:
return new return new
def __getstate__(self): def __getstate__(self):
return [self.info, self.mode, self.size, self.getpalette(), self.tobytes()] im_data = self.tobytes() # load image first
return [self.info, self.mode, self.size, self.getpalette(), im_data]
def __setstate__(self, state): def __setstate__(self, state):
Image.__init__(self) Image.__init__(self)