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

List:       kde-commits
Subject:    extragear/graphics/digikam/libs
From:       Gilles Caulier <caulier.gilles () free ! fr>
Date:       2006-11-27 12:43:55
Message-ID: 1164631435.357567.22214.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 608311 by cgilles:

digikam from trunk : bug fix : RAW preview extraction use an external dcraw instance \
instead the digikamdcraw.

 M  +7 -4      dcraw/dcrawpreview.cpp  
 M  +5 -5      dimg/loaders/rawloader.cpp  


--- trunk/extragear/graphics/digikam/libs/dcraw/dcrawpreview.cpp #608310:608311
@@ -45,6 +45,7 @@
 
 #include "ddebug.h"
 #include "rawfiles.h"
+#include "dcrawbinary.h"
 #include "dcrawpreview.h"
 
 namespace Digikam
@@ -72,9 +73,10 @@
     // -e : Extract the camera-generated thumbnail, not the raw image (JPEG or a PPM \
file).  // Note : this code require at least dcraw version 8.x
 
-    command  = "dcraw -c -e ";
+    command  = DcrawBinary::instance()->path();
+    command += " -c -e ";
     command += QFile::encodeName( KProcess::quote( path ) );
-    DDebug() << "Running dcraw command " << command << endl;
+    DDebug() << "Running RAW decoding command " << command << endl;
 
     f = popen( command.data(), "r" );
 
@@ -117,9 +119,10 @@
     // -w : Use camera white balance, if possible
 
     f=NULL;
-    command  = "dcraw -c -h -w -a ";
+    command  = DcrawBinary::instance()->path();
+    command += " -c -h -w -a ";
     command += QFile::encodeName( KProcess::quote( path ) );
-    DDebug() << "Running dcraw command " << command << endl;
+    DDebug() << "Running RAW decoding command " << command << endl;
 
     f = popen( command.data(), "r" );
 
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/rawloader.cpp #608310:608311
@@ -356,13 +356,13 @@
     *m_process << QFile::encodeName( m_filePath );
 
 #ifdef ENABLE_DEBUG_MESSAGES
-    DDebug() << "Running dcraw command " << m_process->args() << endl;
+    DDebug() << "Running RAW decoding command " << m_process->args() << endl;
 #endif
 
     // actually start the process
     if ( !m_process->start(KProcess::NotifyOnExit, \
KProcess::Communication(KProcess::Stdout | KProcess::Stderr)) )  {
-        DError() << "Failed to start dcraw" << endl;
+        DError() << "Failed to start RAW decoding" << endl;
         delete m_process;
         m_process    = 0;
         m_running    = false;
@@ -413,7 +413,7 @@
         QString magic = QString::fromAscii(buffer, 2);
         if (magic != "P6") 
         {
-            DError() << "Cannot parse header from dcraw: Magic is " << magic << \
endl; +            DError() << "Cannot parse header from RAW decoding: Magic is " << \
magic << endl;  m_process->kill();
             return;
         }
@@ -437,7 +437,7 @@
         QStringList sizes = QStringList::split(" ", splitlist[1]);
         if (splitlist.size() < 3 || sizes.size() < 2)
         {
-            DError() << "Cannot parse header from dcraw: Could not split" << endl;
+            DError() << "Cannot parse header from RAW decoding: Could not split" << \
endl;  m_process->kill();
             return;
         }
@@ -468,7 +468,7 @@
 void RAWLoader::slotReceivedStderr(KProcess *, char *buffer, int buflen)
 {
     QCString message(buffer, buflen);
-    DDebug() << "Dcraw StdErr: " << message << endl;
+    DDebug() << "RAW decoding StdErr: " << message << endl;
 }
 
 bool RAWLoader::save(const QString&, DImgLoaderObserver *)


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