Merge from branch 'dev'

rtengine/procparams.h

@@ -40,6 +40,7 @@ class OpacityCurve;
 class RetinexgaintransmissionCurve;
 class RetinextransmissionCurve;
 class WavCurve;
+class Wavblcurve;
 class WavOpacityCurveBY;
 class WavOpacityCurveRG;
 class WavOpacityCurveW;
@@ -661,6 +662,7 @@ struct ColorAppearanceParams {
     double        adaplum;
     int           badpixsl;
     Glib::ustring wbmodel;
+    Glib::ustring illum;
     Glib::ustring algo;
     double        contrast;
     double        qcontrast;
@@ -676,10 +678,12 @@ struct ColorAppearanceParams {
     bool          datacie;
     bool          tonecie;
     int tempout;
+    bool          autotempout;
     int ybout;
     double greenout;
     int tempsc;
     double greensc;
+    bool presetcat02;
 
     ColorAppearanceParams();
 
@@ -1195,6 +1199,7 @@ private:
 
 struct WaveletParams {
     std::vector<double> ccwcurve;
+    std::vector<double> blcurve;
     std::vector<double> opacityCurveRG;
     std::vector<double> opacityCurveBY;
     std::vector<double> opacityCurveW;
@@ -1213,9 +1218,19 @@ struct WaveletParams {
     int bluemed;
     int greenhigh;
     int bluehigh;
+    double ballum;
+    double balchrom;
+    double chromfi;
+    double chromco;
+    double mergeL;
+    double mergeC;
+    double softrad;
+    double softradend;
 
     bool lipst;
     bool avoid;
+    bool showmask;
+    bool oldsh;
     bool tmr;
     int strength;
     int balance;
@@ -1225,10 +1240,12 @@ struct WaveletParams {
     int c[9];
     int ch[9];
     bool expedge;
+    bool expbl;
     bool expresid;
     bool expfinal;
     bool exptoning;
     bool expnoise;
+    bool expclari;
 
     int Lmethod;
     Glib::ustring CLmethod;
@@ -1237,6 +1254,7 @@ struct WaveletParams {
     Glib::ustring daubcoeffmethod;
     Glib::ustring CHmethod;
     Glib::ustring Medgreinf;
+    Glib::ustring ushamethod;
     Glib::ustring CHSLmethod;
     Glib::ustring EDmethod;
     Glib::ustring NPmethod;
@@ -1244,10 +1262,17 @@ struct WaveletParams {
     Glib::ustring TMmethod;
     Glib::ustring Dirmethod;
     Glib::ustring HSmethod;
+    double sigma;
+    double offset;
+    double lowthr;
     int rescon;
     int resconH;
     int reschro;
+    int resblur;
+    int resblurc;
     double tmrs;
+    double edgs;
+    double scale;
     double gamma;
     int sup;
     double sky;
@@ -1263,11 +1288,15 @@ struct WaveletParams {
     int edgeampli;
     int contrast;
     int edgrad;
+    double edgeffect;
     int edgval;
     int edgthresh;
     int thr;
     int thrH;
+    int radius;
     double skinprotect;
+    double chrwav;
+    double bluwav;
     Threshold<int> hueskin;
     Threshold<int> hueskin2;
     Threshold<int> hllev;
@@ -1287,6 +1316,7 @@ struct WaveletParams {
 
     void getCurves(
         WavCurve& cCurve,
+        Wavblcurve& tCurve,
         WavOpacityCurveRG&
         opacityCurveLUTRG,
         WavOpacityCurveBY& opacityCurveLUTBY,
@@ -1542,6 +1572,10 @@ struct FilmNegativeParams {
     double greenExp;
     double blueRatio;
 
+    double redBase;
+    double greenBase;
+    double blueBase;
+    
     FilmNegativeParams();
 
     bool operator ==(const FilmNegativeParams& other) const;