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

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-11-19 09:08:45 +01:00
parent 1483f28bfb f6bd06a06c
commit 75cec00e95
51 changed files with 2253 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/options.cc
View File

@@ -313,7 +313,6 @@ void Options::setDefaults ()
saveFormat.format = "jpg";
saveFormat.jpegQuality = 92;
saveFormat.jpegSubSamp = 2;
saveFormat.pngCompression = 6;
saveFormat.pngBits = 8;
saveFormat.tiffBits = 16;
saveFormat.tiffUncompressed = true;
@@ -322,7 +321,6 @@ void Options::setDefaults ()
saveFormatBatch.format = "jpg";
saveFormatBatch.jpegQuality = 92;
saveFormatBatch.jpegSubSamp = 2;
saveFormatBatch.pngCompression = 6;
saveFormatBatch.pngBits = 8;
saveFormatBatch.tiffBits = 16;
saveFormatBatch.tiffUncompressed = true;
@@ -828,10 +826,6 @@ void Options::readFromFile (Glib::ustring fname)
saveFormat.jpegSubSamp = keyFile.get_integer ("Output", "JpegSubSamp");
}
if (keyFile.has_key ("Output", "PngCompression")) {
saveFormat.pngCompression = keyFile.get_integer ("Output", "PngCompression");
}
if (keyFile.has_key ("Output", "PngBps")) {
saveFormat.pngBits = keyFile.get_integer ("Output", "PngBps");
}
@@ -861,10 +855,6 @@ void Options::readFromFile (Glib::ustring fname)
saveFormatBatch.jpegSubSamp = keyFile.get_integer ("Output", "JpegSubSampBatch");
}
if (keyFile.has_key ("Output", "PngCompressionBatch")) {
saveFormatBatch.pngCompression = keyFile.get_integer ("Output", "PngCompressionBatch");
}
if (keyFile.has_key ("Output", "PngBpsBatch")) {
saveFormatBatch.pngBits = keyFile.get_integer ("Output", "PngBpsBatch");
}
@@ -1987,7 +1977,6 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_string ("Output", "Format", saveFormat.format);
keyFile.set_integer ("Output", "JpegQuality", saveFormat.jpegQuality);
keyFile.set_integer ("Output", "JpegSubSamp", saveFormat.jpegSubSamp);
keyFile.set_integer ("Output", "PngCompression", saveFormat.pngCompression);
keyFile.set_integer ("Output", "PngBps", saveFormat.pngBits);
keyFile.set_integer ("Output", "TiffBps", saveFormat.tiffBits);
keyFile.set_boolean ("Output", "TiffUncompressed", saveFormat.tiffUncompressed);
@@ -1996,7 +1985,6 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_string ("Output", "FormatBatch", saveFormatBatch.format);
keyFile.set_integer ("Output", "JpegQualityBatch", saveFormatBatch.jpegQuality);
keyFile.set_integer ("Output", "JpegSubSampBatch", saveFormatBatch.jpegSubSamp);
keyFile.set_integer ("Output", "PngCompressionBatch", saveFormatBatch.pngCompression);
keyFile.set_integer ("Output", "PngBpsBatch", saveFormatBatch.pngBits);
keyFile.set_integer ("Output", "TiffBpsBatch", saveFormatBatch.tiffBits);
keyFile.set_boolean ("Output", "TiffUncompressedBatch", saveFormatBatch.tiffUncompressed);