diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2014-12-28 22:58:54 -0500 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2015-01-04 16:34:33 -0500 |
| commit | 9b299132ef8912910df5a90b1628cc3af1efc54d (patch) | |
| tree | c72a130835c069e060b24781675cee8b5dd531e2 /src/colorramp.c | |
| parent | redshift: Add gamma_is_valid function to check gamma (diff) | |
| download | redshift-ng-9b299132ef8912910df5a90b1628cc3af1efc54d.tar.gz redshift-ng-9b299132ef8912910df5a90b1628cc3af1efc54d.tar.bz2 redshift-ng-9b299132ef8912910df5a90b1628cc3af1efc54d.tar.xz | |
colorramp: Use supplied gamma ramps as initial value
This changes colorramp_fill() to base the ramp calculations on the
existing values in the supplied tables, instead of basing it on a pure
`i/size` value computed on the fly.
All gamma adjustment methods are changed to explicitly initialize the ramps
to the `i/size` value before calls to colorramp_fill().
Diffstat (limited to 'src/colorramp.c')
| -rw-r--r-- | src/colorramp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/colorramp.c b/src/colorramp.c index d732a18..fda75f2 100644 --- a/src/colorramp.c +++ b/src/colorramp.c @@ -297,9 +297,12 @@ colorramp_fill(uint16_t *gamma_r, uint16_t *gamma_g, uint16_t *gamma_b, &blackbody_color[temp_index+3], white_point); for (int i = 0; i < size; i++) { - gamma_r[i] = F((float)i/size, 0) * (UINT16_MAX+1); - gamma_g[i] = F((float)i/size, 1) * (UINT16_MAX+1); - gamma_b[i] = F((float)i/size, 2) * (UINT16_MAX+1); + gamma_r[i] = F((double)gamma_r[i]/(UINT16_MAX+1), 0) * + (UINT16_MAX+1); + gamma_g[i] = F((double)gamma_g[i]/(UINT16_MAX+1), 1) * + (UINT16_MAX+1); + gamma_b[i] = F((double)gamma_b[i]/(UINT16_MAX+1), 2) * + (UINT16_MAX+1); } } @@ -315,9 +318,9 @@ colorramp_fill_float(float *gamma_r, float *gamma_g, float *gamma_b, &blackbody_color[temp_index+3], white_point); for (int i = 0; i < size; i++) { - gamma_r[i] = F((float)i/size, 0); - gamma_g[i] = F((float)i/size, 1); - gamma_b[i] = F((float)i/size, 2); + gamma_r[i] = F((double)gamma_r[i], 0); + gamma_g[i] = F((double)gamma_g[i], 1); + gamma_b[i] = F((double)gamma_b[i], 2); } } |