MonetDB: sfcgal - Do a proper increment, reset variable and add ...

[Romulo Goncalves]

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

Do a proper increment, reset variable and add a defense line.


diffs (42 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -1625,7 +1625,7 @@ dumpGeometriesSingle(BAT *idBAT, BAT *ge
             BUNappend(geomBAT, singleWKB, TRUE) != GDK_SUCCEED)
         err = createException(MAL, "geom.Dump", "BUNappend failed");
     else
-        *num_geoms++;
+        *num_geoms = *num_geoms+1;
 
        GDKfree(newPath);
        GDKfree(singleWKB);
@@ -1835,7 +1835,7 @@ dumpPointsPoint(BAT *idBAT, BAT *geomBAT
            BUNappend(geomBAT, pointWKB, TRUE) != GDK_SUCCEED)
                err = createException(MAL, "geom.Dump", "BUNappend failed");
     else
-        *num_points++;
+        *num_points = *num_points+1;
 
        GDKfree(newPath);
        GDKfree(pointWKB);
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -2492,7 +2492,7 @@ WKBtoWKBSflagINT(bat *parentBAT_id, bat 
                 }
             }
         }
-
+        cnt = 0;
     }
 
     /*Release input BATs*/
@@ -2516,6 +2516,8 @@ WKBtoWKBSflagINT(bat *parentBAT_id, bat 
     */
 
     /*Keep refs for output BATs*/
+    if ( !((BATcount(idBAT) == BATcount(geomBAT)) && (BATcount(idBAT) == 
BATcount(parentBAT))) )
+        assert(0);
        BBPkeepref(*idBAT_id = idBAT->batCacheid);
        BBPkeepref(*geomBAT_id = geomBAT->batCacheid);
     if (inParentBAT_id)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list