Enable DCP options regardless of DCP source. Neutral profile disables DCP curve and look table. Fixes #2922

rtengine/dcp.cc

@@ -814,7 +814,7 @@ const DCPProfile::HSBModify* DCPProfile::MakeHueSatMap(ColorTemp &wb, int prefer
     return aDeltas;
 }
 
-DCPProfile::DCPProfile(Glib::ustring fname, bool isRTProfile)
+DCPProfile::DCPProfile(Glib::ustring fname)
 {
     const int TIFFFloatSize = 4;
     const int TagColorMatrix1 = 50721, TagColorMatrix2 = 50722, TagProfileHueSatMapDims = 50937;
@@ -989,7 +989,7 @@ DCPProfile::DCPProfile(Glib::ustring fname, bool isRTProfile)
     // Read tone curve points, if any, but disable to RTs own profiles
     tag = tagDir->getTag(TagProfileToneCurve);
 
-    if (tag != NULL && !isRTProfile) {
+    if (tag != NULL) {
         std::vector<double> cPoints;
         cPoints.push_back(double(DCT_Spline));  // The first value is the curve type
 
@@ -1760,7 +1760,7 @@ void DCPStore::init (Glib::ustring rtProfileDir)
     }
 }
 
-DCPProfile* DCPStore::getProfile (Glib::ustring filename, bool isRTProfile)
+DCPProfile* DCPStore::getProfile (Glib::ustring filename)
 {
     MyMutex::MyLock lock(mtx);
 
@@ -1771,7 +1771,7 @@ DCPProfile* DCPStore::getProfile (Glib::ustring filename, bool isRTProfile)
     }
 
     // Add profile
-    profileCache[filename] = new DCPProfile(filename, isRTProfile);
+    profileCache[filename] = new DCPProfile(filename);
 
     return profileCache[filename];
 }
@@ -1783,7 +1783,7 @@ DCPProfile* DCPStore::getStdProfile(Glib::ustring camShortName)
     // Warning: do NOT use map.find(), since it does not seem to work reliably here
     for (std::map<Glib::ustring, Glib::ustring>::iterator i = fileStdProfiles.begin(); i != fileStdProfiles.end(); i++)
         if (name2 == (*i).first) {
-            return getProfile((*i).second, true);
+            return getProfile((*i).second);
         }
 
     return NULL;

rtengine/dcp.h

@@ -76,7 +76,7 @@ class DCPProfile
     void HSDApply(const HSDTableInfo &ti, const HSBModify *tableBase, float &h, float &s, float &v) const;
 
 public:
-    DCPProfile(Glib::ustring fname, bool isRTProfile);
+    DCPProfile(Glib::ustring fname);
     ~DCPProfile();
 
     bool getHasToneCurve()
@@ -122,7 +122,7 @@ public:
 
     bool isValidDCPFileName(Glib::ustring filename) const;
 
-    DCPProfile* getProfile(Glib::ustring filename, bool isRTProfile = false);
+    DCPProfile* getProfile(Glib::ustring filename);
     DCPProfile* getStdProfile(Glib::ustring camShortName);
 
     static DCPStore* getInstance();

rtengine/procparams.cc

@@ -831,8 +831,8 @@ void ColorManagementParams::setDefaults()
 {
     input   = "(cameraICC)";
     blendCMSMatrix = false;
-    toneCurve = true;
-    applyLookTable = true;
+    toneCurve = false;
+    applyLookTable = false;
     applyBaselineExposureOffset = true;
     applyHueSatMap = true;
     dcpIlluminant = 0;