Skip to content

Commit 63d9a29

Browse files
author
timlinux
committed
Fix compile warnings caused by using int instead of unsigned int for loops. Now compiles in pedantic mode.
git-svn-id: http://svn.osgeo.org/qgis/trunk@6954 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2c24223 commit 63d9a29

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/core/qgsgeometry.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ mDirtyGeos( rhs.mDirtyGeos )
6565
if(multiPoly)
6666
{
6767
std::vector<GEOS_GEOM::Geometry*> polygonVector;
68-
for(int i = 0; i < multiPoly->getNumGeometries(); ++i)
68+
for(unsigned int i = 0; i < multiPoly->getNumGeometries(); ++i)
6969
{
7070
polygonVector.push_back((GEOS_GEOM::Geometry*)(multiPoly->getGeometryN(i)));
7171
}
@@ -187,7 +187,7 @@ QgsGeometry & QgsGeometry::operator=( QgsGeometry const & rhs )
187187
if(multiPoly)
188188
{
189189
std::vector<GEOS_GEOM::Geometry*> polygonVector;
190-
for(int i = 0; i < multiPoly->getNumGeometries(); ++i)
190+
for(unsigned int i = 0; i < multiPoly->getNumGeometries(); ++i)
191191
{
192192
polygonVector.push_back((GEOS_GEOM::Geometry*)(multiPoly->getGeometryN(i)));
193193
}
@@ -3553,7 +3553,7 @@ bool QgsGeometry::exportGeosToWkb()
35533553

35543554
//first determine size of geometry
35553555
int geometrySize = 1 + (2 * sizeof(int)); //endian, type, number of polygons
3556-
for(int i = 0; i < theMultiPolygon->getNumGeometries(); ++i)
3556+
for(unsigned int i = 0; i < theMultiPolygon->getNumGeometries(); ++i)
35573557
{
35583558
GEOS_GEOM::Polygon* thePoly = (GEOS_GEOM::Polygon*)(theMultiPolygon->getGeometryN(i));
35593559
geometrySize += (1 + (2 * sizeof(int))); //endian, type, number of rings
@@ -3563,7 +3563,7 @@ bool QgsGeometry::exportGeosToWkb()
35633563
geometrySize += (2*sizeof(double)*exRing->getNumPoints());
35643564

35653565
const GEOS_GEOM::LineString* intRing = 0;
3566-
for(int j = 0; j < thePoly->getNumInteriorRing(); ++j)
3566+
for(unsigned int j = 0; j < thePoly->getNumInteriorRing(); ++j)
35673567
{
35683568
geometrySize += sizeof(int); //number of points in ring
35693569
intRing = thePoly->getInteriorRingN(j);
@@ -3585,7 +3585,7 @@ bool QgsGeometry::exportGeosToWkb()
35853585
wkbPosition += sizeof(int);
35863586

35873587
//loop over polygons
3588-
for(int i = 0; i < theMultiPolygon->getNumGeometries(); ++i)
3588+
for(unsigned int i = 0; i < theMultiPolygon->getNumGeometries(); ++i)
35893589
{
35903590
GEOS_GEOM::Polygon* thePoly = (GEOS_GEOM::Polygon*)(theMultiPolygon->getGeometryN(i));
35913591
memcpy(&mGeometry[wkbPosition], &byteOrder, 1);
@@ -3618,7 +3618,7 @@ bool QgsGeometry::exportGeosToWkb()
36183618
}
36193619

36203620
//interior rings
3621-
for(int j = 0; j < thePoly->getNumInteriorRing(); ++j)
3621+
for(unsigned int j = 0; j < thePoly->getNumInteriorRing(); ++j)
36223622
{
36233623
theRing = thePoly->getInteriorRingN(j);
36243624
nPointsInRing = theRing->getNumPoints();

0 commit comments

Comments
 (0)