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

one more fix for locating the lensfun db in bundle mode

Browse Source
This commit is contained in:
Alberto Griggio
2017-09-17 16:45:54 +02:00
parent 6d453dbd34
commit 6f7ca3f5ec
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/main-cli.cc
View File

@@ -59,7 +59,6 @@ Glib::ustring argv0;
Glib::ustring creditsPath; Glib::ustring creditsPath;
Glib::ustring licensePath; Glib::ustring licensePath;
Glib::ustring argv1; Glib::ustring argv1;
Glib::ustring lensfunDbPath;
//bool simpleEditor; //bool simpleEditor;
//Glib::Threads::Thread* mainThread; //Glib::Threads::Thread* mainThread;
@@ -147,16 +146,16 @@ int main (int argc, char **argv)
} }
if (Glib::path_is_absolute(LENSFUN_DB_PATH)) { if (Glib::path_is_absolute(LENSFUN_DB_PATH)) {
lensfunDbPath = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
} else { } else {
lensfunDbPath = Glib::build_filename(exePath, LENSFUN_DB_PATH); options.rtSettings.lensfunDbDirectory = Glib::build_filename(exePath, 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;
lensfunDbPath = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
#endif #endif
bool quickstart = dontLoadCache (argc, argv); bool quickstart = dontLoadCache (argc, argv);

7
rtgui/main.cc
View File

@@ -60,7 +60,6 @@ extern Options options;
Glib::ustring argv0; Glib::ustring argv0;
Glib::ustring creditsPath; Glib::ustring creditsPath;
Glib::ustring licensePath; Glib::ustring licensePath;
Glib::ustring lensfunDbPath;
Glib::ustring argv1; Glib::ustring argv1;
Glib::ustring argv2; Glib::ustring argv2;
bool simpleEditor = false; bool simpleEditor = false;
@@ -531,16 +530,16 @@ int main (int argc, char **argv)
} }
if (Glib::path_is_absolute (LENSFUN_DB_PATH)) { if (Glib::path_is_absolute (LENSFUN_DB_PATH)) {
lensfunDbPath = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
} else { } else {
lensfunDbPath = Glib::build_filename (exePath, LENSFUN_DB_PATH); options.rtSettings.lensfunDbDirectory = Glib::build_filename (exePath, 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;
lensfunDbPath = LENSFUN_DB_PATH; options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
#endif #endif

5
rtgui/options.cc
View File

@@ -49,8 +49,6 @@ Options options;
Glib::ustring versionString = RTVERSION; Glib::ustring versionString = RTVERSION;
Glib::ustring paramFileExtension = ".pp3"; Glib::ustring paramFileExtension = ".pp3";
extern Glib::ustring lensfunDbPath; // defined in main
Options::Options () Options::Options ()
{ {
@@ -729,8 +727,7 @@ void Options::setDefaults ()
lastLensProfileDir = ""; lastLensProfileDir = "";
gimpPluginShowInfoDialog = true; gimpPluginShowInfoDialog = true;
maxRecentFolders = 15; maxRecentFolders = 15;
rtSettings.lensfunDbDirectory = ""; // set also in main.cc and main-cli.cc
rtSettings.lensfunDbDirectory = lensfunDbPath;
} }
Options* Options::copyFrom (Options* other) Options* Options::copyFrom (Options* other)