fixed several warnings from Xcode 4 LLVM compiler; fixed bug #920

This commit is contained in:
Vadim Pisarevsky
2011-04-30 19:29:26 +00:00
parent 92852ca06e
commit 23a9b7bb9c
18 changed files with 51 additions and 53 deletions

View File

@@ -73,7 +73,7 @@ void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> poin
}
int patternClusterIdx = 0;
while(clusters[patternClusterIdx].size() < patternSize.area() && countNonZero(distsMask == 255) > 0)
while((int)clusters[patternClusterIdx].size() < patternSize.area() && countNonZero(distsMask == 255) > 0)
{
Point minLoc;
minMaxLoc(dists, 0, 0, &minLoc, 0, distsMask);
@@ -93,7 +93,7 @@ void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> poin
}
patternPoints.clear();
if(clusters[patternClusterIdx].size() != patternSize.area())
if((int)clusters[patternClusterIdx].size() != patternSize.area())
{
return;
}