Merge pull request #988 from zbjornson/rrggbbaa

Support #RGBA, #RRGGBBAA hex colors

Author: LinusU

src/color.cc

@@ -550,6 +550,20 @@ rgba_from_rgb(uint8_t r, uint8_t g, uint8_t b) {
   return rgba_from_rgba(r, g, b, 255);
 }
 
+/*
+ * Return rgba from #RRGGBBAA
+ */
+
+static int32_t
+rgba_from_hex8_string(const char *str) {
+  return rgba_from_rgba(
+    (h(str[0]) << 4) + h(str[1]),
+    (h(str[2]) << 4) + h(str[3]),
+    (h(str[4]) << 4) + h(str[5]),
+    (h(str[6]) << 4) + h(str[7])
+  );
+}
+
 /*
  * Return rgb from "#RRGGBB".
  */
@@ -563,6 +577,20 @@ rgba_from_hex6_string(const char *str) {
     );
 }
 
+/*
+* Return rgba from #RGBA
+*/
+
+static int32_t
+rgba_from_hex4_string(const char *str) {
+  return rgba_from_rgba(
+    (h(str[0]) << 4) + h(str[0]),
+    (h(str[1]) << 4) + h(str[1]),
+    (h(str[2]) << 4) + h(str[2]),
+    (h(str[3]) << 4) + h(str[3])
+  );
+}
+
 /*
  * Return rgb from "#RGB"
  */
@@ -673,16 +701,22 @@ rgba_from_hsl_string(const char *str, short *ok) {
  * Return rgb from:
  *  
  *  - "#RGB"
+ *  - "#RGBA"
  *  - "#RRGGBB"
+ *  - "#RRGGBBAA"
  *
  */
 
 static int32_t
 rgba_from_hex_string(const char *str, short *ok) {
   size_t len = strlen(str);
   *ok = 1;
-  if (6 == len) return rgba_from_hex6_string(str);
-  if (3 == len) return rgba_from_hex3_string(str);
+  switch (len) {
+    case 8: return rgba_from_hex8_string(str);
+    case 6: return rgba_from_hex6_string(str);
+    case 4: return rgba_from_hex4_string(str);
+    case 3: return rgba_from_hex3_string(str);
+  }
   return *ok = 0;
 }
 
@@ -705,7 +739,9 @@ rgba_from_name_string(const char *str, short *ok) {
  * Return rgb from:
  *  
  *  - #RGB
+ *  - #RGBA
  *  - #RRGGBB
+ *  - #RRGGBBAA
  *  - rgb(r,g,b)
  *  - rgba(r,g,b,a)
  *  - hsl(h,s,l)

test/canvas.test.js

@@ -140,6 +140,16 @@ describe('Canvas', function () {
     ctx.fillStyle = 'afasdfasdf';
     assert.equal('#ffffff', ctx.fillStyle);
 
+    // #rgba and #rrggbbaa
+    ctx.fillStyle = '#ffccaa80'
+    assert.equal('rgba(255, 204, 170, 0.50)', ctx.fillStyle)
+
+    ctx.fillStyle = '#acf8'
+    assert.equal('rgba(170, 204, 255, 0.53)', ctx.fillStyle)
+
+    ctx.fillStyle = '#BEAD'
+    assert.equal('rgba(187, 238, 170, 0.87)', ctx.fillStyle)
+
     ctx.fillStyle = 'rgb(255,255,255)';
     assert.equal('#ffffff', ctx.fillStyle);