MonetDB: sfcgal - Fix compilation in other platforms

[Romulo Goncalves]

Changeset: 35d17d037172 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35d17d037172
Modified Files:
        geom/monetdb5/Makefile.ag
        geom/monetdb5/geomBulk.c
        geom/monetdb5/geom_geojson.c
        geom/monetdb5/geom_x3d.c
        geom/monetdb5/sfcgal.mal
Branch: sfcgal
Log Message:

Fix compilation in other platforms


diffs (66 lines):

diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -62,4 +62,4 @@ headers_autoload_sfcgal = {
        SOURCES = 31_sfcgal.mal
 }
 
-EXTRA_DIST = 30_geom.mal 31_geom.mal geom.mal
+EXTRA_DIST = 30_geom.mal 31_sfcgal.mal geom.mal sfcgal.mal
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -1661,7 +1661,7 @@ wkbIntersection_bat_s(bat *outBAT_id, ba
 {
        BAT *outBAT = NULL, *aBAT = NULL, *bBAT = NULL, *saBAT = NULL, *sbBAT = 
NULL;
        BATiter aBAT_iter, bBAT_iter, saBAT_iter, sbBAT_iter;
-    uint32_t i = 0;
+    BUN i = 0;
 
        //get the descriptors of the input BATs
        if ((aBAT = BATdescriptor(*aBAT_id)) == NULL) {
diff --git a/geom/monetdb5/geom_geojson.c b/geom/monetdb5/geom_geojson.c
--- a/geom/monetdb5/geom_geojson.c
+++ b/geom/monetdb5/geom_geojson.c
@@ -598,7 +598,7 @@ asgeojson_geom_buf(GEOSGeom geom, char *
 print_double(double d, int maxdd, char *buf, size_t bufsize)
 {
     double ad = fabs(d);
-    int ndd = ad < 1 ? 0 : floor(log10(ad))+1; /* non-decimal digits */
+    double ndd = ad < 1 ? 0 : floor(log10(ad))+1; /* non-decimal digits */
     if (fabs(d) < OUT_MAX_DOUBLE)
     {
         if ( maxdd > (OUT_MAX_DOUBLE_PRECISION - ndd) )  maxdd -= ndd;
@@ -691,7 +691,7 @@ points_geojson_size(const GEOSGeometry *
 trim_trailing_zeros(char *str)
 {
     char *ptr, *totrim=NULL;
-    int len;
+    size_t len;
     int i;
 
     /* no dot, no decimal digits */
diff --git a/geom/monetdb5/geom_x3d.c b/geom/monetdb5/geom_x3d.c
--- a/geom/monetdb5/geom_x3d.c
+++ b/geom/monetdb5/geom_x3d.c
@@ -490,7 +490,7 @@ x3d_3_psurface_buf(GEOSGeom psur, char *
             {
                 ptr += sprintf(ptr, " ");
             }
-            ptr += sprintf(ptr, "%d", (j + k));
+            ptr += sprintf(ptr, "%ud", (j + k));
         }
         if (i < (ngeoms - 1) )
         {
diff --git a/geom/monetdb5/sfcgal.mal b/geom/monetdb5/sfcgal.mal
--- a/geom/monetdb5/sfcgal.mal
+++ b/geom/monetdb5/sfcgal.mal
@@ -26,8 +26,6 @@ command triangulate2DZ(geo:wkb, flag:int
 address geom_sfcgal_triangulate2DZ
 comment "Triangulates a geometry collection";
 
-
-
 module batgeom;
 
 command triangulate2DZ(geo:bat[:oid,:wkb], flag:int) :bat[ :oid, :wkb]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list