merge with dev

2018-02-16 08:22:30 +01:00
parent 9916cdb4b0 38cab123fc
commit 9660858976
12 changed files with 100 additions and 26 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1237,7 +1237,7 @@ struct WaveletParams {
    bool exptoning;
    bool expnoise;

-    Glib::ustring Lmethod;
+    int Lmethod;
    Glib::ustring CLmethod;
    Glib::ustring Backmethod;
    Glib::ustring Tilesmethod;