Merge branch 'dev' into testoutputprofile

This commit is contained in:
Hombre
2018-07-09 22:12:08 +02:00
76 changed files with 1697 additions and 837 deletions

View File

@@ -236,6 +236,13 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
printf("Demosaic X-Trans image with using method: %s\n", rp.xtranssensor.method.c_str());
}
}
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(std::max(params.raw.bayersensor.border, 2));
}
}
bool autoContrast = false;
double contrastThreshold = 0.f;
imgsrc->demosaic(rp, autoContrast, contrastThreshold); //enabled demosaic