merge master into retinexgain

2016-05-01 08:53:52 +02:00
parent 67a19d0cc9 c8db56643a
commit a742e3a7ba
221 changed files with 7954 additions and 6498 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1110,7 +1110,7 @@ public:
    double skinprotect;
    Threshold<int> hueskin;
    //Glib::ustring algo;
-
+    Glib::ustring cbdlMethod;
    DirPyrEqualizerParams() : hueskin(20, 80, 2000, 1200, false) {};
 };

@@ -1222,6 +1222,7 @@ public:
    int ff_clipControl;

    bool ca_autocorrect;
+    double caautostrength;
    double cared;
    double cablue;