From 8bcf6271716192c892243c580c25d5ae7c69802f Mon Sep 17 00:00:00 2001 From: joncruz Date: Mon, 5 Jun 2006 07:47:10 +0000 Subject: [PATCH] Applied patch 1500659 for warning cleanup --- ChangeLog | 8 +++++++- src/trace/siox.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ea0356ba..bcf3baae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2006-06-01 Jon A. Cruz +2006-06-02 Jon A. Cruz + + * trace/siox.cpp: + + Applied patch #1500659. + +2006-06-02 Jon A. Cruz * src/dialogs/layers-panel.h, src/dialogs/layers-panel.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; -- 2.30.2