Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use rounding in ImageOps contain() and pad() #6522

Merged
merged 5 commits into from Sep 21, 2022
Merged

Use rounding in ImageOps contain() and pad() #6522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be9224f
ImageOps.contain function finding new size issue
bibinhashley Aug 22, 2022
192aae9
Merge branch 'main' into ImageOps.contain-function-issue-in-finding-n…
radarhere Aug 24, 2022
df4bb34
Added test
radarhere Aug 24, 2022
f9d3ee0
Round position in pad()
radarhere Aug 24, 2022
cf4017b
Merge pull request #1 from radarhere/ImageOps.contain-function-issue-…
bibinhashley Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions Tests/test_imageops.py
View file
Open in desktop
Expand Up @@ -110,6 +110,16 @@ def test_contain(new_size):
assert new_im.size == (256, 256)


def test_contain_round():
im = Image.new("1", (43, 63), 1)
new_im = ImageOps.contain(im, (5, 7))
assert new_im.width == 5

im = Image.new("1", (63, 43), 1)
new_im = ImageOps.contain(im, (7, 5))
assert new_im.height == 5


def test_pad():
# Same ratio
im = hopper()
Expand All @@ -130,6 +140,15 @@ def test_pad():
)


def test_pad_round():
im = Image.new("1", (1, 1), 1)
new_im = ImageOps.pad(im, (4, 1))
assert new_im.load()[2, 0] == 1

new_im = ImageOps.pad(im, (1, 4))
assert new_im.load()[0, 2] == 1


def test_pil163():
# Division by zero in equalize if < 255 pixels in image (@PIL163)

Expand Down
8 changes: 4 additions & 4 deletions src/PIL/ImageOps.py
View file
Open in desktop
Expand Up @@ -255,11 +255,11 @@ def contain(image, size, method=Image.Resampling.BICUBIC):

if im_ratio != dest_ratio:
if im_ratio > dest_ratio:
new_height = int(image.height / image.width * size[0])
new_height = round(image.height / image.width * size[0])
if new_height != size[1]:
size = (size[0], new_height)
else:
new_width = int(image.width / image.height * size[1])
new_width = round(image.width / image.height * size[1])
if new_width != size[0]:
size = (new_width, size[1])
return image.resize(size, resample=method)
Expand Down Expand Up @@ -292,10 +292,10 @@ def pad(image, size, method=Image.Resampling.BICUBIC, color=None, centering=(0.5
else:
out = Image.new(image.mode, size, color)
if resized.width != size[0]:
x = int((size[0] - resized.width) * max(0, min(centering[0], 1)))
x = round((size[0] - resized.width) * max(0, min(centering[0], 1)))
out.paste(resized, (x, 0))
else:
y = int((size[1] - resized.height) * max(0, min(centering[1], 1)))
y = round((size[1] - resized.height) * max(0, min(centering[1], 1)))
out.paste(resized, (0, y))
return out

Expand Down