diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2015-05-10 20:34:47 -0400 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2015-05-10 20:34:47 -0400 |
| commit | 5f26b3d3966b018680017b5b673805efb87f2207 (patch) | |
| tree | 4313a3e9f0dfd661a5f073f7922452e7ca9da726 /src | |
| parent | Merge pull request #201 from maandree/update-gitignore (diff) | |
| parent | Fix CLAMP macro overwritten by glib headers (diff) | |
| download | redshift-ng-5f26b3d3966b018680017b5b673805efb87f2207.tar.gz redshift-ng-5f26b3d3966b018680017b5b673805efb87f2207.tar.bz2 redshift-ng-5f26b3d3966b018680017b5b673805efb87f2207.tar.xz | |
Merge pull request #197 from forivall/clamp-fix
Fix clamp issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/redshift.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/redshift.c b/src/redshift.c index 095e0db..defd0a1 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -49,11 +49,6 @@ #include "systemtime.h" #include "hooks.h" - -#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. */ #ifdef __WIN32__ @@ -97,6 +92,8 @@ # include "location-corelocation.h" #endif +#undef CLAMP +#define CLAMP(lo,mid,up) (((lo) > (mid)) ? (lo) : (((mid) < (up)) ? (mid) : (up))) /* Union of state data for gamma adjustment methods */ typedef union { @@ -978,8 +975,7 @@ run_continual_mode(const location_t *loc, } /* Clamp alpha value */ - adjustment_alpha = - MAX(0.0, MIN(adjustment_alpha, 1.0)); + adjustment_alpha = CLAMP(0.0, adjustment_alpha, 1.0); } /* Interpolate between 6500K and calculated |