From 4857566d258ffaaf12e03bf17df4bb90b2e505f0 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Tue, 12 Nov 2019 18:06:55 +0100 Subject: [PATCH 1/2] Capture sharpening: add range label to default file --- rtdata/languages/default | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rtdata/languages/default b/rtdata/languages/default index f1ed6ed5f..bdc3fc8a0 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -771,6 +771,7 @@ HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost +HISTORY_MSG_PDSHARPEN_RANGE;CS - Range HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter @@ -2037,6 +2038,7 @@ TP_SHARPENING_METHOD;Method TP_SHARPENING_ONLYEDGES;Sharpen only edges TP_SHARPENING_RADIUS;Radius TP_SHARPENING_RADIUS_BOOST;Corner radius boost +TP_SHARPENING_RANGE;Range TP_SHARPENING_RLD;RL Deconvolution TP_SHARPENING_RLD_AMOUNT;Amount TP_SHARPENING_RLD_DAMPING;Damping From a4909dc09e610b02beeddc8f01b329ed1b3711e7 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 12 Nov 2019 22:49:07 +0100 Subject: [PATCH 2/2] Panasonic DC-S1 white levels update Updated white levels for ISO 50, 64 and 80, based on raw files from issue #5204 --- rtengine/camconst.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 3463bfcc9..f2db455a3 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -1,4 +1,5 @@ /* +vim: set syntax=javascript: DO NOT EDIT THIS FILE! @@ -2142,10 +2143,17 @@ Camera constants: } }, - { // Quality B, issue #5204. Missing ISO 50, 64 and 80 and I expect the WL to differ for these ISO values + { // Quality A, issue #5204. "make_model": [ "Panasonic DC-S1" ], "dcraw_matrix": [ 9744, -3905, -779, -4899, 12807, 2324, -798, 1630, 5827 ], // ColorMatrix2 using illuminant D65 from Adobe DNG Converter 11.4 - "ranges": { "white": 16320 } + "ranges": { + "white": [ + { "iso": 50, "levels": 8400 }, // LENR 8000 + { "iso": 64, "levels": 10450 }, // LENR 10000 + { "iso": 80, "levels": 13050 }, // LENR 12400 + { "iso": 100, "levels": 16320 } + ] + } }, { // Quality X, issue #5204. No white frames available.