Update of /cvsroot/monetdb/geom/src/monetdb5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27271/src/monetdb5
Modified Files:
geom.mx
Log Message:
propagated changes of Friday Jun 20 2008 - Monday Jun 23 2008
from the Geom_0-4 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
NT/geom_config.h.in,1.4.4.1(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Use monetdb_winconfig.h.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
RunMserver.bat.in,1.1.1.1.4.1(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
RunMtest.bat.in,1.3.4.1(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
One step towards being able to use this on Windows.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
src/monetdb5/geom.mx,1.13.4.6(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Export functions.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
src/lib/libgeom.mx,1.5.4.5(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
src/monetdb5/geom.mx,1.13.4.7(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Port to geos 3.0.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
RunMtest.bat.in,1.3.4.2(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Add SQL module path to MOD_PATH.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
configure.ag,1.12.2.5(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Commented max version check for geos library: we should now be able to
use geos 3.0.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - stmane:
vertoo.config,1.3.4.2(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
have VERSION in NT/rules.msc maintained by vertoo
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/21 - stmane:
RunMtest.bat.in,1.3.4.3(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22)
make sure that we indeed call
"%sql_prefix%\bin\monetdb-sql-config.bat"
not just
"%sql_prefix%"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: geom.mx
===================================================================
RCS file: /cvsroot/monetdb/geom/src/monetdb5/geom.mx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- geom.mx 6 Jun 2008 10:50:31 -0000 1.16
+++ geom.mx 23 Jun 2008 14:22:59 -0000 1.17
@@ -284,6 +284,9 @@
int TYPE_mbr;
+geom_export bat*
+geom_prelude(void);
+
bat*
geom_prelude(void)
{
@@ -292,6 +295,9 @@
return NULL;
}
+geom_export void
+geom_epilogue(void);
+
void
geom_epilogue(void)
{
@@ -312,6 +318,9 @@
/* NULL: generic nil mbr. */
/* returns a pointer to a nil-mbr. */
+geom_export mbr*
+mbrNULL(void);
+
mbr*
mbrNULL(void)
{
@@ -325,6 +334,13 @@
/* FROMSTR: parse string to mbr. */
/* return number of parsed characters. */
+geom_export int
+mbrFROMSTR(
+ char* src, /* IN: to-be-parsed string. */
+ int* len, /* INOUT: length of area pointed to by atom
[may need enlarging!] */
+ mbr** atom /* INOUT: ptr to atom-ptr [may need (re-)alloc!] */
+);
+
int
mbrFROMSTR(
char* src, /* IN: to-be-parsed string. */
@@ -360,6 +376,13 @@
/* TOSTR: print atom in a string. */
/* return length of resulting string. */
+geom_export int
+mbrTOSTR(
+ char** dst, /* INOUT: dst charbuffer [maybe 0, may need realloc]*/
+ int* len, /* INOUT: length of buffer */
+ mbr* atom /* IN: to-be-printed mbr. */
+);
+
int
mbrTOSTR(
char** dst, /* INOUT: dst charbuffer [maybe 0, may need realloc]*/
@@ -392,6 +415,11 @@
/* HASH: compute a hash value. */
/* returns a positive integer hash value */
+geom_export hash_t
+mbrHASH(
+ mbr* atom /* IN: to-be-hashed mbr. */
+);
+
hash_t
mbrHASH(
mbr* atom /* IN: to-be-hashed mbr. */
@@ -402,6 +430,12 @@
/* COMP: compare two mbrs. */
/* returns int <0 if l<r, 0 if l==r, >0 else */
+geom_export int
+mbrCOMP(
+ mbr* l, /* IN: first geom_point. */
+ mbr* r /* IN: second geom_point. */
+);
+
int
mbrCOMP(
mbr* l, /* IN: first geom_point. */
@@ -423,6 +457,9 @@
return res;
}
+geom_export mbr *
+mbrREAD(mbr *a, stream *s, size_t cnt);
+
mbr *
mbrREAD(mbr *a, stream *s, size_t cnt)
{
@@ -444,6 +481,9 @@
return a;
}
+geom_export void
+mbrWRITE(mbr *c, stream *s, size_t cnt);
+
void
mbrWRITE(mbr *c, stream *s, size_t cnt)
{
@@ -458,6 +498,9 @@
}
}
+geom_export str
+mbrFromString(mbr **w, str *src);
+
str
mbrFromString(mbr **w, str *src)
{
@@ -468,6 +511,9 @@
throw(MAL, "mbr.FromString", GDKerrbuf);
}
+geom_export str
+mbrFromMBR(mbr **w, mbr **src);
+
str
mbrFromMBR(mbr **w, mbr **src)
{
@@ -491,6 +537,13 @@
/* TOSTR: print atom in a string. */
/* return length of resulting string. */
+geom_export int
+wkbTOSTR(
+ char** dst, /* INOUT: dst charbuffer [maybe 0, may need realloc]*/
+ int* len, /* INOUT: length of buffer */
+ wkb* atom /* IN: to-be-printed geom_geometry. */
+);
+
int
wkbTOSTR(
char** dst, /* INOUT: dst charbuffer [maybe 0, may need realloc]*/
@@ -525,6 +578,13 @@
/* FROMSTR: parse string to @1. */
/* return number of parsed characters. */
+geom_export int
+wkbFROMSTR(
+ char* src, /* IN: to-be-parsed string. */
+ int* len, /* INOUT: length of area pointed to by atom
[may need enlarging!] */
+ wkb** atom /* INOUT: ptr to atom-ptr [may need (re-)alloc!] */
+);
+
int
wkbFROMSTR(
char* src, /* IN: to-be-parsed string. */
@@ -569,6 +629,9 @@
return strlen(src);
}
+geom_export str
+wkbFromString(wkb **w, str *wkt);
+
str
wkbFromString(wkb **w, str *wkt)
{
@@ -579,6 +642,9 @@
throw(MAL, "wkb.FromString", GDKerrbuf);
}
+geom_export str
+wkbFromWKB(wkb **w, wkb **src);
+
str
wkbFromWKB(wkb **w, wkb **src)
{
@@ -593,6 +659,9 @@
return MAL_SUCCEED;
}
+geom_export str
+wkbFromText(wkb **w, str *wkt, int *tpe);
+
str
wkbFromText(wkb **w, str *wkt, int *tpe)
{
@@ -611,6 +680,9 @@
throw(MAL, "wkb.FromText", GDKerrbuf);
}
+geom_export hash_t
+wkbHASH(wkb *w);
+
hash_t
wkbHASH(wkb *w)
{
@@ -624,6 +696,9 @@
return h;
}
+geom_export int
+wkbCOMP(wkb *l, wkb *r);
+
int
wkbCOMP(wkb *l, wkb *r)
{
@@ -638,6 +713,9 @@
return memcmp(l->data, r->data, len);
}
+geom_export wkb *
+wkbNULL(void);
+
wkb *
wkbNULL(void)
{
@@ -647,6 +725,9 @@
return (&nullval);
}
+geom_export str
+wkbAsText(str *r, wkb** w);
+
str
wkbAsText(str *r, wkb** w)
{
@@ -658,12 +739,18 @@
throw(MAL, "geom.AsText", "Failed to create Text from Well Known
Format");
}
+geom_export void
+wkbDEL(Heap *h, var_t *index);
+
void
wkbDEL(Heap *h, var_t *index)
{
HEAP_free(h, *index);
}
+geom_export wkb *
+wkbREAD(wkb *a, stream *s, size_t cnt);
+
wkb *
wkbREAD(wkb *a, stream *s, size_t cnt)
{
@@ -683,6 +770,9 @@
return a;
}
+geom_export void
+wkbWRITE(wkb *a, stream *s, size_t cnt);
+
void
wkbWRITE(wkb *a, stream *s, size_t cnt)
{
@@ -694,6 +784,9 @@
stream_write(s, (char *) a->data, len, 1);
}
+geom_export void
+wkbCONVERT(wkb *b, int direction);
+
void
wkbCONVERT(wkb *b, int direction)
{
@@ -701,18 +794,27 @@
b->len = normal_int_SWAP(b->len);
}
+geom_export int
+wkbLENGTH(wkb *p);
+
int
wkbLENGTH(wkb *p)
{
return wkb_size(p->len);
}
+geom_export void
+wkbHEAP(Heap *heap, size_t capacity);
+
void
wkbHEAP(Heap *heap, size_t capacity)
{
HEAP_initialize(heap, capacity, 0, (int) sizeof(var_t));
}
+geom_export var_t
+wkbPUT(Heap *h, var_t *bun, wkb *val);
+
var_t
wkbPUT(Heap *h, var_t *bun, wkb *val)
{
@@ -728,6 +830,15 @@
/* COMMAND mbr
* Creates the mbr for the given geom_geometry.
*/
+geom_export str
+ordinatesMBR(
+ mbr** res, /* INOUT. */
+ flt* minX, /* IN. */
+ flt* minY, /* IN. */
+ flt* maxX, /* IN. */
+ flt* maxY /* IN. */
+);
+
str
ordinatesMBR(
mbr** res, /* INOUT. */
@@ -749,6 +860,12 @@
/* COMMAND mbr
* Creates the mbr for the given geom_geometry.
*/
+geom_export str
+wkbMBR(
+ mbr** res, /* INOUT. */
+ wkb** geom /* IN. */
+);
+
str
wkbMBR(
mbr** res, /* INOUT. */
@@ -763,6 +880,9 @@
throw(MAL, "geom.mbr", "Failed to create mbr");
}
+geom_export wkb *
+geos2wkb( GEOSGeom geosGeometry );
+
wkb *
geos2wkb( GEOSGeom geosGeometry )
{
@@ -781,6 +901,9 @@
}
@= getcoord
+geom_export str
[EMAIL PROTECTED](double *out, wkb **geom);
+
str
[EMAIL PROTECTED](double *out, wkb **geom)
{
@@ -788,7 +911,11 @@
GEOSGeom geosGeometry = wkb2geos(*geom);
if (geosGeometry) {
+#if GEOS_CAPI_VERSION_MAJOR >= 1 && GEOS_CAPI_VERSION_MINOR >= 3
+ const GEOSCoordSequence *gcs =
GEOSGeom_getCoordSeq(geosGeometry);
+#else
const GEOSCoordSeq gcs = GEOSGeom_getCoordSeq(geosGeometry);
+#endif
/* we could also check if geom is a
LineString, LinearRing or Point */
@@ -806,6 +933,9 @@
@:getcoord(Y)@
@c
+geom_export str
+wkbcreatepoint(wkb **out, double *x,double *y);
+
str
wkbcreatepoint(wkb **out, double *x,double *y)
{
@@ -817,6 +947,9 @@
return MAL_SUCCEED;
}
+geom_export str
+mbroverlaps( bit *out, mbr *b1, mbr *b2);
+
str
mbroverlaps( bit *out, mbr *b1, mbr *b2)
{
@@ -828,6 +961,9 @@
}
@= basic
+geom_export str
[EMAIL PROTECTED]( @2 *out, wkb **geom);
+
str
[EMAIL PROTECTED]( @2 *out, wkb **geom)
{
@@ -854,6 +990,9 @@
@:basic(Boundary,wkb*,GEOSBoundary,geos2wkb,NULL)@
@= spatial
+geom_export str
[EMAIL PROTECTED]( bit *out, wkb **a, wkb **b);
+
str
[EMAIL PROTECTED]( bit *out, wkb **a, wkb **b)
{
@@ -874,6 +1013,9 @@
return ret;
}
@= spatial2
+geom_export str
[EMAIL PROTECTED]( bit *out, wkb **a, wkb **b, @3 @4);
+
str
[EMAIL PROTECTED]( bit *out, wkb **a, wkb **b, @3 @4)
{
@@ -905,6 +1047,9 @@
@:spatial2(Relate,GEOSRelatePattern,char*,pattern)@
@= analysis
+geom_export str
[EMAIL PROTECTED]( dbl *out, wkb **a);
+
str
[EMAIL PROTECTED]( dbl *out, wkb **a)
{
@@ -921,6 +1066,9 @@
return ret;
}
@= analysis2
+geom_export str
[EMAIL PROTECTED]( dbl *out, wkb **a, wkb **b);
+
str
[EMAIL PROTECTED]( dbl *out, wkb **a, wkb **b)
{
@@ -941,6 +1089,9 @@
return ret;
}
@= analysis3
+geom_export str
[EMAIL PROTECTED]( @2 *out, wkb **a, wkb **b);
+
str
[EMAIL PROTECTED]( @2 *out, wkb **a, wkb **b)
{
@@ -971,6 +1122,9 @@
@:analysis3(SymDifference,wkb*,GEOSSymDifference,geos2wkb)@
@c
+geom_export str
+wkbBuffer( wkb **out, wkb **geom, dbl *distance);
+
str
wkbBuffer( wkb **out, wkb **geom, dbl *distance)
{
@@ -1007,6 +1161,10 @@
*X = (Y)->batCacheid; \
BBPkeepref(*(X));\
BBPreleaseref(Z->batCacheid);
+
+geom_export str
+bat_wkbMBR(int *ret, int *l);
+
str
bat_wkbMBR(int *ret, int *l)
{
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
