diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-03-18 07:11:24 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-03-18 07:11:24 +0100 |
| commit | b724bf06c94fd35d3a6536cbfd9735bdc2cd870c (patch) | |
| tree | a9c4eb5e816b11e4f9c5a838a7d753e6ff21e5d6 /src/colorramp.c | |
| parent | Merge remote-tracking branch 'maandree/leaks' (diff) | |
| download | redshift-ng-b724bf06c94fd35d3a6536cbfd9735bdc2cd870c.tar.gz redshift-ng-b724bf06c94fd35d3a6536cbfd9735bdc2cd870c.tar.bz2 redshift-ng-b724bf06c94fd35d3a6536cbfd9735bdc2cd870c.tar.xz | |
Apply gamma after brightness and termperature
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/colorramp.c')
| -rw-r--r-- | src/colorramp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/colorramp.c b/src/colorramp.c index cd43e7b..f1988d4 100644 --- a/src/colorramp.c +++ b/src/colorramp.c @@ -291,12 +291,11 @@ colorramp_fill(uint16_t *gamma_r, uint16_t *gamma_g, uint16_t *gamma_b, interpolate_color(alpha, &blackbody_color[temp_index], &blackbody_color[temp_index+3], white_point); +#define F(Y, C) pow((Y) * brightness * white_point[C], 1.0/gamma[C]) + for (int i = 0; i < size; i++) { - gamma_r[i] = pow((float)i/size, 1.0/gamma[0]) * - (UINT16_MAX+1) * brightness * white_point[0]; - gamma_g[i] = pow((float)i/size, 1.0/gamma[1]) * - (UINT16_MAX+1) * brightness * white_point[1]; - gamma_b[i] = pow((float)i/size, 1.0/gamma[2]) * - (UINT16_MAX+1) * brightness * white_point[2]; + 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); } } |