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

Move camera constants into multiple JSON files

Browse Source 
Create dcraw.json for dcraw constants, rt.json for RawTherapee overrides
for dcraw, and cammatrices.json for color matrices from Adobe DNG
Converter.

Cherry-picked from ART, commit 4f360f3a883f6920f6507c533646db275853093f.
This commit is contained in:
Lawrence Lee
2024-11-10 14:59:16 -08:00
parent bc2fbfad66
commit 6bd9d410ca
5 changed files with 4968 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtengine/camconst.cc
View File

@@ -863,7 +863,29 @@ CameraConstantsStore::~CameraConstantsStore()
void CameraConstantsStore::init(const Glib::ustring& baseDir, const Glib::ustring& userSettingsDir)
{
parse_camera_constants_file(Glib::build_filename(baseDir, "camconst.json"));
// list of built-in files with camera constants. Besides camconst.json, we
// now have 3 more locations where camera matrices are stored:
//
// - dcraw.json, with matrices copied from dcraw.cc
// - rt.json, with matrices copied from rawimage.cc
// - cammatrices.json, with matrices rebuilt from the Adobe DNG converter
//
// the first two are essentially for backwards compatibility only. We want
// to store all the new matrices in cammatrices.json
//
// note that the order is relevant, later files ones override earlier ones
static const char *builtin_files[] = {
"dcraw.json",
"rt.json",
"camconst.json",
"cammatrices.json"
};
for (size_t i = 0; i < sizeof(builtin_files)/sizeof(const char *); ++i) {
Glib::ustring f(Glib::build_filename(baseDir, builtin_files[i]));
if (Glib::file_test(f, Glib::FILE_TEST_EXISTS)) {
parse_camera_constants_file(f);
}
}
const Glib::ustring userFile(Glib::build_filename(userSettingsDir, "camconst.json"));