diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2014-12-06 15:02:29 -0500 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2014-12-15 20:31:03 -0500 |
| commit | b2fb992757aa42f6b06ee785d7cbef74e2520caf (patch) | |
| tree | 6b2f5ac9a7c62a5c8ba263b14bce0d0854b77ae8 /src | |
| parent | Merge pull request #145 from jonls/appdata-xml (diff) | |
| download | redshift-ng-b2fb992757aa42f6b06ee785d7cbef74e2520caf.tar.gz redshift-ng-b2fb992757aa42f6b06ee785d7cbef74e2520caf.tar.bz2 redshift-ng-b2fb992757aa42f6b06ee785d7cbef74e2520caf.tar.xz | |
colorramp: Add float-typed colorramp_fill() equivalent
Diffstat (limited to 'src')
| -rw-r--r-- | src/colorramp.c | 28 | ||||
| -rw-r--r-- | src/colorramp.h | 5 |
2 files changed, 29 insertions, 4 deletions
diff --git a/src/colorramp.c b/src/colorramp.c index f1988d4..3521195 100644 --- a/src/colorramp.c +++ b/src/colorramp.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) 2013 Jon Lund Steffensen <jonlst@gmail.com> + Copyright (c) 2013-2014 Jon Lund Steffensen <jonlst@gmail.com> Copyright (c) 2013 Ingo Thies <ithies@astro.uni-bonn.de> */ @@ -280,6 +280,9 @@ interpolate_color(float a, const float *c1, const float *c2, float *c) c[2] = (1.0-a)*c1[2] + a*c2[2]; } +/* Helper macro used in the fill functions */ +#define F(Y, C) pow((Y) * brightness * white_point[C], 1.0/gamma[C]) + void colorramp_fill(uint16_t *gamma_r, uint16_t *gamma_g, uint16_t *gamma_b, int size, int temp, float brightness, const float gamma[3]) @@ -291,11 +294,30 @@ 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] = 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); } } + +void +colorramp_fill_float(float *gamma_r, float *gamma_g, float *gamma_b, + int size, int temp, float brightness, + const float gamma[3]) +{ + /* Approximate white point */ + float white_point[3]; + float alpha = (temp % 100) / 100.0; + int temp_index = ((temp - 1000) / 100)*3; + interpolate_color(alpha, &blackbody_color[temp_index], + &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); + } +} + +#undef F diff --git a/src/colorramp.h b/src/colorramp.h index dd0fa97..f8df478 100644 --- a/src/colorramp.h +++ b/src/colorramp.h @@ -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) 2010 Jon Lund Steffensen <jonlst@gmail.com> + Copyright (c) 2010-2014 Jon Lund Steffensen <jonlst@gmail.com> */ #ifndef REDSHIFT_COLORRAMP_H @@ -24,5 +24,8 @@ void colorramp_fill(uint16_t *gamma_r, uint16_t *gamma_g, uint16_t *gamma_b, int size, int temp, float brightness, const float gamma[3]); +void colorramp_fill_float(float *gamma_r, float *gamma_g, float *gamma_b, + int size, int temp, float brightness, + const float gamma[3]); #endif /* ! REDSHIFT_COLORRAMP_H */ |