merge with dev

This commit is contained in:
Desmis
2018-05-05 09:37:58 +02:00
115 changed files with 1924 additions and 3142 deletions

View File

@@ -455,7 +455,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";
@@ -1588,10 +1587,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" );
}
@@ -2079,7 +2074,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);