merge with dev

This commit is contained in:
Desmis
2019-12-13 16:26:30 +01:00
2 changed files with 9 additions and 0 deletions

View File

@@ -1398,6 +1398,11 @@ Camera constants:
"raw_crop": [ 4, 4, -4, -4 ] // full raw 6016x4016, Official 6000x4000
},
{ // Quality C, only raw crop
"make_model": "Leica SL2",
"raw_crop": [ 0, 0, 0, -18 ] // 18 rows at bottom are garbage
},
{ // Quality C
"make_model": "LG mobile LG-H815",
"dcraw_matrix": [ 5859,547,-1250,-6484,15547,547,-2422,5625,3906 ], // DNG D65

View File

@@ -700,6 +700,10 @@ namespace rtengine
void RawImageSource::captureSharpening(const procparams::CaptureSharpeningParams &sharpeningParams, bool showMask, double &conrastThreshold, double &radius) {
if (!(ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS || ri->get_colors() == 1)) {
return;
}
if (plistener) {
plistener->setProgressStr(M("TP_PDSHARPENING_LABEL"));
plistener->setProgress(0.0);