fix #1245 (take two)

jef · jef · commit 55493aa6130c · 2008-08-24T18:20:25.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9155 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -109,14 +109,14 @@ static GEOSGeometry *createGeosCollection( int typeId, QVector<GEOSGeometry*> ge
 
 static GEOSGeometry *cloneGeosGeom( const GEOSGeometry *geom )
 {
-  if ( GEOSGeomTypeId( geom ) == GEOS_MULTIPOLYGON )
+  if ( GEOSGeomTypeId(( GEOSGeometry * ) geom ) == GEOS_MULTIPOLYGON )
   {
     QVector<GEOSGeometry *> geoms;
 
     try
     {
 
-      for ( int i = 0; i < GEOSGetNumGeometries( geom ); ++i )
+      for ( int i = 0; i < GEOSGetNumGeometries(( GEOSGeometry * )geom ); ++i )
         geoms << GEOSGeom_clone(( GEOSGeometry * ) GEOSGetGeometryN(( GEOSGeometry * ) geom, i ) );
 
       return createGeosCollection( GEOS_MULTIPOLYGON, geoms );

Original file line number	Diff line number	Diff line change
`@@ -109,14 +109,14 @@ static GEOSGeometry createGeosCollection( int typeId, QVector<GEOSGeometry> ge`
`109`	`109`
`110`	`110`	`static GEOSGeometry cloneGeosGeom( const GEOSGeometry geom )`
`111`	`111`	`{`
`112`		`- if ( GEOSGeomTypeId( geom ) == GEOS_MULTIPOLYGON )`
	`112`	`+ if ( GEOSGeomTypeId(( GEOSGeometry * ) geom ) == GEOS_MULTIPOLYGON )`
`113`	`113`	`{`
`114`	`114`	`QVector<GEOSGeometry *> geoms;`
`115`	`115`
`116`	`116`	`try`
`117`	`117`	`{`
`118`	`118`
`119`		`- for ( int i = 0; i < GEOSGetNumGeometries( geom ); ++i )`
	`119`	`+ for ( int i = 0; i < GEOSGetNumGeometries(( GEOSGeometry * )geom ); ++i )`
`120`	`120`	`geoms << GEOSGeom_clone(( GEOSGeometry * ) GEOSGetGeometryN(( GEOSGeometry * ) geom, i ) );`
`121`	`121`
`122`	`122`	`return createGeosCollection( GEOS_MULTIPOLYGON, geoms );`