From 39fae6e0770086b1aed7928c32f7cd6f66f5a844 Mon Sep 17 00:00:00 2001
From: Daniel Plakhotich <daniel.plakhotich@gmail.com>
Date: Thu, 14 Jun 2018 12:18:08 +0300
Subject: [PATCH] TGA: Read and write LA data

---
 Tests/images/la.tga                  | Bin 0 -> 7205 bytes
 Tests/test_file_tga.py               |  24 +++++++++++++++++++-----
 docs/handbook/image-file-formats.rst |  12 +++++++-----
 src/PIL/TgaImagePlugin.py            |   6 +++++-
 4 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 Tests/images/la.tga

diff --git a/Tests/images/la.tga b/Tests/images/la.tga
new file mode 100644
index 0000000000000000000000000000000000000000..8c83104ed7e59a750906aae922ceb4b66fdccb38
GIT binary patch
literal 7205
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

literal 0
HcmV?d00001

diff --git a/Tests/test_file_tga.py b/Tests/test_file_tga.py
index ef3acfe65..da92cdf28 100644
--- a/Tests/test_file_tga.py
+++ b/Tests/test_file_tga.py
@@ -41,9 +41,6 @@ class TestFileTga(PillowTestCase):
         test_im = Image.open(test_file)
         self.assertEqual(test_im.size, (100, 100))
 
-        # Unsupported mode save
-        self.assertRaises(IOError, lambda: im.convert("LA").save(test_file))
-
     def test_save_rle(self):
         test_file = "Tests/images/rgb32rle.tga"
         im = Image.open(test_file)
@@ -60,8 +57,25 @@ class TestFileTga(PillowTestCase):
         test_im = Image.open(test_file)
         self.assertEqual(test_im.size, (199, 199))
 
-        # Unsupported mode save
-        self.assertRaises(IOError, lambda: im.convert("LA").save(test_file))
+    def test_save_l_transparency(self):
+        # There are 559 transparent pixels in la.tga.
+        num_transparent = 559
+
+        in_file = "Tests/images/la.tga"
+        im = Image.open(in_file)
+        self.assertEqual(im.mode, "LA")
+        self.assertEqual(
+            im.getchannel("A").getcolors()[0][0], num_transparent)
+
+        test_file = self.tempfile("temp.tga")
+        im.save(test_file)
+
+        test_im = Image.open(test_file)
+        self.assertEqual(test_im.mode, "LA")
+        self.assertEqual(
+            test_im.getchannel("A").getcolors()[0][0], num_transparent)
+
+        self.assert_image_equal(im, test_im)
 
 
 if __name__ == '__main__':
diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst
index dd1a3d2bc..7f2836f54 100644
--- a/docs/handbook/image-file-formats.rst
+++ b/docs/handbook/image-file-formats.rst
@@ -558,6 +558,13 @@ For more information about the SPIDER image processing package, see the
 .. _SPIDER homepage: https://spider.wadsworth.org/spider_doc/spider/docs/spider.html
 .. _Wadsworth Center: https://www.wadsworth.org/
 
+TGA
+^^^
+
+PIL reads and writes TGA images containing ``L``, ``LA``, ``P``,
+``RGB``, and ``RGBA`` data. PIL can read both uncompressed and
+run-length encoded TGAs, but writes only uncompressed data.
+
 TIFF
 ^^^^
 
@@ -927,11 +934,6 @@ PSD
 PIL identifies and reads PSD files written by Adobe Photoshop 2.5 and 3.0.
 
 
-TGA
-^^^
-
-PIL reads 24- and 32-bit uncompressed and run-length encoded TGA files.
-
 WAL
 ^^^
 
diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py
index 76d9ba8de..33b9a3e38 100644
--- a/src/PIL/TgaImagePlugin.py
+++ b/src/PIL/TgaImagePlugin.py
@@ -33,6 +33,7 @@ MODES = {
     (1, 8):  "P",
     (3, 1):  "1",
     (3, 8):  "L",
+    (3, 16): "LA",
     (2, 16): "BGR;5",
     (2, 24): "BGR",
     (2, 32): "BGRA",
@@ -74,6 +75,8 @@ class TgaImageFile(ImageFile.ImageFile):
             self.mode = "L"
             if depth == 1:
                 self.mode = "1"  # ???
+            elif depth == 16:
+                self.mode = "LA"
         elif imagetype in (1, 9):
             self.mode = "P"
         elif imagetype in (2, 10):
@@ -134,6 +137,7 @@ class TgaImageFile(ImageFile.ImageFile):
 SAVE = {
     "1": ("1", 1, 0, 3),
     "L": ("L", 8, 0, 3),
+    "LA": ("LA", 16, 0, 3),
     "P": ("P", 8, 1, 1),
     "RGB": ("BGR", 24, 0, 2),
     "RGBA": ("BGRA", 32, 0, 2),
@@ -152,7 +156,7 @@ def _save(im, fp, filename):
     else:
         colormapfirst, colormaplength, colormapentry = 0, 0, 0
 
-    if im.mode == "RGBA":
+    if im.mode in ("LA", "RGBA"):
         flags = 8
     else:
         flags = 0