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

do not use the hard-coded (i.e. not user-selectable) fast export options if the new fast pipeline is selected

Browse Source
This commit is contained in:
Alberto Griggio 2017-03-10 10:53:10 +01:00
parent f8d350715c
commit 359b4136b5
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/simpleprocess.cc
View File

@ -1381,8 +1381,8 @@ private:
params.wavelet.strength = params.wavelet.strength =
int(float(params.wavelet.strength) * tmpScale); int(float(params.wavelet.strength) * tmpScale);
params.dirpyrDenoise.luma *= tmpScale; params.dirpyrDenoise.luma *= tmpScale;
params.dirpyrDenoise.smethod = "shal"; params.dirpyrDenoise.smethod = "shal";
params.dirpyrDenoise.median = false;
const double dirpyreq_scale = min(tmpScale * 1.5, 1.0); const double dirpyreq_scale = min(tmpScale * 1.5, 1.0);
for (int i = 0; i < 6; ++i) { for (int i = 0; i < 6; ++i) {

52
rtgui/filecatalog.cc
View File

@ -1129,25 +1129,27 @@ void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe, bool fas
params.wavelet.enabled = false; params.wavelet.enabled = false;
} }
//if (options.fastexport_bypass_raw_bayer_all_enhance ) params.raw.bayersensor.all_enhance = false; if (!options.fastexport_use_fast_pipeline) {
if (options.fastexport_bypass_raw_bayer_dcb_iterations ) { //if (options.fastexport_bypass_raw_bayer_all_enhance ) params.raw.bayersensor.all_enhance = false;
params.raw.bayersensor.dcb_iterations = 0; if (options.fastexport_bypass_raw_bayer_dcb_iterations ) {
} params.raw.bayersensor.dcb_iterations = 0;
}
if (options.fastexport_bypass_raw_bayer_dcb_enhance ) { if (options.fastexport_bypass_raw_bayer_dcb_enhance ) {
params.raw.bayersensor.dcb_enhance = false; params.raw.bayersensor.dcb_enhance = false;
} }
if (options.fastexport_bypass_raw_bayer_lmmse_iterations) { if (options.fastexport_bypass_raw_bayer_lmmse_iterations) {
params.raw.bayersensor.lmmse_iterations = 0; params.raw.bayersensor.lmmse_iterations = 0;
} }
if (options.fastexport_bypass_raw_bayer_linenoise ) { if (options.fastexport_bypass_raw_bayer_linenoise ) {
params.raw.bayersensor.linenoise = 0; params.raw.bayersensor.linenoise = 0;
} }
if (options.fastexport_bypass_raw_bayer_greenthresh ) { if (options.fastexport_bypass_raw_bayer_greenthresh ) {
params.raw.bayersensor.greenthresh = 0; params.raw.bayersensor.greenthresh = 0;
}
} }
if (options.fastexport_bypass_raw_ccSteps ) { if (options.fastexport_bypass_raw_ccSteps ) {
@ -1170,14 +1172,18 @@ void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe, bool fas
params.raw.ff_file = ""; params.raw.ff_file = "";
} }
params.raw.bayersensor.method = options.fastexport_raw_bayer_method ;
params.raw.xtranssensor.method = options.fastexport_raw_xtrans_method; if (!options.fastexport_use_fast_pipeline) {
params.icm.input = options.fastexport_icm_input ; params.raw.bayersensor.method = options.fastexport_raw_bayer_method ;
params.icm.working = options.fastexport_icm_working ; params.raw.xtranssensor.method = options.fastexport_raw_xtrans_method;
params.icm.output = options.fastexport_icm_output ; params.icm.input = options.fastexport_icm_input ;
params.icm.outputIntent = options.fastexport_icm_outputIntent ; params.icm.working = options.fastexport_icm_working ;
params.icm.outputBPC = options.fastexport_icm_outputBPC ; params.icm.output = options.fastexport_icm_output ;
params.icm.gamma = options.fastexport_icm_gamma ; 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.enabled = options.fastexport_resize_enabled ;
params.resize.scale = options.fastexport_resize_scale ; params.resize.scale = options.fastexport_resize_scale ;
params.resize.appliesTo = options.fastexport_resize_appliesTo ; params.resize.appliesTo = options.fastexport_resize_appliesTo ;