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

[Francisco J. Cruz]

SVN commit 502424 by fjcruz:

This stuff has been fixed:

// FIXME : with File/Restore image action from GUI :
// cmSettings =0      ==> settings in d provate class instance will be lost !
// iofileSettings = 0 ==> crash !

CCMAIL:digikam-devel at kde.org

 M  +18 -13    dimginterface.cpp  


--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp #502423:502424
@@ -68,18 +68,19 @@
 
     DImgInterfacePrivate()
     {
-        undoMan    = 0;
-        cmSettings = 0;
-        thread     = 0;
-        width      = 0;
-        height     = 0;
-        origWidth  = 0;
-        origHeight = 0;
-        selX       = 0;
-        selY       = 0;
-        selW       = 0;
-        selH       = 0;
-        zoom       = 1.0;
+        undoMan         = 0;
+        cmSettings      = 0;
+        iofileSettings  = 0;
+        thread          = 0;
+        width           = 0;
+        height          = 0;
+        origWidth       = 0;
+        origHeight      = 0;
+        selX            = 0;
+        selY            = 0;
+        selW            = 0;
+        selH            = 0;
+        zoom            = 1.0;
         
         exifOrient           = false;
         valid                = false;
@@ -117,6 +118,8 @@
 
     ICCSettingsContainer *cmSettings;
 
+    IOFileSettingsContainer *iofileSettings;
+
     SharedLoadSaveThread *thread;
 };
 
@@ -187,6 +190,7 @@
     // iofileSettings = 0 ==> crash !
     
     d->cmSettings = cmSettings;
+    d->iofileSettings = iofileSettings;
     d->undoMan->clear();
 
     d->thread->load( LoadingDescription(filename, iofileSettings->rawDecodingSettings),
@@ -395,7 +399,8 @@
 {
     d->undoMan->clear();
 
-    load(d->filename, 0, 0);
+//     load(d->filename, 0, 0);
+    load(d->filename, d->cmSettings, d->iofileSettings);
     //this is now emitted in slotImageLoaded. Correct?
     //emit signalModified(false, false);
 }