Integrated "Fattal02" tone-mapping operator from Luminance HDR

This commit is contained in:
Alberto Griggio
2017-11-02 22:34:49 +01:00
parent dd6e411c13
commit 77b4ad497b
17 changed files with 1267 additions and 1 deletions

View File

@@ -264,6 +264,9 @@ void ParamsEdited::set (bool v)
epd.edgeStopping = v;
epd.scale = v;
epd.reweightingIterates = v;
fattal.enabled = v;
fattal.alpha = v;
fattal.beta = v;
sh.enabled = v;
sh.hq = v;
sh.highlights = v;
@@ -804,6 +807,10 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
epd.scale = epd.scale && p.epd.scale == other.epd.scale;
epd.reweightingIterates = epd.reweightingIterates && p.epd.reweightingIterates == other.epd.reweightingIterates;
fattal.enabled = fattal.enabled && p.fattal.enabled == other.fattal.enabled;
fattal.alpha = fattal.alpha && p.fattal.alpha == other.fattal.alpha;
fattal.beta = fattal.beta && p.fattal.beta == other.fattal.beta;
sh.enabled = sh.enabled && p.sh.enabled == other.sh.enabled;
sh.hq = sh.hq && p.sh.hq == other.sh.hq;
sh.highlights = sh.highlights && p.sh.highlights == other.sh.highlights;
@@ -1972,6 +1979,16 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.epd.reweightingIterates = mods.epd.reweightingIterates;
}
if (fattal.enabled) {
toEdit.fattal.enabled = mods.fattal.enabled;
}
if (fattal.alpha) {
toEdit.fattal.alpha = mods.fattal.alpha;
}
if (fattal.beta) {
toEdit.fattal.beta = mods.fattal.beta;
}
if (sh.enabled) {
toEdit.sh.enabled = mods.sh.enabled;
}