Merge branch 'dev' into spot-removal-tool

rtengine/procparams.h

@@ -20,10 +20,11 @@
 
 #include <cmath>
 #include <cstdio>
+#include <map>
 #include <type_traits>
 #include <vector>
 
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 #include <lcms2.h>
 
 #include "coord.h"
@@ -548,9 +549,10 @@ struct CaptureSharpeningParams {
     bool           autoContrast;
     bool           autoRadius;
     double         contrast;
-    double         gamma;
     double         deconvradius;
+    double         deconvradiusOffset;
     int            deconviter;
+    bool           deconvitercheck;
 
     CaptureSharpeningParams();
 
@@ -1378,6 +1380,7 @@ struct DehazeParams {
     int strength;
     bool showDepthMap;
     int depth;
+    bool luminance;
 
     DehazeParams();
 
@@ -1421,6 +1424,7 @@ struct RAWParams {
         enum class PSDemosaicMethod {
             AMAZE,
             AMAZEVNG4,
+            RCDVNG4,
             LMMSE
         };