python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 18:06:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Better thumbnail aspect ratio preservation

Browse Source
This commit is contained in:
Alexander 2019-12-07 20:07:27 +03:00
parent 995c863200
commit 791d1a2846
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Tests/test_image_thumbnail.py
View File

@ -5,37 +5,43 @@ from .helper import PillowTestCase, hopper
class TestImageThumbnail(PillowTestCase): class TestImageThumbnail(PillowTestCase):
def test_sanity(self): def test_sanity(self):
im = hopper() im = hopper()
im.thumbnail((100, 100)) self.assertIsNone(im.thumbnail((100, 100)))
self.assert_image(im, im.mode, (100, 100)) self.assertEqual(im.size, (100, 100))
def test_aspect(self): def test_aspect(self):
im = Image.new("L", (128, 128))
im = hopper()
im.thumbnail((100, 100)) im.thumbnail((100, 100))
self.assert_image(im, im.mode, (100, 100)) self.assertEqual(im.size, (100, 100))
im = hopper().resize((128, 256)) im = Image.new("L", (128, 256))
im.thumbnail((100, 100)) im.thumbnail((100, 100))
self.assert_image(im, im.mode, (50, 100)) self.assertEqual(im.size, (50, 100))
im = hopper().resize((128, 256)) im = Image.new("L", (128, 256))
im.thumbnail((50, 100)) im.thumbnail((50, 100))
self.assert_image(im, im.mode, (50, 100)) self.assertEqual(im.size, (50, 100))
im = hopper().resize((256, 128)) im = Image.new("L", (256, 128))
im.thumbnail((100, 100)) im.thumbnail((100, 100))
self.assert_image(im, im.mode, (100, 50)) self.assertEqual(im.size, (100, 50))
im = hopper().resize((256, 128)) im = Image.new("L", (256, 128))
im.thumbnail((100, 50)) im.thumbnail((100, 50))
self.assert_image(im, im.mode, (100, 50)) self.assertEqual(im.size, (100, 50))
im = hopper().resize((128, 128)) im = Image.new("L", (128, 128))
im.thumbnail((100, 100)) im.thumbnail((100, 100))
self.assert_image(im, im.mode, (100, 100)) self.assertEqual(im.size, (100, 100))
im = Image.new("L", (256, 162)) # ratio is 1.5802469136
im.thumbnail((33, 33))
self.assertEqual(im.size, (33, 21)) # ratio is 1.5714285714
im = Image.new("L", (162, 256)) # ratio is 0.6328125
im.thumbnail((33, 33))
self.assertEqual(im.size, (21, 33)) # ratio is 0.6363636364
def test_no_resize(self): def test_no_resize(self):
# Check that draft() can resize the image to the destination size # Check that draft() can resize the image to the destination size
@ -46,4 +52,4 @@ class TestImageThumbnail(PillowTestCase):
# Test thumbnail(), where only draft() is necessary to resize the image # Test thumbnail(), where only draft() is necessary to resize the image
with Image.open("Tests/images/hopper.jpg") as im: with Image.open("Tests/images/hopper.jpg") as im:
im.thumbnail((64, 64)) im.thumbnail((64, 64))
self.assert_image(im, im.mode, (64, 64)) self.assertEqual(im.size, (64, 64))

8
src/PIL/Image.py
View File

@ -2137,11 +2137,11 @@ class Image:
# preserve aspect ratio # preserve aspect ratio
x, y = self.size x, y = self.size
if x > size[0]: if x > size[0]:
y = int(max(y * size[0] / x, 1)) y = max(round(y * size[0] / x), 1)
x = int(size[0]) x = size[0]
if y > size[1]: if y > size[1]:
x = int(max(x * size[1] / y, 1)) x = max(round(x * size[1] / y), 1)
y = int(size[1]) y = size[1]
size = x, y size = x, y
if size == self.size: if size == self.size: