[geos-commits] r3003 - trunk/swig
svn_geos at osgeo.org
svn_geos at osgeo.org
Wed Jun 16 06:39:52 EDT 2010
Author: strk
Date: 2010-06-16 10:39:52 +0000 (Wed, 16 Jun 2010)
New Revision: 3003
Modified:
trunk/swig/geos.i.in
Log:
Drop carriage returns
Modified: trunk/swig/geos.i.in
===================================================================
--- trunk/swig/geos.i.in 2010-06-16 09:45:08 UTC (rev 3002)
+++ trunk/swig/geos.i.in 2010-06-16 10:39:52 UTC (rev 3003)
@@ -265,10 +265,10 @@
%rename(MultiLineString) GeosMultiLineString;
%rename(MultiLinearRing) GeosMultiLinearRing;
%rename(MultiPolygon) GeosMultiPolygon;
-%rename(WktReader) GeosWktReader;
-%rename(WktWriter) GeosWktWriter;
-%rename(WkbReader) GeosWkbReader;
-%rename(WkbWriter) GeosWkbWriter;
+%rename(WktReader) GeosWktReader;
+%rename(WktWriter) GeosWktWriter;
+%rename(WkbReader) GeosWkbReader;
+%rename(WkbWriter) GeosWkbWriter;
%rename("union") GeosGeometry::geomUnion;
@@ -284,11 +284,11 @@
typedef void GeosMultiLineString;
typedef void GeosMultiLinearRing;
typedef void GeosMultiPolygon;
-
-typedef void GeosWktReader;
-typedef void GeosWktWriter;
-typedef void GeosWkbReader;
-typedef void GeosWkbWriter;
+
+typedef void GeosWktReader;
+typedef void GeosWktWriter;
+typedef void GeosWkbReader;
+typedef void GeosWkbWriter;
%}
%newobject GeosGeometry::intersection;
@@ -1117,177 +1117,177 @@
}
-%newobject GeosWktReader::read;
-class GeosWktReader
-{
-public:
-%extend
-{
- GeosWktReader()
- {
- return GEOSWKTReader_create();
- }
-
- ~GeosWktReader()
- {
- GEOSWKTReader *reader = (GEOSWKTReader*) self;
- GEOSWKTReader_destroy(reader);
- }
-
- GeosGeometry* read(const char *wkt)
- {
- if(wkt == NULL)
- throw std::runtime_error("Trying to create geometry from a NULL string");
-
- GEOSWKTReader *reader = (GEOSWKTReader*) self;
- GEOSGeometry *geom = GEOSWKTReader_read(reader, wkt);
-
- if(geom == NULL)
- throw std::runtime_error(message);
-
- return (GeosGeometry*) geom;
- }
-}
-};
-
-class GeosWktWriter
-{
-public:
-%extend
-{
- GeosWktWriter()
- {
- return GEOSWKTWriter_create();
- }
-
- ~GeosWktWriter()
- {
- GEOSWKTWriter *writer = (GEOSWKTWriter*) self;
- GEOSWKTWriter_destroy(writer);
- }
-
- char* write(const GeosGeometry* g)
- {
- GEOSWKTWriter *writer = (GEOSWKTWriter*) self;
- GEOSGeom geom = (GEOSGeom) g;
- return GEOSWKTWriter_write(writer, geom);
- }
-}
-};
-
-
-%newobject GeosWkbReader::read;
-%newobject GeosWkbReader::readHEX;
-class GeosWkbReader
-{
-public:
-%extend
-{
- GeosWkbReader()
- {
- return GEOSWKBReader_create();
- }
-
- ~GeosWkbReader()
- {
- GEOSWKBReader *reader = (GEOSWKBReader*) self;
- GEOSWKBReader_destroy(reader);
- }
-
- GeosGeometry* read(const unsigned char *wkb, size_t size)
- {
- if(wkb == NULL)
- throw std::runtime_error("Trying to create geometry from a NULL string");
-
- GEOSWKBReader *reader = (GEOSWKBReader*) self;
- GEOSGeometry *geom = GEOSWKBReader_read(reader, wkb, size);
-
- if(geom == NULL)
- throw std::runtime_error(message);
-
- return (GeosGeometry*) geom;
- }
-
- GeosGeometry* readHEX(const unsigned char *wkb, size_t size)
- {
- if(wkb == NULL)
- throw std::runtime_error("Trying to create geometry from a NULL string");
-
- GEOSWKBReader *reader = (GEOSWKBReader*) self;
- GEOSGeometry *geom = GEOSWKBReader_readHEX(reader, wkb, size);
-
- if(geom == NULL)
- throw std::runtime_error(message);
-
- return (GeosGeometry*) geom;
- }
-}
-};
-
-class GeosWkbWriter
-{
-public:
-%extend
-{
- GeosWkbWriter()
- {
- return GEOSWKBWriter_create();
- }
-
- ~GeosWkbWriter()
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- GEOSWKBWriter_destroy(writer);
- }
-
- int getOutputDimension()
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- return GEOSWKBWriter_getOutputDimension(writer);
- }
-
- void setOutputDimension(int newDimension)
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- GEOSWKBWriter_setOutputDimension(writer, newDimension);
- }
-
- int getByteOrder()
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- return GEOSWKBWriter_getByteOrder(writer);
- }
-
- void setByteOrder(int newByteOrder)
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- return GEOSWKBWriter_setByteOrder(writer, newByteOrder);
- }
-
- bool getIncludeSRID()
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- return GEOSWKBWriter_getIncludeSRID(writer);
- }
-
- void setIncludeSRID(bool newIncludeSRID)
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- return GEOSWKBWriter_setIncludeSRID(writer, newIncludeSRID);
- }
-
- unsigned char* write(const GeosGeometry* g, size_t *size)
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- GEOSGeom geom = (GEOSGeom) g;
- return GEOSWKBWriter_write(writer, geom, size);
- }
-
- unsigned char* writeHEX(const GeosGeometry* g, size_t *size)
- {
- GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
- GEOSGeom geom = (GEOSGeom) g;
- return GEOSWKBWriter_writeHEX(writer, geom, size);
- }
-}
-};
+%newobject GeosWktReader::read;
+class GeosWktReader
+{
+public:
+%extend
+{
+ GeosWktReader()
+ {
+ return GEOSWKTReader_create();
+ }
+
+ ~GeosWktReader()
+ {
+ GEOSWKTReader *reader = (GEOSWKTReader*) self;
+ GEOSWKTReader_destroy(reader);
+ }
+
+ GeosGeometry* read(const char *wkt)
+ {
+ if(wkt == NULL)
+ throw std::runtime_error("Trying to create geometry from a NULL string");
+
+ GEOSWKTReader *reader = (GEOSWKTReader*) self;
+ GEOSGeometry *geom = GEOSWKTReader_read(reader, wkt);
+
+ if(geom == NULL)
+ throw std::runtime_error(message);
+
+ return (GeosGeometry*) geom;
+ }
+}
+};
+
+class GeosWktWriter
+{
+public:
+%extend
+{
+ GeosWktWriter()
+ {
+ return GEOSWKTWriter_create();
+ }
+
+ ~GeosWktWriter()
+ {
+ GEOSWKTWriter *writer = (GEOSWKTWriter*) self;
+ GEOSWKTWriter_destroy(writer);
+ }
+
+ char* write(const GeosGeometry* g)
+ {
+ GEOSWKTWriter *writer = (GEOSWKTWriter*) self;
+ GEOSGeom geom = (GEOSGeom) g;
+ return GEOSWKTWriter_write(writer, geom);
+ }
+}
+};
+
+
+%newobject GeosWkbReader::read;
+%newobject GeosWkbReader::readHEX;
+class GeosWkbReader
+{
+public:
+%extend
+{
+ GeosWkbReader()
+ {
+ return GEOSWKBReader_create();
+ }
+
+ ~GeosWkbReader()
+ {
+ GEOSWKBReader *reader = (GEOSWKBReader*) self;
+ GEOSWKBReader_destroy(reader);
+ }
+
+ GeosGeometry* read(const unsigned char *wkb, size_t size)
+ {
+ if(wkb == NULL)
+ throw std::runtime_error("Trying to create geometry from a NULL string");
+
+ GEOSWKBReader *reader = (GEOSWKBReader*) self;
+ GEOSGeometry *geom = GEOSWKBReader_read(reader, wkb, size);
+
+ if(geom == NULL)
+ throw std::runtime_error(message);
+
+ return (GeosGeometry*) geom;
+ }
+
+ GeosGeometry* readHEX(const unsigned char *wkb, size_t size)
+ {
+ if(wkb == NULL)
+ throw std::runtime_error("Trying to create geometry from a NULL string");
+
+ GEOSWKBReader *reader = (GEOSWKBReader*) self;
+ GEOSGeometry *geom = GEOSWKBReader_readHEX(reader, wkb, size);
+
+ if(geom == NULL)
+ throw std::runtime_error(message);
+
+ return (GeosGeometry*) geom;
+ }
+}
+};
+
+class GeosWkbWriter
+{
+public:
+%extend
+{
+ GeosWkbWriter()
+ {
+ return GEOSWKBWriter_create();
+ }
+
+ ~GeosWkbWriter()
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ GEOSWKBWriter_destroy(writer);
+ }
+
+ int getOutputDimension()
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ return GEOSWKBWriter_getOutputDimension(writer);
+ }
+
+ void setOutputDimension(int newDimension)
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ GEOSWKBWriter_setOutputDimension(writer, newDimension);
+ }
+
+ int getByteOrder()
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ return GEOSWKBWriter_getByteOrder(writer);
+ }
+
+ void setByteOrder(int newByteOrder)
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ return GEOSWKBWriter_setByteOrder(writer, newByteOrder);
+ }
+
+ bool getIncludeSRID()
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ return GEOSWKBWriter_getIncludeSRID(writer);
+ }
+
+ void setIncludeSRID(bool newIncludeSRID)
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ return GEOSWKBWriter_setIncludeSRID(writer, newIncludeSRID);
+ }
+
+ unsigned char* write(const GeosGeometry* g, size_t *size)
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ GEOSGeom geom = (GEOSGeom) g;
+ return GEOSWKBWriter_write(writer, geom, size);
+ }
+
+ unsigned char* writeHEX(const GeosGeometry* g, size_t *size)
+ {
+ GEOSWKBWriter *writer = (GEOSWKBWriter*) self;
+ GEOSGeom geom = (GEOSGeom) g;
+ return GEOSWKBWriter_writeHEX(writer, geom, size);
+ }
+}
+};
More information about the geos-commits
mailing list