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.

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

Do not premultiply alpha when resizing with Image.NEAREST resampling #5304

Merged
merged 2 commits into from Mar 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions Tests/test_image_transform.py
Expand Up @@ -143,6 +143,41 @@ def op(im, sz):

self._test_alpha_premult(op)

def _test_nearest(self, op, mode):
# create white image with half transparent,
# do op,
# the image should remain white with half transparent
transparent, opaque = {
"RGBA": ((255, 255, 255, 0), (255, 255, 255, 255)),
"LA": ((255, 0), (255, 255)),
}[mode]
im = Image.new(mode, (10, 10), transparent)
im2 = Image.new(mode, (5, 10), opaque)
im.paste(im2, (0, 0))

im = op(im, (40, 10))

colors = im.getcolors()
assert colors == [
(20 * 10, opaque),
(20 * 10, transparent),
]

@pytest.mark.parametrize("mode", ("RGBA", "LA"))
def test_nearest_resize(self, mode):
def op(im, sz):
return im.resize(sz, Image.NEAREST)

self._test_nearest(op, mode)

@pytest.mark.parametrize("mode", ("RGBA", "LA"))
def test_nearest_transform(self, mode):
def op(im, sz):
(w, h) = im.size
return im.transform(sz, Image.EXTENT, (0, 0, w, h), Image.NEAREST)

self._test_nearest(op, mode)

def test_blank_fill(self):
# attempting to hit
# https://github.com/python-pillow/Pillow/issues/254 reported
Expand Down
6 changes: 3 additions & 3 deletions src/PIL/Image.py
Expand Up @@ -1910,7 +1910,7 @@ def resize(self, size, resample=BICUBIC, box=None, reducing_gap=None):
if self.mode in ("1", "P"):
resample = NEAREST

if self.mode in ["LA", "RGBA"]:
if self.mode in ["LA", "RGBA"] and resample != NEAREST:
im = self.convert(self.mode[:-1] + "a")
im = im.resize(size, resample, box)
return im.convert(self.mode)
Expand Down Expand Up @@ -2394,14 +2394,14 @@ def getdata(self):
:returns: An :py:class:`~PIL.Image.Image` object.
"""

if self.mode == "LA":
if self.mode == "LA" and resample != NEAREST:
return (
self.convert("La")
.transform(size, method, data, resample, fill, fillcolor)
.convert("LA")
)

if self.mode == "RGBA":
if self.mode == "RGBA" and resample != NEAREST:
return (
self.convert("RGBa")
.transform(size, method, data, resample, fill, fillcolor)
Expand Down