[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: cpfind: avoid endless loop on small im...

[<hug...@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/10a4e06dcf41
changeset: 4785:10a4e06dcf41
user:      Pablo d'Angelo <pab...@we...>
date:       Thu Dec 30 09:07:17 2010 +0100
description:
cpfind: avoid endless loop on small images.

diffstat:

 src/hugin_cpfind/localfeatures/KeyPointDetector.cpp |  22 ++++++++++----------
 1 files changed, 11 insertions(+), 11 deletions(-)

Unterschiede (50 Zeilen):

diff -r 473d40945cc4 -r 10a4e06dcf41 src/hugin_cpfind/localfeatures/KeyPointDetector.cpp
--- a/src/hugin_cpfind/localfeatures/KeyPointDetector.cpp	Wed Dec 29 09:30:32 2010 +0100
+++ b/src/hugin_cpfind/localfeatures/KeyPointDetector.cpp	Thu Dec 30 09:07:17 2010 +0100
@@ -63,8 +63,8 @@
 	{
 		// calculate the pixel step on the image, and the image size
 		unsigned int aPixelStep = 1 << o;	// 2^aOctaveIt
-		unsigned int aOctaveWidth = iImage.getWidth() / aPixelStep;	// integer division
-		unsigned int aOctaveHeight = iImage.getHeight() / aPixelStep;	// integer division
+		int aOctaveWidth = iImage.getWidth() / aPixelStep;	// integer division
+		int aOctaveHeight = iImage.getHeight() / aPixelStep;	// integer division
 
 		// fill each scale matrices
 		for (unsigned int s = 0; s < _maxScales; ++s)
@@ -76,15 +76,15 @@
 			aBorderSize[s] = getBorderSize(o, s);
 			
 			// fill the hessians
-			unsigned int aEy = aOctaveHeight - aBorderSize[s];
-			unsigned int aEx = aOctaveWidth - aBorderSize[s];
+			int aEy = aOctaveHeight - aBorderSize[s];
+			int aEx = aOctaveWidth - aBorderSize[s];
 			
-			unsigned int aYPS = aBorderSize[s] * aPixelStep;
-			for (unsigned int y = aBorderSize[s]; y < aEy; ++y)
+			int aYPS = aBorderSize[s] * aPixelStep;
+			for (int y = aBorderSize[s]; y < aEy; ++y)
 			{
 				aBoxFilter.setY(aYPS);
-				unsigned int aXPS = aBorderSize[s] * aPixelStep;
-				for (unsigned int x = aBorderSize[s]; x < aEx; ++x)
+				int aXPS = aBorderSize[s] * aPixelStep;
+				for (int x = aBorderSize[s]; x < aEx; ++x)
 				{
 					aSH[s][y][x] = aBoxFilter.getDetWithX(aXPS);
 					aXPS += aPixelStep;
@@ -96,10 +96,10 @@
 		// detect the feature points with a 3x3x3 neighborhood non-maxima suppression
 		for (unsigned int aSIt = 1; aSIt < (_maxScales - 1); aSIt +=2)
 		{			
-			const unsigned int aBS = aBorderSize[aSIt+1];
-			for (unsigned int aYIt = aBS + 1; aYIt < aOctaveHeight - aBS - 1; aYIt+=2)
+			const int aBS = aBorderSize[aSIt+1];
+			for (int aYIt = aBS + 1; aYIt < aOctaveHeight - aBS - 1; aYIt+=2)
 			{
-				for (unsigned int aXIt = aBS + 1; aXIt < aOctaveWidth - aBS - 1; aXIt+=2)
+				for (int aXIt = aBS + 1; aXIt < aOctaveWidth - aBS - 1; aXIt+=2)
 				{
 					// find the maximum in the 2x2x2 cube
 					double aTab[8];