merge with dev

2019-09-22 17:37:39 +02:00
parent 35a5ee3295 153ef5a888
commit 363cfab749
10 changed files with 64 additions and 11 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -568,6 +568,7 @@ struct CaptureSharpeningParams {
    double         contrast;
    double         gamma;
    double         deconvradius;
+    double         deconvradiusOffset;
    int            deconviter;

    CaptureSharpeningParams();