merge with dev

2019-11-14 10:52:16 +01:00
parent 29127f051f 3be7016517
commit 00c777a3f0
10 changed files with 102 additions and 52 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -570,7 +570,7 @@ struct CaptureSharpeningParams {
    double         deconvradius;
    double         deconvradiusOffset;
    int            deconviter;
-    int            deconvrange;
+    bool           deconvitercheck;

    CaptureSharpeningParams();