MonetDB: sfcgal - Fix compilation issues

[Romulo Goncalves]

Changeset: 852fb17e5b84 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=852fb17e5b84
Modified Files:
        geom/monetdb5/geom_clean.c
Branch: sfcgal
Log Message:

Fix compilation issues


diffs (37 lines):

diff --git a/geom/monetdb5/geom_clean.c b/geom/monetdb5/geom_clean.c
--- a/geom/monetdb5/geom_clean.c
+++ b/geom/monetdb5/geom_clean.c
@@ -331,13 +331,13 @@ GEOSGeom_GEOS_nodeLines(GEOSGeometry **r
 
 /*TODO: Find a way to clone it*/
 static GEOSGeometry*
-GEOSGeom_GEOS_buildArea(const GEOSGeometry* geom_in) {
+GEOSGeom_GEOS_buildArea(const GEOSGeometry* geosGeometry) {
     return NULL;
 }
 
 
 static str
-GEOSGeom_GEOS_makeValidPolygon(GEOSGeometry **res, const GEOSGeometry *poly)
+GEOSGeom_GEOS_makeValidPolygon(GEOSGeometry **res, const GEOSGeometry 
*geosGeometry)
 {
        GEOSGeom geosBound, geosCutEdges, geosArea, collapsePoints;
        GEOSGeometry *vgeoms[3], *uniqPointsBound = NULL, *uniqPointsEdges = 
NULL;
@@ -346,7 +346,7 @@ GEOSGeom_GEOS_makeValidPolygon(GEOSGeome
 
        assert (GEOSGeomTypeId(geosGeometry) == GEOS_POLYGON || 
GEOSGeomTypeId(geosGeometry) == GEOS_MULTIPOLYGON);
 
-       if ( (geosBound = GEOSBoundary(poly)) == NULL) {
+       if ( (geosBound = GEOSBoundary(geosGeometry)) == NULL) {
         *res = NULL;
                throw(MAL, "GEOSGeom_GEOS_makeValidPolygon", "GEOSBoundary 
failed");
     }
@@ -728,7 +728,7 @@ geom_make_valid(GEOSGeometry **res, cons
        if ( (GEOSGeomTypeId(geosGeometry)+1) == wkbGeometryCollection_mdb && 
(GEOSGeomTypeId(*res) +1 ) != wkbGeometryCollection_mdb) {
                GEOSGeom *ogeoms = (GEOSGeom *) GDKmalloc(sizeof(GEOSGeom*));
         int geometryType = -1, type = -1;
-               assert(geom_in != res);
+               assert(geosGeometry != res);
         ogeoms[0] = *res;
 
         geometryType = GEOSGeomTypeId(*res);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list