merge with dev

2020-04-13 18:00:27 +02:00
parent 25513c85bc 22eee9787e
commit 6db96ed88e
21 changed files with 705 additions and 191 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1561,6 +1561,10 @@ struct FilmNegativeParams {
    double greenExp;
    double blueRatio;

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

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