merge with dev manually

2017-08-15 09:57:19 +02:00
parent 47ed067c70 411b7b5975
commit 9b0c008006
15 changed files with 2241 additions and 1923 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -619,6 +619,10 @@ public:
    //      bool          badpix;
    bool          datacie;
    bool          tonecie;
+    int tempout;
+    int ybout;
+    double greenout;
+
    //      bool          sharpcie;
 };