Update of /cvsroot/monetdb/geom/src/lib
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9640/src/lib
Modified Files:
libgeom.mx
Log Message:
propagated changes of Thursday Jun 05 2008 - Friday Jun 06 2008
from the Geom_0-4 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/05 - stmane: src/lib/libgeom.mx,1.5.4.4 src/monetdb5/geom.mx,1.13.4.5
undoing my "stupid" checkin of htis morning.
The problem on gento is actually not the gcc 4.3 compiler
but the geos 3.0.0 version that differs significantly from geos 2.2.3.
Basically, our code is not (yet?) ready for geos 3.0.0.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/05 - stmane: configure.ag,1.12.2.3
improved/extended check for Geos library:
The differences between Geos 2.2.3 (default on, e.g., Fedora 8 & 9)
and Geos 3.0.0 (e.g., on Gentoo) are significant and "incompatible".
Our code base does not support version 3.0.0, yet, hence, we now
check whether we find a Geos version >= 2.0.0 and < 3.0.0
(assuming that all 2.x.y vesions are "compatible" and similar to
the tested 2.2.3).
If no suitable version if found, we abandon compilation.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/05 - stmane: configure.ag,1.12.2.4
icc complains about Goes' header files, at least if Geos
is found in the default place and we set GEOS_INCS & GEOS_LIBS.
Since setting GEOS_INCS & GEOS_LIBS is not strictly required
in this case, we omit setting them in this case.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: libgeom.mx
===================================================================
RCS file: /cvsroot/monetdb/geom/src/lib/libgeom.mx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libgeom.mx 5 Jun 2008 09:09:54 -0000 1.7
+++ libgeom.mx 6 Jun 2008 10:50:30 -0000 1.8
@@ -178,7 +178,7 @@
return 0;
if (GEOSGeomTypeId(envelope) == GEOS_POINT) {
- const GEOSCoordSeq GEOS_DLL coords =
GEOSGeom_getCoordSeq(envelope);
+ const GEOSCoordSeq coords = GEOSGeom_getCoordSeq(envelope);
GEOSCoordSeq_getX(coords, 0, &xmin);
GEOSCoordSeq_getY(coords, 0, &ymin);
res->xmin = xmin;
@@ -186,9 +186,9 @@
res->xmax = xmin;
res->ymax = ymin;
} else { /* GEOSGeomTypeId(envelope) == GEOS_POLYGON */
- const GEOSGeom GEOS_DLL ring = GEOSGetExteriorRing(envelope);
+ const GEOSGeom ring = GEOSGetExteriorRing(envelope);
if (ring) {
- const GEOSCoordSeq GEOS_DLL coords =
GEOSGeom_getCoordSeq(ring);
+ const GEOSCoordSeq coords = GEOSGeom_getCoordSeq(ring);
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
