Multi-version adjustment to r6954. To be truly pedantic, use int with GEOS 2.2 and size_t with GEOS 3.0.

telwertowski · telwertowski · commit aab183459c0e · 2007-05-22T21:00:27.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6958 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -65,7 +65,7 @@ mDirtyGeos( rhs.mDirtyGeos )
 	if(multiPoly)
 	  {
 	    std::vector<GEOS_GEOM::Geometry*> polygonVector;
-	    for(unsigned int i = 0; i < multiPoly->getNumGeometries(); ++i)
+	    for(GEOS_SIZE_T i = 0; i < multiPoly->getNumGeometries(); ++i)
 	      {
 		polygonVector.push_back((GEOS_GEOM::Geometry*)(multiPoly->getGeometryN(i)));
 	      }
@@ -187,7 +187,7 @@ QgsGeometry & QgsGeometry::operator=( QgsGeometry const & rhs )
 	if(multiPoly)
 	  {
 	    std::vector<GEOS_GEOM::Geometry*> polygonVector;
-	    for(unsigned int i = 0; i < multiPoly->getNumGeometries(); ++i)
+	    for(GEOS_SIZE_T i = 0; i < multiPoly->getNumGeometries(); ++i)
 	      {
 		polygonVector.push_back((GEOS_GEOM::Geometry*)(multiPoly->getGeometryN(i)));
 	      }
@@ -2009,7 +2009,7 @@ double QgsGeometry::closestVertexWithContext(const QgsPoint& point,
   GEOS_GEOM::CoordinateSequence* sequence = mGeos->getCoordinates();
   if(sequence)
   {
-    for(int i = 0; i < (int) sequence->getSize(); ++i)
+    for(GEOS_SIZE_T i = 0; i < sequence->getSize(); ++i)
     {
       double testDist = point.sqrDist(sequence->getAt(i).x, sequence->getAt(i).y);
       if(testDist < sqrDist)
@@ -3453,7 +3453,7 @@ bool QgsGeometry::exportGeosToWkb()
             geometrySize += sizeof(int);
             geometrySize += theRing->getNumPoints()*2*sizeof(double);
           }
-          for(int i = 0; i < (int) thePolygon->getNumInteriorRing(); ++i)
+          for(GEOS_SIZE_T i = 0; i < thePolygon->getNumInteriorRing(); ++i)
           {
             geometrySize += sizeof(int); //number of points in ring
             theRing = thePolygon->getInteriorRingN(i);
@@ -3487,7 +3487,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 < (int) ringSequence->getSize(); ++j)
+            for(GEOS_SIZE_T j = 0; j < ringSequence->getSize(); ++j)
             {
               //x = theRing->getPointN(j)->getX();
               x = ringSequence->getAt(j).x;
@@ -3501,7 +3501,7 @@ bool QgsGeometry::exportGeosToWkb()
           }
 
           //interior rings after
-          for(int i = 0; i < (int) thePolygon->getNumInteriorRing(); ++i)
+          for(GEOS_SIZE_T i = 0; i < thePolygon->getNumInteriorRing(); ++i)
           {
             theRing = thePolygon->getInteriorRingN(i);
             if(theRing)
@@ -3553,7 +3553,7 @@ bool QgsGeometry::exportGeosToWkb()
 
 	//first determine size of geometry
         int geometrySize = 1 + (2 * sizeof(int)); //endian, type, number of polygons
-	for(unsigned int i = 0; i < theMultiPolygon->getNumGeometries(); ++i)
+	for(GEOS_SIZE_T i = 0; i < theMultiPolygon->getNumGeometries(); ++i)
 	  {
 	    GEOS_GEOM::Polygon* thePoly = (GEOS_GEOM::Polygon*)(theMultiPolygon->getGeometryN(i));
 	    geometrySize += (1 + (2 * sizeof(int))); //endian, type, number of rings
@@ -3563,7 +3563,7 @@ bool QgsGeometry::exportGeosToWkb()
 	    geometrySize += (2*sizeof(double)*exRing->getNumPoints());
 
 	    const GEOS_GEOM::LineString* intRing = 0;
-	    for(unsigned int j = 0; j < thePoly->getNumInteriorRing(); ++j)
+	    for(GEOS_SIZE_T j = 0; j < thePoly->getNumInteriorRing(); ++j)
 	      {
 		geometrySize += sizeof(int); //number of points in ring
 		intRing = thePoly->getInteriorRingN(j);
@@ -3585,7 +3585,7 @@ bool QgsGeometry::exportGeosToWkb()
 	wkbPosition += sizeof(int);
 
 	//loop over polygons
-	for(unsigned int i = 0; i < theMultiPolygon->getNumGeometries(); ++i)
+	for(GEOS_SIZE_T i = 0; i < theMultiPolygon->getNumGeometries(); ++i)
 	  {
 	    GEOS_GEOM::Polygon* thePoly = (GEOS_GEOM::Polygon*)(theMultiPolygon->getGeometryN(i));
 	    memcpy(&mGeometry[wkbPosition], &byteOrder, 1);
@@ -3618,7 +3618,7 @@ bool QgsGeometry::exportGeosToWkb()
 	      }
 	    
 	    //interior rings
-	    for(unsigned int j = 0; j < thePoly->getNumInteriorRing(); ++j)
+	    for(GEOS_SIZE_T j = 0; j < thePoly->getNumInteriorRing(); ++j)
 	      {
 		theRing = thePoly->getInteriorRingN(j);
 		nPointsInRing = theRing->getNumPoints();
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -27,11 +27,13 @@ email                : morb at ozemail dot com dot au
 #define GEOS_GEOM geos
 #define GEOS_IO geos
 #define GEOS_UTIL geos
+#define GEOS_SIZE_T int
 #define COORD_SEQ_FACTORY DefaultCoordinateSequenceFactory
 #else
 #define GEOS_GEOM geos::geom
 #define GEOS_IO geos::io
 #define GEOS_UTIL geos::util
+#define GEOS_SIZE_T size_t
 #define COORD_SEQ_FACTORY CoordinateArraySequenceFactory
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ mDirtyGeos( rhs.mDirtyGeos )`
`65`	`65`	`if(multiPoly)`
`66`	`66`	`{`
`67`	`67`	`std::vector<GEOS_GEOM::Geometry*> polygonVector;`
`68`		`- for(unsigned int i = 0; i < multiPoly->getNumGeometries(); ++i)`
	`68`	`+ for(GEOS_SIZE_T i = 0; i < multiPoly->getNumGeometries(); ++i)`
`69`	`69`	`{`
`70`	`70`	`polygonVector.push_back((GEOS_GEOM::Geometry*)(multiPoly->getGeometryN(i)));`
`71`	`71`	`}`
`@@ -187,7 +187,7 @@ QgsGeometry & QgsGeometry::operator=( QgsGeometry const & rhs )`
`187`	`187`	`if(multiPoly)`
`188`	`188`	`{`
`189`	`189`	`std::vector<GEOS_GEOM::Geometry*> polygonVector;`
`190`		`- for(unsigned int i = 0; i < multiPoly->getNumGeometries(); ++i)`
	`190`	`+ for(GEOS_SIZE_T i = 0; i < multiPoly->getNumGeometries(); ++i)`
`191`	`191`	`{`
`192`	`192`	`polygonVector.push_back((GEOS_GEOM::Geometry*)(multiPoly->getGeometryN(i)));`
`193`	`193`	`}`
`@@ -2009,7 +2009,7 @@ double QgsGeometry::closestVertexWithContext(const QgsPoint& point,`
`2009`	`2009`	`GEOS_GEOM::CoordinateSequence* sequence = mGeos->getCoordinates();`
`2010`	`2010`	`if(sequence)`
`2011`	`2011`	`{`
`2012`		`- for(int i = 0; i < (int) sequence->getSize(); ++i)`
	`2012`	`+ for(GEOS_SIZE_T i = 0; i < sequence->getSize(); ++i)`
`2013`	`2013`	`{`
`2014`	`2014`	`double testDist = point.sqrDist(sequence->getAt(i).x, sequence->getAt(i).y);`
`2015`	`2015`	`if(testDist < sqrDist)`
`@@ -3453,7 +3453,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3453`	`3453`	`geometrySize += sizeof(int);`
`3454`	`3454`	`geometrySize += theRing->getNumPoints()2sizeof(double);`
`3455`	`3455`	`}`
`3456`		`- for(int i = 0; i < (int) thePolygon->getNumInteriorRing(); ++i)`
	`3456`	`+ for(GEOS_SIZE_T i = 0; i < thePolygon->getNumInteriorRing(); ++i)`
`3457`	`3457`	`{`
`3458`	`3458`	`geometrySize += sizeof(int); //number of points in ring`
`3459`	`3459`	`theRing = thePolygon->getInteriorRingN(i);`
`@@ -3487,7 +3487,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3487`	`3487`	`position += sizeof(int);`
`3488`	`3488`	`const GEOS_GEOM::CoordinateSequence* ringSequence = theRing->getCoordinatesRO();`
`3489`	`3489`	`//for(int j = 0; j < nPointsInRing; ++j)`
`3490`		`- for(int j = 0; j < (int) ringSequence->getSize(); ++j)`
	`3490`	`+ for(GEOS_SIZE_T j = 0; j < ringSequence->getSize(); ++j)`
`3491`	`3491`	`{`
`3492`	`3492`	`//x = theRing->getPointN(j)->getX();`
`3493`	`3493`	`x = ringSequence->getAt(j).x;`
`@@ -3501,7 +3501,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3501`	`3501`	`}`
`3502`	`3502`
`3503`	`3503`	`//interior rings after`
`3504`		`- for(int i = 0; i < (int) thePolygon->getNumInteriorRing(); ++i)`
	`3504`	`+ for(GEOS_SIZE_T i = 0; i < thePolygon->getNumInteriorRing(); ++i)`
`3505`	`3505`	`{`
`3506`	`3506`	`theRing = thePolygon->getInteriorRingN(i);`
`3507`	`3507`	`if(theRing)`
`@@ -3553,7 +3553,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3553`	`3553`
`3554`	`3554`	`//first determine size of geometry`
`3555`	`3555`	`int geometrySize = 1 + (2 * sizeof(int)); //endian, type, number of polygons`
`3556`		`- for(unsigned int i = 0; i < theMultiPolygon->getNumGeometries(); ++i)`
	`3556`	`+ for(GEOS_SIZE_T i = 0; i < theMultiPolygon->getNumGeometries(); ++i)`
`3557`	`3557`	`{`
`3558`	`3558`	`GEOS_GEOM::Polygon* thePoly = (GEOS_GEOM::Polygon*)(theMultiPolygon->getGeometryN(i));`
`3559`	`3559`	`geometrySize += (1 + (2 * sizeof(int))); //endian, type, number of rings`
`@@ -3563,7 +3563,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3563`	`3563`	`geometrySize += (2sizeof(double)exRing->getNumPoints());`
`3564`	`3564`
`3565`	`3565`	`const GEOS_GEOM::LineString* intRing = 0;`
`3566`		`- for(unsigned int j = 0; j < thePoly->getNumInteriorRing(); ++j)`
	`3566`	`+ for(GEOS_SIZE_T j = 0; j < thePoly->getNumInteriorRing(); ++j)`
`3567`	`3567`	`{`
`3568`	`3568`	`geometrySize += sizeof(int); //number of points in ring`
`3569`	`3569`	`intRing = thePoly->getInteriorRingN(j);`
`@@ -3585,7 +3585,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3585`	`3585`	`wkbPosition += sizeof(int);`
`3586`	`3586`
`3587`	`3587`	`//loop over polygons`
`3588`		`- for(unsigned int i = 0; i < theMultiPolygon->getNumGeometries(); ++i)`
	`3588`	`+ for(GEOS_SIZE_T i = 0; i < theMultiPolygon->getNumGeometries(); ++i)`
`3589`	`3589`	`{`
`3590`	`3590`	`GEOS_GEOM::Polygon* thePoly = (GEOS_GEOM::Polygon*)(theMultiPolygon->getGeometryN(i));`
`3591`	`3591`	`memcpy(&mGeometry[wkbPosition], &byteOrder, 1);`
`@@ -3618,7 +3618,7 @@ bool QgsGeometry::exportGeosToWkb()`
`3618`	`3618`	`}`
`3619`	`3619`
`3620`	`3620`	`//interior rings`
`3621`		`- for(unsigned int j = 0; j < thePoly->getNumInteriorRing(); ++j)`
	`3621`	`+ for(GEOS_SIZE_T j = 0; j < thePoly->getNumInteriorRing(); ++j)`
`3622`	`3622`	`{`
`3623`	`3623`	`theRing = thePoly->getInteriorRingN(j);`
`3624`	`3624`	`nPointsInRing = theRing->getNumPoints();`