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

Simplified code #1

Merged
merged 3 commits into from
Nov 19, 2022
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
45 changes: 20 additions & 25 deletions Tests/test_file_webp_alpha.py
Expand Up @@ -97,38 +97,33 @@ def test_write_rgba(tmp_path):
assert_image_similar(image, pil_image, 1.0)


def test_write_rgba_keep_transparent(tmp_path):
def test_keep_rgb_values_when_transparent(tmp_path):
"""
Can we write a RGBA mode file to WebP while preserving
the transparent RGB without error.
Does it have the bits we expect?
Saving transparent pixels should retain their original RGB values
when using the "exact" parameter.
"""

temp_output_file = str(tmp_path / "temp.webp")
image = hopper("RGB")

input_image = hopper("RGB")
# make a copy of the image
output_image = input_image.copy()
# make a single channel image with the same size as input_image
new_alpha = Image.new("L", input_image.size, 255)
# make the left half transparent
new_alpha.paste((0,), (0, 0, new_alpha.size[0] // 2, new_alpha.size[1]))
# putalpha on output_image
output_image.putalpha(new_alpha)
# create a copy of the image
# with the left half transparent
half_transparent_image = image.copy()
new_alpha = Image.new("L", (128, 128), 255)
new_alpha.paste(0, (0, 0, 64, 128))
half_transparent_image.putalpha(new_alpha)

# now save with transparent area preserved.
output_image.save(temp_output_file, "WEBP", exact=True, lossless=True)
# even though it is lossless, if we don't put exact=True, the transparent
# area will be filled with black (or something more conducive to compression)
# save with transparent area preserved
temp_file = str(tmp_path / "temp.webp")
half_transparent_image.save(temp_file, exact=True, lossless=True)

with Image.open(temp_output_file) as image:
image.load()
with Image.open(temp_file) as reloaded:
assert reloaded.mode == "RGBA"
assert reloaded.format == "WEBP"

assert image.mode == "RGBA"
assert image.format == "WEBP"
image.load()
image = image.convert("RGB")
assert_image_similar(image, input_image, 1.0)
# even though it is lossless, if we don't use exact=True
# in libwebp >= 0.5, the transparent area will be filled with black
# (or something more conducive to compression)
assert_image_equal(reloaded.convert("RGB"), image)


def test_write_unsupported_mode_PA(tmp_path):
Expand Down
4 changes: 2 additions & 2 deletions src/PIL/WebPImagePlugin.py
Expand Up @@ -318,7 +318,7 @@ def _save(im, fp, filename):
exif = exif[6:]
xmp = im.encoderinfo.get("xmp", "")
method = im.encoderinfo.get("method", 4)
exact = im.encoderinfo.get("exact", False)
exact = 1 if im.encoderinfo.get("exact") else 0

if im.mode not in _VALID_WEBP_LEGACY_MODES:
alpha = (
Expand All @@ -337,7 +337,7 @@ def _save(im, fp, filename):
im.mode,
icc_profile,
method,
1 if exact else 0,
exact,
exif,
xmp,
)
Expand Down