merge 'simpleprocess-fast-export-test' into dev

This commit is contained in:
Alberto Griggio
2017-03-28 15:02:10 +02:00
13 changed files with 1588 additions and 1251 deletions

View File

@@ -480,6 +480,7 @@ void Options::setDefaults ()
fastexport_resize_dataspec = 3;
fastexport_resize_width = 900;
fastexport_resize_height = 900;
fastexport_use_fast_pipeline = true;
clutsDir = "./cluts";
@@ -1784,6 +1785,9 @@ int Options::readFromFile (Glib::ustring fname)
if (keyFile.has_key ("Fast Export", "fastexport_resize_height" )) {
fastexport_resize_height = keyFile.get_integer ("Fast Export", "fastexport_resize_height" );
}
if (keyFile.has_key ("Fast Export", "fastexport_use_fast_pipeline" )) {
fastexport_use_fast_pipeline = keyFile.get_integer ("Fast Export", "fastexport_use_fast_pipeline" );
}
}
if (keyFile.has_group ("Dialogs")) {
@@ -2142,6 +2146,7 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_integer ("Fast Export", "fastexport_resize_dataspec", fastexport_resize_dataspec );
keyFile.set_integer ("Fast Export", "fastexport_resize_width", fastexport_resize_width );
keyFile.set_integer ("Fast Export", "fastexport_resize_height", fastexport_resize_height );
keyFile.set_integer ("Fast Export", "fastexport_use_fast_pipeline", fastexport_use_fast_pipeline );
keyFile.set_string ("Dialogs", "LastIccDir", lastIccDir);
keyFile.set_string ("Dialogs", "LastDarkframeDir", lastDarkframeDir);