fix for 3 warnings in feature split code

mhugent · mhugent · commit 4a68c19a26f8 · 2008-01-21T11:23:28.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8011 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -2912,7 +2912,6 @@ int QgsGeometry::splitGeometry(const QList<QgsPoint>& splitLine, QList<QgsGeomet
 	}
       else if(vectorType() == QGis::Polygon)
 	{
-	  QgsGeometry* newGeometry = 0;
 	  returnCode = splitPolygonGeometry(splitLineGeos, newGeometries);
 	  delete splitLineGeos;
 	}
@@ -4500,7 +4499,7 @@ int QgsGeometry::splitLinearGeometry(GEOS_GEOM::LineString* splitLine, QList<Qgs
   QList<GEOS_GEOM::Geometry*> testedGeometries;
   GEOS_GEOM::Geometry* intersectGeom = 0;
 
-  for(int i = 0; i < mergedLineStrings->size(); ++i)
+  for(unsigned int i = 0; i < mergedLineStrings->size(); ++i)
     {
       intersectGeom = mGeos->intersection((*mergedLineStrings)[i]);
       if(intersectGeom->getLength() > 0.00000001)
@@ -4584,7 +4583,7 @@ int QgsGeometry::splitPolygonGeometry(GEOS_GEOM::LineString* splitLine, QList<Qg
   //include in result if yes
   QList<GEOS_GEOM::Geometry*> testedGeometries;
   GEOS_GEOM::Geometry* intersectGeometry = 0;
-  for(int i = 0; i < polygons->size(); ++i)
+  for(unsigned int i = 0; i < polygons->size(); ++i)
     {
       intersectGeometry = mGeos->intersection((*polygons)[i]);
       if(intersectGeometry->getArea() > 0.00000000001)

Original file line number	Diff line number	Diff line change
`@@ -2912,7 +2912,6 @@ int QgsGeometry::splitGeometry(const QList<QgsPoint>& splitLine, QList<QgsGeomet`
`2912`	`2912`	`}`
`2913`	`2913`	`else if(vectorType() == QGis::Polygon)`
`2914`	`2914`	`{`
`2915`		`- QgsGeometry* newGeometry = 0;`
`2916`	`2915`	`returnCode = splitPolygonGeometry(splitLineGeos, newGeometries);`
`2917`	`2916`	`delete splitLineGeos;`
`2918`	`2917`	`}`
`@@ -4500,7 +4499,7 @@ int QgsGeometry::splitLinearGeometry(GEOS_GEOM::LineString* splitLine, QList<Qgs`
`4500`	`4499`	`QList<GEOS_GEOM::Geometry*> testedGeometries;`
`4501`	`4500`	`GEOS_GEOM::Geometry* intersectGeom = 0;`
`4502`	`4501`
`4503`		`- for(int i = 0; i < mergedLineStrings->size(); ++i)`
	`4502`	`+ for(unsigned int i = 0; i < mergedLineStrings->size(); ++i)`
`4504`	`4503`	`{`
`4505`	`4504`	`intersectGeom = mGeos->intersection((*mergedLineStrings)[i]);`
`4506`	`4505`	`if(intersectGeom->getLength() > 0.00000001)`
`@@ -4584,7 +4583,7 @@ int QgsGeometry::splitPolygonGeometry(GEOS_GEOM::LineString* splitLine, QList<Qg`
`4584`	`4583`	`//include in result if yes`
`4585`	`4584`	`QList<GEOS_GEOM::Geometry*> testedGeometries;`
`4586`	`4585`	`GEOS_GEOM::Geometry* intersectGeometry = 0;`
`4587`		`- for(int i = 0; i < polygons->size(); ++i)`
	`4586`	`+ for(unsigned int i = 0; i < polygons->size(); ++i)`
`4588`	`4587`	`{`
`4589`	`4588`	`intersectGeometry = mGeos->intersection((*polygons)[i]);`
`4590`	`4589`	`if(intersectGeometry->getArea() > 0.00000000001)`