merge with dev

2019-10-01 14:55:25 +02:00
parent 015cef4e74 9764d0e972
commit 9a982e6fc2
2 changed files with 7 additions and 1 deletions
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -1481,6 +1481,12 @@ Camera constants:
        }
    },

+    { // Quality B
+        "make_model": "NIKON COOLPIX P1000",
+        "dcraw_matrix": [ 14294, -6116, -1333, -1628, 10219, 1637, -14, 1158, 5022 ], // ColorMatrix2 from Adobe DNG Converter 11.4
+        "ranges": { "black": 200 }
+    },
+
    { // Quality B, no LENR samples
        "make_model": "Nikon D5",
        "dcraw_matrix": [ 9200,-3522,-992,-5755,13803,2117,-753,1486,6338 ], // adobe dng_v9.5 d65