Merge pull request #15 from rickyvetter/hsl-nan

Check for 0 on hsl2hsv and tests
Qix- · Jun 2, 2015 · ce5ee4b · ce5ee4b
2 parents 3e79182 + f18e41f
commit ce5ee4b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/conversions.js b/conversions.js
@@ -238,6 +238,13 @@ function hsl2hsv(hsl) {
       s = hsl[1] / 100,
       l = hsl[2] / 100,
       sv, v;
+
+  if(l === 0) {
+      // no need to do calc on black
+      // also avoids divide by 0 error
+      return [0, 0, 0];
+  }
+
   l *= 2;
   s *= (l <= 1) ? l : 2 - l;
   v = (l + s) / 2;

diff --git a/test/basic.js b/test/basic.js
@@ -177,3 +177,11 @@ assert.deepEqual(convert.hwb2rgb([240, 0, 0]), [0,0,255]);
 assert.deepEqual(convert.hwb2rgb([240, 20, 40]), [51, 51, 153]);
 assert.deepEqual(convert.hwb2rgb([240, 40, 40]), [102, 102, 153]);
 assert.deepEqual(convert.hwb2rgb([240, 40, 20]), [102, 102, 204]);
+
+
+// black should always stay black
+val = [0, 0, 0];
+assert.deepEqual(convert.hsl2hsv(val), val);
+assert.deepEqual(convert.hsl2rgb(val), val);
+assert.deepEqual(convert.hsl2hwb(val), [0, 0, 100]);
+assert.deepEqual(convert.hsl2cmyk(val), [0, 0, 0, 100]);