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-12-21 18:32:34 +01:00
parent 8b36406856 48ecbd169d
commit 3ddf4c53ee
31 changed files with 437 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/simpleprocess.cc
View File

@@ -2583,8 +2583,7 @@ private:
if (params.prsharpening.enabled) {
params.sharpening = params.prsharpening;
} else {
adjust_radius(defaultparams.sharpening.radius, scale_factor,
params.sharpening.radius);
params.sharpening.radius *= scale_factor;
}
params.impulseDenoise.thresh *= scale_factor;
@@ -2635,9 +2634,10 @@ private:
params.dirpyrequalizer.threshold *= scale_factor;
adjust_radius(defaultparams.defringe.radius, scale_factor,
params.defringe.radius);
adjust_radius(defaultparams.sh.radius, scale_factor, params.sh.radius);
adjust_radius (defaultparams.defringe.radius, scale_factor,
params.defringe.radius);
params.sh.radius *= scale_factor;
params.localContrast.radius *= scale_factor;
if (params.raw.xtranssensor.method == procparams::RAWParams::XTransSensor::getMethodString(procparams::RAWParams::XTransSensor::Method::THREE_PASS)) {
params.raw.xtranssensor.method = procparams::RAWParams::XTransSensor::getMethodString(procparams::RAWParams::XTransSensor::Method::ONE_PASS);