Merge pull request #5396 from radarhere/mapdepth

TGA color map entry size is only 1 byte
python-pillow · Apr 18, 2021 · 50fdc15 · 50fdc15
2 parents 28eb578 + 04df6e3
commit 50fdc15
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Tests/images/200x32_p_bl_raw_origin.tga b/Tests/images/200x32_p_bl_raw_origin.tga
diff --git a/Tests/test_file_tga.py b/Tests/test_file_tga.py
@@ -6,7 +6,7 @@
 
 from PIL import Image
 
-from .helper import assert_image_equal, hopper
+from .helper import assert_image_equal, assert_image_equal_tofile, hopper
 
 _TGA_DIR = os.path.join("Tests", "images", "tga")
 _TGA_DIR_COMMON = os.path.join(_TGA_DIR, "common")
@@ -112,6 +112,14 @@ def test_save_wrong_mode(tmp_path):
         im.save(out)
 
 
+def test_save_mapdepth():
+    # This image has been manually hexedited from 200x32_p_bl_raw.tga
+    # to include an origin
+    test_file = "Tests/images/200x32_p_bl_raw_origin.tga"
+    with Image.open(test_file) as im:
+        assert_image_equal_tofile(im, "Tests/images/tga/common/200x32_p.png")
+
+
 def test_save_id_section(tmp_path):
     test_file = "Tests/images/rgb32rle.tga"
     with Image.open(test_file) as im:

diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py
@@ -110,7 +110,7 @@ def _open(self):
 
         if colormaptype:
             # read palette
-            start, size, mapdepth = i16(s, 3), i16(s, 5), i16(s, 7)
+            start, size, mapdepth = i16(s, 3), i16(s, 5), s[7]
             if mapdepth == 16:
                 self.palette = ImagePalette.raw(
                     "BGR;16", b"\0" * 2 * start + self.fp.read(2 * size)