Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into spot-removal-tool

rtgui/paramsedited.h

@@ -51,6 +51,7 @@ struct ToneCurveParamsEdited {
     bool saturation;
     bool shcompr;
     bool hlcompr;
+    bool hlbl;
     bool hlcomprthresh;
     bool autoexp;
     bool clip;
@@ -267,6 +268,8 @@ struct ColorAppearanceParamsEdited {
     bool curveMode2;
     bool curveMode3;
     bool complexmethod;
+    bool modelmethod;
+    bool catmethod;
     bool enabled;
     bool degree;
     bool autodegree;
@@ -414,11 +417,13 @@ public:
         bool balanh;
         bool colorde;
         bool colorscope;
+        bool avoidrad;
         bool transitweak;
         bool transitgrad;
         bool hishow;
         bool activ;
         bool avoid;
+        bool avoidmun;
         bool blwh;
         bool recurs;
         bool laplac;
@@ -491,6 +496,10 @@ public:
         bool Lmaskcurve;
         bool LLmaskcolcurvewav;
         bool csthresholdcol;
+        bool recothresc;
+        bool lowthresc;
+        bool higthresc;
+        bool decayc;
         // Exposure
         bool visiexpose;
         bool expexpose;
@@ -534,6 +543,10 @@ public:
         bool fatdetail;
         bool fatanchor;
         bool fatlevel;
+        bool recothrese;
+        bool lowthrese;
+        bool higthrese;
+        bool decaye;
         // Shadow highlight
         bool visishadhigh;
         bool expshadhigh;
@@ -566,6 +579,10 @@ public:
         bool fatanchorSH;
         bool gamSH;
         bool sloSH;
+        bool recothress;
+        bool lowthress;
+        bool higthress;
+        bool decays;
         // Vibrance
         bool visivibrance;
         bool expvibrance;
@@ -594,6 +611,10 @@ public:
         bool strvibh;
         bool angvib;
         bool Lmaskvibcurve;
+        bool recothresv;
+        bool lowthresv;
+        bool higthresv;
+        bool decayv;
         // Soft Light
         bool visisoft;
         bool expsoft;
@@ -612,13 +633,29 @@ public:
         bool itera;
         bool guidbl;
         bool strbl;
+        bool recothres;
+        bool lowthres;
+        bool higthres;
+        bool recothresd;
+        bool lowthresd;
+        bool midthresd;
+        bool midthresdch;
+        bool higthresd;
+        bool decayd;
         bool isogr;
         bool strengr;
         bool scalegr;
+        bool divgr;
         bool epsbl;
         bool blMethod;
         bool chroMethod;
         bool quamethod;
+        bool usemask;
+        bool invmaskd;
+        bool invmask;
+        bool levelthr;
+        bool lnoiselow;
+        bool levelthrlow;
         bool blurMethod;
         bool medMethod;
         bool activlum;
@@ -633,9 +670,15 @@ public:
         bool noisechrodetail;
         bool adjblur;
         bool bilateral;
+        bool nlstr;
+        bool nldet;
+        bool nlpat;
+        bool nlrad;
+        bool nlgam;
         bool sensiden;
         bool detailthr;
         bool locwavcurveden;
+        bool locwavcurvehue;
         bool showmaskblMethodtyp;
         bool CCmaskblcurve;
         bool LLmaskblcurve;
@@ -682,6 +725,10 @@ public:
         bool slomasktm;
         bool lapmasktm;
         bool Lmasktmcurve;
+        bool recothrest;
+        bool lowthrest;
+        bool higthrest;
+        bool decayt;
         // Retinex
         bool visireti;
         bool expreti;
@@ -720,6 +767,10 @@ public:
         bool cliptm;
         bool fftwreti;
         bool Lmaskreticurve;
+        bool recothresr;
+        bool lowthresr;
+        bool higthresr;
+        bool decayr;
         // Sharpening
         bool visisharp;
         bool expsharp;
@@ -805,6 +856,10 @@ public:
         bool radmasklc;
         bool chromasklc;
         bool Lmasklccurve;
+        bool recothresw;
+        bool lowthresw;
+        bool higthresw;
+        bool decayw;
         // Contrast by detail levels
         bool visicbdl;
         bool expcbdl;
@@ -827,6 +882,10 @@ public:
         bool slomaskcb;
         bool lapmaskcb;
         bool Lmaskcbcurve;
+        bool recothrescb;
+        bool lowthrescb;
+        bool higthrescb;
+        bool decaycb;
         // Log encoding
         bool visilog;
         bool explog;
@@ -865,6 +924,10 @@ public:
         bool radmaskL;
         bool chromaskL;
         bool LmaskcurveL;
+        bool recothresl;
+        bool lowthresl;
+        bool higthresl;
+        bool decayl;
         //mask
         bool visimask;
         bool complexmask;