Merge branch 'dev' into spot-removal-tool (see #2239)

2017-11-25 23:30:52 +01:00
parent 81932ba2d6 3b7a382f1d
commit 20a0fb7af9
320 changed files with 17146 additions and 8522 deletions
--- a/rtengine/imagefloat.h
+++ b/rtengine/imagefloat.h
@@ -80,9 +80,9 @@ public:
    {
        return save (fname);
    }
-    virtual int          saveAsPNG  (Glib::ustring fname, int compression = -1, int bps = -1)
+    virtual int          saveAsPNG  (Glib::ustring fname, int bps = -1)
    {
-        return savePNG (fname, compression, bps);
+        return savePNG (fname, bps);
    }
    virtual int          saveAsJPEG (Glib::ustring fname, int quality = 100, int subSamp = 3)
    {