Merge branch 'dev' into metadata-exiv2

rtgui/paramsedited.h

@@ -109,7 +109,7 @@ struct LCurveParamsEdited {
     bool brightness;
     bool contrast;
     bool chromaticity;
-    bool avoidcolorshift;
+    bool gamutmunselmethod;
     bool rstprotection;
     bool lcurve;
     bool acurve;
@@ -305,7 +305,6 @@ struct ColorAppearanceParamsEdited {
     bool ybout;
     bool tempsc;
     bool greensc;
-    bool presetcat02;
 };
 
 struct DirPyrDenoiseParamsEdited {
@@ -403,6 +402,7 @@ public:
         bool structexclu;
         bool struc;
         bool shapeMethod;
+        bool avoidgamutMethod;
         bool loc;
         bool centerX;
         bool centerY;
@@ -422,8 +422,6 @@ public:
         bool transitgrad;
         bool hishow;
         bool activ;
-        bool avoid;
-        bool avoidmun;
         bool blwh;
         bool recurs;
         bool laplac;
@@ -431,6 +429,7 @@ public:
         bool shortc;
         bool savrest;
         bool scopemask;
+        bool denoichmask;
         bool lumask;
         // Color & Light
         bool visicolor;
@@ -438,6 +437,8 @@ public:
         bool complexcolor;
         bool curvactiv;
         bool lightness;
+        bool reparcol;
+        bool gamc;
         bool contrast;
         bool chroma;
         bool labgridALow;
@@ -513,6 +514,7 @@ public:
         bool expchroma;
         bool sensiex;
         bool structexp;
+        bool gamex;
         bool blurexpde;
         bool strexp;
         bool angexp;
@@ -537,6 +539,7 @@ public:
         bool expMethod;
         bool exnoiseMethod;
         bool laplacexp;
+        bool reparexp;
         bool balanexp;
         bool linear;
         bool gamm;
@@ -575,6 +578,7 @@ public:
         bool slomaskSH;
         bool lapmaskSH;
         bool detailSH;
+        bool reparsh;
         bool LmaskSHcurve;
         bool fatamountSH;
         bool fatanchorSH;
@@ -590,6 +594,7 @@ public:
         bool complexvibrance;
         bool saturated;
         bool pastels;
+        bool vibgam;
         bool warm;
         bool psthreshold;
         bool protectskins;
@@ -666,6 +671,7 @@ public:
         bool noiselumc;
         bool noiselumdetail;
         bool noiselequal;
+        bool noisegam;
         bool noisechrof;
         bool noisechroc;
         bool noisechrodetail;
@@ -677,6 +683,7 @@ public:
         bool nlrad;
         bool nlgam;
         bool sensiden;
+        bool reparden;
         bool detailthr;
         bool locwavcurveden;
         bool locwavcurvehue;
@@ -708,6 +715,7 @@ public:
         bool gamma;
         bool estop;
         bool scaltm;
+        bool repartm;
         bool rewei;
         bool satur;
         bool sensitm;
@@ -782,6 +790,7 @@ public:
         bool shardamping;
         bool shariter;
         bool sharblur;
+        bool shargam;
         bool sensisha;
         bool inverssha;
         // Local Contrast
@@ -799,6 +808,9 @@ public:
         bool residshathr;
         bool residhi;
         bool residhithr;
+        bool gamlc;
+        bool residgam;
+        bool residslop;
         bool residblur;
         bool levelblur;
         bool sigmabl;
@@ -829,6 +841,7 @@ public:
         bool edgw;
         bool basew;
         bool sensilc;
+        bool reparw;
         bool fftwlc;
         bool blurlc;
         bool wavblur;
@@ -898,6 +911,7 @@ public:
         bool targetGray;
         bool catad;
         bool saturl;
+        bool chroml;
         bool lightl;
         bool lightq;
         bool contl;
@@ -959,6 +973,110 @@ public:
         bool Lmask_curve;
         bool LLmask_curvewav;
         bool csthresholdmask;
+        //locallabcie
+        bool visicie;
+        bool complexcie;
+        bool expcie;
+        bool reparcie;
+        bool sensicie;
+        bool Autograycie;
+        bool forcejz;
+        bool forcebw;
+        bool qtoj;
+        bool jabcie;
+        bool sigmoidqjcie;
+        bool logcie;
+        bool logjz;
+        bool sigjz;
+        bool sigq;
+        bool chjzcie;
+        bool sourceGraycie;
+        bool sourceabscie;
+        bool sursourcie;
+        bool modecam;
+        bool modecie;
+        bool saturlcie;
+        bool rstprotectcie;
+        bool chromlcie;
+        bool huecie;
+        bool toneMethodcie;
+        bool ciecurve;
+        bool toneMethodcie2;
+        bool ciecurve2;
+        bool chromjzcie;
+        bool saturjzcie;
+        bool huejzcie;
+        bool softjzcie;
+        bool strsoftjzcie;
+        bool thrhjzcie;
+        bool jzcurve;
+        bool czcurve;
+        bool czjzcurve;
+        bool HHcurvejz;
+        bool CHcurvejz;
+        bool LHcurvejz;
+        bool lightlcie;
+        bool lightjzcie;
+        bool lightqcie;
+        bool contlcie;
+        bool contjzcie;
+        bool adapjzcie;
+        bool jz100;
+        bool pqremap;
+        bool pqremapcam16;
+        bool hljzcie;
+        bool hlthjzcie;
+        bool shjzcie;
+        bool shthjzcie;
+        bool radjzcie;
+        bool contthrescie;
+        bool blackEvjz;
+        bool whiteEvjz;
+        bool targetjz;
+        bool sigmoidldacie;
+        bool sigmoidthcie;
+        bool sigmoidblcie;
+        bool sigmoidldajzcie;
+        bool sigmoidthjzcie;
+        bool sigmoidbljzcie;
+        bool contqcie;
+        bool colorflcie;
+/*
+        bool lightlzcam;
+        bool lightqzcam;
+        bool contlzcam;
+        bool contqzcam; 
+        bool contthreszcam;
+        bool colorflzcam;
+        bool saturzcam;
+        bool chromzcam;
+*/
+        bool targabscie;
+        bool targetGraycie;
+        bool catadcie;
+        bool detailcie;
+        bool surroundcie;
+        bool enacieMask;
+        bool CCmaskciecurve;
+        bool LLmaskciecurve;
+        bool HHmaskciecurve;
+        bool blendmaskcie;
+        bool radmaskcie;
+        bool sigmalcjz;
+        bool clarilresjz;
+        bool claricresjz;
+        bool clarisoftjz;
+        bool locwavcurvejz;
+        bool csthresholdjz;
+        bool chromaskcie;
+        bool lapmaskcie;
+        bool gammaskcie;
+        bool slomaskcie;
+        bool Lmaskciecurve;
+        bool recothrescie;
+        bool lowthrescie;
+        bool higthrescie;
+        bool decaycie;
 
         LocallabSpotEdited(bool v);
 
@@ -1076,10 +1194,19 @@ struct ResizeParamsEdited {
     bool dataspec;
     bool width;
     bool height;
+    bool longedge;
+    bool shortedge;
     bool enabled;
     bool allowUpscaling;
 };
 
+class SpotParamsEdited
+{
+public:
+    bool enabled;
+    bool entries;
+};
+
 struct ColorManagementParamsEdited {
     bool inputProfile;
     bool toneCurve;
@@ -1092,7 +1219,26 @@ struct ColorManagementParamsEdited {
     bool workingTRC;
     bool workingTRCGamma;
     bool workingTRCSlope;
-
+    bool will;
+    bool wprim;
+    bool redx;
+    bool redy;
+    bool grex;
+    bool grey;
+    bool blux;
+    bool bluy;
+    bool preser;
+    bool fbw;
+    bool gamut;
+    bool labgridcieALow;
+    bool labgridcieBLow;
+    bool labgridcieAHigh;
+    bool labgridcieBHigh;
+    bool labgridcieGx;
+    bool labgridcieGy;
+    bool labgridcieWx;
+    bool labgridcieWy;
+    bool aRendIntent;
     bool outputProfile;
     bool outputIntent;
     bool outputBPC;
@@ -1134,7 +1280,7 @@ struct WaveletParamsEdited {
     bool Backmethod;
     bool Tilesmethod;
     bool complexmethod;
-    bool denmethod;
+    //bool denmethod;
     bool mixmethod;
     bool slimethod;
     bool quamethod;
@@ -1188,7 +1334,7 @@ struct WaveletParamsEdited {
     bool levelsigm;
     bool ccwcurve;
     bool blcurve;
-    bool opacityCurveSH;
+    //bool opacityCurveSH;
     bool opacityCurveBY;
     bool wavdenoise;
     bool wavdenoiseh;
@@ -1297,6 +1443,7 @@ struct RAWParamsEdited {
         bool pixelShiftShowMotionMaskOnly;
         bool pixelShiftHoleFill;
         bool pixelShiftMedian;
+        bool pixelShiftAverage;
         bool pixelShiftGreen;
         bool pixelShiftBlur;
         bool pixelShiftSmooth;
@@ -1341,6 +1488,7 @@ struct RAWParamsEdited {
     bool df_autoselect;
     bool ff_file;
     bool ff_AutoSelect;
+    bool ff_FromMetaData;
     bool ff_BlurRadius;
     bool ff_BlurType;
     bool ff_AutoClipControl;
@@ -1413,6 +1561,7 @@ struct ParamsEdited {
     ChannelMixerParamsEdited chmixer;
     BlackWhiteParamsEdited blackwhite;
     ResizeParamsEdited resize;
+    SpotParamsEdited spot;
     ColorManagementParamsEdited icm;
     RAWParamsEdited raw;
     DirPyrEqualizerParamsEdited dirpyrequalizer;