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
2017-09-26 12:44:10 +02:00
parent 8b7c3ab0a5 be39ef3260
commit b7a0b6c1aa
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/init.cc
View File

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

6
rtgui/main-cli.cc
View File

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

6
rtgui/main.cc
View File

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

3
rtgui/options.cc
View File

@@ -519,8 +519,7 @@ void Options::setDefaults ()
#endif
// 0 = SET mode, 1 = ADD mode
baBehav.clear();
baBehav.resize(ADDSET_PARAM_NUM, 0);
baBehav.assign(ADDSET_PARAM_NUM, 0);
rtSettings.darkFramesPath = "";
rtSettings.flatFieldsPath = "";

3
rtgui/preferences.cc
View File

@@ -2582,8 +2582,7 @@ bool Preferences::splashClosed (GdkEventAny* event)
void Preferences::behAddSetAllPressed (bool add)
{
moptions.baBehav.clear();
moptions.baBehav.resize(ADDSET_PARAM_NUM, add);
moptions.baBehav.assign(ADDSET_PARAM_NUM, add);
for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); ++sections) {
for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); ++adjs) {
adjs->set_value(behavColumns.badd, add);