First round of cleanups for rtengine/dcp.*

- Sorted functions and methods
- Moved local functions to anonymous namespace
- Slightly modernized local functions
- Reworked `DCPStore` and fixed memory leak

Still coming:
- Rework `DCPProfile`

rtengine/dcp.h

@@ -17,22 +17,47 @@
 *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _DCP_
+#pragma once
-#define _DCP_
+
+#include <map>
+
+#include <glibmm.h>
 
 #include "imagefloat.h"
 #include "curves.h"
 #include "colortemp.h"
+
 #include "../rtgui/threadutils.h"
-#include <glibmm.h>
-#include <map>
-//#include <string>
 
 namespace rtengine
 {
 
-class DCPProfile
+class DCPProfile final
 {
+public:
+    struct dcpApplyState{
+        double m2ProPhoto[3][3];
+        double m2Work[3][3];
+        bool alreadyProPhoto;
+        bool useToneCurve;
+        bool applyLookTable;
+        float blScale;
+    };
+
+    DCPProfile(const Glib::ustring &fname);
+    ~DCPProfile();
+
+    bool getHasToneCurve() const;
+    bool getHasLookTable() const;
+    bool getHasHueSatMap() const;
+    bool getHasBaselineExposureOffset() const;
+    void getIlluminants(int &i1, double &temp1, int &i2, double &temp2, bool &willInterpolate_) const;
+
+    void Apply(Imagefloat *pImg, int preferredIlluminant, const Glib::ustring &workingSpace, const ColorTemp &wb, double pre_mul[3], double camMatrix[3][3], bool useToneCurve = false, bool applyHueSatMap = true, bool applyLookTable = false) const;
+    void setStep2ApplyState(const Glib::ustring &workingSpace, bool useToneCurve, bool applyLookTable, bool applyBaselineExposure, dcpApplyState &asOut);
+    void step2ApplyTile(float *r, float *g, float *b, int width, int height, int tileWidth, const dcpApplyState &asIn) const;
+
+private:
     struct HSBModify {
         float fHueShift;
         float fSatScale;
@@ -49,6 +74,13 @@ class DCPProfile
         } pc;
     };
 
+    void dngref_XYCoord2Temperature(const double whiteXY[2], double *temp, double *tint) const;
+    void dngref_FindXYZtoCamera(const double whiteXY[2], int preferredIlluminant, double (*xyzToCamera)[3]) const;
+    void dngref_NeutralToXY(double neutral[3], int preferredIlluminant, double XY[2]) const;
+    void MakeXYZCAM(const ColorTemp &wb, double pre_mul[3], double camWbMatrix[3][3], int preferredIlluminant, double (*mXYZCAM)[3]) const;
+    const HSBModify* MakeHueSatMap(const ColorTemp &wb, int preferredIlluminant, HSBModify **deleteHandle) const;
+    void HSDApply(const HSDTableInfo &ti, const HSBModify *tableBase, float &h, float &s, float &v) const;
+
     double mColorMatrix1[3][3], mColorMatrix2[3][3];
     bool hasColorMatrix1, hasColorMatrix2, hasForwardMatrix1, hasForwardMatrix2, hasToneCurve, hasBaselineExposureOffset, willInterpolate;
     double mForwardMatrix1[3][3], mForwardMatrix2[3][3];
@@ -59,76 +91,33 @@ class DCPProfile
     short iLightSource1, iLightSource2;
 
     AdobeToneCurve toneCurve;
-
-    void dngref_XYCoord2Temperature(const double whiteXY[2], double *temp, double *tint) const;
-    void dngref_FindXYZtoCamera(const double whiteXY[2], int preferredIlluminant, double (*xyzToCamera)[3]) const;
-    void dngref_NeutralToXY(double neutral[3], int preferredIlluminant, double XY[2]) const;
-    void MakeXYZCAM(const ColorTemp &wb, double pre_mul[3], double camWbMatrix[3][3], int preferredIlluminant, double (*mXYZCAM)[3]) const;
-    const HSBModify* MakeHueSatMap(const ColorTemp &wb, int preferredIlluminant, HSBModify **deleteHandle) const;
-    void HSDApply(const HSDTableInfo &ti, const HSBModify *tableBase, float &h, float &s, float &v) const;
-
-public:
-    struct dcpApplyState{
-        double m2ProPhoto[3][3];
-        double m2Work[3][3];
-        bool alreadyProPhoto;
-        bool useToneCurve;
-        bool applyLookTable;
-        float blScale;
-    };
-
-    DCPProfile(const Glib::ustring &fname);
-    ~DCPProfile();
-
-    bool getHasToneCurve() const
-    {
-        return hasToneCurve;
-    }
-    bool getHasLookTable() const
-    {
-        return !!aLookTable;
-    }
-    bool getHasHueSatMap() const
-    {
-        return !!aDeltas1;
-    }
-    bool getHasBaselineExposureOffset() const
-    {
-        return hasBaselineExposureOffset;
-    }
-    void getIlluminants(int &i1, double &temp1, int &i2, double &temp2, bool &willInterpolate_) const
-    {
-        i1 = iLightSource1;
-        i2 = iLightSource2;
-        temp1 = temperature1, temp2 = temperature2;
-        willInterpolate_ = willInterpolate;
-    };
-    void Apply(Imagefloat *pImg, int preferredIlluminant, const Glib::ustring &workingSpace, const ColorTemp &wb, double pre_mul[3], double camMatrix[3][3], bool useToneCurve = false, bool applyHueSatMap = true, bool applyLookTable = false) const;
-    void setStep2ApplyState(const Glib::ustring &workingSpace, bool useToneCurve, bool applyLookTable, bool applyBaselineExposure, dcpApplyState &asOut);
-    void step2ApplyTile(float *r, float *g, float *b, int width, int height, int tileWidth, const dcpApplyState &asIn) const;
 };
 
