From ca42b7b726f901c18153efd3206f1e4fe597b769 Mon Sep 17 00:00:00 2001
From: scx <scx.mail@gmail.com>
Date: Thu, 26 Sep 2019 04:21:28 +0200
Subject: [PATCH 1/3] Fix launch of custom editor

Fixes Beep6581/RawTherapee#5472
---
 rtgui/extprog.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rtgui/extprog.cc b/rtgui/extprog.cc
index 95c1c937d..00ea07713 100644
--- a/rtgui/extprog.cc
+++ b/rtgui/extprog.cc
@@ -334,7 +334,7 @@ bool ExtProgStore::openInCustomEditor (const Glib::ustring& fileName)
 
 #else
 
-    const auto cmdLine = Glib::ustring("\"") + options.customEditorProg + "\" " + Glib::shell_quote(fileName);
+    const auto cmdLine = options.customEditorProg + Glib::ustring(" ") + Glib::shell_quote(fileName);
     return spawnCommandAsync (cmdLine);
 
 #endif

From bd3c8a2066e525d0737c06098b69ecc55406cc99 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Mon, 30 Sep 2019 17:19:46 +0200
Subject: [PATCH 2/3] Nikon COOLPIX P1000 black level

---
 rtengine/camconst.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index 7f481e104..ae50369e5 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -1481,6 +1481,13 @@ Camera constants:
         }
     },
 
+    { // Quality C
+        "make_model": "Nikon COOLPIX P1000",
+        "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

From 9764d0e97250df24ce9fc489d013091d938d5996 Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Tue, 1 Oct 2019 11:31:37 +0200
Subject: [PATCH 3/3] NIKON COOLPIX P1000 matrix, closes #5480

Also, no issue with magenta highlights, so bumping quality to B.
---
 rtengine/camconst.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index ae50369e5..128ba3e24 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -1481,11 +1481,10 @@ Camera constants:
         }
     },
 
-    { // Quality C
-        "make_model": "Nikon COOLPIX P1000",
-        "ranges": {
-            "black": 200
-        }
+    { // 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