merge with dev

2019-07-18 13:41:26 +02:00
parent 1add88a9ae 4a6956d91e
commit cbeb828609
52 changed files with 1853 additions and 463 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -900,6 +900,15 @@ struct MetaDataParamsEdited {
    bool mode;
 };

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