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

Improved ImageOps palette handling #6596

Merged
merged 7 commits into from
Sep 26, 2022
Merged

Improved ImageOps palette handling #6596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d80aa74
Put palette into the new pad image
PososikTeam Sep 18, 2022
d88200e
fix bug
PososikTeam Sep 18, 2022
c0aaf54
Removed unnecessary palette copy
radarhere Sep 19, 2022
279ddf4
Use getpalette() in ImageOps
radarhere Sep 19, 2022
3c42b27
Copy palette in expand() for PA
radarhere Sep 19, 2022
597dff7
Merge pull request #1 from radarhere/fix-padding
PososikTeam Sep 19, 2022
b3e847a
Merge branch 'main' into fix-padding
radarhere Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Tests/test_imageops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,21 @@ def test_pad_round():
assert new_im.load()[0, 2] == 1


@pytest.mark.parametrize("mode", ("P", "PA"))
def test_palette(mode):
im = hopper(mode)

# Expand
expanded_im = ImageOps.expand(im)
assert_image_equal(im.convert("RGB"), expanded_im.convert("RGB"))

# Pad
padded_im = ImageOps.pad(im, (256, 128), centering=(0, 0))
assert_image_equal(
im.convert("RGB"), padded_im.convert("RGB").crop((0, 0, 128, 128))
)


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

Expand Down
9 changes: 5 additions & 4 deletions src/PIL/ImageOps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import operator
import re

from . import Image
from . import Image, ImagePalette

#
# helpers
Expand Down Expand Up @@ -291,6 +291,8 @@ def pad(image, size, method=Image.Resampling.BICUBIC, color=None, centering=(0.5
out = resized
else:
out = Image.new(image.mode, size, color)
if resized.palette:
out.putpalette(resized.getpalette())
if resized.width != size[0]:
x = round((size[0] - resized.width) * max(0, min(centering[0], 1)))
out.paste(resized, (x, 0))
Expand Down Expand Up @@ -396,9 +398,8 @@ def expand(image, border=0, fill=0):
width = left + image.size[0] + right
height = top + image.size[1] + bottom
color = _color(fill, image.mode)
if image.mode == "P" and image.palette:
image.load()
palette = image.palette.copy()
if image.palette:
palette = ImagePalette.ImagePalette(palette=image.getpalette())
if isinstance(color, tuple):
color = palette.getcolor(color)
else:
Expand Down