Merge pull request #4248 from uploadcare/La-packing

Add La mode packing and unpacking
python-pillow · Dec 5, 2019 · 5dc8abf · 5dc8abf
2 parents d19b2c8 + a4a6a9e
commit 5dc8abf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/Tests/test_lib_pack.py b/Tests/test_lib_pack.py
@@ -44,6 +44,9 @@ def test_LA(self):
         self.assert_pack("LA", "LA", 2, (1, 2), (3, 4), (5, 6))
         self.assert_pack("LA", "LA;L", 2, (1, 4), (2, 5), (3, 6))
 
+    def test_La(self):
+        self.assert_pack("La", "La", 2, (1, 2), (3, 4), (5, 6))
+
     def test_P(self):
         self.assert_pack("P", "P;1", b"\xe4", 1, 1, 1, 0, 0, 255, 0, 0)
         self.assert_pack("P", "P;2", b"\xe4", 3, 2, 1, 0)
@@ -269,6 +272,9 @@ def test_LA(self):
         self.assert_unpack("LA", "LA", 2, (1, 2), (3, 4), (5, 6))
         self.assert_unpack("LA", "LA;L", 2, (1, 4), (2, 5), (3, 6))
 
+    def test_La(self):
+        self.assert_unpack("La", "La", 2, (1, 2), (3, 4), (5, 6))
+
     def test_P(self):
         self.assert_unpack("P", "P;1", b"\xe4", 1, 1, 1, 0, 0, 1, 0, 0)
         self.assert_unpack("P", "P;2", b"\xe4", 3, 2, 1, 0)

diff --git a/src/libImaging/Pack.c b/src/libImaging/Pack.c
@@ -555,6 +555,9 @@ static struct {
     {"LA",      "LA",           16,     packLA},
     {"LA",      "LA;L",         16,     packLAL},
 
+    /* greyscale w. alpha premultiplied */
+    {"La",      "La",           16,     packLA},
+
     /* palette */
     {"P",       "P;1",          1,      pack1},
     {"P",       "P;2",          2,      packP2},

diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c
@@ -1306,6 +1306,9 @@ static struct {
     /* greyscale w. alpha */
     {"LA",      "LA",           16,     unpackLA},
     {"LA",      "LA;L",         16,     unpackLAL},
+
+    /* greyscale w. alpha premultiplied */
+    {"La",      "La",           16,     unpackLA},
 
     /* palette */
     {"P",       "P;1",          1,      unpackP1},
@@ -1384,7 +1387,6 @@ static struct {
     {"RGBX",    "RGBX;16N",     64,     unpackRGBA16B},
 #endif
 
-
     /* true colour w. alpha premultiplied */
     {"RGBa",    "RGBa",         32,     copy4},
     {"RGBa",    "BGRa",         32,     unpackBGRA},