Merge branch 'dev' into spot-removal-tool

2019-07-31 23:03:50 +02:00
parent 56b2649cd2 2283d1c969
commit 437d883082
269 changed files with 5554 additions and 33357 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -673,6 +673,15 @@ struct MetaDataParamsEdited {
    bool mode;
 };

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