blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 745 Projects 19 Wiki Activity

Fix for negative gamma correction rounding to int

This commit is contained in:
Campbell Barton 2014-03-05 22:33:47 +11:00
parent c169413a0f
commit e49e78e414
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenkernel/intern/seqeffects.c
View File

@ -635,33 +635,35 @@ static void makeGammaTables(float gamma)
static float gammaCorrect(float c)
{
int i;
float res = 0.0;
float res;
i = floor(c * inv_color_step);
i = floorf(c * inv_color_step);
/* Clip to range [0, 1]: outside, just do the complete calculation.
* We may have some performance problems here. Stretching up the LUT
* may help solve that, by exchanging LUT size for the interpolation.
* Negative colors are explicitly handled.
*/
if (i < 0) res = -pow(abs(c), valid_gamma);
else if (i >= RE_GAMMA_TABLE_SIZE) res = pow(c, valid_gamma);
else res = gamma_range_table[i] + ( (c - color_domain_table[i]) * gamfactor_table[i]);
if (UNLIKELY(i < 0)) res = -powf(-c, valid_gamma);
else if (i >= RE_GAMMA_TABLE_SIZE) res = powf(c, valid_gamma);
else res = gamma_range_table[i] +
((c - color_domain_table[i]) * gamfactor_table[i]);
return res;
}
/* ------------------------------------------------------------------------- */
static float invGammaCorrect(float col)
static float invGammaCorrect(float c)
{
int i;
float res = 0.0;
i = floor(col * inv_color_step);
i = floorf(c * inv_color_step);
/* Negative colors are explicitly handled */
if (i < 0) res = -pow(abs(col), valid_inv_gamma);
else if (i >= RE_GAMMA_TABLE_SIZE) res = pow(col, valid_inv_gamma);
else res = inv_gamma_range_table[i] + ( (col - color_domain_table[i]) * inv_gamfactor_table[i]);
if (UNLIKELY(i < 0)) res = -powf(-c, valid_inv_gamma);
else if (i >= RE_GAMMA_TABLE_SIZE) res = powf(c, valid_inv_gamma);
else res = inv_gamma_range_table[i] +
((c - color_domain_table[i]) * inv_gamfactor_table[i]);
return res;
}