|
 |
2f16550 |
diff -ru player-2.1.1.orig/server/drivers/vectormap/dbconn.cc player-2.1.1/server/drivers/vectormap/dbconn.cc
|
|
|
2f16550 |
--- player-2.1.1.orig/server/drivers/vectormap/dbconn.cc 2008-04-12 23:15:43.000000000 +0100
|
|
|
2f16550 |
+++ player-2.1.1/server/drivers/vectormap/dbconn.cc 2008-12-17 10:57:27.000000000 +0000
|
|
|
2f16550 |
@@ -314,13 +314,13 @@
|
|
|
2f16550 |
printf("GEOSGeomFromWKB_buf returned NULL!\n");
|
|
|
2f16550 |
return res;
|
|
|
2f16550 |
}
|
|
|
2f16550 |
- GEOSGeom linestring = GEOSGetExteriorRing(polygon);
|
|
|
2f16550 |
+ const GEOSGeometry* linestring = GEOSGetExteriorRing(polygon);
|
|
|
2f16550 |
if (linestring == NULL)
|
|
|
2f16550 |
{
|
|
|
2f16550 |
printf("GEOSGetExteriorRing returned NULL!\n");
|
|
|
2f16550 |
return res;
|
|
|
2f16550 |
}
|
|
|
2f16550 |
- GEOSCoordSeq coords = GEOSGeom_getCoordSeq(linestring);
|
|
|
2f16550 |
+ const GEOSCoordSequence* coords = GEOSGeom_getCoordSeq(linestring);
|
|
|
2f16550 |
if (coords == NULL)
|
|
|
2f16550 |
{
|
|
|
2f16550 |
printf("GEOSGeom_getCoordSeq returned NULL!\n");
|
|
|
2f16550 |
diff -ru player-2.1.1.orig/server/drivers/vectormap/vec2map.cc player-2.1.1/server/drivers/vectormap/vec2map.cc
|
|
|
2f16550 |
--- player-2.1.1.orig/server/drivers/vectormap/vec2map.cc 2008-04-16 03:40:20.000000000 +0100
|
|
|
2f16550 |
+++ player-2.1.1/server/drivers/vectormap/vec2map.cc 2008-12-17 11:00:16.000000000 +0000
|
|
|
2f16550 |
@@ -285,7 +286,7 @@
|
|
|
2f16550 |
#ifdef HAVE_GEOS
|
|
|
2f16550 |
void Vec2Map::dumpFeature(GEOSGeom geom, vector<player_segment_t> & segments)
|
|
|
2f16550 |
{
|
|
|
2f16550 |
- GEOSCoordSeq seq;
|
|
|
2f16550 |
+ const GEOSCoordSequence* seq;
|
|
|
2f16550 |
double x0, y0, x1, y1;
|
|
|
2f16550 |
unsigned int numcoords;
|
|
|
2f16550 |
player_segment_t segment;
|
|
|
2f16550 |
@@ -338,16 +339,16 @@
|
|
|
2f16550 |
}
|
|
|
2f16550 |
break;
|
|
|
2f16550 |
case GEOS_POLYGON:
|
|
|
2f16550 |
- this->dumpFeature(GEOSGetExteriorRing(geom), segments);
|
|
|
2f16550 |
+ this->dumpFeature(const_cast<GEOSGeometry*>(GEOSGetExteriorRing(geom)), segments);
|
|
|
2f16550 |
numcoords = GEOSGetNumInteriorRings(geom);
|
|
|
2f16550 |
- for (i = 0; i < (signed)numcoords; i++) this->dumpFeature(GEOSGetInteriorRingN(geom, i), segments);
|
|
|
2f16550 |
+ for (i = 0; i < (signed)numcoords; i++) this->dumpFeature(const_cast<GEOSGeometry*>(GEOSGetInteriorRingN(geom, i)), segments);
|
|
|
2f16550 |
break;
|
|
|
2f16550 |
case GEOS_MULTIPOINT:
|
|
|
2f16550 |
case GEOS_MULTILINESTRING:
|
|
|
2f16550 |
case GEOS_MULTIPOLYGON:
|
|
|
2f16550 |
case GEOS_GEOMETRYCOLLECTION:
|
|
|
2f16550 |
numcoords = GEOSGetNumGeometries(geom);
|
|
|
2f16550 |
- for (i = 0; i < (signed)numcoords; i++) this->dumpFeature(GEOSGetGeometryN(geom, i), segments);
|
|
|
2f16550 |
+ for (i = 0; i < (signed)numcoords; i++) this->dumpFeature(const_cast<GEOSGeometry*>(GEOSGetGeometryN(geom, i)), segments);
|
|
|
2f16550 |
break;
|
|
|
2f16550 |
default:
|
|
|
2f16550 |
PLAYER_WARN("unknown feature type!");
|