merge with dev

rtengine/procparams.h

@@ -680,6 +680,7 @@ struct ColorAppearanceParams {
     double        adaplum;
     int           badpixsl;
     Glib::ustring wbmodel;
+    Glib::ustring illum;
     Glib::ustring algo;
     double        contrast;
     double        qcontrast;
@@ -695,10 +696,12 @@ struct ColorAppearanceParams {
     bool          datacie;
     bool          tonecie;
     int tempout;
+    bool          autotempout;
     int ybout;
     double greenout;
     int tempsc;
     double greensc;
+    bool presetcat02;
 
     ColorAppearanceParams();
 
@@ -1668,9 +1671,14 @@ struct WaveletParams {
     int bluemed;
     int greenhigh;
     int bluehigh;
+    double mergeL;
+    double mergeC;
+    double softrad;
+    double softradend;
 
     bool lipst;
     bool avoid;
+    bool showmask;
     bool tmr;
     int strength;
     int balance;
@@ -1684,6 +1692,7 @@ struct WaveletParams {
     bool expfinal;
     bool exptoning;
     bool expnoise;
+    bool expclari;
 
     int Lmethod;
     Glib::ustring CLmethod;
@@ -1692,6 +1701,7 @@ struct WaveletParams {
     Glib::ustring daubcoeffmethod;
     Glib::ustring CHmethod;
     Glib::ustring Medgreinf;
+    Glib::ustring ushamethod;
     Glib::ustring CHSLmethod;
     Glib::ustring EDmethod;
     Glib::ustring NPmethod;
@@ -1699,10 +1709,13 @@ struct WaveletParams {
     Glib::ustring TMmethod;
     Glib::ustring Dirmethod;
     Glib::ustring HSmethod;
+    double sigma;
     int rescon;
     int resconH;
     int reschro;
     double tmrs;
+    double edgs;
+    double scale;
     double gamma;
     int sup;
     double sky;
@@ -1722,6 +1735,7 @@ struct WaveletParams {
     int edgthresh;
     int thr;
     int thrH;
+    int radius;
     double skinprotect;
     Threshold<int> hueskin;
     Threshold<int> hueskin2;