mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-02-03 13:14:27 +03:00
Merge pull request #6352 from radarhere/apply_transparency
Added apply_transparency()
This commit is contained in:
commit
8bd7e81b5d
|
@ -849,6 +849,35 @@ class TestImage:
|
|||
im = Image.new("RGB", size)
|
||||
assert im.tobytes() == b""
|
||||
|
||||
def test_apply_transparency(self):
|
||||
im = Image.new("P", (1, 1))
|
||||
im.putpalette((0, 0, 0, 1, 1, 1))
|
||||
assert im.palette.colors == {(0, 0, 0): 0, (1, 1, 1): 1}
|
||||
|
||||
# Test that no transformation is applied without transparency
|
||||
im.apply_transparency()
|
||||
assert im.palette.colors == {(0, 0, 0): 0, (1, 1, 1): 1}
|
||||
|
||||
# Test that a transparency index is applied
|
||||
im.info["transparency"] = 0
|
||||
im.apply_transparency()
|
||||
assert "transparency" not in im.info
|
||||
assert im.palette.colors == {(0, 0, 0, 0): 0, (1, 1, 1, 255): 1}
|
||||
|
||||
# Test that existing transparency is kept
|
||||
im = Image.new("P", (1, 1))
|
||||
im.putpalette((0, 0, 0, 255, 1, 1, 1, 128), "RGBA")
|
||||
im.info["transparency"] = 0
|
||||
im.apply_transparency()
|
||||
assert im.palette.colors == {(0, 0, 0, 0): 0, (1, 1, 1, 128): 1}
|
||||
|
||||
# Test that transparency bytes are applied
|
||||
with Image.open("Tests/images/pil123p.png") as im:
|
||||
assert isinstance(im.info["transparency"], bytes)
|
||||
assert im.palette.colors[(27, 35, 6)] == 24
|
||||
im.apply_transparency()
|
||||
assert im.palette.colors[(27, 35, 6, 214)] == 24
|
||||
|
||||
def test_categories_deprecation(self):
|
||||
with pytest.warns(DeprecationWarning):
|
||||
assert hopper().category == 0
|
||||
|
|
|
@ -123,6 +123,7 @@ methods. Unless otherwise stated, all methods return a new instance of the
|
|||
|
||||
|
||||
.. automethod:: PIL.Image.Image.alpha_composite
|
||||
.. automethod:: PIL.Image.Image.apply_transparency
|
||||
.. automethod:: PIL.Image.Image.convert
|
||||
|
||||
The following example converts an RGB image (linearly calibrated according to
|
||||
|
|
|
@ -57,10 +57,13 @@ TODO
|
|||
API Additions
|
||||
=============
|
||||
|
||||
TODO
|
||||
^^^^
|
||||
Image.apply_transparency
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
TODO
|
||||
Added :py:meth:`~PIL.Image.Image.apply_transparency`, a method to take a P mode image
|
||||
with "transparency" in ``im.info``, and apply the transparency to the palette instead.
|
||||
The image's palette mode will become "RGBA", and "transparency" will be removed from
|
||||
``im.info``.
|
||||
|
||||
Security
|
||||
========
|
||||
|
|
|
@ -1449,6 +1449,28 @@ class Image:
|
|||
rawmode = mode
|
||||
return list(self.im.getpalette(mode, rawmode))
|
||||
|
||||
def apply_transparency(self):
|
||||
"""
|
||||
If a P mode image has a "transparency" key in the info dictionary,
|
||||
remove the key and apply the transparency to the palette instead.
|
||||
"""
|
||||
if self.mode != "P" or "transparency" not in self.info:
|
||||
return
|
||||
|
||||
from . import ImagePalette
|
||||
|
||||
palette = self.getpalette("RGBA")
|
||||
transparency = self.info["transparency"]
|
||||
if isinstance(transparency, bytes):
|
||||
for i, alpha in enumerate(transparency):
|
||||
palette[i * 4 + 3] = alpha
|
||||
else:
|
||||
palette[transparency * 4 + 3] = 0
|
||||
self.palette = ImagePalette.ImagePalette("RGBA", bytes(palette))
|
||||
self.palette.dirty = 1
|
||||
|
||||
del self.info["transparency"]
|
||||
|
||||
def getpixel(self, xy):
|
||||
"""
|
||||
Returns the pixel value at a given position.
|
||||
|
|
Loading…
Reference in New Issue
Block a user