From 48acbc6ed82b18fb07aa5e7964f7702428bade73 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Tue, 18 Oct 2011 07:54:57 +0200
Subject: cppcheck

(bzr r10681)
---
 src/trace/siox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/trace/siox.cpp')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index b3404fc00..a30d903cd 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -584,7 +584,7 @@ void SioxImage::assign(const SioxImage &other)
 /**
  * Write the image to a PPM file
  */
-bool SioxImage::writePPM(const std::string fileName)
+bool SioxImage::writePPM(const std::string &fileName)
 {
 
     FILE *f = fopen(fileName.c_str(), "wb");
-- 
cgit v1.2.3


From 4f89fdb05ba7b39b86cb7034c22692faadb06f6b Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Fri, 21 Oct 2011 18:06:32 +0200
Subject: cppcheck

(bzr r10687)
---
 src/trace/siox.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/trace/siox.cpp')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index a30d903cd..e7ef5b0c0 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -1011,7 +1011,7 @@ SioxImage Siox::extractForeground(const SioxImage &originalImage,
                     }
                 tupel.minFgDist  = minFg;
                 tupel.indexMinFg = minIndex;
-                if (fgSignature.size() == 0)
+                if (fgSignature.empty())
                     {
                     isBackground = (minBg <= clusterSize);
                     // remove next line to force behaviour of old algorithm
@@ -1414,7 +1414,7 @@ int Siox::depthFirstSearch(int startPos,
         }
 
 
-    while (pixelsToVisit.size() > 0)
+    while (!pixelsToVisit.empty())
         {
         int pos = pixelsToVisit[pixelsToVisit.size() - 1];
         pixelsToVisit.erase(pixelsToVisit.end() - 1);
@@ -1486,7 +1486,7 @@ void Siox::fillColorRegions()
         // int componentSize = 1;
         pixelsToVisit.push_back(i);
         // depth first search to fill region
-        while (pixelsToVisit.size() > 0)
+        while (!pixelsToVisit.empty())
             {
             int pos = pixelsToVisit[pixelsToVisit.size() - 1];
             pixelsToVisit.erase(pixelsToVisit.end() - 1);
-- 
cgit v1.2.3


From 2c2601527cd6082e53cee79c0feb99e703c0b220 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Fri, 18 Nov 2011 16:13:41 +0100
Subject: cppcheck: initialisation and warning cleanup

(bzr r10744)
---
 src/trace/siox.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'src/trace/siox.cpp')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index e7ef5b0c0..4c6cf1eac 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -736,19 +736,33 @@ const float Siox::CERTAIN_BACKGROUND_CONFIDENCE=0.0f;
 /**
  *  Construct a Siox engine
  */
-Siox::Siox()
+Siox::Siox() :
+    sioxObserver(0),
+    keepGoing(true),
+    width(0),
+    height(0),
+    pixelCount(0),
+    image(0),
+    cm(0),
+    labelField(0)
 {
-    sioxObserver = NULL;
     init();
 }
 
 /**
  *  Construct a Siox engine
  */
-Siox::Siox(SioxObserver *observer)
+Siox::Siox(SioxObserver *observer) :
+    sioxObserver(observer),
+    keepGoing(true),
+    width(0),
+    height(0),
+    pixelCount(0),
+    image(0),
+    cm(0),
+    labelField(0)
 {
     init();
-    sioxObserver = observer;
 }
 
 
-- 
cgit v1.2.3