merge with dev

2019-09-23 11:40:25 +02:00
parent 332782ec9b c656fa0fc7
commit f57d74ffbd
17 changed files with 120 additions and 64 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -549,6 +549,7 @@ struct CaptureSharpeningParams {
    double         contrast;
    double         gamma;
    double         deconvradius;
+    double         deconvradiusOffset;
    int            deconviter;

    CaptureSharpeningParams();