Merge branch 'dev' into metadata-exiv2
This commit is contained in:
@@ -313,6 +313,7 @@ void Options::setDefaults()
|
||||
saveFormat.tiffBits = 16;
|
||||
saveFormat.tiffFloat = false;
|
||||
saveFormat.tiffUncompressed = true;
|
||||
saveFormat.bigTiff = false;
|
||||
saveFormat.saveParams = true;
|
||||
|
||||
saveFormatBatch.format = "jpg";
|
||||
@@ -1049,6 +1050,10 @@ void Options::readFromFile(Glib::ustring fname)
|
||||
saveFormat.tiffUncompressed = keyFile.get_boolean("Output", "TiffUncompressed");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Output", "BigTiff")) {
|
||||
saveFormat.bigTiff = keyFile.get_boolean("Output", "BigTiff");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Output", "SaveProcParams")) {
|
||||
saveFormat.saveParams = keyFile.get_boolean("Output", "SaveProcParams");
|
||||
}
|
||||
@@ -2471,6 +2476,7 @@ void Options::saveToFile(Glib::ustring fname)
|
||||
keyFile.set_integer("Output", "TiffBps", saveFormat.tiffBits);
|
||||
keyFile.set_boolean("Output", "TiffFloat", saveFormat.tiffFloat);
|
||||
keyFile.set_boolean("Output", "TiffUncompressed", saveFormat.tiffUncompressed);
|
||||
keyFile.set_boolean("Output", "BigTiff", saveFormat.bigTiff);
|
||||
keyFile.set_boolean("Output", "SaveProcParams", saveFormat.saveParams);
|
||||
|
||||
keyFile.set_string("Output", "FormatBatch", saveFormatBatch.format);
|
||||
|
Reference in New Issue
Block a user