diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2006-07-03 23:49:22 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2006-07-03 23:49:22 +0000 |
| commit | 1bf0879d1b55d0fccbfd1850c0dbe528c852281d (patch) | |
| tree | 04e704eada4512674ffaf9dd76f05c31a56aee79 /sci-libs/geos/files | |
| parent | Add nls useflag and related dependencies, disabled static libraries (it's a m... (diff) | |
| download | gentoo-2-1bf0879d1b55d0fccbfd1850c0dbe528c852281d.tar.gz gentoo-2-1bf0879d1b55d0fccbfd1850c0dbe528c852281d.tar.bz2 gentoo-2-1bf0879d1b55d0fccbfd1850c0dbe528c852281d.zip | |
patched the swig stuff so python works correctly
(Portage version: 2.1.1_pre2-r2)
Diffstat (limited to 'sci-libs/geos/files')
| -rw-r--r-- | sci-libs/geos/files/geos-2.2.2-swig.patch | 56 | ||||
| -rw-r--r-- | sci-libs/geos/files/python.i | 3 |
2 files changed, 59 insertions, 0 deletions
diff --git a/sci-libs/geos/files/geos-2.2.2-swig.patch b/sci-libs/geos/files/geos-2.2.2-swig.patch new file mode 100644 index 000000000000..ee7121970493 --- /dev/null +++ b/sci-libs/geos/files/geos-2.2.2-swig.patch @@ -0,0 +1,56 @@ +--- swig/geos.i.orig 2006-07-03 14:06:23.000000000 -0700 ++++ swig/geos.i 2006-07-03 14:11:37.000000000 -0700 +@@ -163,7 +163,6 @@ + %newobject GeometricShapeFactory::getEnvelope; + + %newobject WKBReader::read; +-%newobject WKBReader::readHEX; + %newobject WKTReader::read; + } + +@@ -183,12 +182,6 @@ + geos::MultiPoint, geos::MultiLineString, + geos::MultiPolygon, geos::GeometryCollection); + +-%factory(geos::Geometry * geos::WKBReader::readHEX, geos::Point, +- geos::LinearRing, geos::LineString, +- geos::Polygon, +- geos::MultiPoint, geos::MultiLineString, +- geos::MultiPolygon, geos::GeometryCollection); +- + %factory(geos::Geometry * geos::Geometry::downcast, geos::Point, + geos::LinearRing, geos::LineString, + geos::Polygon, +@@ -294,32 +287,3 @@ + objects. So create a global factory.*/ + + /* Add some helper methods to geometries */ +-%extend geos::Geometry { +- static geos::GeometryFactory& factory() +- { +- static geos::GeometryFactory factory; +- return factory; +- } +- +- static geos::WKBReader& reader() +- { +- #if GEOS_VERSION_MAJOR == 2 +- static geos::WKBReader reader(geos_Geometry_factory()); +- #else +- static geos::io::WKBReader reader(geos_Geometry_factory()); +- #endif +- return reader; +- } +- +- static Geometry* fromWKT(std::string wkt) +- { +- std::stringstream in(wkt); +- return geos_Geometry_reader().read(in); +- } +- +- static Geometry* fromHEX(std::string hex) +- { +- std::stringstream in(hex); +- return geos_Geometry_reader().readHEX(in); +- } +-}; diff --git a/sci-libs/geos/files/python.i b/sci-libs/geos/files/python.i new file mode 100644 index 000000000000..8218e3ee72b0 --- /dev/null +++ b/sci-libs/geos/files/python.i @@ -0,0 +1,3 @@ +%template(vector_GeometryP) std::vector<geos::Geometry *>; +%template(vector_LineStringP) std::vector<geos::LineString *>; +%template(vector_PolygonP) std::vector<geos::Polygon *>; |