merge with Dev

rtengine/improcfun.h

@@ -36,6 +36,7 @@
 #include "curves.h"
 #include "cplx_wavelet_dec.h"
 #include "pipettebuffer.h"
+#include "gamutwarning.h"
 
 namespace rtengine
 {
@@ -54,8 +55,7 @@ class ImProcFunctions
     LabImage *spotbuffer;
 
     cmsHTRANSFORM monitorTransform;
-    cmsHTRANSFORM lab2outputTransform;
-    cmsHTRANSFORM output2monitorTransform;
+    std::unique_ptr<GamutWarning> gamutWarning;
 
     const ProcParams* params;
     double scale;
@@ -207,7 +207,7 @@ public:
     double lumimul[3];
 
     ImProcFunctions(const ProcParams* iparams, bool imultiThread = true)
-        : lastcutpast(false), lastcxbuf(0), lastcybuf(0), lastcount(0), spotbuffer(nullptr), monitorTransform(nullptr), lab2outputTransform(nullptr), output2monitorTransform(nullptr), params(iparams), scale(1), multiThread(imultiThread), lumimul{} {}
+        : monitorTransform (nullptr), params (iparams), scale (1), multiThread (imultiThread), lumimul{} {}
     ~ImProcFunctions();
     bool needsLuminanceOnly()
     {