merge with dev

2017-11-19 09:08:45 +01:00
parent 1483f28bfb f6bd06a06c
commit 75cec00e95
51 changed files with 2253 additions and 409 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -47,7 +47,6 @@ struct SaveFormat {
    SaveFormat() :
        format ("jpg"),
        pngBits (8),
-        pngCompression (6),
        jpegQuality (90),
        jpegSubSamp (2),
        tiffBits (8),
@@ -58,7 +57,6 @@ struct SaveFormat {

    Glib::ustring format;
    int pngBits;
-    int pngCompression;
    int jpegQuality;
    int jpegSubSamp;  // 1=best compression, 3=best quality
    int tiffBits;