Merge branch 'dev' into spot-removal-tool

rtengine/procparams.h

@@ -1031,6 +1031,7 @@ struct LocallabParams {
         int complexcolor;
         bool curvactiv;
         int lightness;
+        double reparcol;
         int contrast;
         int chroma;
         double labgridALow;
@@ -1110,6 +1111,7 @@ struct LocallabParams {
         double strexp;
         double angexp;
         std::vector<double> excurve;
+        bool norm;
         bool inversex;
         bool enaExpMask;
         bool enaExpMaskaft;
@@ -1129,6 +1131,7 @@ struct LocallabParams {
         Glib::ustring expMethod; // std, pde
         Glib::ustring exnoiseMethod; // none, med, medhi
         double laplacexp;
+        double reparexp;
         double balanexp;
         double linear;
         double gamm;
@@ -1167,6 +1170,7 @@ struct LocallabParams {
         double slomaskSH;
         double lapmaskSH;
         int detailSH;
+        double reparsh;
         std::vector<double> LmaskSHcurve;
         double fatamountSH;
         double fatanchorSH;
@@ -1269,6 +1273,7 @@ struct LocallabParams {
         int nlrad;
         double nlgam;
         int sensiden;
+        double reparden;
         int detailthr;
         std::vector<double> locwavcurveden;
         std::vector<double> locwavcurvehue;
@@ -1300,6 +1305,7 @@ struct LocallabParams {
         double gamma;
         double estop;
         double scaltm;
+        double repartm;
         int rewei;
         double satur;
         int sensitm;
@@ -1421,6 +1427,7 @@ struct LocallabParams {
         double edgw;
         double basew;
         int sensilc;
+        double reparw;
         bool fftwlc;
         bool blurlc;
         bool wavblur;
@@ -1490,9 +1497,11 @@ struct LocallabParams {
         double targetGray;
         double catad;
         double saturl;
+        double chroml;
         double lightl;
         double lightq;
         double contl;
+        double contthres;
         double contq;
         double colorfl;
         std::vector<double> LcurveL;