color-convert
Advanced tools
Comparing version 1.9.1 to 1.9.2
@@ -98,37 +98,44 @@ /* MIT license */ | ||
convert.rgb.hsv = function (rgb) { | ||
var r = rgb[0]; | ||
var g = rgb[1]; | ||
var b = rgb[2]; | ||
var min = Math.min(r, g, b); | ||
var max = Math.max(r, g, b); | ||
var delta = max - min; | ||
var rdif; | ||
var gdif; | ||
var bdif; | ||
var h; | ||
var s; | ||
var v; | ||
if (max === 0) { | ||
s = 0; | ||
var r = rgb[0] / 255; | ||
var g = rgb[1] / 255; | ||
var b = rgb[2] / 255; | ||
var v = Math.max(r, g, b); | ||
var diff = v - Math.min(r, g, b); | ||
var diffc = function (c) { | ||
return (v - c) / 6 / diff + 1 / 2; | ||
}; | ||
if (diff === 0) { | ||
h = s = 0; | ||
} else { | ||
s = (delta / max * 1000) / 10; | ||
} | ||
s = diff / v; | ||
rdif = diffc(r); | ||
gdif = diffc(g); | ||
bdif = diffc(b); | ||
if (max === min) { | ||
h = 0; | ||
} else if (r === max) { | ||
h = (g - b) / delta; | ||
} else if (g === max) { | ||
h = 2 + (b - r) / delta; | ||
} else if (b === max) { | ||
h = 4 + (r - g) / delta; | ||
if (r === v) { | ||
h = bdif - gdif; | ||
} else if (g === v) { | ||
h = (1 / 3) + rdif - bdif; | ||
} else if (b === v) { | ||
h = (2 / 3) + gdif - rdif; | ||
} | ||
if (h < 0) { | ||
h += 1; | ||
} else if (h > 1) { | ||
h -= 1; | ||
} | ||
} | ||
h = Math.min(h * 60, 360); | ||
if (h < 0) { | ||
h += 360; | ||
} | ||
v = ((max / 255) * 1000) / 10; | ||
return [h, s, v]; | ||
return [ | ||
h * 360, | ||
s * 100, | ||
v * 100 | ||
]; | ||
}; | ||
@@ -135,0 +142,0 @@ |
{ | ||
"name": "color-convert", | ||
"description": "Plain color conversion functions", | ||
"version": "1.9.1", | ||
"version": "1.9.2", | ||
"author": "Heather Arthur <fayearthur@gmail.com>", | ||
@@ -40,8 +40,8 @@ "license": "MIT", | ||
"devDependencies": { | ||
"chalk": "^1.1.1", | ||
"xo": "^0.11.2" | ||
"chalk": "1.1.1", | ||
"xo": "0.11.2" | ||
}, | ||
"dependencies": { | ||
"color-name": "^1.1.1" | ||
"color-name": "1.1.1" | ||
} | ||
} |
26964
836
+ Addedcolor-name@1.1.1(transitive)
- Removedcolor-name@1.1.4(transitive)
Updatedcolor-name@1.1.1