From d2fc1bd7933685386fb0e2690d0730cc6655437f Mon Sep 17 00:00:00 2001 From: Yay295 Date: Wed, 1 May 2024 14:05:11 -0500 Subject: [PATCH] use new rawmodes in BMP and TGA image plugins --- src/PIL/BmpImagePlugin.py | 6 +++--- src/PIL/TgaImagePlugin.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py index ef204533712..3f4405e3396 100644 --- a/src/PIL/BmpImagePlugin.py +++ b/src/PIL/BmpImagePlugin.py @@ -43,7 +43,7 @@ 1: ("P", "P;1"), 4: ("P", "P;4"), 8: ("P", "P"), - 16: ("RGB", "BGR;15"), + 16: ("RGB", "XRGB;1555"), 24: ("RGB", "BGR"), 32: ("RGB", "BGRX"), } @@ -205,8 +205,8 @@ def _bitmap(self, header=0, offset=0): (32, (0xFF000000, 0xFF00, 0xFF, 0xFF0000)): "BGAR", (32, (0x0, 0x0, 0x0, 0x0)): "BGRA", (24, (0xFF0000, 0xFF00, 0xFF)): "BGR", - (16, (0xF800, 0x7E0, 0x1F)): "BGR;16", - (16, (0x7C00, 0x3E0, 0x1F)): "BGR;15", + (16, (0xF800, 0x7E0, 0x1F)): "RGB;565", + (16, (0x7C00, 0x3E0, 0x1F)): "XRGB;1555", } if file_info["bits"] in SUPPORTED: if ( diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index f16f075df05..67eff213e11 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -36,7 +36,7 @@ (3, 1): "1", (3, 8): "L", (3, 16): "LA", - (2, 16): "BGR;5", + (2, 16): "ARGB;1555", (2, 24): "BGR", (2, 32): "BGRA", } @@ -118,8 +118,9 @@ def _open(self) -> None: start, size, mapdepth = i16(s, 3), i16(s, 5), s[7] if mapdepth == 16: self.palette = ImagePalette.raw( - "BGR;15", b"\0" * 2 * start + self.fp.read(2 * size) + "ARGB;1555", b"\0" * 2 * start + self.fp.read(2 * size) ) + self.palette.mode = "RGBA" elif mapdepth == 24: self.palette = ImagePalette.raw( "BGR", b"\0" * 3 * start + self.fp.read(3 * size)