MonetDB: Jul2015 - make sure the return types and returned bats ...

[Niels Nes]

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

make sure the return types and returned bats are equal (fixes crash/assert)


diffs (67 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -826,7 +826,7 @@ pnpoly_(int *out, int nvert, dbl *vx, db
        dbl *px = NULL, *py = NULL;
        BUN i = 0, cnt;
        int j = 0, nv;
-       bte *cs = NULL;
+       bit *cs = NULL;
 
        /*Get the BATs*/
        if ((bpx = BATdescriptor(*point_x)) == NULL) {
@@ -849,7 +849,7 @@ pnpoly_(int *out, int nvert, dbl *vx, db
        }
 
        /*Create output BAT*/
-       if ((bo = BATnew(TYPE_void, ATOMindex("bte"), BATcount(bpx), 
TRANSIENT)) == NULL) {
+       if ((bo = BATnew(TYPE_void, ATOMindex("bit"), BATcount(bpx), 
TRANSIENT)) == NULL) {
                BBPunfix(bpx->batCacheid);
                BBPunfix(bpy->batCacheid);
                throw(MAL, "geom.point", MAL_MALLOC_FAIL);
@@ -862,7 +862,7 @@ pnpoly_(int *out, int nvert, dbl *vx, db
 
        nv = nvert -1;
        cnt = BATcount(bpx);
-       cs = (bte*) Tloc(bo,BUNfirst(bo));
+       cs = (bit*) Tloc(bo,BUNfirst(bo));
        for (i = 0; i < cnt; i++) {
                int wn = 0;
                for (j = 0; j < nv; j++) {
@@ -895,7 +895,7 @@ pnpolyWithHoles_(bat *out, int nvert, db
        dbl *px = NULL, *py = NULL;
        BUN i = 0, cnt = 0;
        int j = 0, h = 0;
-       bte *cs = NULL;
+       bit *cs = NULL;
 
        /*Get the BATs*/
        if ((bpx = BATdescriptor(*point_x)) == NULL) {
@@ -917,7 +917,7 @@ pnpolyWithHoles_(bat *out, int nvert, db
        }
 
        /*Create output BAT*/
-       if ((bo = BATnew(TYPE_void, ATOMindex("bte"), BATcount(bpx), 
TRANSIENT)) == NULL) {
+       if ((bo = BATnew(TYPE_void, ATOMindex("bit"), BATcount(bpx), 
TRANSIENT)) == NULL) {
                BBPunfix(bpx->batCacheid);
                BBPunfix(bpy->batCacheid);
                throw(MAL, "geom.point", MAL_MALLOC_FAIL);
@@ -928,7 +928,7 @@ pnpolyWithHoles_(bat *out, int nvert, db
        px = (dbl *) Tloc(bpx, BUNfirst(bpx));
        py = (dbl *) Tloc(bpy, BUNfirst(bpx));
        cnt = BATcount(bpx);
-       cs = (bte*) Tloc(bo,BUNfirst(bo));
+       cs = (bit*) Tloc(bo,BUNfirst(bo));
        for (i = 0; i < cnt; i++) {
                int wn = 0;
 
@@ -985,7 +985,8 @@ pnpolyWithHoles_(bat *out, int nvert, db
 #define POLY_NUM_HOLE 10
 
 str
-wkbContains_point_bat(bat *out, wkb **a, bat *point_x, bat *point_y) {
+wkbContains_point_bat(bat *out, wkb **a, bat *point_x, bat *point_y) 
+{
        double *vert_x, *vert_y, **holes_x = NULL, **holes_y= NULL;
        int *holes_n= NULL, j;
        wkb *geom = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list