merge with dev

2019-11-12 07:15:29 +01:00
parent 3064b5fb87 174f5e95ff
commit 61e2e1c4a1
10 changed files with 88 additions and 158 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -567,7 +567,6 @@ struct CaptureSharpeningParams {
    bool           autoContrast;
    bool           autoRadius;
    double         contrast;
-    double         gamma;
    double         deconvradius;
    double         deconvradiusOffset;
    int            deconviter;