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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-01-22 08:56:24 +01:00
parent 6cdbba2a0f 5342e75289
commit cef451807d
35 changed files with 1066 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/paramsedited.cc
View File

@@ -49,6 +49,7 @@ void ParamsEdited::set(bool v)
toneCurve.expcomp = v;
toneCurve.hrenabled = v;
toneCurve.method = v;
toneCurve.histmatching = v;
retinex.cdcurve = v;
retinex.mapcurve = v;
retinex.cdHcurve = v;
@@ -721,6 +722,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
toneCurve.expcomp = toneCurve.expcomp && p.toneCurve.expcomp == other.toneCurve.expcomp;
toneCurve.hrenabled = toneCurve.hrenabled && p.toneCurve.hrenabled == other.toneCurve.hrenabled;
toneCurve.method = toneCurve.method && p.toneCurve.method == other.toneCurve.method;
toneCurve.histmatching = toneCurve.histmatching && p.toneCurve.histmatching == other.toneCurve.histmatching;
retinex.cdcurve = retinex.cdcurve && p.retinex.cdcurve == other.retinex.cdcurve;
retinex.mapcurve = retinex.mapcurve && p.retinex.mapcurve == other.retinex.mapcurve;
retinex.cdHcurve = retinex.cdHcurve && p.retinex.cdHcurve == other.retinex.cdHcurve;
@@ -1429,6 +1431,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.toneCurve.method = mods.toneCurve.method;
}
if (toneCurve.histmatching) {
toEdit.toneCurve.histmatching = mods.toneCurve.histmatching;
}
if (retinex.enabled) {
toEdit.retinex.enabled = mods.retinex.enabled;
}