-class DCPStore
+class DCPStore final
 {
-    MyMutex mtx;
+public:
+    static DCPStore* getInstance();
+
+    DCPStore(const DCPStore& other) = delete;
+    DCPStore& operator =(const DCPStore& other) = delete;
+
+    void init(const Glib::ustring& rt_profile_dir);
+
+    bool isValidDCPFileName(const Glib::ustring& filename) const;
+
+    DCPProfile* getProfile(const Glib::ustring& filename) const;
+    DCPProfile* getStdProfile(const Glib::ustring& camShortName) const;
+
+private:
+    DCPStore() = default;
+
+    mutable MyMutex mutex;
 
     // these contain standard profiles from RT. keys are all in uppercase, file path is value
-    std::map<Glib::ustring, Glib::ustring> fileStdProfiles;
+    std::map<Glib::ustring, Glib::ustring> file_std_profiles;
 
     // Maps file name to profile as cache
-    std::map<Glib::ustring, DCPProfile*> profileCache;
+    mutable std::map<Glib::ustring, DCPProfile*> profile_cache;
-
-public:
-    void init(const Glib::ustring &rtProfileDir);
-
-    bool isValidDCPFileName(const Glib::ustring &filename) const;
-
-    DCPProfile* getProfile(const Glib::ustring &filename);
-    DCPProfile* getStdProfile(const Glib::ustring &camShortName);
-
-    static DCPStore* getInstance();
 };
 
-#define dcpStore DCPStore::getInstance()
 }
-#endif

rtengine/init.cc

