python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-11 16:52:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplified code

Browse Source
This commit is contained in:
Andrew Murray 2022-02-17 22:20:52 +11:00
parent acd33bf62a
commit 985e4fbe40
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/PIL/BlpImagePlugin.py
View File

@ -245,7 +245,7 @@ class BlpImageFile(ImageFile.ImageFile):
if self.magic == b"BLP1": if self.magic == b"BLP1":
decoder = "BLP1" decoder = "BLP1"
self.mode = "RGBA" self.mode = "RGB"
elif self.magic == b"BLP2": elif self.magic == b"BLP2":
decoder = "BLP2" decoder = "BLP2"
self.mode = "RGBA" if self._blp_alpha_depth else "RGB" self.mode = "RGBA" if self._blp_alpha_depth else "RGB"
@ -334,7 +334,7 @@ class BLP1Decoder(_BLPBaseDecoder):
except struct.error: except struct.error:
break break
b, g, r, a = palette[offset] b, g, r, a = palette[offset]
data.extend([r, g, b, 0xFF]) # is there a case where alpha is used? data.extend([r, g, b])
self.set_as_raw(bytes(data)) self.set_as_raw(bytes(data))
else: else:
@ -357,19 +357,8 @@ class BLP1Decoder(_BLPBaseDecoder):
data = BytesIO(data) data = BytesIO(data)
image = JpegImageFile(data) image = JpegImageFile(data)
Image._decompression_bomb_check(image.size) Image._decompression_bomb_check(image.size)
image.mode = "RGBA" image.mode = "RGB"
image.tile = [("jpeg", (0, 0) + self.size, 0, ("RGBA", ""))] image.tile = [("jpeg", (0, 0) + self.size, 0, ("BGRX", ""))]
b, g, r, a = image.split()
if not any(
[a.getpixel((x, y)) for x in range(a.width) for y in range(a.height)]
):
# try to unprotect completely transparent pictures
from PIL import ImageOps
a = ImageOps.invert(a)
image = Image.merge("RGBA", (r, g, b, a))
self.set_as_raw(image.tobytes()) self.set_as_raw(image.tobytes())