[Digikam-devel] extragear/graphics/digikam/utilities/imageeditor/canvas

[Francisco J. Cruz]

SVN commit 561767 by fjcruz:

New Color Management setting: if this new option is enabled, CM plugin is launched when a RAW image is opened in IE


CCMAIL: caulier.gilles at kdemail.net , Digikam-devel at kde.org

 M  +1 -1      dimginterface.cpp  
 M  +5 -3      iccsettingscontainer.h  


--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp #561766:561767
@@ -229,7 +229,7 @@
         
         if (d->cmSettings->enableCMSetting)
         {
-            if (d->image.attribute("format").toString() == QString("RAW"))
+            if ((d->image.attribute("format").toString() == QString("RAW"))  && (d->cmSettings->CMInRawLoadingSetting) )
             {
                 // With RAW files, we load the Color Management image plugin.
                 emit signalColorManagementTool();        
--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/iccsettingscontainer.h #561766:561767
@@ -40,9 +40,10 @@
     {
         enableCMSetting    = false;  // IMPORTANT: by default, ICC color management must be disable.
 
-        askOrApplySetting  = false;
-        BPCSetting         = false;
-        managedViewSetting = false;
+        askOrApplySetting       = false;
+        BPCSetting              = false;
+        managedViewSetting      = false;
+        CMInRawLoadingSetting   = false;
 
         renderingSetting   = 0;
 
@@ -63,6 +64,7 @@
     bool    askOrApplySetting;
     bool    BPCSetting;
     bool    managedViewSetting;
+    bool    CMInRawLoadingSetting;
 
     int     renderingSetting;