From 6569bd48e55e513307581a480a6280940aeaa663 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 1 Sep 2014 18:44:54 +0000 Subject: merge hsv and hsl routines --- spectrogram.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'spectrogram.c') diff --git a/spectrogram.c b/spectrogram.c index 90ca61a..284d685 100644 --- a/spectrogram.c +++ b/spectrogram.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -33,7 +32,7 @@ #include "sio.h" #include "fft.h" -#include "hsv2rgb.h" +#include "cms.h" #define HGAP 4 #define VGAP 1 @@ -80,7 +79,6 @@ enum scale { LIN_SCALE, LOG_SCALE }; unsigned long hsvcolor(Display *d, struct hsv hsv, enum scale scale) { - float r, g, b; int scr = DefaultScreen(d); Colormap cmap = DefaultColormap(d, scr); XColor c; @@ -88,11 +86,7 @@ hsvcolor(Display *d, struct hsv hsv, enum scale scale) if (scale == LOG_SCALE) hsv.v = logf(100 * hsv.v + 1) / logf(101); - hsv2rgb(&r, &g, &b, hsv.h, hsv.s, hsv.v); - - c.red = UINT16_MAX * r; - c.green = UINT16_MAX * g; - c.blue = UINT16_MAX * b; + hsv2rgb(&c.red, &c.green, &c.blue, hsv.h, hsv.s, hsv.v); c.flags = DoRed|DoGreen|DoBlue; XAllocColor(d, cmap, &c); -- cgit v1.2.3