Applied patch 1500659 for warning cleanup

diff --git a/ChangeLog b/ChangeLog
index 3ea0356ba78ca6500e10b8258b21b548ea604472..bcf3baae6930a3851ab5214c29ae5abf45b8dfe3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2006-06-01  Jon A. Cruz  <jon@joncruz.org>
+2006-06-02  Jon A. Cruz  <jon@joncruz.org>
+
+       * trace/siox.cpp:
+
+         Applied patch #1500659.
+
+2006-06-02  Jon A. Cruz  <jon@joncruz.org>
 
        * src/dialogs/layers-panel.h, src/dialogs/layers-panel.cpp:
 

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index d460d15579b9c8db4a65a76534b4b77f91f4001a..955446b42219e341cfee0453685b396bc42be74e 100644 (file)
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -1219,7 +1219,7 @@ int Siox::depthFirstSearch(int startPos,
 
         // check all four neighbours
         int left = pos - 1;
-        if (x-1>=0 && labelField[left]==-1 && cm[left]>=threshold)
+        if (((int)x)-1>=0 && labelField[left]==-1 && cm[left]>=threshold)
             {
             labelField[left]=curLabel;
             componentSize++;
@@ -1235,7 +1235,7 @@ int Siox::depthFirstSearch(int startPos,
             }
 
         int top = pos - width;
-        if (y-1>=0 && labelField[top]==-1 && cm[top]>=threshold)
+        if (((int)y)-1>=0 && labelField[top]==-1 && cm[top]>=threshold)
             {
             labelField[top]=curLabel;
             componentSize++;
@@ -1290,7 +1290,7 @@ void Siox::fillColorRegions()
             unsigned int y=pos / width;
             // check all four neighbours
             int left = pos-1;
-            if (x-1 >= 0 && labelField[left] == -1
+            if (((int)x)-1 >= 0 && labelField[left] == -1
                         && CLAB::diff(image[left], origColor)<1.0)
                 {
                 labelField[left]=curLabel;
@@ -1308,7 +1308,7 @@ void Siox::fillColorRegions()
                 pixelsToVisit.push_back(right);
                 }
             int top = pos - width;
-            if (y-1>=0 && labelField[top]==-1
+            if (((int)y)-1>=0 && labelField[top]==-1
                         && CLAB::diff(image[top], origColor)<1.0)
                 {
                 labelField[top]=curLabel;