merge with Dev

2018-01-23 17:52:31 +01:00
parent 9f0b5dc844 4046a3c9b9
commit 62d9825bce
15 changed files with 39 additions and 89 deletions
--- a/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -83,14 +83,6 @@ public:
    double          artifact_cbdl;
    double          level0_cbdl;
    double          level123_cbdl;
-    double          bot_left;
-    double          top_left;
-    double          top_right;
-    double          bot_right;
-    double          ed_detec;
-    double          ed_detecStr;
-    double          ed_low;
-
    int             nspot;
    bool            locdelay;
    int             cropsleep;