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

Some tweaks to curve extraction from histogram matching

Browse Source
This commit is contained in:
Alberto Griggio
2018-01-22 13:38:23 +01:00
parent dbe3d55e33
commit 03afede882
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/histmatching.cc
View File

@@ -108,7 +108,7 @@ void mappingToCurve(const std::vector<int> &mapping, std::vector<double> &curve)
int v = mapping[i]; int v = mapping[i];
bool change = i > 0 && v != mapping[i-1]; bool change = i > 0 && v != mapping[i-1];
int diff = i - prev; int diff = i - prev;
if (change && std::abs(diff - step) <= 1) { if ((change && std::abs(diff - step) <= 1) || diff > step * 2) {
curve.push_back(coord(i)); curve.push_back(coord(i));
curve.push_back(coord(v)); curve.push_back(coord(v));
prev = i; prev = i;
@@ -117,10 +117,13 @@ void mappingToCurve(const std::vector<int> &mapping, std::vector<double> &curve)
}; };
doit(0, idx, idx > step ? step : idx / 2, true); doit(0, idx, idx > step ? step : idx / 2, true);
doit(idx, int(mapping.size()), step, idx - step > step / 2); doit(idx, int(mapping.size()), step, idx - step > step / 2);
if (curve.size() <= 2 || curve.back() < 0.99 || (1 - curve[curve.size()-2] > step / 512.0 && curve.back() < coord(mapping.back()))) { if (curve.size() > 2 && (1 - curve[curve.size()-2] <= step / (256.0 * 3))) {
curve.emplace_back(1.0); curve.pop_back();
curve.emplace_back(1.0); curve.pop_back();
} }
curve.push_back(1.0);
curve.push_back(1.0);
if (curve.size() < 4) { if (curve.size() < 4) {
curve = { DCT_Linear }; // not enough points, fall back to linear curve = { DCT_Linear }; // not enough points, fall back to linear
} else { } else {