Better thumbnail aspect ratio preservation #4256
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hugovk
approved these changes
Dec 14, 2019
radarhere
reviewed
Dec 16, 2019
| y = int(max(y * size[0] / x, 1)) | ||
| x = int(size[0]) | ||
| y = max(round(y * size[0] / x), 1) | ||
| x = size[0] |
Member
There was a problem hiding this comment.
Just to be aware - by removing the int rounding on these second lines, if someone had existing code im.thumbnail((150.2, 150.2)), it would now break.
That's not unreasonable though.
Member
There was a problem hiding this comment.
Example:
from PIL import Image
im = Image.open("Tests/images/hopper.png")
print(im.size)
im.thumbnail((15.2, 15.2))
print(im.size)
im.thumbnail((10, 10))
print(im.size)On 6.2.1:
(128, 128)
(15, 15)
(10, 10)
On master with this PR:
(128, 128)
Traceback (most recent call last):
File "1.py", line 6, in <module>
im.thumbnail((15.2, 15.2))
File "/Users/hugo/github/Pillow/src/PIL/Image.py", line 2153, in thumbnail
im = self.resize(size, resample)
File "/Users/hugo/github/Pillow/src/PIL/Image.py", line 1822, in resize
return self._new(self.im.resize(size, resample, box))
TypeError: integer argument expected, got float
Should we fix it something like this?
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
index 613b3a36..981c8c81 100644
--- a/src/PIL/Image.py
+++ b/src/PIL/Image.py
@@ -2138,10 +2138,10 @@ class Image:
x, y = self.size
if x > size[0]:
y = max(round(y * size[0] / x), 1)
- x = size[0]
+ x = round(size[0])
if y > size[1]:
x = max(round(x * size[1] / y), 1)
- y = size[1]
+ y = round(size[1])
size = x, y
if size == self.size:(128, 128)
(15, 15)
(10, 10)
radarhere
added a commit
to radarhere/Pillow
that referenced
this pull request
Dec 17, 2019
kernc
added a commit
to kernc/pelican-plugins
that referenced
this pull request
Jul 19, 2020
Due to change in pillow aspect rounding: * python-pillow/Pillow#4256
kdeldycke
pushed a commit
to pelican-plugins/thumbnailer
that referenced
this pull request
Aug 28, 2020
Due to change in pillow aspect rounding: * python-pillow/Pillow#4256
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the source image is 256×162, it's aspect ratio is 1.58. Before, after thumbnailing, for example, the resulting image had 33×20 size, which aspect ratio is 1.65. Now thumbnail returns 33×21 image, with aspect ration 1.57, which is much closer.