Skip to content
Permalink
Browse files

Enable compilation using GEOS 3 as well as GEOS 2.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6416 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski
telwertowski committed Jan 9, 2007
1 parent bbd36b1 commit 5a1386b4ce041a186b809fab19b26cb3c2def2bd
Showing with 3 additions and 2 deletions.
  1. +2 −2 src/core/qgsgeometry.cpp
  2. +1 −0 src/providers/wfs/qgswfsprovider.h
@@ -73,8 +73,8 @@ QgsGeometry::QgsGeometry( QgsGeometry const & rhs )

QgsGeometry* QgsGeometry::fromWkt(QString wkt)
{
geos::WKTReader reader(geosGeometryFactory);
geos::Geometry* geom = reader.read(wkt.toLocal8Bit().data());
GEOS_IO::WKTReader reader(geosGeometryFactory);
GEOS_GEOM::Geometry* geom = reader.read(wkt.toLocal8Bit().data());
QgsGeometry* g = new QgsGeometry;
g->setGeos(geom);
return g;
@@ -22,6 +22,7 @@
#include "qgis.h"
#include "qgsrect.h"
#include "qgsvectordataprovider.h"
#include <geos.h>
#include <indexStrtree.h>
#if GEOS_VERSION_MAJOR < 3
#define GEOS_INDEX_STRTREE geos

0 comments on commit 5a1386b

Please sign in to comment.
You can’t perform that action at this time.