[mapserver-commits] r9726 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-01-21 13:32:34 -0500 (Thu, 21 Jan 2010)
New Revision: 9726

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
   trunk/mapserver/mapgeos.c
Log:
Bumped GEOS requirement to version 3.0+ (#3215)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-01-21 17:57:08 UTC (rev 9725)
+++ trunk/mapserver/HISTORY.TXT	2010-01-21 18:32:34 UTC (rev 9726)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Bumped GEOS requirement to version 3.0+ (#3215)
+
 - Fixed memory leak related to templates (#2996)
 
 - Added support of 44xx gtypes in oracle spatial driver (#2830)

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2010-01-21 17:57:08 UTC (rev 9725)
+++ trunk/mapserver/configure	2010-01-21 18:32:34 UTC (rev 9726)
@@ -10888,7 +10888,7 @@
   fi
 
 
-  min_geos_version=2.2.2
+  min_geos_version=3.0.0
 
   echo "$as_me:$LINENO: checking for GEOS version >= $min_geos_version" >&5
 echo $ECHO_N "checking for GEOS version >= $min_geos_version... $ECHO_C" >&6
@@ -10925,12 +10925,6 @@
 
   GEOS_ENABLED=-DUSE_GEOS
 
-    if test 300000 -le $ac_geos_version  ; then
-    echo "$as_me:$LINENO: result: GEOS >= 3.0.0 found. Adding -DGEOS_HAS_SIMPLIFY" >&5
-echo "${ECHO_T}GEOS >= 3.0.0 found. Adding -DGEOS_HAS_SIMPLIFY" >&6
-    GEOS_ENABLED="$GEOS_ENABLED -DGEOS_HAS_SIMPLIFY"
-  fi
-
   GEOS_INCDIR=`$GEOS_CONFIG --includes`
   GEOS_INC="-I$GEOS_INCDIR"
   GEOS_LIB="`$GEOS_CONFIG --libs`_c"

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2010-01-21 17:57:08 UTC (rev 9725)
+++ trunk/mapserver/configure.in	2010-01-21 18:32:34 UTC (rev 9726)
@@ -1286,11 +1286,11 @@
   fi
 
   dnl
-  dnl Test that we have at least version 2.2.2
+  dnl Test that we have at least version 3.0.0
   dnl (Version check code borrowed from GDAL's geos.m4)
   dnl
 
-  min_geos_version=2.2.2
+  min_geos_version=3.0.0
 
   AC_MSG_CHECKING(for GEOS version >= $min_geos_version)
 
@@ -1325,12 +1325,6 @@
 
   GEOS_ENABLED=-DUSE_GEOS
 
-  dnl GEOS 3.0+ required for GEOSSimplify
-  if test 300000 -le $ac_geos_version  ; then
-    AC_MSG_RESULT([GEOS >= 3.0.0 found. Adding -DGEOS_HAS_SIMPLIFY])
-    GEOS_ENABLED="$GEOS_ENABLED -DGEOS_HAS_SIMPLIFY"
-  fi
-
   GEOS_INCDIR=`$GEOS_CONFIG --includes`
   GEOS_INC="-I$GEOS_INCDIR"
   GEOS_LIB="`$GEOS_CONFIG --libs`_c"

Modified: trunk/mapserver/mapgeos.c
===================================================================
--- trunk/mapserver/mapgeos.c	2010-01-21 17:57:08 UTC (rev 9725)
+++ trunk/mapserver/mapgeos.c	2010-01-21 18:32:34 UTC (rev 9726)
@@ -669,7 +669,7 @@
 
 shapeObj *msGEOSSimplify(shapeObj *shape, double tolerance)
 {
-#if defined(USE_GEOS) && defined(GEOS_HAS_SIMPLIFY)
+#ifdef USE_GEOS
   GEOSGeom g1, g2; 
 
   if(!shape) 
@@ -691,7 +691,7 @@
 
 shapeObj *msGEOSTopologyPreservingSimplify(shapeObj *shape, double tolerance)
 {
-#if defined(USE_GEOS) && defined(GEOS_HAS_SIMPLIFY)
+#ifdef USE_GEOS
   GEOSGeom g1, g2; 
 
   if(!shape)