merge with dev

rtengine/procparams.h

@@ -728,7 +728,6 @@ struct DirPyrDenoiseParams {
     bool operator !=(const DirPyrDenoiseParams& other) const;
 
     void getCurves(NoiseCurve& lCurve, NoiseCurve& cCurve) const;
-
 };
 
 // EPD related parameters.
@@ -1056,7 +1055,6 @@ struct ColorManagementParams {
     bool operator !=(const ColorManagementParams& other) const;
 };
 
-
 /**
   * Parameters for metadata handling
   */
@@ -1305,7 +1303,6 @@ struct HSVEqualizerParams {
     bool operator !=(const HSVEqualizerParams& other) const;
 };
 
-
 /**
  *  Film simualtion params
  */
@@ -1320,7 +1317,6 @@ struct FilmSimulationParams {
     bool operator !=(const FilmSimulationParams& other) const;
 };
 
-
 struct SoftLightParams {
     bool enabled;
     int strength;
@@ -1344,7 +1340,6 @@ struct DehazeParams {
     bool operator!=(const DehazeParams &other) const;
 };
 
-
 /**
   * Parameters for RAW demosaicing, common to all sensor type
   */
@@ -1511,6 +1506,21 @@ struct RAWParams {
     static Glib::ustring getFlatFieldBlurTypeString(FlatFieldBlurType type);
 };
 
+/**
+  * Parameters of film negative
+  */
+struct FilmNegativeParams {
+    bool enabled;
+    double redRatio;
+    double greenExp;
+    double blueRatio;
+
+    FilmNegativeParams();
+
+    bool operator ==(const FilmNegativeParams& other) const;
+    bool operator !=(const FilmNegativeParams& other) const;
+};
+
 /**
   * This class holds all the processing parameters applied on the images
   */
@@ -1559,6 +1569,7 @@ public:
     FilmSimulationParams    filmSimulation;  ///< film simulation parameters
     SoftLightParams         softlight;       ///< softlight parameters
     DehazeParams            dehaze;          ///< dehaze parameters
+    FilmNegativeParams      filmNegative;    ///< Film negative parameters
     int                     rank;            ///< Custom image quality ranking
     int                     colorlabel;      ///< Custom color label
     bool                    inTrash;         ///< Marks deleted image