From 837046256b55773be86b45a51756e5939e33614a Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Mon, 5 Jun 2006 07:47:10 +0000 Subject: Applied patch 1500659 for warning cleanup (bzr r1158) --- src/trace/siox.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/trace/siox.cpp') diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp index d460d1557..955446b42 100644 --- 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; -- cgit v1.2.3