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-11 18:38:31 +02:00
parent 849a2652a3 e8bbefef7a
commit f1a90dad54
33 changed files with 215 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/simpleprocess.cc
View File

@@ -279,12 +279,8 @@ private:
if (settings->leveldnautsimpl == 1 && params.dirpyrDenoise.Cmethod == "PON") {
MyTime t1pone, t2pone;
t1pone.set();
int crW, crH;
if (settings->leveldnv == 0) {
crW = 100;
crH = 100;
}
int crW = 100; // settings->leveldnv == 0
int crH = 100; // settings->leveldnv == 0
if (settings->leveldnv == 1) {
crW = 250;
@@ -748,7 +744,7 @@ private:
{
procparams::ProcParams& params = job->pparams;
//ImProcFunctions ipf (&params, true);
ImProcFunctions &ipf = * (ipf_p.get());
ImProcFunctions &ipf = *(ipf_p.get());
// perform luma/chroma denoise
// CieImage *cieView;
@@ -813,7 +809,7 @@ private:
{
procparams::ProcParams& params = job->pparams;
//ImProcFunctions ipf (&params, true);
ImProcFunctions &ipf = * (ipf_p.get());
ImProcFunctions &ipf = *(ipf_p.get());
imgsrc->convertColorSpace (baseImg, params.icm, currWB);
@@ -836,7 +832,7 @@ private:
{
procparams::ProcParams& params = job->pparams;
//ImProcFunctions ipf (&params, true);
ImProcFunctions &ipf = * (ipf_p.get());
ImProcFunctions &ipf = *(ipf_p.get());
if (params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
const int W = baseImg->getWidth();
@@ -2064,7 +2060,7 @@ private:
{
procparams::ProcParams& params = job->pparams;
//ImProcFunctions ipf (&params, true);
ImProcFunctions &ipf = * (ipf_p.get());
ImProcFunctions &ipf = *(ipf_p.get());
int imw, imh;
double scale_factor = ipf.resizeScale (&params, fw, fh, imw, imh);
@@ -2100,7 +2096,7 @@ private:
tmplab = std::move (resized);
}
adjust_procparams (scale_factor);
adjust_procparams(scale_factor);
fw = imw;
fh = imh;
@@ -2154,7 +2150,7 @@ private:
}
}
}
params.epd.scale *= scale_factor;
//params.epd.edgeStopping *= scale_factor;