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

Merge pull request #4088 from radarhere/fit

Browse Source 
Do not calculate the crop width in Image.fit if it is already known
This commit is contained in:
Hugo van Kemenade 2019-09-29 12:57:29 +03:00 committed by GitHub
commit d3ae7a1c46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/test_imageops.py
View File

@ -81,6 +81,16 @@ class TestImageOps(PillowTestCase):
newimg = ImageOps.fit(hopper("RGB").resize((100, 1)), (35, 35)) newimg = ImageOps.fit(hopper("RGB").resize((100, 1)), (35, 35))
self.assertEqual(newimg.size, (35, 35)) self.assertEqual(newimg.size, (35, 35))
def test_fit_same_ratio(self):
# The ratio for this image is 1000.0 / 755 = 1.3245033112582782
# If the ratios are not acknowledged to be the same,
# and Pillow attempts to adjust the width to
# 1.3245033112582782 * 755 = 1000.0000000000001
# then centering this greater width causes a negative x offset when cropping
with Image.new("RGB", (1000, 755)) as im:
new_im = ImageOps.fit(im, (1000, 755))
self.assertEqual(new_im.size, (1000, 755))
def test_pad(self): def test_pad(self):
# Same ratio # Same ratio
im = hopper() im = hopper()

6
src/PIL/ImageOps.py
View File

@ -426,7 +426,11 @@ def fit(image, size, method=Image.NEAREST, bleed=0.0, centering=(0.5, 0.5)):
output_ratio = float(size[0]) / size[1] output_ratio = float(size[0]) / size[1]
# figure out if the sides or top/bottom will be cropped off # figure out if the sides or top/bottom will be cropped off
if live_size_ratio >= output_ratio: if live_size_ratio == output_ratio:
# live_size is already the needed ratio
crop_width = live_size[0]
crop_height = live_size[1]
elif live_size_ratio >= output_ratio:
# live_size is wider than what's needed, crop the sides # live_size is wider than what's needed, crop the sides
crop_width = output_ratio * live_size[1] crop_width = output_ratio * live_size[1]
crop_height = live_size[1] crop_height = live_size[1]