merge with dev

2020-04-18 07:43:44 +02:00
parent 10ed56e740 22eee9787e
commit f0e78b2a0d
22 changed files with 708 additions and 190 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -2027,6 +2027,10 @@ struct FilmNegativeParams {
    double greenExp;
    double blueRatio;

+    double redBase;
+    double greenBase;
+    double blueBase;
+    
    FilmNegativeParams();

    bool operator ==(const FilmNegativeParams& other) const;