From 5a38d0610d92a24331c7d489e6cf38b15854bd2a Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Sun, 12 Mar 2017 21:03:49 +0100 Subject: [PATCH] fix for resizing bug in fast-export mode --- rtgui/filecatalog.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index a5b3cdb85..b9818a839 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -1183,14 +1183,20 @@ void FileCatalog::developRequested (std::vector tbe, bool fas params.icm.outputBPC = options.fastexport_icm_outputBPC ; params.icm.gamma = options.fastexport_icm_gamma ; } + + if (params.resize.enabled) { + params.resize.width = rtengine::min(params.resize.width, options.fastexport_resize_width) ; + params.resize.height = rtengine::min(params.resize.height, options.fastexport_resize_height) ; + } else { + params.resize.width = options.fastexport_resize_width; + params.resize.height = options.fastexport_resize_height; + } params.resize.enabled = options.fastexport_resize_enabled ; params.resize.scale = options.fastexport_resize_scale ; params.resize.appliesTo = options.fastexport_resize_appliesTo ; params.resize.method = options.fastexport_resize_method ; params.resize.dataspec = options.fastexport_resize_dataspec ; - params.resize.width = rtengine::min(params.resize.width, options.fastexport_resize_width) ; - params.resize.height = rtengine::min(params.resize.height, options.fastexport_resize_height) ; } rtengine::ProcessingJob* pjob = rtengine::ProcessingJob::create (fbe->filename, th->getType() == FT_Raw, params, fastmode && options.fastexport_use_fast_pipeline);