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

Merge pull request #6186 from radarhere/thumbnail_load

Browse Source
This commit is contained in:
Hugo van Kemenade 2022-04-06 11:11:10 +03:00 committed by GitHub
commit 98abd62cc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/test_image_thumbnail.py
View File

@ -88,6 +88,14 @@ def test_no_resize():
assert im.size == (64, 64) assert im.size == (64, 64)
def test_load_first():
# load() may change the size of the image
# Test that thumbnail() is calling it before performing size calculations
with Image.open("Tests/images/g4_orientation_5.tif") as im:
im.thumbnail((64, 64))
assert im.size == (64, 10)
# valgrind test is failing with memory allocated in libjpeg # valgrind test is failing with memory allocated in libjpeg
@pytest.mark.valgrind_known_error(reason="Known Failing") @pytest.mark.valgrind_known_error(reason="Known Failing")
def test_DCT_scaling_edges(): def test_DCT_scaling_edges():
@ -130,4 +138,4 @@ def test_reducing_gap_for_DCT_scaling():
with Image.open("Tests/images/hopper.jpg") as im: with Image.open("Tests/images/hopper.jpg") as im:
im.thumbnail((18, 18), Image.Resampling.BICUBIC, reducing_gap=3.0) im.thumbnail((18, 18), Image.Resampling.BICUBIC, reducing_gap=3.0)
assert_image_equal(ref, im) assert_image_similar(ref, im, 1.4)

1
src/PIL/Image.py
View File

@ -2448,6 +2448,7 @@ class Image:
:returns: None :returns: None
""" """
self.load()
x, y = map(math.floor, size) x, y = map(math.floor, size)
if x >= self.width and y >= self.height: if x >= self.width and y >= self.height:
return return