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

Colortoning Lab regions: move some calculations outside last loop, #4914

Browse Source
This commit is contained in:
heckflosse 2018-11-01 20:09:30 +01:00
parent 41b802bdd3
commit dd635de72c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtengine/iplabregions.cc
View File

@ -138,6 +138,18 @@ BENCHFUN
return 12000.f * SGN(x) * xlog2lin(std::abs(x), 4.f); return 12000.f * SGN(x) * xlog2lin(std::abs(x), 4.f);
}; };
float abca[n];
float abcb[n];
float rs[n];
float rl[n];
for (int i = 0; i < n; ++i) {
auto &r = params->colorToning.labregions[i];
abca[i] = abcoord(r.a);
abcb[i] = abcoord(r.b);
rs[i] = 1.f + r.saturation / 100.f;
rl[i] = 1.f + float(r.lightness) / 500.f;
}
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for if (multiThread) #pragma omp parallel for if (multiThread)
#endif #endif
@ -148,12 +160,11 @@ BENCHFUN
float b = lab->b[y][x]; float b = lab->b[y][x];
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
auto &r = params->colorToning.labregions[i];
float blend = abmask[i][y][x]; float blend = abmask[i][y][x];
float s = 1.f + r.saturation / 100.f; float s = rs[i];
float a_new = LIM(s * (a + abcoord(r.a)), -42000.f, 42000.f); float a_new = LIM(s * (a + abca[i]), -42000.f, 42000.f);
float b_new = LIM(s * (b + abcoord(r.b)), -42000.f, 42000.f); float b_new = LIM(s * (b + abcb[i]), -42000.f, 42000.f);
float l_new = LIM(l * (1.f + float(r.lightness) / 500.f), 0.f, 32768.f); float l_new = LIM(l * rl[i], 0.f, 32768.f);
l = intp(Lmask[i][y][x], l_new, l); l = intp(Lmask[i][y][x], l_new, l);
a = intp(blend, a_new, a); a = intp(blend, a_new, a);
b = intp(blend, b_new, b); b = intp(blend, b_new, b);