Fix pedantic compile warnings due to signed int , unsigned in comparisons

timlinux · timlinux · commit 53b15d708586 · 2007-04-19T10:24:19.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6898 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -1978,7 +1978,7 @@ double QgsGeometry::closestVertexWithContext(const QgsPoint& point,
     GEOS_GEOM::CoordinateSequence* sequence = mGeos->getCoordinates();
 	if(sequence)
 	  {
-	    for(int i = 0; i < sequence->getSize(); ++i)
+	    for(unsigned int i = 0; i < sequence->getSize(); ++i)
 	      {
 		double testDist = point.sqrDist(sequence->getAt(i).x, sequence->getAt(i).y);
 		if(testDist < sqrDist)
@@ -3231,7 +3231,7 @@ bool QgsGeometry::exportGeosToWkb()
 	      geometrySize += sizeof(int);
 	      geometrySize += theRing->getNumPoints()*2*sizeof(double);
 	    }
-	  for(int i = 0; i < thePolygon->getNumInteriorRing(); ++i)
+	  for(unsigned int i = 0; i < thePolygon->getNumInteriorRing(); ++i)
 	    {
 	      geometrySize += sizeof(int); //number of points in ring
 	      theRing = thePolygon->getInteriorRingN(i);
@@ -3265,7 +3265,7 @@ bool QgsGeometry::exportGeosToWkb()
 		position += sizeof(int);
 		const GEOS_GEOM::CoordinateSequence* ringSequence = theRing->getCoordinatesRO();
 		//for(int j = 0; j < nPointsInRing; ++j)
-		for(int j = 0; j <ringSequence->getSize(); ++j)
+		for(unsigned int j = 0; j <ringSequence->getSize(); ++j)
 		      {
 			//x = theRing->getPointN(j)->getX();
 			x = ringSequence->getAt(j).x;
@@ -3279,7 +3279,7 @@ bool QgsGeometry::exportGeosToWkb()
 	      }
 
 	    //interior rings after
-	    for(int i = 0; i < thePolygon->getNumInteriorRing(); ++i)
+	    for(unsigned int i = 0; i < thePolygon->getNumInteriorRing(); ++i)
 	      {
 		theRing = thePolygon->getInteriorRingN(i);
 		if(theRing)

Original file line number	Diff line number	Diff line change
`@@ -1978,7 +1978,7 @@ double QgsGeometry::closestVertexWithContext(const QgsPoint& point,`
`1978`	`1978`	`GEOS_GEOM::CoordinateSequence* sequence = mGeos->getCoordinates();`
`1979`	`1979`	`if(sequence)`
`1980`	`1980`	`{`
`1981`		`- for(int i = 0; i < sequence->getSize(); ++i)`
	`1981`	`+ for(unsigned int i = 0; i < sequence->getSize(); ++i)`
`1982`	`1982`	`{`
`1983`	`1983`	`double testDist = point.sqrDist(sequence->getAt(i).x, sequence->getAt(i).y);`
`1984`	`1984`	`if(testDist < sqrDist)`
`@@ -3231,7 +3231,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3231`	`3231`	`geometrySize += sizeof(int);`
`3232`	`3232`	`geometrySize += theRing->getNumPoints()2sizeof(double);`
`3233`	`3233`	`}`
`3234`		`- for(int i = 0; i < thePolygon->getNumInteriorRing(); ++i)`
	`3234`	`+ for(unsigned int i = 0; i < thePolygon->getNumInteriorRing(); ++i)`
`3235`	`3235`	`{`
`3236`	`3236`	`geometrySize += sizeof(int); //number of points in ring`
`3237`	`3237`	`theRing = thePolygon->getInteriorRingN(i);`
`@@ -3265,7 +3265,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3265`	`3265`	`position += sizeof(int);`
`3266`	`3266`	`const GEOS_GEOM::CoordinateSequence* ringSequence = theRing->getCoordinatesRO();`
`3267`	`3267`	`//for(int j = 0; j < nPointsInRing; ++j)`
`3268`		`- for(int j = 0; j <ringSequence->getSize(); ++j)`
	`3268`	`+ for(unsigned int j = 0; j <ringSequence->getSize(); ++j)`
`3269`	`3269`	`{`
`3270`	`3270`	`//x = theRing->getPointN(j)->getX();`
`3271`	`3271`	`x = ringSequence->getAt(j).x;`
`@@ -3279,7 +3279,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3279`	`3279`	`}`
`3280`	`3280`
`3281`	`3281`	`//interior rings after`
`3282`		`- for(int i = 0; i < thePolygon->getNumInteriorRing(); ++i)`
	`3282`	`+ for(unsigned int i = 0; i < thePolygon->getNumInteriorRing(); ++i)`
`3283`	`3283`	`{`
`3284`	`3284`	`theRing = thePolygon->getInteriorRingN(i);`
`3285`	`3285`	`if(theRing)`