From 625ff24358b3705791450fd68b0f9ad8e8afca98 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Mon, 21 Jul 2014 22:31:32 -0700
Subject: [PATCH] Storage, packing and access for HSV format images

---
 PIL/Image.py         | 1 +
 PIL/PyAccess.py      | 1 +
 Tests/make_hash.py   | 1 +
 libImaging/Access.c  | 5 +++--
 libImaging/Pack.c    | 6 ++++++
 libImaging/Storage.c | 7 +++++++
 libImaging/Unpack.c  | 6 ++++++
 7 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/PIL/Image.py b/PIL/Image.py
index ea8cc6155..a61aaa62b 100644
--- a/PIL/Image.py
+++ b/PIL/Image.py
@@ -220,6 +220,7 @@ _MODEINFO = {
     "CMYK": ("RGB", "L", ("C", "M", "Y", "K")),
     "YCbCr": ("RGB", "L", ("Y", "Cb", "Cr")),
     "LAB": ("RGB", "L", ("L", "A", "B")),
+    "HSV": ("RGB", "L", ("H", "S", "V")),
 
     # 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
diff --git a/PIL/PyAccess.py b/PIL/PyAccess.py
index f76beb820..7ccc313eb 100644
--- a/PIL/PyAccess.py
+++ b/PIL/PyAccess.py
@@ -261,6 +261,7 @@ mode_map = {'1': _PyAccess8,
             'PA': _PyAccess32_2,
             'RGB': _PyAccess32_3,
             'LAB': _PyAccess32_3,
+            'HSV': _PyAccess32_3,
             'YCbCr': _PyAccess32_3,
             'RGBA': _PyAccess32_4,
             'RGBa': _PyAccess32_4,
diff --git a/Tests/make_hash.py b/Tests/make_hash.py
index 32196e9f8..88bb2994b 100644
--- a/Tests/make_hash.py
+++ b/Tests/make_hash.py
@@ -9,6 +9,7 @@ modes = [
     "RGB", "RGBA", "RGBa", "RGBX",
     "CMYK",
     "YCbCr",
+    "LAB", "HSV",
     ]
 
 
diff --git a/libImaging/Access.c b/libImaging/Access.c
index 62c97f3a3..97474a0b8 100644
--- a/libImaging/Access.c
+++ b/libImaging/Access.c
@@ -13,8 +13,8 @@
 #include "Imaging.h"
 
 /* use Tests/make_hash.py to calculate these values */
-#define ACCESS_TABLE_SIZE 21
-#define ACCESS_TABLE_HASH 30197
+#define ACCESS_TABLE_SIZE 27
+#define ACCESS_TABLE_HASH 3078
 
 static struct ImagingAccessInstance access_table[ACCESS_TABLE_SIZE];
 
@@ -238,6 +238,7 @@ ImagingAccessInit()
     ADD("CMYK", line_32, get_pixel_32, put_pixel_32);
     ADD("YCbCr", line_32, get_pixel_32, put_pixel_32);
     ADD("LAB", line_32, get_pixel_32, put_pixel_32);
+    ADD("HSV", line_32, get_pixel_32, put_pixel_32);
 }
 
 ImagingAccess
diff --git a/libImaging/Pack.c b/libImaging/Pack.c
index 1cc1f3a94..fecafbde4 100644
--- a/libImaging/Pack.c
+++ b/libImaging/Pack.c
@@ -566,6 +566,12 @@ static struct {
     {"LAB",  	"A",           8,      band1},
     {"LAB",  	"B",           8,      band2},
 
+    /* HSV */
+    {"HSV",	    "HSV",	       24,     ImagingPackRGB},
+    {"HSV",  	"H",           8,      band0},
+    {"HSV",  	"S",           8,      band1},
+    {"HSV",  	"V",           8,      band2},
+
     /* integer */
     {"I", 	"I",		32,	copy4},
     {"I", 	"I;16B",	16,	packI16B},
diff --git a/libImaging/Storage.c b/libImaging/Storage.c
index c6d2e5c5e..d65de1c0a 100644
--- a/libImaging/Storage.c
+++ b/libImaging/Storage.c
@@ -186,6 +186,13 @@ ImagingNewPrologueSubtype(const char *mode, unsigned xsize, unsigned ysize,
         im->pixelsize = 4;
         im->linesize = xsize * 4;
 
+    } else if (strcmp(mode, "HSV") == 0) {
+        /* 24-bit color, luminance, + 2 color channels */
+        /* L is uint8, a,b are int8 */
+        im->bands = 3;
+        im->pixelsize = 4;
+        im->linesize = xsize * 4;
+
     } else {
         free(im);
         return (Imaging) ImagingError_ValueError("unrecognized mode");
diff --git a/libImaging/Unpack.c b/libImaging/Unpack.c
index 552c759b9..7c453dbfd 100644
--- a/libImaging/Unpack.c
+++ b/libImaging/Unpack.c
@@ -1159,6 +1159,12 @@ static struct {
     {"LAB",  	"A",            8,      band1},
     {"LAB",  	"B",            8,      band2},
 
+    /* HSV Color */
+    {"HSV",	    "HSV",	        24,	    ImagingUnpackRGB},
+    {"HSV",  	"H",            8,      band0},
+    {"HSV",  	"S",            8,      band1},
+    {"HSV",  	"V",            8,      band2},
+
     /* integer variations */
     {"I",       "I",            32,     copy4},
     {"I",       "I;8",          8,      unpackI8},