merge with devv

2017-07-13 08:42:08 +02:00
parent 4f7d310eb2 14f5d52304
commit 4c7287574d
30 changed files with 178 additions and 319 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -317,7 +317,6 @@ public:
    double  gam;
    double  slope;
    int     neigh;
-    int     gain;
    int     offs;
    int     highlights;
    int     htonalwidth;
@@ -333,7 +332,6 @@ public:
    int     vart;
    int     limd;
    int     highl;
-    double     baselog;
    int     skal;
    bool    medianmap;
    RetinexParams ();
@@ -1387,7 +1385,6 @@ public:
    int ff_clipControl;

    bool ca_autocorrect;
-    double caautostrength;
    double cared;
    double cablue;