merge with dev

rtengine/camconst.json

@@ -115,7 +115,7 @@ How to Measure White Levels:
     dcraw provides the default values used by RawTherapee, but often provides too high white levels, and only provides a
     single value regardless of color channel, ISO or aperture. If you open an image with a large clipped area and that
     is rendered in a pink/magenta color rather than white it usually means that the white level constant is too high. You can
-    fix this by adjusting the"Raw White Point" in the raw tab inside RawTherapee, or permanently fix it by measuring and
+    fix this by adjusting white-point correction in the Raw tab > Raw White Points, or permanently fix it by measuring and
     providing a more exact white level in camconst.json so RawTherapee gets to know from start where the camera actually
     clips. Providing a complete and detailed white-level profile can be a quite large and complicated effort. As an
     alternative you can provide a simpler profile.We suggest one of the following alternatives in rising difficulty
@@ -159,7 +159,7 @@ How to Measure White Levels:
     histogram. While it's common to with very little variation, say only +/-2 units, some can have +/-500 or more (some may
     have different variation depending on ISO). There can also be camera-to-camera variation.
 
-    If the white level is set too high RawTherapee will not think the pixels are clipped and you can get discoloured
+    If the white level is set too high RawTherapee will not think the pixels are clipped and you can get discolored
     highlights (usually pink), this is what we want to avoid. If white level is set too low RawTherapee will clip early, ie
     you lose a little highlight detail, but the color is rendered correctly and highlight reconstruction can work properly,
     so this is not as bad. This is why we want conservative values.
@@ -1622,14 +1622,14 @@ Camera constants:
         "ranges": { "white": 3980 } // 12-bit files.
     },
 
-    { // Quality C, only colour matrix and PDAF lines info
+    { // Quality C, only color matrix and PDAF lines info
         "make_model" : "Nikon Z 7",
         "dcraw_matrix" : [10405,-3755,-1270,-5461,13787,1793,-1040,2015,6785], // Adobe DNG Converter 11.0 ColorMatrix2
         "pdaf_pattern" : [0, 12],
         "pdaf_offset" : 29
     },
 
-    { // Quality C, only colour matrix and PDAF lines info
+    { // Quality C, only color matrix and PDAF lines info
         "make_model" : "Nikon Z 6",
         "dcraw_matrix" : [8210, -2534, -683, -5355, 13338, 2212, -1143, 1929, 6464], // Adobe DNG Converter 11.1 Beta ColorMatrix2
         "pdaf_pattern" : [0, 12],
@@ -1759,6 +1759,15 @@ Camera constants:
         }
     },
 
+    { // Quality C, only color matrix
+        "make_model" : "Panasonic DC-GF10",
+        "dcraw_matrix": [ 7610, -2780, -576, -4614, 12195, 2733, -1375, 2393, 6490 ], // ColorMatrix2 from Adobe DNG Converter 11.3
+        "raw_crop": [ 0, 0, 4600, 0 ], // SensorWidth=4816 SensorHeight=3464. Width=4600 to match DNG.
+        "ranges": {
+            "black": 15
+        }
+    },
+
     { // Quality B, CameraPhone, some samples are missing but has the same sensor as FZ1000 ..
         "make_model": [ "Panasonic DMC-CM1", "Panasonic DMC-CM10" ],
         "dcraw_matrix": [ 8770,-3194,-820,-2871,11281,1803,-513,1552,4434 ], // dcp_v8.7 d65
@@ -1897,7 +1906,8 @@ Camera constants:
         "dcraw_matrix": [ 7122,-2092,-419,-4643,11769,3283,-1363,2413,5944 ], // RT
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
-            "white": 4060 } // Exif:4095 normal distribution 4080-4095, 4070-4095 on long exposure NR
+            "white": 4060 // Exif:4095 normal distribution 4080-4095, 4070-4095 on long exposure NR
+        }
     },
 
     { // Quality A, Replicated from rawimage.cc
@@ -1917,7 +1927,8 @@ Camera constants:
         "dcraw_matrix": [ 7694,-1791,-745,-4917,12818,2332,-1221,2322,7197 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
-            "white": 4050 } // Exif:4095 normal distribution 4080-4095, 4050-4095 on long exposure NR
+            "white": 4050 // Exif:4095 normal distribution 4080-4095, 4050-4095 on long exposure NR
+        }
     },
 
     { // Quality A, Replicated from rawimage.cc
@@ -1925,7 +1936,8 @@ Camera constants:
         "dcraw_matrix": [ 8074,-1846,-861,-5026,12999,2239,-1320,2375,7422 ], // Colin Walker
         "ranges": {
             "black": 15, // 15 is BL offset. dcraw/RT read the base black from Exif and calculates total BL = BLbase+BLoffset
-            "white": 4050 } // Exif:4095 normal distribution 4080-4095, 4050-4095 on long exposure NR
+            "white": 4050 // Exif:4095 normal distribution 4080-4095, 4050-4095 on long exposure NR
+        }
     },
 
     { // Quality A, Replicated from rawimage.cc