liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed endless loop in chromiluminancecurve, Issue 2821, Fixed some ciecam02 bugs, Issue 2819

Browse Source
This commit is contained in:
Ingo
2015-06-25 22:22:44 +02:00
parent 0bfc5a0e98
commit 90229e99f6
6 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/colortemp.h
View File

@@ -190,9 +190,16 @@ class ColorTemp {
if(c-0.1 < 0.0) c1=-1; else c1=1;
return c1*(100.0 / fl) * pow( (27.13 * fabs( c - 0.1 )) / (400.0 - fabs( c - 0.1 )), 1.0 / 0.42 );
}
static float inverse_nonlinear_adaptationfloat( float c, float fl ) {
if(c-0.1f < 0.f) fl*=-1.f;
return (100.0f / fl) * pow_F( (27.13f * fabsf( c - 0.1f )) / (400.0f - fabsf( c - 0.1f )), 2.38095238f );
static float inverse_nonlinear_adaptationfloat( float c, float fl ) {
c -= 0.1f;
if(c < 0.f) {
fl *= -1.f;
if(c < -399.99f) // avoid nan values
c = -399.99f;
} else if(c > 399.99f) { // avoid nan values
c = 399.99f;
}
return (100.0f / fl) * pow_F( (27.13f * fabsf( c )) / (400.0f - fabsf( c )), 2.38095238f );
}