liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-10-01 14:55:25 +02:00
parent 015cef4e74 9764d0e972
commit 9a982e6fc2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/camconst.json
View File

@@ -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 { // Quality B, no LENR samples
"make_model": "Nikon D5", "make_model": "Nikon D5",
"dcraw_matrix": [ 9200,-3522,-992,-5755,13803,2117,-753,1486,6338 ], // adobe dng_v9.5 d65 "dcraw_matrix": [ 9200,-3522,-992,-5755,13803,2117,-753,1486,6338 ], // adobe dng_v9.5 d65

2
rtgui/extprog.cc
View File

@@ -334,7 +334,7 @@ bool ExtProgStore::openInCustomEditor (const Glib::ustring& fileName)
#else #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); return spawnCommandAsync (cmdLine);
#endif #endif