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

Suppress clarity which seems to lead crash in some cases

Browse Source
This commit is contained in:
Desmis
2019-04-07 16:42:05 +02:00
parent efcbcdddff
commit 29ff14b5c9
12 changed files with 122 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/paramsedited.cc
View File

@@ -1092,6 +1092,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).threshold = locallab.spots.at(j).threshold && pSpot.threshold == otherSpot.threshold;
locallab.spots.at(j).sensicb = locallab.spots.at(j).sensicb && pSpot.sensicb == otherSpot.sensicb;
locallab.spots.at(j).clarityml = locallab.spots.at(j).clarityml && pSpot.clarityml == otherSpot.clarityml;
locallab.spots.at(j).contresid = locallab.spots.at(j).contresid && pSpot.contresid == otherSpot.contresid;
locallab.spots.at(j).softradiuscb = locallab.spots.at(j).softradiuscb && pSpot.softradiuscb == otherSpot.softradiuscb;
// Denoise
locallab.spots.at(j).expdenoi = locallab.spots.at(j).expdenoi && pSpot.expdenoi == otherSpot.expdenoi;
@@ -3140,6 +3141,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).clarityml = mods.locallab.spots.at(i).clarityml;
}
if (locallab.spots.at(i).contresid) {
toEdit.locallab.spots.at(i).contresid = mods.locallab.spots.at(i).contresid;
}
if (locallab.spots.at(i).softradiuscb) {
toEdit.locallab.spots.at(i).softradiuscb = mods.locallab.spots.at(i).softradiuscb;
}
@@ -4291,6 +4296,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
threshold(v),
sensicb(v),
clarityml(v),
contresid(v),
softradiuscb(v),
// Denoise
expdenoi(v),
@@ -4474,6 +4480,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
threshold = v;
sensicb = v;
clarityml = v;
contresid = v;
softradiuscb = v;
// Denoise
expdenoi = v;