From 38402554869bdb2af6ac81bcb90070e939a41c38 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 25 Jun 2024 20:50:17 +1000 Subject: [PATCH] Invert alpha bit for map depth 16 --- Tests/images/p_16.png | Bin 378 -> 414 bytes Tests/test_file_tga.py | 5 +++-- src/PIL/TgaImagePlugin.py | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Tests/images/p_16.png b/Tests/images/p_16.png index e3588641277b804c0100707146a46a506f33d0d6..458f7138e8026159cb9e52a18088db59358e4c44 100644 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU`+LNaSW-L^Y)S>UxNY}4gE|G$2o{oCumKWmr&|6dn*{vnHidV>Yy5l#g^ ohC-$eVTU;kk4A;CheS1lgtNdOv)R!Vz;I{qboFyt=akR{0D$9pJpcdz literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1SEZ8zRh7^V083!aSW-L^Y-FF&I1Yp3 None: def test_palette_depth_16(tmp_path: Path) -> None: with Image.open("Tests/images/p_16.tga") as im: - assert_image_equal_tofile(im.convert("RGB"), "Tests/images/p_16.png") + assert im.palette.mode == "RGBA" + assert_image_equal_tofile(im.convert("RGBA"), "Tests/images/p_16.png") out = str(tmp_path / "temp.png") im.save(out) with Image.open(out) as reloaded: - assert_image_equal_tofile(reloaded.convert("RGB"), "Tests/images/p_16.png") + assert_image_equal_tofile(reloaded.convert("RGBA"), "Tests/images/p_16.png") def test_id_field() -> None: diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index 9bc483fc5..d158fe492 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -117,9 +117,11 @@ class TgaImageFile(ImageFile.ImageFile): # read palette start, size, mapdepth = i16(s, 3), i16(s, 5), s[7] if mapdepth == 16: - self.palette = ImagePalette.raw( - "BGRA;15", b"\0" * 2 * start + self.fp.read(2 * size) - ) + colormap = self.fp.read(2 * size) + palette_data = bytearray(b"\0" * 2 * start) + for a, b in zip(colormap[::2], colormap[1::2]): + palette_data += bytearray((a, b ^ 128)) + self.palette = ImagePalette.raw("BGRA;15", bytes(palette_data)) self.palette.mode = "RGBA" elif mapdepth == 24: self.palette = ImagePalette.raw(