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
2017-06-27 10:28:35 +02:00
parent acd715dd44 0ecb02afdd
commit dfffa2e8aa
45 changed files with 1074 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/paramsedited.cc
View File

@@ -235,7 +235,6 @@ void ParamsEdited::set (bool v)
dirpyrDenoise.lcurve = v;
dirpyrDenoise.cccurve = v;
dirpyrDenoise.median = v;
dirpyrDenoise.autochroma = v;
dirpyrDenoise.luma = v;
dirpyrDenoise.Ldetail = v;
dirpyrDenoise.chroma = v;
@@ -425,7 +424,6 @@ void ParamsEdited::set (bool v)
icm.applyLookTable = v;
icm.applyBaselineExposureOffset = v;
icm.applyHueSatMap = v;
icm.blendCMSMatrix = v;
icm.dcpIlluminant = v;
icm.working = v;
icm.output = v;
@@ -835,7 +833,6 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
dirpyrDenoise.enabled = dirpyrDenoise.enabled && p.dirpyrDenoise.enabled == other.dirpyrDenoise.enabled;
dirpyrDenoise.enhance = dirpyrDenoise.enhance && p.dirpyrDenoise.enhance == other.dirpyrDenoise.enhance;
dirpyrDenoise.median = dirpyrDenoise.median && p.dirpyrDenoise.median == other.dirpyrDenoise.median;
dirpyrDenoise.autochroma = dirpyrDenoise.autochroma && p.dirpyrDenoise.autochroma == other.dirpyrDenoise.autochroma;
// dirpyrDenoise.perform = dirpyrDenoise.perform && p.dirpyrDenoise.perform == other.dirpyrDenoise.perform;
dirpyrDenoise.luma = dirpyrDenoise.luma && p.dirpyrDenoise.luma == other.dirpyrDenoise.luma;
dirpyrDenoise.lcurve = dirpyrDenoise.lcurve && p.dirpyrDenoise.lcurve == other.dirpyrDenoise.lcurve;
@@ -1027,7 +1024,6 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
icm.applyLookTable = icm.applyLookTable && p.icm.applyLookTable == other.icm.applyLookTable;
icm.applyBaselineExposureOffset = icm.applyBaselineExposureOffset && p.icm.applyBaselineExposureOffset == other.icm.applyBaselineExposureOffset;
icm.applyHueSatMap = icm.applyHueSatMap && p.icm.applyHueSatMap == other.icm.applyHueSatMap;
icm.blendCMSMatrix = icm.blendCMSMatrix && p.icm.blendCMSMatrix == other.icm.blendCMSMatrix;
icm.dcpIlluminant = icm.dcpIlluminant && p.icm.dcpIlluminant == other.icm.dcpIlluminant;
icm.working = icm.working && p.icm.working == other.icm.working;
icm.output = icm.output && p.icm.output == other.icm.output;
@@ -1976,10 +1972,6 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.dirpyrDenoise.median = mods.dirpyrDenoise.median;
}
if (dirpyrDenoise.autochroma) {
toEdit.dirpyrDenoise.autochroma = mods.dirpyrDenoise.autochroma;
}
if (dirpyrDenoise.luma) {
toEdit.dirpyrDenoise.luma = dontforceSet && options.baBehav[ADDSET_DIRPYRDN_LUMA] ? toEdit.dirpyrDenoise.luma + mods.dirpyrDenoise.luma : mods.dirpyrDenoise.luma;
}
@@ -2698,10 +2690,6 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.icm.applyHueSatMap = mods.icm.applyHueSatMap;
}
if (icm.blendCMSMatrix) {
toEdit.icm.blendCMSMatrix = mods.icm.blendCMSMatrix;
}
if (icm.dcpIlluminant) {
toEdit.icm.dcpIlluminant = mods.icm.dcpIlluminant;
}