Skip to content
Snippets Groups Projects
Commit 48c384c9 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

SuperBuild: try a patch on Ossim to compile with Geos 3.6

parent 04232e9a
No related branches found
No related tags found
No related merge requests found
diff -burN OSSIM.orig/ossim/src/ossim/base/ossimPolyArea2d.cpp OSSIM/ossim/src/ossim/base/ossimPolyArea2d.cpp
--- OSSIM.orig/ossim/src/ossim/base/ossimPolyArea2d.cpp 2017-07-04 15:16:30.659669941 +0200
+++ OSSIM/ossim/src/ossim/base/ossimPolyArea2d.cpp 2017-07-05 09:46:23.142041689 +0200
@@ -28,19 +28,13 @@
#include <exception>
#include <vector>
-class ossimGeometryFactoryWrapper : public ossimReferenced
+class ossimGeometryFactoryWrapper : public ossimReferenced, public geos::geom::GeometryFactory
{
public:
ossimGeometryFactoryWrapper()
- : m_geomFactory(0)
- {
- geos::geom::PrecisionModel *pm =
- new geos::geom::PrecisionModel(geos::geom::PrecisionModel::FLOATING);
- m_geomFactory = new geos::geom::GeometryFactory(pm, -1);
- }
- virtual ~ossimGeometryFactoryWrapper(){if(m_geomFactory) delete m_geomFactory;m_geomFactory=0;}
-
- geos::geom::GeometryFactory* m_geomFactory;
+ : geos::geom::GeometryFactory(new geos::geom::PrecisionModel(geos::geom::PrecisionModel::FLOATING),-1)
+ {}
+ virtual ~ossimGeometryFactoryWrapper(){}
};
class OssimPolyArea2dPrivate
@@ -55,7 +49,7 @@
void deleteGeometry() { if(m_geometry) { delete m_geometry; m_geometry = 0; }}
void setGeometry(const ossimPolygon& polygon, const vector<ossimPolygon>& holes = vector<ossimPolygon>());
void setGeometry(GeometryPtr geom){deleteGeometry();m_geometry=geom;}
- geos::geom::GeometryFactory* geomFactory(){{return m_globalFactory.valid()?m_globalFactory->m_geomFactory:0;}}
+ geos::geom::GeometryFactory* geomFactory(){{return m_globalFactory.valid()?m_globalFactory.get():0;}}
GeometryPtr m_geometry;
static ossimRefPtr<ossimGeometryFactoryWrapper> m_globalFactory;
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment