JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redshift: Add gamma_is_valid function to check gamma

Browse Source 
This checks whether the gamma values are within the bounds of
MIN_GAMMA and MAX_GAMMA.
This commit is contained in:
Jon Lund Steffensen
2015-01-04 16:32:47 -05:00
parent bb61a25e88
commit 017fc230be
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/redshift.c
+15 -12
View File
@@ -731,6 +731,19 @@ parse_brightness_string(const char *str, float *bright_day, float *bright_night)
}
}
/* Check whether gamma is within allowed levels. */
static int
gamma_is_valid(const float gamma[3])
{
return !(gamma[0] < MIN_GAMMA ||
gamma[0] > MAX_GAMMA ||
gamma[1] < MIN_GAMMA ||
gamma[1] > MAX_GAMMA ||
gamma[2] < MIN_GAMMA ||
gamma[2] > MAX_GAMMA);
}
static const gamma_method_t *
find_gamma_method(const char *name)
{
@@ -1511,18 +1524,8 @@ main(int argc, char *argv[])
}
/* Gamma */
if (scheme.day.gamma[0] < MIN_GAMMA ||
scheme.day.gamma[0] > MAX_GAMMA ||
scheme.day.gamma[1] < MIN_GAMMA ||
scheme.day.gamma[1] > MAX_GAMMA ||
scheme.day.gamma[2] < MIN_GAMMA ||
scheme.day.gamma[2] > MAX_GAMMA ||
scheme.night.gamma[0] < MIN_GAMMA ||
scheme.night.gamma[0] > MAX_GAMMA ||
scheme.night.gamma[1] < MIN_GAMMA ||
scheme.night.gamma[1] > MAX_GAMMA ||
scheme.night.gamma[2] < MIN_GAMMA ||
scheme.night.gamma[2] > MAX_GAMMA) {
if (!gamma_is_valid(scheme.day.gamma) ||
!gamma_is_valid(scheme.night.gamma)) {
fprintf(stderr,
_("Gamma value must be between %.1f and %.1f.\n"),
MIN_GAMMA, MAX_GAMMA);