From 1d137246045b556c5c90dff11e695e2e2b0e4688 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 30 Jun 2018 15:12:57 +0200 Subject: [PATCH] Limit usable raw border range to 2..16 for pixelshift files --- rtengine/improccoordinator.cc | 2 +- rtengine/simpleprocess.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 72e6832c0..29eeb07e8 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -234,7 +234,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) if(params.raw.bayersensor.method != RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) { imgsrc->setBorder(params.raw.bayersensor.border); } else { - imgsrc->setBorder(std::max(params.raw.bayersensor.border, 1)); + imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2)); } } bool autoContrast = false; diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index 718c9c88c..14f215f07 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -163,7 +163,7 @@ private: if(params.raw.bayersensor.method!= RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) { imgsrc->setBorder(params.raw.bayersensor.border); } else { - imgsrc->setBorder(std::max(params.raw.bayersensor.border, 1)); + imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2)); } } imgsrc->getFullSize (fw, fh, tr);