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

Full processing ignored custom raw border, #4642

Browse Source
This commit is contained in:
heckflosse
2018-06-28 19:18:19 +02:00
parent d748e4dacc
commit 8cfbd28ad8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/simpleprocess.cc
View File

@@ -159,6 +159,13 @@ private:
imgsrc = ii->getImageSource (); imgsrc = ii->getImageSource ();
tr = getCoarseBitMask (params.coarse); 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); imgsrc->getFullSize (fw, fh, tr);
// check the crop params // check the crop params
@@ -196,20 +203,12 @@ private:
ipf_p.reset (new ImProcFunctions (&params, true)); ipf_p.reset (new ImProcFunctions (&params, true));
ImProcFunctions &ipf = * (ipf_p.get()); ImProcFunctions &ipf = * (ipf_p.get());
pp = PreviewProps (0, 0, fw, fh, 1);
imgsrc->setCurrentFrame (params.raw.bayersensor.imageNum); imgsrc->setCurrentFrame (params.raw.bayersensor.imageNum);
imgsrc->preprocess ( params.raw, params.lensProf, params.coarse, params.dirpyrDenoise.enabled); imgsrc->preprocess ( params.raw, params.lensProf, params.coarse, params.dirpyrDenoise.enabled);
if (pl) { if (pl) {
pl->setProgress (0.20); 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; double contrastThresholdDummy;
imgsrc->demosaic (params.raw, false, contrastThresholdDummy); imgsrc->demosaic (params.raw, false, contrastThresholdDummy);
@@ -217,6 +216,7 @@ private:
if (pl) { if (pl) {
pl->setProgress (0.30); pl->setProgress (0.30);
} }
pp = PreviewProps (0, 0, fw, fh, 1);
if (params.retinex.enabled) { //enabled Retinex if (params.retinex.enabled) { //enabled Retinex
LUTf cdcurve (65536, 0); LUTf cdcurve (65536, 0);