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

Segfault when pasting a copied profile with retinex filter, fixes #2913

Browse Source
This commit is contained in:
heckflosse
2015-09-22 17:26:40 +02:00
parent bedd95e181
commit 5f2151ba4d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/paramsedited.cc
View File

@@ -1065,7 +1065,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (retinex.slope) { if (retinex.slope) {
toEdit.retinex.slope = mods.retinex.slope; toEdit.retinex.slope = mods.retinex.slope;
} }
if (retinex.str) { if (retinex.str) {
toEdit.retinex.str = dontforceSet && options.baBehav[ADDSET_DH_STR] ? toEdit.retinex.str + mods.retinex.str : mods.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; return lcpFile;
} }
bool RetinexParamsEdited::isUnchanged() const
{
return enabled && retinexcolorspace && gammaretinex && gam && slope;
}

2
rtgui/paramsedited.h
View File

@@ -77,7 +77,7 @@ public:
bool cdHcurve; bool cdHcurve;
bool retinex; bool retinex;
bool medianmap; bool medianmap;
bool isUnchanged() const;
}; };

2
rtgui/toolpanelcoord.cc
View File

@@ -396,7 +396,7 @@ void ToolPanelCoordinator::profileChange (const PartialProfile *nparams, rtengi
lParams[1] = *mergedParams; lParams[1] = *mergedParams;
pe.initFrom (lParams); pe.initFrom (lParams);
filterRawRefresh = pe.raw.isUnchanged() && pe.lensProf.isUnchanged(); filterRawRefresh = pe.raw.isUnchanged() && pe.lensProf.isUnchanged() && pe.retinex.isUnchanged();
} }
*params = *mergedParams; *params = *mergedParams;