Segfault when pasting a copied profile with retinex filter, fixes #2913
This commit is contained in:
parent
bedd95e181
commit
5f2151ba4d
@ -1065,7 +1065,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
|
||||
if (retinex.slope) {
|
||||
toEdit.retinex.slope = mods.retinex.slope;
|
||||
}
|
||||
|
||||
|
||||
if (retinex.str) {
|
||||
toEdit.retinex.str = dontforceSet && options.baBehav[ADDSET_DH_STR] ? toEdit.retinex.str + mods.retinex.str : mods.retinex.str;
|
||||
}
|
||||
@ -2681,3 +2681,8 @@ bool LensProfParamsEdited::isUnchanged() const
|
||||
{
|
||||
return lcpFile;
|
||||
}
|
||||
|
||||
bool RetinexParamsEdited::isUnchanged() const
|
||||
{
|
||||
return enabled && retinexcolorspace && gammaretinex && gam && slope;
|
||||
}
|
@ -77,7 +77,7 @@ public:
|
||||
bool cdHcurve;
|
||||
bool retinex;
|
||||
bool medianmap;
|
||||
|
||||
bool isUnchanged() const;
|
||||
};
|
||||
|
||||
|
||||
|
@ -396,7 +396,7 @@ void ToolPanelCoordinator::profileChange (const PartialProfile *nparams, rtengi
|
||||
lParams[1] = *mergedParams;
|
||||
pe.initFrom (lParams);
|
||||
|
||||
filterRawRefresh = pe.raw.isUnchanged() && pe.lensProf.isUnchanged();
|
||||
filterRawRefresh = pe.raw.isUnchanged() && pe.lensProf.isUnchanged() && pe.retinex.isUnchanged();
|
||||
}
|
||||
|
||||
*params = *mergedParams;
|
||||
|
Loading…
x
Reference in New Issue
Block a user