From 92c29bcd65ae36c418b5bd29393602ad905c8fbf Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Fri, 13 Dec 2019 13:50:00 +0100 Subject: [PATCH 1/2] Skip capture sharpening for predemosaiced raw files, fixes #5563 --- rtengine/capturesharpening.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rtengine/capturesharpening.cc b/rtengine/capturesharpening.cc index 910de6fd3..281a2ad71 100644 --- a/rtengine/capturesharpening.cc +++ b/rtengine/capturesharpening.cc @@ -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); From 0c10b1466ef0220d1aec9d924c2edbd34f80c86f Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Fri, 13 Dec 2019 14:39:05 +0100 Subject: [PATCH 2/2] raw crop for Leica SL2 --- rtengine/camconst.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 8639ea2e1..a3bab58a8 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -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