mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
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
This commit is contained in:
parent
bbd36b107f
commit
5a1386b4ce
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user