Changeset: ed480560b028 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ed480560b028
Modified Files:
geom/monetdb5/geom_atoms.c
Branch: resource_management
Log Message:
merge upstream
diffs (44 lines):
diff --git a/geom/monetdb5/geom_atoms.c b/geom/monetdb5/geom_atoms.c
--- a/geom/monetdb5/geom_atoms.c
+++ b/geom/monetdb5/geom_atoms.c
@@ -52,6 +52,7 @@ wkbTOSTR(allocator *ma, char **geomWKT,
if (*len < dstStrLen + 1 || *geomWKT == NULL) {
*len = dstStrLen + 1;
////GDKfree(*geomWKT);
+ assert(ma);
if ((*geomWKT = ma_alloc(ma, *len)) == NULL) {
GEOSFree_r(geoshandle, wkt);
return -1;
@@ -1153,24 +1154,6 @@ mbrFromString(Client ctx, mbr **w, const
*/
str
-ordinatesMBR(mbr **res, flt *minX, flt *minY, flt *maxX, flt *maxY)
-{
- allocator *ma = MT_thread_getallocator();
- assert(ma);
- if ((*res = ma_alloc(ma, sizeof(mbr))) == NULL)
- throw(MAL, "geom.mbr", SQLSTATE(HY013) MAL_MALLOC_FAIL);
- if (is_flt_nil(*minX) || is_flt_nil(*minY) || is_flt_nil(*maxX) ||
is_flt_nil(*maxY))
- **res = mbrNIL;
- else {
- (*res)->xmin = *minX;
- (*res)->ymin = *minY;
- (*res)->xmax = *maxX;
- (*res)->ymax = *maxY;
- }
- return MAL_SUCCEED;
-}
-
-str
mbrIntersects(Client ctx, bit *out, mbr** mbr1, mbr** mbr2) {
(void) ctx;
if (((*mbr1)->ymax < (*mbr2)->ymin) || ((*mbr1)->ymin > (*mbr2)->ymax))
diff --git a/geom/monetdb5/geom_atoms.h b/geom/monetdb5/geom_atoms.h
--- a/geom/monetdb5/geom_atoms.h
+++ b/geom/monetdb5/geom_atoms.h
@@ -83,4 +83,3 @@ geom_export str mbrDistance(Client ctx,
geom_export str mbrDistance_wkb(Client ctx, dbl *out, wkb **geom1WKB, wkb
**geom2WKB);
geom_export str wkbCoordinateFromWKB(Client ctx, dbl*, wkb**, int*);
geom_export str wkbCoordinateFromMBR(Client ctx, dbl*, mbr**, int*);
-geom_export str ordinatesMBR(mbr **res, flt *minX, flt *minY, flt *maxX, flt
*maxY);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
