Merge from default branch

rtengine/procparams.h

@@ -132,6 +132,29 @@ class ColorDenoiseParams {
         bool    edgesensitive;
         int		amount;
 };
+	
+	/**
+	 * Parameters of impulse denoising
+	 */
+	class ImpulseDenoiseParams {
+		
+    public:
+        bool    enabled;
+		int		thresh;
+
+	};
+	
+	/**
+	 * Parameters of the directional pyramid denoising
+	 */
+	class DirPyrDenoiseParams {
+		
+    public:
+        bool    enabled;
+        int		luma;
+        int     chroma;
+		float	gamma;
+	};
 
 /**
   * Parameters of the shadow/highlight enhancement
@@ -311,6 +334,16 @@ class EqualizerParams {
         bool enabled;
         int c[8];
 };
+	
+/**
+	* Directional pyramid equalizer params
+	*/
+	class DirPyrEqualizerParams {
+		
+    public:
+        bool enabled;
+        double mult[8];
+	};
 
 /**
   * Parameters for RAW demosaicing
@@ -322,6 +355,8 @@ class RAWParams {
 					numMethods }; // This MUST be the last enum
 		static const char *methodstring[numMethods];
 
+
+
 	    Glib::ustring dark_frame;
 	    bool df_autoselect;
 		bool ca_autocorrect;
@@ -348,6 +383,8 @@ class ProcParams {
         ColorShiftParams        colorShift;     ///< Color shift parameters
         LumaDenoiseParams       lumaDenoise;    ///< Luminance denoising parameters
         ColorDenoiseParams      colorDenoise;   ///< Color denoising parameters
+	ImpulseDenoiseParams    impulseDenoise; ///< Impulse denoising parameters
+	DirPyrDenoiseParams		dirpyrDenoise;  ///< Directional Pyramid denoising parameters
         SHParams                sh;             ///< Shadow/highlight enhancement parameters
         CropParams              crop;           ///< Crop parameters
         CoarseTransformParams   coarse;         ///< Coarse transformation (90, 180, 270 deg rotation, h/v flipping) parameters
@@ -363,6 +400,7 @@ class ProcParams {
         ColorManagementParams   icm;            ///< profiles/color spaces used during the image processing
         EqualizerParams         equalizer;      ///< wavelet equalizer parameters
         RAWParams               raw;            ///< RAW parameters before demosaicing
+	DirPyrEqualizerParams   dirpyrequalizer;///< directional pyramid equalizer parameters
         std::vector<ExifPair> exif;             ///< List of modifications appplied on the exif tags of the input image
         std::vector<IPTCPair> iptc;             ///< The IPTC tags and values to be saved to the output image
         int version;                            ///< Version of the file from which the parameters have been read