merge with dev

2018-03-20 18:21:51 +01:00
parent 0bf7736f61 33a24bb1d3
commit a08c7b4182
34 changed files with 1509 additions and 2218 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -654,7 +654,7 @@ struct ColorAppearanceParams {
 struct DefringeParams {
    bool    enabled;
    double  radius;
-    float   threshold;
+    int     threshold;
    std::vector<double> huecurve;

    DefringeParams();