merge with dev

2019-11-12 17:07:57 +01:00
parent 35024d0751 e525f5bec1
commit d9be38e6c2
9 changed files with 45 additions and 7 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -570,6 +570,7 @@ struct CaptureSharpeningParams {
    double         deconvradius;
    double         deconvradiusOffset;
    int            deconviter;
+    int            deconvrange;

    CaptureSharpeningParams();