Merge from trunk to version ed52f4f469 "Updated make-app-bundle script to use new template for file name"

rtengine/procparams.h

@@ -334,6 +334,16 @@ class EqualizerParams {
         bool enabled;
         int c[8];
 };
+	
+/**
+	* Directional pyramid equalizer params
+	*/
+	class DirPyrEqualizerParams {
+		
+    public:
+        bool enabled;
+        double mult[8];
+	};
 
 /**
   * This class holds all the processing parameters applied on the images
@@ -365,6 +375,7 @@ class ProcParams {
         ResizeParams            resize;         ///< Resize parameters
         ColorManagementParams   icm;            ///< profiles/color spaces used during the image processing
         EqualizerParams         equalizer;      ///< wavelet equalizer parameters
+		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