merge with dev

rtgui/paramsedited.h

@@ -676,6 +676,15 @@ struct MetaDataParamsEdited {
     bool mode;
 };
 
+struct FilmNegativeParamsEdited {
+    bool enabled;
+    bool redRatio;
+    bool greenExp;
+    bool blueRatio;
+
+    bool isUnchanged() const;
+};
+
 struct ParamsEdited {
     GeneralParamsEdited general;
     ToneCurveParamsEdited toneCurve;
@@ -720,6 +729,7 @@ struct ParamsEdited {
     SoftLightParamsEdited softlight;
     DehazeParamsEdited dehaze;
     MetaDataParamsEdited metadata;
+    FilmNegativeParamsEdited filmNegative;
     bool exif;
     bool iptc;