merge with dev

This commit is contained in:
Desmis
2018-04-30 07:49:49 +02:00
56 changed files with 465 additions and 989 deletions

View File

@@ -447,7 +447,6 @@ void Options::setDefaults()
//fastexport_bypass_colorDenoise = true;
fastexport_bypass_defringe = true;
fastexport_bypass_dirpyrDenoise = true;
fastexport_bypass_sh_hq = true;
fastexport_bypass_dirpyrequalizer = true;
fastexport_bypass_wavelet = true;
fastexport_raw_bayer_method = "fast";
@@ -1545,10 +1544,6 @@ void Options::readFromFile(Glib::ustring fname)
fastexport_bypass_dirpyrDenoise = keyFile.get_boolean("Fast Export", "fastexport_bypass_dirpyrDenoise");
}
if (keyFile.has_key("Fast Export", "fastexport_bypass_sh_hq")) {
fastexport_bypass_sh_hq = keyFile.get_boolean("Fast Export", "fastexport_bypass_sh_hq");
}
if (keyFile.has_key("Fast Export", "fastexport_bypass_dirpyrequalizer")) {
fastexport_bypass_dirpyrequalizer = keyFile.get_boolean("Fast Export", "fastexport_bypass_dirpyrequalizer");
}
@@ -2024,7 +2019,6 @@ void Options::saveToFile(Glib::ustring fname)
//keyFile.set_boolean ("Fast Export", "fastexport_bypass_colorDenoise" , fastexport_bypass_colorDenoise);
keyFile.set_boolean("Fast Export", "fastexport_bypass_defringe", fastexport_bypass_defringe);
keyFile.set_boolean("Fast Export", "fastexport_bypass_dirpyrDenoise", fastexport_bypass_dirpyrDenoise);
keyFile.set_boolean("Fast Export", "fastexport_bypass_sh_hq", fastexport_bypass_sh_hq);
keyFile.set_boolean("Fast Export", "fastexport_bypass_dirpyrequalizer", fastexport_bypass_dirpyrequalizer);
keyFile.set_boolean("Fast Export", "fastexport_bypass_wavelet", fastexport_bypass_wavelet);
keyFile.set_string("Fast Export", "fastexport_raw_bayer_method", fastexport_raw_bayer_method);