merge with dev

2019-11-14 14:07:04 +01:00
parent d621721ffe c2ed31991b
commit c58d2a1d75
113 changed files with 700 additions and 368 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -548,10 +548,10 @@ struct CaptureSharpeningParams {
    bool           autoContrast;
    bool           autoRadius;
    double         contrast;
-    double         gamma;
    double         deconvradius;
    double         deconvradiusOffset;
    int            deconviter;
+    bool           deconvitercheck;

    CaptureSharpeningParams();