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

Add Lensfun DB lookup fallback directory

Browse Source 
Load from the bundled database directory if loading from the configured
location fails.
This commit is contained in:
Lawrence Lee 2022-11-24 13:09:30 -08:00
parent 331b3af0e4
commit 255dc13843
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtengine/init.cc
View File

@ -58,10 +58,20 @@ int init (const Settings* s, const Glib::ustring& baseDir, const Glib::ustring&
#pragma omp section #pragma omp section
#endif #endif
{ {
bool ok;
if (s->lensfunDbDirectory.empty() || Glib::path_is_absolute(s->lensfunDbDirectory)) { if (s->lensfunDbDirectory.empty() || Glib::path_is_absolute(s->lensfunDbDirectory)) {
LFDatabase::init(s->lensfunDbDirectory); ok = LFDatabase::init(s->lensfunDbDirectory);
} else { } else {
LFDatabase::init(Glib::build_filename(baseDir, s->lensfunDbDirectory)); ok = LFDatabase::init(Glib::build_filename(baseDir, s->lensfunDbDirectory));
}
if (!ok && !s->lensfunDbBundleDirectory.empty() && s->lensfunDbBundleDirectory != s->lensfunDbDirectory) {
if (Glib::path_is_absolute(s->lensfunDbBundleDirectory)) {
LFDatabase::init(s->lensfunDbBundleDirectory);
} else {
LFDatabase::init(Glib::build_filename(baseDir, s->lensfunDbBundleDirectory));
}
} }
} }
#ifdef _OPENMP #ifdef _OPENMP

1
rtengine/settings.h
View File

@ -83,6 +83,7 @@ public:
double level0_cbdl; double level0_cbdl;
double level123_cbdl; double level123_cbdl;
Glib::ustring lensfunDbDirectory; // The directory containing the lensfun database. If empty, the system defaults will be used, as described in https://lensfun.github.io/manual/latest/dbsearch.html Glib::ustring lensfunDbDirectory; // The directory containing the lensfun database. If empty, the system defaults will be used, as described in https://lensfun.github.io/manual/latest/dbsearch.html
Glib::ustring lensfunDbBundleDirectory;
int cropsleep; int cropsleep;
double reduchigh; double reduchigh;
double reduclow; double reduclow;

2
rtgui/main-cli.cc
View File

@ -148,12 +148,14 @@ int main (int argc, char **argv)
} }
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
options.rtSettings.lensfunDbBundleDirectory = LENSFUN_DB_PATH;
#else #else
argv0 = DATA_SEARCH_PATH; argv0 = DATA_SEARCH_PATH;
creditsPath = CREDITS_SEARCH_PATH; creditsPath = CREDITS_SEARCH_PATH;
licensePath = LICENCE_SEARCH_PATH; licensePath = LICENCE_SEARCH_PATH;
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
options.rtSettings.lensfunDbBundleDirectory = LENSFUN_DB_PATH;
#endif #endif
bool quickstart = dontLoadCache (argc, argv); bool quickstart = dontLoadCache (argc, argv);

2
rtgui/main.cc
View File

@ -425,12 +425,14 @@ int main (int argc, char **argv)
} }
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
options.rtSettings.lensfunDbBundleDirectory = LENSFUN_DB_PATH;
#else #else
argv0 = DATA_SEARCH_PATH; argv0 = DATA_SEARCH_PATH;
creditsPath = CREDITS_SEARCH_PATH; creditsPath = CREDITS_SEARCH_PATH;
licensePath = LICENCE_SEARCH_PATH; licensePath = LICENCE_SEARCH_PATH;
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
options.rtSettings.lensfunDbBundleDirectory = LENSFUN_DB_PATH;
#endif #endif
#ifdef WIN32 #ifdef WIN32