Merge branch 'dev' into newlocallab

This commit is contained in:
Ingo Weyrich
2019-08-08 16:18:58 +02:00
96 changed files with 1000 additions and 1654 deletions

View File

@@ -105,10 +105,10 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab, bool ena, int labmode, in
#pragma omp parallel for if (multiThread)
#endif
for (int l = 0; l < 32768; ++l) {
auto base = pow_F(l / 32768.f, gamma);
auto val = pow_F(l / 32768.f, gamma);
// get a bit more contrast in the shadows
base = sh_contrast.getVal(base);
f[l] = base * 32768.f;
val = sh_contrast.getVal(val);
f[l] = val * 32768.f;
}
} else {
#ifdef _OPENMP
@@ -118,10 +118,10 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab, bool ena, int labmode, in
float l, a, b;
float R = c, G = c, B = c;
rgb2lab(R, G, B, l, a, b);
auto base = pow_F(l / 32768.f, gamma);
auto val = pow_F(l / 32768.f, gamma);
// get a bit more contrast in the shadows
base = sh_contrast.getVal(base);
l = base * 32768.f;
val = sh_contrast.getVal(val);
l = val * 32768.f;
lab2rgb(l, a, b, R, G, B);
f[c] = G;
}
@@ -132,8 +132,8 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab, bool ena, int labmode, in
#pragma omp parallel for if (multiThread)
#endif
for (int l = 0; l < 32768; ++l) {
auto base = pow_F(l / 32768.f, gamma);
f[l] = base * 32768.f;
auto val = pow_F(l / 32768.f, gamma);
f[l] = val * 32768.f;
}
} else {
#ifdef _OPENMP
@@ -143,8 +143,8 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab, bool ena, int labmode, in
float l, a, b;
float R = c, G = c, B = c;
rgb2lab(R, G, B, l, a, b);
auto base = pow_F(l / 32768.f, gamma);
l = base * 32768.f;
auto val = pow_F(l / 32768.f, gamma);
l = val * 32768.f;
lab2rgb(l, a, b, R, G, B);
f[c] = G;
}