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

L*a*b* regions: allow for a bit more latitude in corrections

Browse Source
This commit is contained in:
Alberto Griggio
2018-11-01 00:18:59 +01:00
parent 4eb93c24f8
commit be03d1061a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/iplabregions.cc
View File

@@ -33,9 +33,6 @@ void ImProcFunctions::labColorCorrectionRegions(LabImage *lab)
return; return;
} }
const float factor = 3.f;
const float scaling = 1.f;
int n = params->colorToning.labregions.size(); int n = params->colorToning.labregions.size();
int show_mask_idx = params->colorToning.labregionsShowMask; int show_mask_idx = params->colorToning.labregionsShowMask;
if (show_mask_idx >= n) { if (show_mask_idx >= n) {
@@ -133,8 +130,7 @@ void ImProcFunctions::labColorCorrectionRegions(LabImage *lab)
const auto abcoord = const auto abcoord =
[](float x) -> float [](float x) -> float
{ {
const float m = ColorToningParams::LABGRID_CORR_MAX; return 12000.f * SGN(x) * log2lin(std::abs(x), 4.f);
return SGN(x) * log2lin(std::abs(x) / m, 4.f) * m;
}; };
#ifdef _OPENMP #ifdef _OPENMP
@@ -150,9 +146,9 @@ void ImProcFunctions::labColorCorrectionRegions(LabImage *lab)
auto &r = params->colorToning.labregions[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 = 1.f + r.saturation / 100.f;
float a_new = LIM(s * (a + 32768.f * abcoord(r.a) / factor / scaling), -42000.f, 42000.f); float a_new = LIM(s * (a + abcoord(r.a)), -42000.f, 42000.f);
float b_new = LIM(s * (b + 32768.f * abcoord(r.b) / factor / scaling), -42000.f, 42000.f); float b_new = LIM(s * (b + abcoord(r.b)), -42000.f, 42000.f);
float l_new = LIM(l * (1.f + float(r.lightness) / 1000.f), 0.f, 32768.f); float l_new = LIM(l * (1.f + float(r.lightness) / 500.f), 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);