From 1ecbd73a4a36508664b474386f3be0b3df685b91 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
Date: Sun, 24 Sep 2023 16:37:29 -0700
Subject: [PATCH] Update camconst.json from ART

Add color matrix for Canon EOS Rebel SL3 (250D / Kiss X10).
Add masked areas for Canon EOS M6 Mark II and 90D.
Include Canon PowerShot G9 X for values for G5 X and G7 X Mark II.
Add black level for LEICA D-LUX 7.
Include PANASONIC DC-GX880 for values for DC-GF10.
---
 rtengine/camconst.json | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index 998ddff19..089f5e4dc 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -1053,6 +1053,11 @@ Camera constants:
         }
     },
 
+    { // Quality C
+        "make_model": [ "Canon EOS Rebel SL3", "Canon EOS 250D", "Canon EOS Kiss X10" ],
+        "dcraw_matrix": [ 9079, -1923, -1236, -4677, 12454, 2492, -922, 2319, 5565 ]
+    },
+
 // Canon low-range DSLRs
 // Canon EOS 1200D/Rebel T5/Kiss X70" is upper at the same item as 600D/T3i/X5
 
@@ -1217,7 +1222,8 @@ Camera constants:
 
     { // Quality C, only raw crop
         "make_model": [ "Canon EOS M6 Mark II", "Canon EOS 90D" ],
-        "raw_crop": [ 144, 72, 6984, 4660 ]
+        "raw_crop": [ 144, 72, 6984, 4660 ],
+        "masked_areas": [ 76, 40, 4580, 140 ]
     },
 
     { // Quality C, only masked area. Raw crop from metadata ok.
@@ -1363,7 +1369,7 @@ Camera constants:
     },
 
     { // Quality B,
-        "make_model": [ "Canon PowerShot G5 X", "Canon PowerShot G7 X Mark II" ],
+        "make_model": [ "Canon PowerShot G5 X", "Canon PowerShot G9 X", "Canon PowerShot G7 X Mark II" ],
         "dcraw_matrix": [ 9602,-3823,-937,-2984,11495,1675,-407,1414,5049 ], // DNG v13.2
         //"raw_crop": [ 116, 24, 5504, 3680 ], // Sensor size 5632x3710. Largest useful frame 120-5616X28-3702 = 5504x3682, 4pix RTborders, Left Border 120-4, Top border 28-4
         "raw_crop": [ 128, 36, 5480, 3656 ], // Default official 3/2 frame 5472X3648, 4pix borders, Left Border 132-4, Top border 40-4
@@ -1630,8 +1636,9 @@ Camera constants:
 
     { // Quality B
         "make_model" : "LEICA D-LUX 7",
-        "dcraw_matrix" : [11577, -4230, -1106, -3967, 12211, 1957, -758, 1762, 5610] // DNG
+        "dcraw_matrix" : [11577, -4230, -1106, -3967, 12211, 1957, -758, 1762, 5610], // DNG
         // "dcraw_matrix" : [8585, -3127, -833, -4005, 12250, 1953, -650, 1494, 4862] // DNG alternate
+        "ranges" : { "black" : 15 }
     },
 
     { // Quality B, Matrix from Adobe's dcp D65 instead of the internal in Leica's DNG
@@ -2260,7 +2267,7 @@ Camera constants:
     },
 
     { // Quality C, only color matrix
-        "make_model" : "Panasonic DC-GF10",
+        "make_model" : [ "Panasonic DC-GF10", "PANASONIC DC-GX880" ],
         "dcraw_matrix": [ 7610, -2781, -576, -4614, 12195, 2733, -1375, 2393, 6490 ], // DNG v13.2
         "raw_crop": [ 0, 0, 4600, 0 ], // SensorWidth=4816 SensorHeight=3464. Width=4600 to match DNG.
         "ranges": { "black": 15 }