Warning and whitespace cleanup

(bzr r4838)

2 files changed, 10 insertions, 10 deletions

diff --git a/src/trace/siox.h b/src/trace/siox.h
index 5d6059d3c..42fd30421 100644
--- a/src/trace/siox.h
+++ b/src/trace/siox.h
@@ -267,8 +267,8 @@ public:
      * If the coordinates are out of range, do nothing.
      */
     virtual void setPixel(unsigned int x, unsigned int y,
-                          unsigned int a, 
-                          unsigned int r, 
+                          unsigned int a,
+                          unsigned int r,
                           unsigned int g,
                           unsigned int b);
 
@@ -368,7 +368,7 @@ private:
      * Confidence matrix data
      */
     float *cmdata;
-    
+
 private:
 
     /**
@@ -411,7 +411,7 @@ public:
      *  Informs the observer how much has been completed.
      *  Return false if the processing should be aborted.
      */
-    virtual bool progress(float percentCompleted)
+    virtual bool progress(float /*percentCompleted*/)
         {
         return true;
         }
@@ -420,7 +420,7 @@ public:
      *  Send an error string to the Observer.  Processing will
      *  be halted.
      */
-    virtual void error(const std::string &msg)
+    virtual void error(const std::string &/*msg*/)
         {
         }
 
@@ -453,7 +453,7 @@ public:
      */
     static const float FOREGROUND_CONFIDENCE; //=0.8f;
 
-    /** 
+    /**
      * Confidence for foreground or background type being equally likely.
      */
     static const float UNKNOWN_REGION_CONFIDENCE; //=0.5f;
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 925e4e195..5833db4fd 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -180,7 +180,7 @@ public:
      *  Informs the observer how much has been completed.
      *  Return false if the processing should be aborted.
      */
-    virtual bool progress(float percentCompleted)
+    virtual bool progress(float /*percentCompleted*/)
         {
         //Tracer *tracer = (Tracer *)context;
         //## Allow the GUI to update
@@ -194,7 +194,7 @@ public:
      *  Send an error string to the Observer.  Processing will
      *  be halted.
      */
-    virtual void error(const std::string &msg)
+    virtual void error(const std::string &/*msg*/)
         {
         //Tracer *tracer = (Tracer *)context;
         }
@@ -303,7 +303,7 @@ Tracer::sioxProcessImage(SPImage *img,
                 {
                 //g_message("hit!\n");
                 //dumpMap->setPixelLong(dumpMap, col, row, 0L);
-                simage.setConfidence(col, row, 
+                simage.setConfidence(col, row,
                         Siox::UNKNOWN_REGION_CONFIDENCE);
                 }
             else
@@ -465,7 +465,7 @@ void Tracer::traceThread()
 
     msgStack->flash(Inkscape::NORMAL_MESSAGE, _("Trace: Starting trace..."));
     desktop->updateCanvasNow();
-    
+
     std::vector<TracingEngineResult> results =
                 engine->trace(pixbuf);
     //printf("nrPaths:%d\n", results.size());