Remove clamp from color_math.h

master
Kenny Levinsen 2020-10-18 00:45:36 +02:00
parent 75b0a71d99
commit fdcdb04023
3 changed files with 7 additions and 3 deletions

View File

@ -133,7 +133,7 @@ static double srgb_gamma(double value, double gamma) {
}
}
double clamp(double value) {
static double clamp(double value) {
if (value > 1.0) {
return 1.0;
} else if (value < 0.0) {

View File

@ -24,6 +24,5 @@ struct sun {
enum sun_condition calc_sun(struct tm *tm, double longitude, double latitude, struct sun *sun);
void calc_whitepoint(int temp, double *rw, double *gw, double *bw);
double clamp(double value);
#endif

7
main.c
View File

@ -397,7 +397,12 @@ static int interpolate_temperature(time_t now, time_t start, time_t stop, int te
if (start == stop) {
return stop;
}
double time_pos = clamp((double)(now - start) / (double)(stop - start));
double time_pos = (double)(now - start) / (double)(stop - start);
if (time_pos > 1.0) {
time_pos = 1.0;
} else if (time_pos < 0.0) {
time_pos = 0.0;
}
int temp_pos = (double)(temp_stop - temp_start) * time_pos;
return temp_start + temp_pos;
}