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

Small improvments residual

Browse Source
This commit is contained in:
Desmis 2019-05-27 11:20:14 +02:00
parent 83f487753c
commit 25e66f1fc2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/ipwavelet.cc
View File

@ -1595,7 +1595,7 @@ void ImProcFunctions::EPDToneMapResid(float * WavCoeffs_L0, unsigned int Iterat
float edgest = params->wavelet.edgs; float edgest = params->wavelet.edgs;
float sca = params->wavelet.scale; float sca = params->wavelet.scale;
float gamm = params->wavelet.gamma; float gamm = params->wavelet.gamma;
float rew = params->epd.reweightingIterates; int rew = 0; //params->epd.reweightingIterates;
EdgePreservingDecomposition epd2(W_L, H_L); EdgePreservingDecomposition epd2(W_L, H_L);
cp.TMmeth = 2; //default after testing cp.TMmeth = 2; //default after testing

6
rtgui/paramsedited.cc
View File

@ -520,6 +520,7 @@ void ParamsEdited::set(bool v)
wavelet.edgthresh = v; wavelet.edgthresh = v;
wavelet.thr = v; wavelet.thr = v;
wavelet.thrH = v; wavelet.thrH = v;
wavelet.radius = v;
wavelet.skinprotect = v; wavelet.skinprotect = v;
wavelet.hueskin = v; wavelet.hueskin = v;
wavelet.hueskin2 = v; wavelet.hueskin2 = v;
@ -1096,6 +1097,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
wavelet.edgthresh = wavelet.edgthresh && p.wavelet.edgthresh == other.wavelet.edgthresh; wavelet.edgthresh = wavelet.edgthresh && p.wavelet.edgthresh == other.wavelet.edgthresh;
wavelet.thr = wavelet.thr && p.wavelet.thr == other.wavelet.thr; wavelet.thr = wavelet.thr && p.wavelet.thr == other.wavelet.thr;
wavelet.thrH = wavelet.thrH && p.wavelet.thrH == other.wavelet.thrH; wavelet.thrH = wavelet.thrH && p.wavelet.thrH == other.wavelet.thrH;
wavelet.radius = wavelet.radius && p.wavelet.radius == other.wavelet.radius;
wavelet.hueskin = wavelet.hueskin && p.wavelet.hueskin == other.wavelet.hueskin; wavelet.hueskin = wavelet.hueskin && p.wavelet.hueskin == other.wavelet.hueskin;
wavelet.hueskin2 = wavelet.hueskin2 && p.wavelet.hueskin2 == other.wavelet.hueskin2; wavelet.hueskin2 = wavelet.hueskin2 && p.wavelet.hueskin2 == other.wavelet.hueskin2;
wavelet.hllev = wavelet.hllev && p.wavelet.hllev == other.wavelet.hllev; wavelet.hllev = wavelet.hllev && p.wavelet.hllev == other.wavelet.hllev;
@ -2928,6 +2930,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.wavelet.thrH = dontforceSet && options.baBehav[ADDSET_WA_THRRH] ? toEdit.wavelet.thrH + mods.wavelet.thrH : mods.wavelet.thrH; toEdit.wavelet.thrH = dontforceSet && options.baBehav[ADDSET_WA_THRRH] ? toEdit.wavelet.thrH + mods.wavelet.thrH : mods.wavelet.thrH;
} }
if (wavelet.radius) {
toEdit.wavelet.radius = dontforceSet && options.baBehav[ADDSET_WA_RADIUS] ? toEdit.wavelet.radius + mods.wavelet.radius : mods.wavelet.radius;
}
if (wavelet.sup) { if (wavelet.sup) {
toEdit.wavelet.sup = mods.wavelet.sup; toEdit.wavelet.sup = mods.wavelet.sup;
} }