Merge branch 'dev' into preprocess_wb

rtgui/paramsedited.h

@@ -275,6 +275,7 @@ struct ColorAppearanceParamsEdited {
     bool ybscen;
     bool badpixsl;
     bool wbmodel;
+    bool illum;
     bool algo;
     bool jlight;
     bool qbright;
@@ -498,6 +499,12 @@ struct WaveletParamsEdited {
     bool strength;
     bool balance;
     bool iter;
+    bool sigmafin;
+    bool sigmaton;
+    bool sigmacol;
+    bool sigmadir;
+    bool rangeab;
+    bool protab;
     bool median;
     bool medianlev;
     bool linkedg;
@@ -507,6 +514,7 @@ struct WaveletParamsEdited {
     bool ushamethod;
     bool avoid;
     bool showmask;
+    bool oldsh;
     bool tmr;
     bool c[9];
     bool ch[9];
@@ -524,9 +532,13 @@ struct WaveletParamsEdited {
     bool daubcoeffmethod;
     bool Dirmethod;
     bool sigma;
+    bool offset;
+    bool lowthr;
     bool rescon;
     bool resconH;
     bool reschro;
+    bool resblur;
+    bool resblurc;
     bool tmrs;
     bool edgs;
     bool scale;
@@ -545,6 +557,7 @@ struct WaveletParamsEdited {
     bool chroma;
     bool contrast;
     bool edgrad;
+    bool edgeffect;
     bool edgval;
     bool edgthresh;
     bool thr;
@@ -556,11 +569,15 @@ struct WaveletParamsEdited {
     bool hllev;
     bool bllev;
     bool edgcont;
+    bool chrwav;
+    bool bluwav;
     bool level0noise;
     bool level1noise;
     bool level2noise;
     bool level3noise;
     bool ccwcurve;
+    bool blcurve;
+    bool opacityCurveSH;
     bool opacityCurveBY;
     bool opacityCurveRG;
     bool opacityCurveW;
@@ -576,6 +593,10 @@ struct WaveletParamsEdited {
     bool bluemed;
     bool greenhigh;
     bool bluehigh;
+    bool ballum;
+    bool balchrom;
+    bool chromfi;
+    bool chromco;
     bool mergeL;
     bool mergeC;
     bool softrad;
@@ -583,11 +604,17 @@ struct WaveletParamsEdited {
     bool expcontrast;
     bool expchroma;
     bool expedge;
+    bool expbl;
     bool expresid;
     bool expfinal;
     bool exptoning;
     bool expnoise;
     bool expclari;
+    bool labgridALow;
+    bool labgridBLow;
+    bool labgridAHigh;
+    bool labgridBHigh;
+    
 };
 
 struct DirPyrEqualizerParamsEdited {
@@ -720,6 +747,7 @@ struct FilmNegativeParamsEdited {
     bool redRatio;
     bool greenExp;
     bool blueRatio;
+    bool baseValues;
 
     bool isUnchanged() const;
 };