From 359b4136b52f90c431665ccd36fdfcb98ef9edcc Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Fri, 10 Mar 2017 10:53:10 +0100 Subject: [PATCH] do not use the hard-coded (i.e. not user-selectable) fast export options if the new fast pipeline is selected --- rtengine/simpleprocess.cc | 2 +- rtgui/filecatalog.cc | 52 ++++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index 774ee6c5c..f10378a07 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -1381,8 +1381,8 @@ private: params.wavelet.strength = int(float(params.wavelet.strength) * tmpScale); params.dirpyrDenoise.luma *= tmpScale; + params.dirpyrDenoise.smethod = "shal"; - params.dirpyrDenoise.median = false; const double dirpyreq_scale = min(tmpScale * 1.5, 1.0); for (int i = 0; i < 6; ++i) { diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 68219d745..a5b3cdb85 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -1129,25 +1129,27 @@ void FileCatalog::developRequested (std::vector tbe, bool fas params.wavelet.enabled = false; } - //if (options.fastexport_bypass_raw_bayer_all_enhance ) params.raw.bayersensor.all_enhance = false; - if (options.fastexport_bypass_raw_bayer_dcb_iterations ) { - params.raw.bayersensor.dcb_iterations = 0; - } + if (!options.fastexport_use_fast_pipeline) { + //if (options.fastexport_bypass_raw_bayer_all_enhance ) params.raw.bayersensor.all_enhance = false; + if (options.fastexport_bypass_raw_bayer_dcb_iterations ) { + params.raw.bayersensor.dcb_iterations = 0; + } - if (options.fastexport_bypass_raw_bayer_dcb_enhance ) { - params.raw.bayersensor.dcb_enhance = false; - } + if (options.fastexport_bypass_raw_bayer_dcb_enhance ) { + params.raw.bayersensor.dcb_enhance = false; + } - if (options.fastexport_bypass_raw_bayer_lmmse_iterations) { - params.raw.bayersensor.lmmse_iterations = 0; - } + if (options.fastexport_bypass_raw_bayer_lmmse_iterations) { + params.raw.bayersensor.lmmse_iterations = 0; + } - if (options.fastexport_bypass_raw_bayer_linenoise ) { - params.raw.bayersensor.linenoise = 0; - } + if (options.fastexport_bypass_raw_bayer_linenoise ) { + params.raw.bayersensor.linenoise = 0; + } - if (options.fastexport_bypass_raw_bayer_greenthresh ) { - params.raw.bayersensor.greenthresh = 0; + if (options.fastexport_bypass_raw_bayer_greenthresh ) { + params.raw.bayersensor.greenthresh = 0; + } } if (options.fastexport_bypass_raw_ccSteps ) { @@ -1170,14 +1172,18 @@ void FileCatalog::developRequested (std::vector tbe, bool fas params.raw.ff_file = ""; } - params.raw.bayersensor.method = options.fastexport_raw_bayer_method ; - params.raw.xtranssensor.method = options.fastexport_raw_xtrans_method; - params.icm.input = options.fastexport_icm_input ; - params.icm.working = options.fastexport_icm_working ; - params.icm.output = options.fastexport_icm_output ; - params.icm.outputIntent = options.fastexport_icm_outputIntent ; - params.icm.outputBPC = options.fastexport_icm_outputBPC ; - params.icm.gamma = options.fastexport_icm_gamma ; + + if (!options.fastexport_use_fast_pipeline) { + params.raw.bayersensor.method = options.fastexport_raw_bayer_method ; + params.raw.xtranssensor.method = options.fastexport_raw_xtrans_method; + params.icm.input = options.fastexport_icm_input ; + params.icm.working = options.fastexport_icm_working ; + params.icm.output = options.fastexport_icm_output ; + params.icm.outputIntent = options.fastexport_icm_outputIntent ; + params.icm.outputBPC = options.fastexport_icm_outputBPC ; + params.icm.gamma = options.fastexport_icm_gamma ; + } + params.resize.enabled = options.fastexport_resize_enabled ; params.resize.scale = options.fastexport_resize_scale ; params.resize.appliesTo = options.fastexport_resize_appliesTo ;