Update of /cvsroot/monetdb/geom/src/lib
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27271/src/lib
Modified Files:
libgeom.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: libgeom.mx
===================================================================
RCS file: /cvsroot/monetdb/geom/src/lib/libgeom.mx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libgeom.mx 6 Jun 2008 10:50:30 -0000 1.8
+++ libgeom.mx 23 Jun 2008 14:22:58 -0000 1.9
@@ -178,7 +178,11 @@
return 0;
if (GEOSGeomTypeId(envelope) == GEOS_POINT) {
+#if GEOS_CAPI_VERSION_MAJOR >= 1 && GEOS_CAPI_VERSION_MINOR >= 3
+ const GEOSCoordSequence *coords =
GEOSGeom_getCoordSeq(envelope);
+#else
const GEOSCoordSeq coords = GEOSGeom_getCoordSeq(envelope);
+#endif
GEOSCoordSeq_getX(coords, 0, &xmin);
GEOSCoordSeq_getY(coords, 0, &ymin);
res->xmin = xmin;
@@ -186,9 +190,17 @@
res->xmax = xmin;
res->ymax = ymin;
} else { /* GEOSGeomTypeId(envelope) == GEOS_POLYGON */
+#if GEOS_CAPI_VERSION_MAJOR >= 1 && GEOS_CAPI_VERSION_MINOR >= 3
+ const GEOSGeometry *ring = GEOSGetExteriorRing(envelope);
+#else
const GEOSGeom ring = GEOSGetExteriorRing(envelope);
+#endif
if (ring) {
+#if GEOS_CAPI_VERSION_MAJOR >= 1 && GEOS_CAPI_VERSION_MINOR >= 3
+ const GEOSCoordSequence *coords =
GEOSGeom_getCoordSeq(ring);
+#else
const GEOSCoordSeq coords = GEOSGeom_getCoordSeq(ring);
+#endif
GEOSCoordSeq_getX(coords, 0, &xmin);
GEOSCoordSeq_getY(coords, 0, &ymin);
GEOSCoordSeq_getX(coords, 2, &xmax);
-------------------------------------------------------------------------
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
