merge with dev

2018-06-05 10:48:26 +02:00
parent 4e67769b34 6adc090718
commit 03fb04cd81
82 changed files with 2764 additions and 2338 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -195,6 +195,7 @@ public :
    bool enabled;
    bool matrix;
    bool amount;
+    bool contrast;
    bool uniformity;

 };
@@ -204,6 +205,7 @@ class SharpeningParamsEdited

 public:
    bool enabled;
+    bool contrast;
    bool radius;
    bool amount;
    bool threshold;