[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam/utilities/imageeditor/canvas
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2010-12-02 10:14:27
Message-ID: 20101202101427.85F39AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202794 by cgilles:

adapt editor image interface to new RAw Import tool behavior, if image is ready to \
load as well in editor memory


 M  +17 -1     dimginterface.cpp  


--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/dimginterface.cpp \
#1202793:1202794 @@ -236,10 +236,26 @@
     {
         d->nextRawDescription.rawDecodingSettings = \
                rawImport->rawDecodingSettings();
         d->nextRawDescription.rawDecodingHint     = \
LoadingDescription::RawDecodingCustomSettings; +
+        if (!rawImport->demosaicingSettingsDirty())
+        {
+            resetValues();
+            d->currentDescription = d->nextRawDescription;
+            d->filename           = d->currentDescription.filePath;
+
+            d->nextRawDescription = LoadingDescription();
+
+            emit signalLoadingStarted(d->filename);
+            slotImageLoaded(d->currentDescription, rawImport->postProcessedImage());
+            EditorToolIface::editorToolIface()->unLoadTool();
+            emit signalImageLoaded(d->filename, true);
     }
-
+        else
+        {
     slotLoadRaw();
 }
+    }
+}
 
 void DImgInterface::slotLoadRaw()
 {


[prev in list] [next in list] [prev in thread] [next in thread]