Changeset: cb1170f6c5de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb1170f6c5de
Modified Files:
geom/monetdb5/geom.c
Branch: sfcgal
Log Message:
BATgroupaggrinit does not have anymore the argument cnt
diffs (75 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2370,7 +2370,7 @@ wkbsubPolygonize(bat *outBAT_id, bat* bB
BAT *b = NULL, *g = NULL, *e = NULL;
oid min, max;
BUN ngrp;
- BUN start, end, cnt;
+ BUN start, end;
wkb **empty_geoms = NULL;
const oid *cand = NULL, *candend = NULL;
@@ -2388,7 +2388,7 @@ wkbsubPolygonize(bat *outBAT_id, bat* bB
}
if ((err = BATgroupaggrinit(b, g, e, NULL, &min, &max, &ngrp,
- &start, &end, &cnt,
+ &start, &end,
&cand, &candend)) != MAL_SUCCEED) {
msg = createException(MAL, "wkbsubPolygonize", "BATgroupaggrinit
failed:%s", err);
return msg;
@@ -3990,7 +3990,7 @@ wkbsubMakeLine(bat *outBAT_id, bat* bBAT
BAT *b = NULL, *g = NULL, *e = NULL;
oid min, max;
BUN ngrp;
- BUN start, end, cnt;
+ BUN start, end;
wkb **empty_geoms = NULL;
const oid *cand = NULL, *candend = NULL;
@@ -4008,7 +4008,7 @@ wkbsubMakeLine(bat *outBAT_id, bat* bBAT
}
if ((err = BATgroupaggrinit(b, g, e, NULL, &min, &max, &ngrp,
- &start, &end, &cnt,
+ &start, &end,
&cand, &candend)) != MAL_SUCCEED) {
msg = createException(MAL, "wkbsubMakeLine", "BATgroupaggrinit
failed:%s", err);
return msg;
@@ -5110,7 +5110,7 @@ wkbsubUnion(bat *outBAT_id, bat* bBAT_id
BAT *b = NULL, *g = NULL, *e = NULL;
oid min, max;
BUN ngrp;
- BUN start, end, cnt;
+ BUN start, end;
wkb **empty_geoms = NULL;
const oid *cand = NULL, *candend = NULL;
@@ -5128,7 +5128,7 @@ wkbsubUnion(bat *outBAT_id, bat* bBAT_id
}
if ((err = BATgroupaggrinit(b, g, e, NULL, &min, &max, &ngrp,
- &start, &end, &cnt,
+ &start, &end,
&cand, &candend)) != MAL_SUCCEED) {
msg = createException(MAL, "wkbsubUnion", "BATgroupaggrinit
failed:%s", err);
return msg;
@@ -5743,7 +5743,7 @@ wkbsubCollect(bat *outBAT_id, bat* bBAT_
BAT *b = NULL, *g = NULL, *e = NULL;
oid min, max;
BUN ngrp = 0;
- BUN start, end, cnt;
+ BUN start, end;
wkb **empty_geoms = NULL;
const oid *cand = NULL, *candend = NULL;
@@ -5761,7 +5761,7 @@ wkbsubCollect(bat *outBAT_id, bat* bBAT_
}
if ((err = BATgroupaggrinit(b, g, e, NULL, &min, &max, &ngrp,
- &start, &end, &cnt,
+ &start, &end,
&cand, &candend)) != MAL_SUCCEED) {
msg = createException(MAL, "wkbsubCollect", "BATgroupaggrinit
failed:%s", err);
return msg;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list