aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2014-09-02 18:57:38 +0000
committerDimitri Sokolyuk <demon@dim13.org>2014-09-02 18:57:38 +0000
commit1325dba661905e37ed61d0708349d24ab797599b (patch)
treeca0bf317760914fb229e5e78bb4a164b98be28d2
parent1e39204a6186b34b3de21ee346eb4fd6d2a068cc (diff)
unify
-rw-r--r--cms.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/cms.c b/cms.c
index d703e5c..d4e9077 100644
--- a/cms.c
+++ b/cms.c
@@ -34,11 +34,12 @@ hsv2rgb(unsigned short *r, unsigned short *g, unsigned short *b,
s /= 100.0;
v /= 100.0;
- if (s == 0.0) {
- *r = *g = *b = UINT16_MAX * v;
- } else {
- if (h == 1.0)
- h = 0.0;
+ /* default to gray */
+ *r = *g = *b = UINT16_MAX * v;
+
+ if (s > 0.0) {
+ if (h >= 1.0)
+ h -= 1.0;
h *= 6.0;
i = (int)h;
F = h - i;
@@ -85,7 +86,9 @@ hsl2rgb(unsigned short *r, unsigned short *g, unsigned short *b,
v = (l <= 0.5) ? (l * (1.0 + s)) : (l + s - l * s);
- if (v > 0) {
+ if (v > 0.0) {
+ if (h >= 1.0)
+ h -= 1.0;
h *= 6.0;
i = (int)h;
F = h - i;