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

Initial commit for DeHaze branch

Browse Source
This commit is contained in:
heckflosse
2015-08-17 18:49:02 +02:00
parent 161fa15922
commit 86b0bb5420
15 changed files with 622 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rtgui/paramsedited.cc
View File

@@ -58,6 +58,12 @@ void ParamsEdited::set (bool v)
labCurve.hhcurve = v;
labCurve.lccurve = v;
labCurve.clcurve = v;
labCurve.dehazmet = v;
labCurve.str = v;
labCurve.scal = v;
labCurve.neigh = v;
labCurve.gain = v;
labCurve.offs = v;
labCurve.brightness = v;
labCurve.contrast = v;
labCurve.chromaticity = v;
@@ -513,6 +519,12 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
labCurve.hhcurve = labCurve.hhcurve && p.labCurve.hhcurve == other.labCurve.hhcurve;
labCurve.lccurve = labCurve.lccurve && p.labCurve.lccurve == other.labCurve.lccurve;
labCurve.clcurve = labCurve.clcurve && p.labCurve.clcurve == other.labCurve.clcurve;
labCurve.dehazmet = labCurve.dehazmet && p.labCurve.dehazmet == other.labCurve.dehazmet;
labCurve.str = labCurve.str && p.labCurve.str == other.labCurve.str;
labCurve.scal = labCurve.scal && p.labCurve.scal == other.labCurve.scal;
labCurve.neigh = labCurve.neigh && p.labCurve.neigh == other.labCurve.neigh;
labCurve.gain = labCurve.gain && p.labCurve.gain == other.labCurve.gain;
labCurve.offs = labCurve.offs && p.labCurve.offs == other.labCurve.offs;
labCurve.brightness = labCurve.brightness && p.labCurve.brightness == other.labCurve.brightness;
labCurve.contrast = labCurve.contrast && p.labCurve.contrast == other.labCurve.contrast;
labCurve.chromaticity = labCurve.chromaticity && p.labCurve.chromaticity == other.labCurve.chromaticity;
@@ -1026,7 +1038,9 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (labCurve.lccurve) {
toEdit.labCurve.lccurve = mods.labCurve.lccurve;
}
if (labCurve.dehazmet) {
toEdit.labCurve.dehazmet = mods.labCurve.dehazmet;
}
if (labCurve.clcurve) {
toEdit.labCurve.clcurve = mods.labCurve.clcurve;
}
@@ -1042,6 +1056,23 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (labCurve.chromaticity) {
toEdit.labCurve.chromaticity = dontforceSet && options.baBehav[ADDSET_LC_CHROMATICITY] ? toEdit.labCurve.chromaticity + mods.labCurve.chromaticity : mods.labCurve.chromaticity;
}
if (labCurve.str) {
toEdit.labCurve.str = mods.labCurve.str;
}
if (labCurve.scal) {
toEdit.labCurve.scal = mods.labCurve.scal;
}
if (labCurve.neigh) {
toEdit.labCurve.neigh = mods.labCurve.neigh;
}
if (labCurve.gain) {
toEdit.labCurve.gain = mods.labCurve.gain;
}
if (labCurve.offs) {
toEdit.labCurve.offs = mods.labCurve.offs;
}
if (labCurve.avoidcolorshift) {
toEdit.labCurve.avoidcolorshift = mods.labCurve.avoidcolorshift;