Merge branch 'dev' into newlocallab

rtengine/improccoordinator.h

@@ -19,6 +19,8 @@
 #ifndef _IMPROCCOORDINATOR_H_
 #define _IMPROCCOORDINATOR_H_
 
+#include <memory>
+
 #include "rtengine.h"
 #include "improcfun.h"
 #include "image8.h"
@@ -70,8 +72,6 @@ protected:
     double lastAwbEqual;
     double lastAwbTempBias;
 
-    ImProcFunctions ipf;
-
     Glib::ustring monitorProfile;
     RenderingIntent monitorIntent;
     bool softProof;
@@ -186,7 +186,7 @@ protected:
     void updatePreviewImage (int todo, bool panningRelatedChange);
 
     MyMutex mProcessing;
-    ProcParams params;
+    const std::unique_ptr<ProcParams> params;
 
     // for optimization purpose, the output profile, output rendering intent and
     // output BPC will trigger a regeneration of the profile on parameter change only
@@ -201,7 +201,7 @@ protected:
     MyMutex paramsUpdateMutex;
     int  changeSinceLast;
     bool updaterRunning;
-    ProcParams nextParams;
+    const std::unique_ptr<ProcParams> nextParams;
     bool destroying;
     bool utili;
     bool autili;
@@ -218,6 +218,7 @@ protected:
     bool highQualityComputed;
     cmsHTRANSFORM customTransformIn;
     cmsHTRANSFORM customTransformOut;
+    ImProcFunctions ipf;
     
     //locallab
     LocallabListener* locallListener;
@@ -281,10 +282,7 @@ public:
     ~ImProcCoordinator () override;
     void assign     (ImageSource* imgsrc);
 
-    void        getParams (procparams::ProcParams* dst) override
-    {
-        *dst = params;
-    }
+    void        getParams (procparams::ProcParams* dst) override;
 
     void        startProcessing (int changeCode) override;
     ProcParams* beginUpdateParams () override;