diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2015-01-15 09:37:31 -0500 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2015-01-15 09:37:31 -0500 |
| commit | 731a7d2cd5e667a4128800948d02dd60d775be13 (patch) | |
| tree | 3aa8a182fbb686da3f0e39fa9e55fcc1d853aaa4 /src | |
| parent | Merge pull request #159 from christian-burger/master (diff) | |
| download | redshift-ng-731a7d2cd5e667a4128800948d02dd60d775be13.tar.gz redshift-ng-731a7d2cd5e667a4128800948d02dd60d775be13.tar.bz2 redshift-ng-731a7d2cd5e667a4128800948d02dd60d775be13.tar.xz | |
Fix #162: Ensure that interpolation alpha is in [0;1]
Diffstat (limited to 'src')
| -rw-r--r-- | src/redshift.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/redshift.c b/src/redshift.c index fb90bb0..0fcb0ba 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see <http://www.gnu.org/licenses/>. - Copyright (c) 2009-2014 Jon Lund Steffensen <jonlst@gmail.com> + Copyright (c) 2009-2015 Jon Lund Steffensen <jonlst@gmail.com> */ #ifdef HAVE_CONFIG_H @@ -50,8 +50,9 @@ #include "hooks.h" -#define MIN(x,y) ((x) < (y) ? (x) : (y)) -#define MAX(x,y) ((x) > (y) ? (x) : (y)) +#define MIN(x,y) ((x) < (y) ? (x) : (y)) +#define MAX(x,y) ((x) > (y) ? (x) : (y)) +#define CLAMP(lo,x,up) (MAX((lo), MIN((x), (up)))) /* pause() is not defined on windows platform but is not needed either. Use a noop macro instead. */ @@ -427,6 +428,7 @@ interpolate_color_settings(const transition_scheme_t *transition, double alpha = (transition->low - elevation) / (transition->low - transition->high); + alpha = CLAMP(0.0, alpha, 1.0); result->temperature = (1.0-alpha)*night->temperature + alpha*day->temperature; |