Merge branch 'dev' into tone-equalizer

rtgui/paramsedited.h

@@ -110,7 +110,7 @@ struct LCurveParamsEdited {
     bool brightness;
     bool contrast;
     bool chromaticity;
-    bool avoidcolorshift;
+    bool gamutmunselmethod;
     bool rstprotection;
     bool lcurve;
     bool acurve;
@@ -306,7 +306,6 @@ struct ColorAppearanceParamsEdited {
     bool ybout;
     bool tempsc;
     bool greensc;
-    bool presetcat02;
 };
 
 struct DirPyrDenoiseParamsEdited {
@@ -412,6 +411,7 @@ public:
         bool structexclu;
         bool struc;
         bool shapeMethod;
+        bool avoidgamutMethod;
         bool loc;
         bool centerX;
         bool centerY;
@@ -431,8 +431,6 @@ public:
         bool transitgrad;
         bool hishow;
         bool activ;
-        bool avoid;
-        bool avoidmun;
         bool blwh;
         bool recurs;
         bool laplac;
@@ -1241,6 +1239,7 @@ struct ColorManagementParamsEdited {
     bool bluy;
     bool preser;
     bool fbw;
+    bool gamut;
     bool labgridcieALow;
     bool labgridcieBLow;
     bool labgridcieAHigh;
@@ -1291,7 +1290,7 @@ struct WaveletParamsEdited {
     bool Backmethod;
     bool Tilesmethod;
     bool complexmethod;
-    bool denmethod;
+    //bool denmethod;
     bool mixmethod;
     bool slimethod;
     bool quamethod;
@@ -1345,7 +1344,7 @@ struct WaveletParamsEdited {
     bool levelsigm;
     bool ccwcurve;
     bool blcurve;
-    bool opacityCurveSH;
+    //bool opacityCurveSH;
     bool opacityCurveBY;
     bool wavdenoise;
     bool wavdenoiseh;
@@ -1499,6 +1498,7 @@ struct RAWParamsEdited {
     bool df_autoselect;
     bool ff_file;
     bool ff_AutoSelect;
+    bool ff_FromMetaData;
     bool ff_BlurRadius;
     bool ff_BlurType;
     bool ff_AutoClipControl;