Changeset: eb84f91d6fd1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb84f91d6fd1
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.h
geom/monetdb5/geomBulk.c
Branch: sfcgal
Log Message:
Fix some bugs detected by Mtest. Do set count and then remove props. tnonil
also needs to be clean.
diffs (46 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -7391,8 +7391,8 @@ pnpoly(int *out, int nvert, dbl *vx, dbl
bo->tsorted = bo->trevsorted = 0;
bo->tkey = 0;
+ BATrmprops(bo)
BATsetcount(bo, cnt);
- BATrmprops(bo)
BATsettrivprop(bo);
BBPunfix(bpx->batCacheid);
BBPunfix(bpy->batCacheid);
@@ -7481,8 +7481,8 @@ pnpolyWithHoles(bat *out, int nvert, dbl
}
bo->tsorted = bo->trevsorted = 0;
bo->tkey = 0;
+ BATrmprops(bo)
BATsetcount(bo, cnt);
- BATrmprops(bo)
BATsettrivprop(bo);
BBPunfix(bpx->batCacheid);
BBPunfix(bpy->batCacheid);
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -43,6 +43,7 @@
b->tnosorted = b->tnorevsorted = 1; \
b->tkey |= 0; \
b->tnokey[0] = b->tnokey[1] = 1; \
+ b->tnonil = 0; \
b->tnodense = 1;
/* general functions */
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -1064,7 +1064,7 @@ WKBWKBtoWKB_bat(bat *outBAT_id, bat *aBA
msg = err;
#pragma omp cancelregion
}
- BUNappend(outBAT, &outWKB, TRUE); //add the result to the new BAT
+ BUNappend(outBAT, outWKB, TRUE); //add the result to the new BAT
}
#ifdef GEOMBULK_DEBUG
gettimeofday(&stop, NULL);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
