[Digikam-devel] extragear/graphics/digikam/libs/dcraw

[Gilles Caulier]

SVN commit 603221 by cgilles:

digikam from trunk : dcraw interface use DDebug() class instead kdDebug(). See B.K.O file 133026 for details

CCBUGS: 133026
CCMAIL: digikam-devel at kde.org


 M  +3 -1      Makefile.am  
 M  +9 -12     dcraw_parse.cpp  
 M  +2 -2      dcrawbinary.cpp  
 M  +5 -5      dcrawpreview.cpp  


--- trunk/extragear/graphics/digikam/libs/dcraw/Makefile.am #603220:603221
@@ -3,7 +3,9 @@
 
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/digikam/digikam $(all_includes)
+INCLUDES = -I$(top_srcdir)/digikam/digikam \
+	       -I$(top_srcdir)/digikam/libs/dimg \
+	       $(all_includes)
 
 noinst_LTLIBRARIES = libdcraw.la
 
--- trunk/extragear/graphics/digikam/libs/dcraw/dcraw_parse.cpp #603220:603221
@@ -34,12 +34,9 @@
 #include <cstdio>
 #include <cstdlib>
 
-// KDE includes.
-
-#include <kdebug.h>
-
 // Local includes.
  
+#include "ddebug.h"
 #include "dcraw_parse.h"
 
 /*
@@ -1265,18 +1262,18 @@
   parse_mos(0);
   parse_jpeg(0);
   if (model[0] == 0) {
-    kdDebug() << "unsupported file format." << endl;
+    DDebug() << "unsupported file format." << endl;
     fclose(ifp);
     return 1;
   }
-  kdDebug() << "Findings for " << infile << ":" << endl;
-  kdDebug() << "Make is \"" << make << "\"" << endl;
-  kdDebug() << "Model is \"" << model << "\"" << endl;
+  DDebug() << "Findings for " << infile << ":" << endl;
+  DDebug() << "Make is \"" << make << "\"" << endl;
+  DDebug() << "Model is \"" << model << "\"" << endl;
   if (model2[0])
-    kdDebug() << "Model2 is \"" << model2 << "\"" << endl;
+    DDebug() << "Model2 is \"" << model2 << "\"" << endl;
 
   if (!thumb_length) {
-    kdDebug() << "Thumbnail image not found" << endl;
+    DDebug() << "Thumbnail image not found" << endl;
     return 1;
   }
   tfp = fopen (outfile, "wb");
@@ -1301,7 +1298,7 @@
 dng_skip:
   thumb = (char *) malloc(thumb_length);
   if (!thumb) {
-    kdDebug() << "Cannot allocate " << thumb_length << " bytes!!!" << endl;
+    DDebug() << "Cannot allocate " << thumb_length << " bytes!!!" << endl;
     return 1;
   }
   fseek (ifp, thumb_offset, SEEK_SET);
@@ -1309,7 +1306,7 @@
   if (thumb_layers && !is_dng) {
     rgb = (char *) malloc(thumb_length);
     if (!rgb) {
-      kdDebug() << "Cannot allocate " << thumb_length << " bytes!!!" << endl;
+      DDebug() << "Cannot allocate " << thumb_length << " bytes!!!" << endl;
       return 1;
     }
     lsize = thumb_length/3;
--- trunk/extragear/graphics/digikam/libs/dcraw/dcrawbinary.cpp #603220:603221
@@ -26,11 +26,11 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kdebug.h>
 #include <kaboutdata.h>
 
 // Local includes
 
+#include "ddebug.h"
 #include "dcrawbinary.h"
 #include "dcrawbinary.moc"
 
@@ -101,7 +101,7 @@
     if (firstLine.startsWith(dcrawHeader))
     {
         d->version = firstLine.remove(0, dcrawHeader.length());    
-        kdDebug() << "Found dcraw version: " << version() << endl;    
+        DDebug() << "Found dcraw version: " << version() << endl;    
     }
 }
 
--- trunk/extragear/graphics/digikam/libs/dcraw/dcrawpreview.cpp #603220:603221
@@ -39,11 +39,11 @@
 
 // KDE includes.
 
-#include <kdebug.h>
 #include <kprocess.h>
 
 // Local includes.
 
+#include "ddebug.h"
 #include "rawfiles.h"
 #include "dcrawpreview.h"
 
@@ -73,7 +73,7 @@
 
     command  = "dcraw -c -e ";
     command += QFile::encodeName( KProcess::quote( path ) );
-    kdDebug() << "Running dcraw command " << command << endl;
+    DDebug() << "Running dcraw command " << command << endl;
 
     f = popen( command.data(), "r" );
 
@@ -104,7 +104,7 @@
     {
         if (image.loadFromData( imgData ))
         {
-            kdDebug() << "Using embedded RAW preview extraction" << endl;
+            DDebug() << "Using embedded RAW preview extraction" << endl;
             return true;
         }
     }
@@ -118,7 +118,7 @@
     f=NULL;
     command  = "dcraw -c -h -w -a ";
     command += QFile::encodeName( KProcess::quote( path ) );
-    kdDebug() << "Running dcraw command " << command << endl;
+    DDebug() << "Running dcraw command " << command << endl;
 
     f = popen( command.data(), "r" );
 
@@ -149,7 +149,7 @@
     {
         if (image.loadFromData( imgData ))
         {
-            kdDebug() << "Using reduced RAW picture extraction" << endl;
+            DDebug() << "Using reduced RAW picture extraction" << endl;
             return true;
         }
     }