More procparams.h relaxation

rtengine/curves.cc

@@ -37,7 +37,6 @@
 #include "ciecam02.h"
 #include "color.h"
 #include "iccstore.h"
-#include "procparams.h"
 #undef CLIPD
 #define CLIPD(a) ((a)>0.0f?((a)<1.0f?(a):1.0f):0.0f)
 

rtengine/dcp.h

@@ -48,7 +48,7 @@ public:
     private:
         struct Data;
 
-        std::unique_ptr<Data> data;
+        const std::unique_ptr<Data> data;
 
         friend class DCPProfile;
     };

rtengine/iccstore.cc

@@ -32,7 +32,6 @@
 #include "iccstore.h"
 
 #include "iccmatrices.h"
-#include "procparams.h"
 
 #include "../rtgui/options.h"
 #include "../rtgui/threadutils.h"

rtengine/iimage.h

@@ -45,7 +45,7 @@ namespace rtengine
 namespace procparams
 {
 
-    class CoarseTransformParams;
+struct CoarseTransformParams;
 
 }
 

rtengine/imageio.h

@@ -56,7 +56,7 @@ protected:
     char* loadedProfileData;
     bool loadedProfileDataJpg;
     int loadedProfileLength;
-    std::unique_ptr<procparams::ExifPairs> exifChange;
+    const std::unique_ptr<procparams::ExifPairs> exifChange;
     IptcData* iptc;
     const rtexif::TagDirectory* exifRoot;
     MyMutex imutex;

rtengine/improccoordinator.h

@@ -185,7 +185,7 @@ protected:
     void updatePreviewImage (int todo, bool panningRelatedChange);
 
     MyMutex mProcessing;
-    std::unique_ptr<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
@@ -200,7 +200,7 @@ protected:
     MyMutex paramsUpdateMutex;
     int  changeSinceLast;
     bool updaterRunning;
-    std::unique_ptr<ProcParams> nextParams;
+    const std::unique_ptr<ProcParams> nextParams;
     bool destroying;
     bool utili;
     bool autili;

rtengine/ipvibrance.cc

@@ -27,6 +27,7 @@
 #include "../rtgui/thresholdselector.h"
 #include "curves.h"
 #include "color.h"
+#include "procparams.h"
 #include "StopWatch.h"
 #ifdef _OPENMP
 #include <omp.h>

rtengine/procparams.h

@@ -28,7 +28,7 @@
 
 #include "noncopyable.h"
 
-class ParamsEdited;
+struct ParamsEdited;
 
 namespace rtengine
 {
@@ -473,7 +473,7 @@ struct ColorToningParams {
     };
     std::vector<LabCorrectionRegion> labregions;
     int labregionsShowMask;
-    
+
     ColorToningParams();
 
     bool operator ==(const ColorToningParams& other) const;

rtengine/rawimagesource.h

@@ -94,7 +94,7 @@ protected:
     float psBlueBrightness[4];
 
     std::vector<double> histMatchingCache;
-    std::unique_ptr<procparams::ColorManagementParams> histMatchingParams;
+    const std::unique_ptr<procparams::ColorManagementParams> histMatchingParams;
 
     void processFalseColorCorrectionThread (Imagefloat* im, array2D<float> &rbconv_Y, array2D<float> &rbconv_I, array2D<float> &rbconv_Q, array2D<float> &rbout_I, array2D<float> &rbout_Q, const int row_from, const int row_to);
     void hlRecovery          (const std::string &method, float* red, float* green, float* blue, int width, float* hlmax);