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

Merge pull request #4659 from Beep6581/histmatching-simpler-curve

Browse Source 
histmatching: use fewer points in the auto-matched curve
This commit is contained in:
Alberto Griggio
2018-07-10 11:06:46 +02:00
committed by GitHub
parent dfa31dddcd eedad21326
commit 06812ebb6f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtengine/histmatching.cc
View File

@@ -51,7 +51,7 @@ CdfInfo getCdf(const IImage8 &img)
for (int y = 0; y < img.getHeight(); ++y) { for (int y = 0; y < img.getHeight(); ++y) {
for (int x = 0; x < img.getWidth(); ++x) { for (int x = 0; x < img.getWidth(); ++x) {
int lum = LIM(0, int(Color::rgbLuminance(float(img.r(y, x)), float(img.g(y, x)), float(img.b(y, x)))), 255); int lum = LIM(int(Color::rgbLuminance(float(img.r(y, x)), float(img.g(y, x)), float(img.b(y, x)))), 0, 255);
++ret.cdf[lum]; ++ret.cdf[lum];
} }
} }
@@ -100,7 +100,6 @@ void mappingToCurve(const std::vector<int> &mapping, std::vector<double> &curve)
{ {
curve.clear(); curve.clear();
const int npoints = 8;
int idx = 15; int idx = 15;
for (; idx < int(mapping.size()); ++idx) { for (; idx < int(mapping.size()); ++idx) {
if (mapping[idx] >= idx) { if (mapping[idx] >= idx) {
@@ -114,7 +113,6 @@ void mappingToCurve(const std::vector<int> &mapping, std::vector<double> &curve)
} }
} }
} }
int step = std::max(int(mapping.size())/npoints, 1);
auto coord = [](int v) -> double { return double(v)/255.0; }; auto coord = [](int v) -> double { return double(v)/255.0; };
auto doit = auto doit =
@@ -148,8 +146,16 @@ void mappingToCurve(const std::vector<int> &mapping, std::vector<double> &curve)
++start; ++start;
} }
doit(start, idx, idx > step ? step : idx / 2, true); const int npoints = 8;
doit(idx, int(mapping.size()), step, idx - step > step / 2 && std::abs(curve[curve.size()-2] - coord(idx)) > 0.01); int step = std::max(int(mapping.size())/npoints, 1);
int end = mapping.size();
if (idx <= end / 3) {
doit(start, idx, idx / 2, true);
doit(idx, end, (end - idx) / 3, false);
} else {
doit(start, idx, idx > step ? step : idx / 2, true);
doit(idx, int(mapping.size()), step, idx - step > step / 2 && std::abs(curve[curve.size()-2] - coord(idx)) > 0.01);
}
if (curve.size() > 2 && (1 - curve[curve.size()-2] <= step / (256.0 * 3))) { if (curve.size() > 2 && (1 - curve[curve.size()-2] <= step / (256.0 * 3))) {
curve.pop_back(); curve.pop_back();
@@ -200,6 +206,9 @@ void RawImageSource::getAutoMatchedToneCurve(const ColorManagementParams &cp, st
int fw, fh; int fw, fh;
getFullSize(fw, fh, TR_NONE); getFullSize(fw, fh, TR_NONE);
if (getRotateDegree() == 90 || getRotateDegree() == 270) {
std::swap(fw, fh);
}
int skip = 3; int skip = 3;
if (settings->verbose) { if (settings->verbose) {