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

Improv TM - and others fixed

Browse Source
This commit is contained in:
Desmis
2019-05-01 07:58:45 +02:00
parent d66cd53119
commit c8f24b4335
11 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/improcfun.cc
View File

@@ -5292,6 +5292,7 @@ void ImProcFunctions::EPDToneMaplocal(int sp, LabImage *lab, LabImage *tmp1, uns
float edgest = ((float)params->locallab.spots.at(sp).estop) / 100.f;
float sca = ((float)params->locallab.spots.at(sp).scaltm) / 10.f;
float gamm = ((float)params->locallab.spots.at(sp).gamma) / 100.f;
float satur = ((float)params->locallab.spots.at(sp).satur) / 100.f;
float rew = ((float)params->locallab.spots.at(sp).rewei);
//Pointers to whole data and size of it.
float *L = lab->L[0];
@@ -5374,6 +5375,10 @@ void ImProcFunctions::EPDToneMaplocal(int sp, LabImage *lab, LabImage *tmp1, uns
//Restore past range, also desaturate a bit per Mantiuk's Color correction for tone mapping.
float s = (1.0f + 38.7889f) * powf(Compression, 1.5856f) / (1.0f + 38.7889f * powf(Compression, 1.5856f));
float ss = (1.f / s) - 1.f;
float sat = 1.f + (2.5f * satur) * ss;
// printf("s=%f ss=%f sat=%f \n", s, ss, sat);
if(sat == 1.f) sat = 1.001f;
#ifdef _OPENMP
#pragma omp parallel for // removed schedule(dynamic,10)
#endif
@@ -5383,8 +5388,8 @@ void ImProcFunctions::EPDToneMaplocal(int sp, LabImage *lab, LabImage *tmp1, uns
int y = i - x * WW;
tmp1->L[x][y] = L[i] * maxL * (1.f / gamm) + minL;
tmp1->a[x][y] = s * a[i];
tmp1->b[x][y] = s * b[i];
tmp1->a[x][y] = sat * a[i];
tmp1->b[x][y] = sat * b[i];
}
}