@@ -42,7 +42,7 @@ int init (const Settings* s, Glib::ustring baseDir, Glib::ustring userSettingsDi
     settings = s;
     iccStore->init (s->iccDirectory, baseDir + "/iccprofiles");
     iccStore->findDefaultMonitorProfile();
-    dcpStore->init (baseDir + "/dcpprofiles");
+    DCPStore::getInstance()->init (baseDir + "/dcpprofiles");
 
     CameraConstantsStore::getInstance ()->init (baseDir, userSettingsDir);
     profileStore.init ();

rtengine/rawimagesource.cc

@@ -898,7 +898,7 @@ DCPProfile *RawImageSource::getDCP(const ColorManagementParams &cmp, ColorTemp &
     if (dcpProf == NULL) {
         return NULL;
     }
-    
+
     dcpProf->setStep2ApplyState(cmp.working, cmp.toneCurve, cmp.applyLookTable, cmp.applyBaselineExposureOffset, as);
     return dcpProf;
 }
@@ -4085,7 +4085,7 @@ bool RawImageSource::findInputProfile(Glib::ustring inProfile, cmsHPROFILE embed
         in = embedded;
     } else if (inProfile == "(cameraICC)") {
         // DCPs have higher quality, so use them first
-        *dcpProf = dcpStore->getStdProfile(camName);
+        *dcpProf = DCPStore::getInstance()->getStdProfile(camName);
 
         if (*dcpProf == NULL) {
             in = iccStore->getStdProfile(camName);
@@ -4097,8 +4097,8 @@ bool RawImageSource::findInputProfile(Glib::ustring inProfile, cmsHPROFILE embed
             normalName = inProfile.substr(5);
         }
 
-        if (dcpStore->isValidDCPFileName(normalName)) {
+        if (DCPStore::getInstance()->isValidDCPFileName(normalName)) {
-            *dcpProf = dcpStore->getProfile(normalName);
+            *dcpProf = DCPStore::getInstance()->getProfile(normalName);
         }
 
         if (*dcpProf == NULL) {

rtgui/icmpanel.cc

@@ -361,9 +361,9 @@ void ICMPanel::updateDCP (int dcpIlluminant, Glib::ustring dcp_name)
     DCPProfile* dcp = NULL;
 
     if(dcp_name == "(cameraICC)") {
-        dcp = dcpStore->getStdProfile(camName);
+        dcp = DCPStore::getInstance()->getStdProfile(camName);
-    } else if (ifromfile->get_active() && dcpStore->isValidDCPFileName(dcp_name)) {
+    } else if (ifromfile->get_active() && DCPStore::getInstance()->isValidDCPFileName(dcp_name)) {
-        dcp = dcpStore->getProfile(dcp_name);
+        dcp = DCPStore::getInstance()->getProfile(dcp_name);
     }
 
     if (dcp) {
@@ -631,10 +631,10 @@ void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited)
 
     DCPProfile* dcp = NULL;
 
-    if (ifromfile->get_active() && pp->icm.input.substr(0, 5) == "file:" && dcpStore->isValidDCPFileName(pp->icm.input.substr(5))) {
+    if (ifromfile->get_active() && pp->icm.input.substr(0, 5) == "file:" && DCPStore::getInstance()->isValidDCPFileName(pp->icm.input.substr(5))) {
-        dcp = dcpStore->getProfile(pp->icm.input.substr(5));
+        dcp = DCPStore::getInstance()->getProfile(pp->icm.input.substr(5));
     } else if(icameraICC->get_active()) {
-        dcp = dcpStore->getStdProfile(camName);
+        dcp = DCPStore::getInstance()->getStdProfile(camName);
     }
 
     if (dcp) {
@@ -920,7 +920,7 @@ void ICMPanel::setRawMeta (bool raw, const rtengine::ImageData* pMeta)
     iembedded->set_active (!raw);
     icamera->set_sensitive (raw);
     camName = pMeta->getCamera();
-    icameraICC->set_sensitive (raw && (iccStore->getStdProfile(pMeta->getCamera()) != NULL || dcpStore->getStdProfile(pMeta->getCamera()) != NULL));
+    icameraICC->set_sensitive (raw && (iccStore->getStdProfile(pMeta->getCamera()) != NULL || DCPStore::getInstance()->getStdProfile(pMeta->getCamera()) != NULL));
     iembedded->set_sensitive (!raw);
 
     enableListener ();