liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into highlight-slider

Browse Source
This commit is contained in:
Thanatomanic
2018-09-02 15:51:17 +02:00
parent f59e7c31e4 df1dc438ff
commit 52e4231c97
111 changed files with 1530 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/options.cc
View File

@@ -301,6 +301,7 @@ void Options::setDefaults()
saveFormat.jpegSubSamp = 2;
saveFormat.pngBits = 8;
saveFormat.tiffBits = 16;
saveFormat.tiffFloat = false;
saveFormat.tiffUncompressed = true;
saveFormat.saveParams = true;
@@ -309,6 +310,7 @@ void Options::setDefaults()
saveFormatBatch.jpegSubSamp = 2;
saveFormatBatch.pngBits = 8;
saveFormatBatch.tiffBits = 16;
saveFormatBatch.tiffFloat = false;
saveFormatBatch.tiffUncompressed = true;
saveFormatBatch.saveParams = true;
@@ -759,6 +761,10 @@ void Options::readFromFile(Glib::ustring fname)
saveFormat.tiffBits = keyFile.get_integer("Output", "TiffBps");
}
if (keyFile.has_key ("Output", "TiffFloat")) {
saveFormat.tiffFloat = keyFile.get_boolean ("Output", "TiffFloat");
}
if (keyFile.has_key("Output", "TiffUncompressed")) {
saveFormat.tiffUncompressed = keyFile.get_boolean("Output", "TiffUncompressed");
}
@@ -788,6 +794,10 @@ void Options::readFromFile(Glib::ustring fname)
saveFormatBatch.tiffBits = keyFile.get_integer("Output", "TiffBpsBatch");
}
if (keyFile.has_key ("Output", "TiffFloatBatch")) {
saveFormatBatch.tiffFloat = keyFile.get_boolean ("Output", "TiffFloatBatch");
}
if (keyFile.has_key("Output", "TiffUncompressedBatch")) {
saveFormatBatch.tiffUncompressed = keyFile.get_boolean("Output", "TiffUncompressedBatch");
}
@@ -1977,6 +1987,7 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_integer("Output", "JpegSubSamp", saveFormat.jpegSubSamp);
keyFile.set_integer("Output", "PngBps", saveFormat.pngBits);
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", "SaveProcParams", saveFormat.saveParams);
@@ -1985,6 +1996,7 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_integer("Output", "JpegSubSampBatch", saveFormatBatch.jpegSubSamp);
keyFile.set_integer("Output", "PngBpsBatch", saveFormatBatch.pngBits);
keyFile.set_integer("Output", "TiffBpsBatch", saveFormatBatch.tiffBits);
keyFile.set_boolean("Output", "TiffFloatBatch", saveFormatBatch.tiffFloat);
keyFile.set_boolean("Output", "TiffUncompressedBatch", saveFormatBatch.tiffUncompressed);
keyFile.set_boolean("Output", "SaveProcParamsBatch", saveFormatBatch.saveParams);