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

allow to use a relative path for Lensfun.DBDirectory in options

Browse Source
This commit is contained in:
Alberto Griggio
2017-09-26 00:10:23 +02:00
parent 31095d3a9d
commit be39ef3260
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/init.cc
View File

@@ -51,7 +51,11 @@ int init (const Settings* s, Glib::ustring baseDir, Glib::ustring userSettingsDi
Color::init (); Color::init ();
PerceptualToneCurve::init (); PerceptualToneCurve::init ();
RawImageSource::init (); RawImageSource::init ();
if (s->lensfunDbDirectory.empty() || Glib::path_is_absolute(s->lensfunDbDirectory)) {
LFDatabase::init(s->lensfunDbDirectory); LFDatabase::init(s->lensfunDbDirectory);
} else {
LFDatabase::init(Glib::build_filename(baseDir, s->lensfunDbDirectory));
}
delete lcmsMutex; delete lcmsMutex;
lcmsMutex = new MyMutex; lcmsMutex = new MyMutex;
dfm.init( s->darkFramesPath ); dfm.init( s->darkFramesPath );

4
rtgui/main-cli.cc
View File

@@ -145,11 +145,7 @@ int main (int argc, char **argv)
licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH); licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH);
} }
if (Glib::path_is_absolute(LENSFUN_DB_PATH)) {
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
} else {
options.rtSettings.lensfunDbDirectory = Glib::build_filename(exePath, LENSFUN_DB_PATH);
}
#else #else
argv0 = DATA_SEARCH_PATH; argv0 = DATA_SEARCH_PATH;

4
rtgui/main.cc
View File

@@ -529,11 +529,7 @@ int main (int argc, char **argv)
licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH); licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH);
} }
if (strlen(LENSFUN_DB_PATH) == 0 || Glib::path_is_absolute (LENSFUN_DB_PATH)) {
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
} else {
options.rtSettings.lensfunDbDirectory = Glib::build_filename (exePath, LENSFUN_DB_PATH);
}
#else #else
argv0 = DATA_SEARCH_PATH; argv0 = DATA_SEARCH_PATH;