From 8cfbd28ad84c7644e90e129dc799a41b211434c9 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Thu, 28 Jun 2018 19:18:19 +0200 Subject: [PATCH] Full processing ignored custom raw border, #4642 --- rtengine/simpleprocess.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index 11e98cf10..ac134f98d 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -159,6 +159,13 @@ private: imgsrc = ii->getImageSource (); tr = getCoarseBitMask (params.coarse); + if(imgsrc->getSensorType() == ST_BAYER) { + if(params.raw.bayersensor.method!= RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) { + imgsrc->setBorder(params.raw.bayersensor.border); + } else { + imgsrc->setBorder(4); + } + } imgsrc->getFullSize (fw, fh, tr); // check the crop params @@ -196,20 +203,12 @@ private: ipf_p.reset (new ImProcFunctions (¶ms, true)); ImProcFunctions &ipf = * (ipf_p.get()); - pp = PreviewProps (0, 0, fw, fh, 1); imgsrc->setCurrentFrame (params.raw.bayersensor.imageNum); imgsrc->preprocess ( params.raw, params.lensProf, params.coarse, params.dirpyrDenoise.enabled); if (pl) { pl->setProgress (0.20); } - if(imgsrc->getSensorType() == ST_BAYER) { - if(params.raw.bayersensor.method!= RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) { - imgsrc->setBorder(params.raw.bayersensor.border); - } else { - imgsrc->setBorder(4); - } - } double contrastThresholdDummy; imgsrc->demosaic (params.raw, false, contrastThresholdDummy); @@ -217,6 +216,7 @@ private: if (pl) { pl->setProgress (0.30); } + pp = PreviewProps (0, 0, fw, fh, 1); if (params.retinex.enabled) { //enabled Retinex LUTf cdcurve (65536, 0);