MonetDB: sfcgal - Proper declaration of the argument type. Do no...

[Romulo Goncalves]

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

Proper declaration of the argument type. Do not swap args order


diffs (44 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -1956,7 +1956,7 @@ dumpPointsMultiGeometry(BAT *idBAT, BAT 
 }
 
 static str
-dumpPointsGeometry_(BAT *idBAT, BAT *geomBAT, const GEOSGeometry 
*geosGeometry, unsigned *num_points, const char *path)
+dumpPointsGeometry_(BAT *idBAT, BAT *geomBAT, const GEOSGeometry 
*geosGeometry, uint32_t *num_points, const char *path)
 {
        int geometryType = GEOSGeomTypeId(geosGeometry) + 1;
        unsigned int lvl = 0;
@@ -1969,7 +1969,7 @@ dumpPointsGeometry_(BAT *idBAT, BAT *geo
        case wkbLinearRing_mdb:
                return dumpPointsLineString(idBAT, geomBAT, geosGeometry, 
num_points, path);
        case wkbPolygon_mdb:
-               return dumpPointsPolygon(idBAT, geomBAT, geosGeometry, 
num_points, &lvl, path);
+               return dumpPointsPolygon(idBAT, geomBAT, geosGeometry, &lvl, 
num_points, path);
        case wkbMultiPoint_mdb:
        case wkbMultiLineString_mdb:
        case wkbMultiPolygon_mdb:
@@ -1981,7 +1981,7 @@ dumpPointsGeometry_(BAT *idBAT, BAT *geo
 }
 
 str
-dumpPointsGeometry(BAT *idBAT, BAT *geomBAT, const GEOSGeometry *geosGeometry, 
unsigned *num_points, const char *path) {
+dumpPointsGeometry(BAT *idBAT, BAT *geomBAT, const GEOSGeometry *geosGeometry, 
uint32_t *num_points, const char *path) {
     return dumpPointsGeometry_(idBAT, geomBAT, geosGeometry, num_points, path);
 }
 
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -272,8 +272,8 @@ geom_export str wkbDumpPoints_bat(bat* i
 geom_export str wkbDumpPointsP(bat* partentBAT_id, bat* idBAT_id, bat* 
geomBAT_id, wkb**, int* parent);
 geom_export str wkbDumpPointsP_bat(bat* partentBAT_id, bat* idBAT_id, bat* 
geomBAT_id, bat* wkbBAT_id, bat *parent);
 geom_export str wkbDumpRings(bat* geomBAT_id, wkb**);
-geom_export str dumpGeometriesGeometry(BAT *idBAT, BAT *geomBAT, const 
GEOSGeometry *geosGeometry, unsigned *num_geoms, const char *path);
-geom_export str dumpPointsGeometry(BAT *idBAT, BAT *geomBAT, const 
GEOSGeometry *geosGeometry, unsigned *num_points, const char *path);
+geom_export str dumpGeometriesGeometry(BAT *idBAT, BAT *geomBAT, const 
GEOSGeometry *geosGeometry, uint32_t *num_geoms, const char *path);
+geom_export str dumpPointsGeometry(BAT *idBAT, BAT *geomBAT, const 
GEOSGeometry *geosGeometry, uint32_t *num_points, const char *path);
 geom_export str wkbPolygonize(wkb **res, wkb **geom);
 geom_export str wkbsubPolygonize(bat *outBAT_id, bat* bBAT_id, bat *gBAT_id, 
bat *eBAT_id, bit* flag);
 geom_export str wkbSimplify(wkb **res, wkb **geom, float *tolerance);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list