Merge branch 'dev' into spot-removal-tool (#2239)

rtengine/procparams.h

@@ -280,13 +280,13 @@ struct ToneCurveParams {
     int         shcompr;
     int         hlcompr;        // Highlight Recovery's compression
     int         hlcomprthresh;  // Highlight Recovery's threshold
+    bool histmatching; // histogram matching
 
     ToneCurveParams();
 
     bool operator ==(const ToneCurveParams& other) const;
     bool operator !=(const ToneCurveParams& other) const;
 
-    static bool HLReconstructionNecessary(const LUTu& histRedRaw, const LUTu& histGreenRaw, const LUTu& histBlueRaw);
 };
 
 /**
@@ -341,6 +341,7 @@ struct RetinexParams
   */
 struct LCurveParams
 {
+    bool enabled;
     std::vector<double>   lcurve;
     std::vector<double>   acurve;
     std::vector<double>   bcurve;
@@ -363,10 +364,29 @@ struct LCurveParams
     bool operator !=(const LCurveParams& other) const;
 };
 
+
+/**
+ * Parameters for local contrast
+ */ 
+struct LocalContrastParams {
+    bool enabled;
+    int radius;
+    double amount;
+    double darkness;
+    double lightness;
+
+    LocalContrastParams();
+
+    bool operator==(const LocalContrastParams &other) const;
+    bool operator!=(const LocalContrastParams &other) const;
+};
+
+
 /**
   * Parameters of the RGB curves
   */
 struct RGBCurvesParams {
+    bool enabled;
     bool lumamode;
     std::vector<double>   rcurve;
     std::vector<double>   gcurve;
@@ -404,6 +424,7 @@ struct ColorToningParams {
      *  Lch        :
      *  RGBSliders :
      *  RGBCurves  :
+     *  LabGrid    :
      */
     Glib::ustring method;
 
@@ -427,6 +448,12 @@ struct ColorToningParams {
     double sathigh;
     bool lumamode;
 
+    double labgridALow;
+    double labgridBLow;
+    double labgridAHigh;
+    double labgridBHigh;
+    static const double LABGRID_CORR_MAX;
+
     ColorToningParams();
 
     bool operator ==(const ColorToningParams& other) const;
@@ -538,6 +565,7 @@ struct WBEntry {
 };
 
 struct WBParams {
+    bool enabled;
     Glib::ustring   method;
     int             temperature;
     double          green;
@@ -717,7 +745,6 @@ struct SHParams {
     int     htonalwidth;
     int     shadows;
     int     stonalwidth;
-    int     localcontrast;
     int     radius;
 
     SHParams();
@@ -895,6 +922,7 @@ struct VignettingParams {
   * Parameters of the color mixer
   */
 struct ChannelMixerParams {
+    bool enabled;
     int red[3];
     int green[3];
     int blue[3];
@@ -1039,6 +1067,25 @@ struct ColorManagementParams {
     bool operator !=(const ColorManagementParams& other) const;
 };
 
+
+/**
+  * Parameters for metadata handling
+  */
+struct MetaDataParams {
+    enum Mode {
+        TUNNEL,
+        EDIT,
+        STRIP
+    };
+    Mode mode;
+
+    MetaDataParams();
+
+    bool operator ==(const MetaDataParams &other) const;
+    bool operator !=(const MetaDataParams &other) const;
+};
+
+
 /**
   * Typedef for representing a key/value for the exif metadata information
   */
@@ -1173,6 +1220,7 @@ struct DirPyrEqualizerParams {
  * HSV equalizer params
  */
 struct HSVEqualizerParams {
+    bool enabled;
     std::vector<double> hcurve;
     std::vector<double> scurve;
     std::vector<double> vcurve;
@@ -1275,6 +1323,7 @@ struct RAWParams {
         double pixelShiftSmoothFactor;
         bool pixelShiftExp0;
         bool pixelShiftLmmse;
+        bool pixelShiftOneGreen;
         bool pixelShiftEqualBright;
         bool pixelShiftEqualBrightChannel;
         bool pixelShiftNonGreenCross;
@@ -1371,6 +1420,7 @@ public:
     ToneCurveParams         toneCurve;       ///< Tone curve parameters
     LCurveParams            labCurve;        ///< CIELAB luminance curve parameters
     RetinexParams           retinex;         ///< Retinex parameters
+    LocalContrastParams     localContrast;   ////< Local contrast parameters
     RGBCurvesParams         rgbCurves;       ///< RGB curves parameters
     ColorToningParams       colorToning;     ///< Color Toning parameters
     SharpeningParams        sharpening;      ///< Sharpening parameters
@@ -1413,6 +1463,7 @@ public:
     Glib::ustring           appVersion;      ///< Version of the application that generated the parameters
     int                     ppVersion;       ///< Version of the PP file from which the parameters have been read
 
+    MetaDataParams          metadata;        ///< Metadata parameters
     ExifPairs               exif;            ///< List of modifications appplied on the exif tags of the input image
     IPTCPairs               iptc;            ///< The IPTC tags and values to be saved to the output image