From 1c3932e89ff2e1512fc00b52ef518c7fa87818ab Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Thu, 10 Oct 2013 23:27:34 -0700
Subject: [PATCH] Added LAB mode, core dumped

---
 PIL/Image.py           | 2 ++
 Tests/test_imagecms.py | 6 +++---
 _imagingcms.c          | 3 +++
 libImaging/Imaging.h   | 1 +
 libImaging/Pack.c      | 6 ++++++
 libImaging/Storage.c   | 8 +++++++-
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/PIL/Image.py b/PIL/Image.py
index 56a4b7093..9c92bf98f 100644
--- a/PIL/Image.py
+++ b/PIL/Image.py
@@ -200,6 +200,7 @@ _MODEINFO = {
     "RGBA": ("RGB", "L", ("R", "G", "B", "A")),
     "CMYK": ("RGB", "L", ("C", "M", "Y", "K")),
     "YCbCr": ("RGB", "L", ("Y", "Cb", "Cr")),
+    "LAB": ("RGB", "L", ("L", "A", "B")),
 
     # Experimental modes include I;16, I;16L, I;16B, RGBa, BGR;15, and
     # BGR;24.  Use these modes only if you know exactly what you're
@@ -224,6 +225,7 @@ _MODE_CONV = {
     "RGBA": ('|u1', 4),
     "CMYK": ('|u1', 4),
     "YCbCr": ('|u1', 3),
+    "LAB": ('|u1', 3),
     "I;16": ('=u2', None),
     "I;16B": ('>u2', None),
     "I;16L": ('<u2', None),
diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py
index 84a4751d3..8be2ea5b7 100644
--- a/Tests/test_imagecms.py
+++ b/Tests/test_imagecms.py
@@ -97,12 +97,12 @@ def test_lab_color_profile():
     
 def test_lab_color():
     pLab = ImageCms.createProfile("LAB")    
-    t = ImageCms.buildTransform(SRGB, pLab, "RGB", "RGB")
+    t = ImageCms.buildTransform(SRGB, pLab, "RGB", "LAB")
     # need to add a type mapping for some PIL type to TYPE_Lab_8 in findLCMSType,
     # and have that mapping work back to a PIL mode. (likely RGB)
     i = ImageCms.applyTransform(lena(), t)
-    assert_image(i, "RGB", (128, 128))
+    assert_image(i, "LAB", (128, 128))
 
     target = Image.open('Tests/images/lena.Lab.tif')
 
-    assert_image_similar(i,target, 1)
+    assert_image_similar(i, target, 1)
diff --git a/_imagingcms.c b/_imagingcms.c
index d489eed60..1548769d5 100644
--- a/_imagingcms.c
+++ b/_imagingcms.c
@@ -236,6 +236,9 @@ findLCMStype(char* PILmode)
     else if (strcmp(PILmode, "YCC") == 0) {
         return TYPE_YCbCr_8;
     }
+    else if (strcmp(PILmode, "LAB") == 0) {
+        return TYPE_Lab_8;
+    }
 
     else {
         /* take a wild guess... but you probably should fail instead. */
diff --git a/libImaging/Imaging.h b/libImaging/Imaging.h
index 0da13baab..c139aed88 100644
--- a/libImaging/Imaging.h
+++ b/libImaging/Imaging.h
@@ -40,6 +40,7 @@ extern "C" {
  * RGBA	    4		R, G, B, A
  * CMYK	    4		C, M, Y, K
  * YCbCr    4		Y, Cb, Cr, -
+ * Lab      4       L, a, b, -
  *
  * experimental modes (incomplete):
  * LA       4           L, -, -, A
diff --git a/libImaging/Pack.c b/libImaging/Pack.c
index 478de7499..52a478208 100644
--- a/libImaging/Pack.c
+++ b/libImaging/Pack.c
@@ -526,6 +526,12 @@ static struct {
     {"YCbCr",  	"Cb",           8,      band1},
     {"YCbCr",  	"Cr",           8,      band2},
 
+    /* LAB Color */
+    {"LAB",	    "LAB",	     24,	ImagingPackRGB},
+    {"LAB",  	"L",            8,      band0},
+    {"LAB",  	"B",           8,      band1},
+    {"LAB",  	"B",           8,      band2},
+
     /* integer */
     {"I", 	"I",		32,	copy4},
     {"I", 	"I;16B",	16,	packI16B},
diff --git a/libImaging/Storage.c b/libImaging/Storage.c
index eb3be4322..1cfcf0913 100644
--- a/libImaging/Storage.c
+++ b/libImaging/Storage.c
@@ -178,9 +178,15 @@ ImagingNewPrologueSubtype(const char *mode, unsigned xsize, unsigned ysize,
         im->pixelsize = 4;
         im->linesize = xsize * 4;
 
+    } else if (strcmp(mode, "LAB") == 0) {
+        /* 24-bit color, luminance, + 2 color channels */
+        im->bands = 3;
+        im->pixelsize = 4;
+        im->linesize = xsize * 4;
+
     } else {
         free(im);
-	return (Imaging) ImagingError_ValueError("unrecognized mode");
+        return (Imaging) ImagingError_ValueError("unrecognized mode");
     }
 
     /* Setup image descriptor */