merge with dev

2019-09-17 10:57:05 +02:00
parent 00df4707a8 c88a74e83a
commit 332782ec9b
25 changed files with 1050 additions and 330 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -545,6 +545,7 @@ struct SharpenMicroParams {
 struct CaptureSharpeningParams {
    bool           enabled;
    bool           autoContrast;
+    bool           autoRadius;
    double         contrast;
    double         gamma;
    double         deconvradius;