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/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -476,6 +476,7 @@ struct ColorToningParams {
  */
 struct SharpeningParams {
    bool           enabled;
+    double         contrast;
    double         radius;
    int            amount;
    Threshold<int> threshold;
@@ -514,6 +515,7 @@ struct SharpenMicroParams {
    bool    enabled;
    bool    matrix;
    double  amount;
+    double  contrast;
    double  uniformity;

    SharpenMicroParams();