merge with dev

rtengine/stdimagesource.cc

@@ -19,11 +19,14 @@
 #include "stdimagesource.h"
 
 #include "color.h"
-#include "curves.h"
 #include "iccstore.h"
+#include "image8.h"
+#include "image16.h"
+#include "imagefloat.h"
 #include "imageio.h"
 #include "mytime.h"
 #include "procparams.h"
+#include "utils.h"
 
 #undef THREAD_PRIORITY_NORMAL
 
@@ -32,8 +35,6 @@ namespace rtengine
 using namespace procparams;
 ProcParams* params;
 
-extern const Settings* settings;
-
 template<class T> void freeArray (T** a, int H)
 {
     for (int i = 0; i < H; i++) {