merge with dev - thanks to Floessie

2019-01-26 08:34:50 +01:00
parent fa3d157d4f f84a75de1e
commit 63f6c26f70
48 changed files with 1133 additions and 1302 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -550,7 +550,7 @@ struct SharpenMicroParams {
    bool    matrix;
    double  amount;
    double  contrast;
-    double  uniformity;
+    int     uniformity;

    SharpenMicroParams();