[geos-commits] r2718 - in branches/3.1: capi source source/geom
source/geom/prep source/geom/util source/geomgraph
source/headers/geos/geom source/headers/geos/geom/prep
source/headers/geos/geomgraph source/noding
source/noding/snapround source/operation/overlay
source/precision source/simplify tests/unit
tests/unit/operation/union tests/unit/simplify tests/xmltester
svn_geos at osgeo.org
svn_geos at osgeo.org
Wed Nov 18 12:55:22 EST 2009
Author: pramsey
Date: 2009-11-18 12:55:20 -0500 (Wed, 18 Nov 2009)
New Revision: 2718
Modified:
branches/3.1/capi/geos_ts_c.cpp
branches/3.1/source/geom/GeometryCollection.cpp
branches/3.1/source/geom/prep/BasicPreparedGeometry.cpp
branches/3.1/source/geom/prep/PreparedPoint.cpp
branches/3.1/source/geom/util/GeometryTransformer.cpp
branches/3.1/source/geomgraph/Edge.cpp
branches/3.1/source/geomgraph/GeometryGraph.cpp
branches/3.1/source/geomgraph/GraphComponent.cpp
branches/3.1/source/geomgraph/Node.cpp
branches/3.1/source/geomgraph/PlanarGraph.cpp
branches/3.1/source/headers/geos/geom/Coordinate.h
branches/3.1/source/headers/geos/geom/IntersectionMatrix.h
branches/3.1/source/headers/geos/geom/prep/BasicPreparedGeometry.h
branches/3.1/source/headers/geos/geom/prep/PreparedGeometry.h
branches/3.1/source/headers/geos/geom/prep/PreparedPoint.h
branches/3.1/source/headers/geos/geomgraph/Edge.h
branches/3.1/source/headers/geos/geomgraph/GeometryGraph.h
branches/3.1/source/headers/geos/geomgraph/GraphComponent.h
branches/3.1/source/headers/geos/geomgraph/Node.h
branches/3.1/source/headers/geos/geomgraph/PlanarGraph.h
branches/3.1/source/headers/geos/geomgraph/TopologyLocation.h
branches/3.1/source/inlines.cpp
branches/3.1/source/noding/MCIndexNoder.cpp
branches/3.1/source/noding/snapround/HotPixel.cpp
branches/3.1/source/operation/overlay/OverlayResultValidator.cpp
branches/3.1/source/precision/GeometrySnapper.cpp
branches/3.1/source/simplify/DouglasPeuckerSimplifier.cpp
branches/3.1/source/simplify/LineSegmentIndex.cpp
branches/3.1/source/simplify/TaggedLineString.cpp
branches/3.1/source/simplify/TaggedLineStringSimplifier.cpp
branches/3.1/tests/unit/geos_unit.cpp
branches/3.1/tests/unit/operation/union/CascadedPolygonUnionTest.cpp
branches/3.1/tests/unit/simplify/DouglasPeuckerSimplifierTest.cpp
branches/3.1/tests/unit/simplify/TopologyPreservingSimplifierTest.cpp
branches/3.1/tests/xmltester/XMLTester.cpp
Log:
HPUX compilation fixes (#286)
Modified: branches/3.1/capi/geos_ts_c.cpp
===================================================================
--- branches/3.1/capi/geos_ts_c.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/capi/geos_ts_c.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -173,7 +173,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -207,7 +207,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -242,7 +242,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -277,7 +277,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -312,7 +312,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -351,7 +351,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -386,7 +386,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -426,7 +426,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -462,7 +462,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -512,7 +512,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -559,7 +559,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -618,7 +618,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -653,7 +653,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -688,7 +688,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -722,7 +722,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -756,7 +756,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -790,7 +790,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -827,7 +827,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -866,7 +866,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -911,7 +911,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -954,7 +954,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -999,7 +999,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1040,7 +1040,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -1073,7 +1073,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -1106,7 +1106,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -1147,7 +1147,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1186,7 +1186,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -1226,7 +1226,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1260,7 +1260,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1268,7 +1268,7 @@
try
{
- GeomAutoPtr g3 = BinaryOp(g1, g2, overlayOp(OverlayOp::opINTERSECTION));
+ GeomAutoPtr g3(BinaryOp(g1, g2, overlayOp(OverlayOp::opINTERSECTION)));
return g3.release();
//Geometry *g3 = g1->intersection(g2);
//return g3;
@@ -1296,7 +1296,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1330,7 +1330,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1364,7 +1364,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1372,7 +1372,7 @@
try
{
- GeomAutoPtr g3 = BinaryOp(g1, g2, overlayOp(OverlayOp::opDIFFERENCE));
+ GeomAutoPtr g3(BinaryOp(g1, g2, overlayOp(OverlayOp::opDIFFERENCE)));
return g3.release();
//Geometry *g3 = g1->difference(g2);
//return g3;
@@ -1400,7 +1400,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1434,7 +1434,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1442,7 +1442,7 @@
try
{
- GeomAutoPtr g3 = BinaryOp(g1, g2, overlayOp(OverlayOp::opSYMDIFFERENCE));
+ GeomAutoPtr g3(BinaryOp(g1, g2, overlayOp(OverlayOp::opSYMDIFFERENCE)));
return g3.release();
//Geometry *g3 = g1->symDifference(g2);
//return g3;
@@ -1470,7 +1470,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1478,7 +1478,7 @@
try
{
- GeomAutoPtr g3 = BinaryOp(g1, g2, overlayOp(OverlayOp::opUNION));
+ GeomAutoPtr g3(BinaryOp(g1, g2, overlayOp(OverlayOp::opUNION)));
return g3.release();
//Geometry *g3 = g1->Union(g2);
//return g3;
@@ -1513,7 +1513,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1551,7 +1551,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1606,7 +1606,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -1622,7 +1622,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -1642,7 +1642,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -1676,7 +1676,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -1712,7 +1712,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -1745,7 +1745,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -1785,7 +1785,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -1822,7 +1822,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1866,7 +1866,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1908,7 +1908,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1948,7 +1948,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -1988,7 +1988,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2053,7 +2053,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2118,7 +2118,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2182,7 +2182,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2239,7 +2239,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -2288,7 +2288,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -2310,7 +2310,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -2329,7 +2329,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -2352,7 +2352,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -2371,7 +2371,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -2393,7 +2393,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2429,7 +2429,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -2481,7 +2481,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2511,7 +2511,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -2564,7 +2564,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -2598,7 +2598,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -2638,7 +2638,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -2654,7 +2654,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -2674,7 +2674,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2719,7 +2719,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2753,7 +2753,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2788,7 +2788,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2823,7 +2823,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2868,7 +2868,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -2898,7 +2898,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -2964,7 +2964,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3001,7 +3001,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3040,7 +3040,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3080,7 +3080,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3096,7 +3096,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3117,7 +3117,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3154,7 +3154,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3194,7 +3194,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3210,7 +3210,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3231,7 +3231,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3269,7 +3269,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3308,7 +3308,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3324,7 +3324,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3345,7 +3345,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3383,7 +3383,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3422,7 +3422,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3461,7 +3461,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3477,7 +3477,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3499,7 +3499,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3540,7 +3540,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3581,7 +3581,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -3609,7 +3609,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3636,7 +3636,7 @@
return 0;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 0;
@@ -3664,7 +3664,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3691,7 +3691,7 @@
return -1;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return -1;
@@ -3720,7 +3720,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3754,7 +3754,7 @@
return NULL;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return NULL;
@@ -3792,7 +3792,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3807,7 +3807,7 @@
return;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return;
@@ -3827,7 +3827,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -3861,7 +3861,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -3895,7 +3895,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
@@ -3929,7 +3929,7 @@
return 2;
}
- handle = (GEOSContextHandleInternal_t*)extHandle;
+ handle = (GEOSContextHandleInternal_t*)((void*)extHandle);
if( handle->initialized == 0 )
{
return 2;
Modified: branches/3.1/source/geom/GeometryCollection.cpp
===================================================================
--- branches/3.1/source/geom/GeometryCollection.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geom/GeometryCollection.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -155,12 +155,14 @@
GeometryCollection::isSimple() const
{
throw util::IllegalArgumentException("Operation not supported by GeometryCollection\n");
+ return false; // here to prevent compiler warning
}
Geometry*
GeometryCollection::getBoundary() const
{
throw util::IllegalArgumentException("Operation not supported by GeometryCollection\n");
+ return NULL; // here to prevent compiler warning
}
bool
Modified: branches/3.1/source/geom/prep/BasicPreparedGeometry.cpp
===================================================================
--- branches/3.1/source/geom/prep/BasicPreparedGeometry.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geom/prep/BasicPreparedGeometry.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -110,7 +110,7 @@
}
bool
-BasicPreparedGeometry::intersects(const geom::Geometry * g) const
+BasicPreparedGeometry::intersects_impl(const geom::Geometry * g) const
{
return baseGeom->intersects(g);
}
Modified: branches/3.1/source/geom/prep/PreparedPoint.cpp
===================================================================
--- branches/3.1/source/geom/prep/PreparedPoint.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geom/prep/PreparedPoint.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -21,7 +21,7 @@
namespace prep { // geos.geom.prep
bool
-PreparedPoint::intersects( geom::Geometry* g)
+PreparedPoint::intersects_impl(const geom::Geometry* g) const
{
if (! envelopesIntersect( g)) return false;
Modified: branches/3.1/source/geom/util/GeometryTransformer.cpp
===================================================================
--- branches/3.1/source/geom/util/GeometryTransformer.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geom/util/GeometryTransformer.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -159,7 +159,8 @@
const Point* p = static_cast<const Point*>(
geom->getGeometryN(i));
- Geometry::AutoPtr transformGeom = transformPoint(p, geom);
+ Geometry::AutoPtr transformGeom(transformPoint(p, geom));
+
if ( transformGeom.get() == NULL ) continue;
if ( transformGeom->isEmpty() ) continue;
@@ -209,8 +210,8 @@
#endif
// should check for 1-point sequences and downgrade them to points
- return factory->createLineString(
- transformCoordinates(geom->getCoordinatesRO(), geom));
+ std::auto_ptr<CoordinateSequence> tempCoordSeq(transformCoordinates(geom->getCoordinatesRO(), geom));
+ return factory->createLineString(tempCoordSeq);
}
Geometry::AutoPtr
@@ -232,7 +233,8 @@
const LineString* l = static_cast<const LineString*>(
geom->getGeometryN(i));
- Geometry::AutoPtr transformGeom = transformLineString(l, geom);
+ Geometry::AutoPtr transformGeom(transformLineString(l, geom));
+
if ( transformGeom.get() == NULL ) continue;
if ( transformGeom->isEmpty() ) continue;
@@ -261,7 +263,8 @@
const LinearRing* lr = static_cast<const LinearRing*>(
geom->getExteriorRing());
- Geometry::AutoPtr shell = transformLinearRing(lr, geom);
+ Geometry::AutoPtr shell(transformLinearRing(lr, geom));
+
if ( shell.get() == NULL
|| ! dynamic_cast<LinearRing*>(shell.get())
|| shell->isEmpty() )
@@ -336,7 +339,7 @@
const Polygon* p = static_cast<const Polygon*>(
geom->getGeometryN(i));
- Geometry::AutoPtr transformGeom = transformPolygon(p, geom);
+ Geometry::AutoPtr transformGeom(transformPolygon(p, geom));
if ( transformGeom.get() == NULL ) continue;
if ( transformGeom->isEmpty() ) continue;
@@ -363,8 +366,7 @@
for (unsigned int i=0, n=geom->getNumGeometries(); i<n; i++)
{
- Geometry::AutoPtr transformGeom = transform(
- geom->getGeometryN(i)); // no parent ?
+ Geometry::AutoPtr transformGeom(transform(geom->getGeometryN(i))); // no parent ?
if ( transformGeom.get() == NULL ) continue;
if ( pruneEmptyGeometry && transformGeom->isEmpty() ) continue;
Modified: branches/3.1/source/geomgraph/Edge.cpp
===================================================================
--- branches/3.1/source/geomgraph/Edge.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geomgraph/Edge.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -289,6 +289,13 @@
return env;
}
+/*protected*/
+void
+Edge::updateIM_impl(geom::IntersectionMatrix *im)
+{
+ GraphComponent::updateIM_impl(im);
+}
+
std::ostream&
operator<< (std::ostream&os, const Edge& e)
{
Modified: branches/3.1/source/geomgraph/GeometryGraph.cpp
===================================================================
--- branches/3.1/source/geomgraph/GeometryGraph.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geomgraph/GeometryGraph.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -465,6 +465,20 @@
}
}
+/*protected*/
+void
+GeometryGraph::add_impl(EdgeEnd *e)
+{
+ PlanarGraph::add_impl(e);
+}
+
+/*protected*/
+Edge*
+GeometryGraph::findEdge_impl(const geom::Coordinate& p0, const geom::Coordinate& p1)
+{
+ return PlanarGraph::findEdge_impl(p0, p1);
+}
+
vector<Edge*> *
GeometryGraph::getEdges()
{
Modified: branches/3.1/source/geomgraph/GraphComponent.cpp
===================================================================
--- branches/3.1/source/geomgraph/GraphComponent.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geomgraph/GraphComponent.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -56,8 +56,7 @@
void
GraphComponent::setLabel(Label* newLabel)
{
- delete label;
- label=newLabel;
+ setLabel_impl(newLabel);
}
void
@@ -70,6 +69,21 @@
void
GraphComponent::updateIM(IntersectionMatrix *im)
{
+ updateIM_impl(im);
+}
+
+/*protected*/
+void
+GraphComponent::setLabel_impl(Label* newLabel)
+{
+ delete label;
+ label=newLabel;
+}
+
+/*protected*/
+void
+GraphComponent::updateIM_impl(IntersectionMatrix *im)
+{
assert(label->getGeometryCount() >= 2); // found partial label
computeIM(im);
}
Modified: branches/3.1/source/geomgraph/Node.cpp
===================================================================
--- branches/3.1/source/geomgraph/Node.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geomgraph/Node.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -129,6 +129,12 @@
return false;
}
+/*protected*/
+void Node::setLabel_impl(Label* newLabel)
+{
+ GraphComponent::setLabel_impl(newLabel);
+}
+
void
Node::add(EdgeEnd *e)
{
Modified: branches/3.1/source/geomgraph/PlanarGraph.cpp
===================================================================
--- branches/3.1/source/geomgraph/PlanarGraph.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/geomgraph/PlanarGraph.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -147,9 +147,9 @@
edges->push_back(e);
}
-/*public*/
+/*protected*/
void
-PlanarGraph::add(EdgeEnd* e)
+PlanarGraph::add_impl(EdgeEnd* e)
{
assert(e);
@@ -160,7 +160,32 @@
edgeEndList->push_back(e);
}
+/*protected*/
+Edge*
+PlanarGraph::findEdge_impl(const Coordinate& p0, const Coordinate& p1)
+{
+ for (size_t i=0, n=edges->size(); i<n; ++i)
+ {
+ Edge *e=(*edges)[i];
+ assert(e);
+
+ const CoordinateSequence* eCoord=e->getCoordinates();
+ assert(eCoord);
+
+ if (p0==eCoord->getAt(0) && p1==eCoord->getAt(1))
+ return e;
+ }
+ return NULL;
+}
+
/*public*/
+void
+PlanarGraph::add(EdgeEnd* e)
+{
+ add_impl(e);
+}
+
+/*public*/
NodeMap::iterator
PlanarGraph::getNodeIterator()
{
@@ -313,18 +338,7 @@
Edge*
PlanarGraph::findEdge(const Coordinate& p0, const Coordinate& p1)
{
- for (size_t i=0, n=edges->size(); i<n; ++i)
- {
- Edge *e=(*edges)[i];
- assert(e);
-
- const CoordinateSequence* eCoord=e->getCoordinates();
- assert(eCoord);
-
- if (p0==eCoord->getAt(0) && p1==eCoord->getAt(1))
- return e;
- }
- return NULL;
+ return findEdge_impl(p0, p1);
}
/*public*/
Modified: branches/3.1/source/headers/geos/geom/Coordinate.h
===================================================================
--- branches/3.1/source/headers/geos/geom/Coordinate.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geom/Coordinate.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -18,6 +18,7 @@
#include <geos/platform.h> // for DoubleNotANumber
#include <geos/inline.h>
+#include <iostream>
#include <set>
#include <stack>
Modified: branches/3.1/source/headers/geos/geom/IntersectionMatrix.h
===================================================================
--- branches/3.1/source/headers/geos/geom/IntersectionMatrix.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geom/IntersectionMatrix.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -21,6 +21,7 @@
#define GEOS_GEOM_INTERSECTIONMATRIX_H
#include <string>
+#include <iostream>
#include <geos/inline.h>
Modified: branches/3.1/source/headers/geos/geom/prep/BasicPreparedGeometry.h
===================================================================
--- branches/3.1/source/headers/geos/geom/prep/BasicPreparedGeometry.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geom/prep/BasicPreparedGeometry.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -84,6 +84,11 @@
*/
bool envelopeCovers(const geom::Geometry* g) const;
+ /**
+ * Default implementation.
+ */
+ virtual bool intersects_impl(const geom::Geometry * g) const;
+
public:
BasicPreparedGeometry( const Geometry * geom);
@@ -147,11 +152,6 @@
/**
* Default implementation.
*/
- bool intersects(const geom::Geometry * g) const;
-
- /**
- * Default implementation.
- */
bool overlaps(const geom::Geometry * g) const;
/**
Modified: branches/3.1/source/headers/geos/geom/prep/PreparedGeometry.h
===================================================================
--- branches/3.1/source/headers/geos/geom/prep/PreparedGeometry.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geom/prep/PreparedGeometry.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -133,7 +133,7 @@
*
* @see Geometry#intersects(Geometry)
*/
- virtual bool intersects(const geom::Geometry *geom) const =0;
+ bool intersects(const geom::Geometry *geom) const {return intersects_impl(geom);};
/**
* Tests whether the base {@link Geometry} overlaps a given geometry.
@@ -164,6 +164,9 @@
* @see Geometry#within(Geometry)
*/
virtual bool within(const geom::Geometry *geom) const =0;
+
+ protected:
+ virtual bool intersects_impl(const geom::Geometry *geom) const =0;
};
Modified: branches/3.1/source/headers/geos/geom/prep/PreparedPoint.h
===================================================================
--- branches/3.1/source/headers/geos/geom/prep/PreparedPoint.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geom/prep/PreparedPoint.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -34,6 +34,7 @@
{
private:
protected:
+ virtual bool intersects_impl(const geom::Geometry* g) const;
public:
PreparedPoint(const Geometry * geom)
: BasicPreparedGeometry( geom)
@@ -45,7 +46,6 @@
* The optimization here is that computing topology for the test geometry
* is avoided. This can be significant for large geometries.
*/
- bool intersects(geom::Geometry* g);
};
Modified: branches/3.1/source/headers/geos/geomgraph/Edge.h
===================================================================
--- branches/3.1/source/headers/geos/geomgraph/Edge.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geomgraph/Edge.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -53,7 +53,6 @@
namespace geomgraph { // geos.geomgraph
class Edge: public GraphComponent{
-using GraphComponent::updateIM;
private:
@@ -71,6 +70,9 @@
int depthDelta; // the change in area depth from the R to L side of this edge
+ protected:
+ virtual void updateIM_impl(geom::IntersectionMatrix *im);
+
public:
void testInvariant() const {
Modified: branches/3.1/source/headers/geos/geomgraph/GeometryGraph.h
===================================================================
--- branches/3.1/source/headers/geos/geomgraph/GeometryGraph.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geomgraph/GeometryGraph.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -56,8 +56,6 @@
namespace geomgraph { // geos.geomgraph
class GeometryGraph: public PlanarGraph {
-using PlanarGraph::add;
-using PlanarGraph::findEdge;
private:
@@ -131,6 +129,10 @@
void addSelfIntersectionNode(int argIndex,
const geom::Coordinate& coord, int loc);
+ protected:
+ virtual void add_impl(EdgeEnd *e);
+ virtual Edge* findEdge_impl(const geom::Coordinate& p0, const geom::Coordinate& p1);
+
public:
static bool isInBoundary(int boundaryCount);
Modified: branches/3.1/source/headers/geos/geomgraph/GraphComponent.h
===================================================================
--- branches/3.1/source/headers/geos/geomgraph/GraphComponent.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geomgraph/GraphComponent.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -45,7 +45,7 @@
GraphComponent(Label* newLabel);
virtual ~GraphComponent();
Label* getLabel();
- virtual void setLabel(Label* newLabel);
+ void setLabel(Label* newLabel);
virtual void setInResult(bool isInResult) { isInResultVar=isInResult; }
virtual bool isInResult() const { return isInResultVar; }
virtual void setCovered(bool isCovered);
@@ -54,10 +54,12 @@
virtual bool isVisited() const { return isVisitedVar; }
virtual void setVisited(bool isVisited) { isVisitedVar = isVisited; }
virtual bool isIsolated() const=0;
- virtual void updateIM(geom::IntersectionMatrix *im);
+ void updateIM(geom::IntersectionMatrix *im);
protected:
Label* label;
virtual void computeIM(geom::IntersectionMatrix *im)=0;
+ virtual void setLabel_impl(Label* newLabel);
+ virtual void updateIM_impl(geom::IntersectionMatrix *im);
private:
bool isInResultVar;
bool isCoveredVar;
Modified: branches/3.1/source/headers/geos/geomgraph/Node.h
===================================================================
--- branches/3.1/source/headers/geos/geomgraph/Node.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geomgraph/Node.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -53,7 +53,6 @@
namespace geomgraph { // geos.geomgraph
class Node: public GraphComponent {
-using GraphComponent::setLabel;
public:
@@ -134,6 +133,7 @@
* Basic nodes do not compute IMs
*/
virtual void computeIM(geom::IntersectionMatrix* /*im*/) {};
+ virtual void setLabel_impl(Label* newLabel);
private:
Modified: branches/3.1/source/headers/geos/geomgraph/PlanarGraph.h
===================================================================
--- branches/3.1/source/headers/geos/geomgraph/PlanarGraph.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geomgraph/PlanarGraph.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -99,7 +99,7 @@
virtual bool isBoundaryNode(int geomIndex, const geom::Coordinate& coord);
- virtual void add(EdgeEnd *e);
+ void add(EdgeEnd *e);
virtual NodeMap::iterator getNodeIterator();
@@ -139,7 +139,7 @@
* @return the edge, if found
* <code>null</code> if the edge was not found
*/
- virtual Edge* findEdge(const geom::Coordinate& p0,
+ Edge* findEdge(const geom::Coordinate& p0,
const geom::Coordinate& p1);
/** \brief
@@ -165,7 +165,9 @@
std::vector<EdgeEnd*> *edgeEndList;
virtual void insertEdge(Edge *e);
-
+ virtual void add_impl(EdgeEnd *e);
+ virtual Edge* findEdge_impl(const geom::Coordinate& p0,
+ const geom::Coordinate& p1);
private:
/** \brief
Modified: branches/3.1/source/headers/geos/geomgraph/TopologyLocation.h
===================================================================
--- branches/3.1/source/headers/geos/geomgraph/TopologyLocation.h 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/headers/geos/geomgraph/TopologyLocation.h 2009-11-18 17:55:20 UTC (rev 2718)
@@ -26,6 +26,7 @@
#include <vector>
#include <string>
+#include <iostream>
namespace geos {
namespace geomgraph { // geos.geomgraph
Modified: branches/3.1/source/inlines.cpp
===================================================================
--- branches/3.1/source/inlines.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/inlines.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -59,7 +59,6 @@
#include <geos/geom/CoordinateArraySequenceFactory.inl>
#include <geos/noding/SegmentString.inl>
#include <geos/noding/snapround/HotPixel.inl>
-#include <geos/noding/snapround/MCIndexSnapRounder.inl>
#include <geos/noding/MCIndexNoder.inl>
#endif // defined __CYGWIN__
Modified: branches/3.1/source/noding/MCIndexNoder.cpp
===================================================================
--- branches/3.1/source/noding/MCIndexNoder.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/noding/MCIndexNoder.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -139,14 +139,10 @@
MCIndexNoder::SegmentOverlapAction::overlap(MonotoneChain* mc1, int start1,
MonotoneChain* mc2, int start2)
{
- SegmentString* ss1 = const_cast<SegmentString*>(
- static_cast<const SegmentString *>(mc1->getContext())
- );
+ SegmentString* ss1 = const_cast<SegmentString*>((const SegmentString *)(mc1->getContext()));
assert(ss1);
- SegmentString* ss2 = const_cast<SegmentString*>(
- static_cast<const SegmentString *>(mc2->getContext())
- );
+ SegmentString* ss2 = const_cast<SegmentString*>((const SegmentString *)(mc2->getContext()));
assert(ss2);
si.processIntersections(ss1, start1, ss2, start2);
Modified: branches/3.1/source/noding/snapround/HotPixel.cpp
===================================================================
--- branches/3.1/source/noding/snapround/HotPixel.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/noding/snapround/HotPixel.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -96,8 +96,9 @@
HotPixel::intersectsScaled(const Coordinate& p0,
const Coordinate& p1) const
{
-
+#ifndef MIN
#define MIN(x,y) (x)<(y)?(x):(y)
+#endif
double segMinx = MIN(p0.x, p1.x);
double segMaxx = MIN(p0.x, p1.x);
Modified: branches/3.1/source/operation/overlay/OverlayResultValidator.cpp
===================================================================
--- branches/3.1/source/operation/overlay/OverlayResultValidator.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/operation/overlay/OverlayResultValidator.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -152,7 +152,8 @@
OverlayResultValidator::addTestPts(const Geometry& g)
{
OffsetPointGenerator ptGen(g, 5 * _TOLERANCE);
- auto_ptr< vector<geom::Coordinate> > pts = ptGen.getPoints();
+ auto_ptr< vector<geom::Coordinate> > pts(ptGen.getPoints());
+
testCoords.insert(testCoords.end(), pts->begin(), pts->end());
}
Modified: branches/3.1/source/precision/GeometrySnapper.cpp
===================================================================
--- branches/3.1/source/precision/GeometrySnapper.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/precision/GeometrySnapper.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -57,7 +57,7 @@
assert(srcPts);
assert(srcPts->toVector());
LineStringSnapper snapper(*(srcPts->toVector()), snapTol);
- auto_ptr<Coordinate::Vect> newPts = snapper.snapTo(snapPts);
+ auto_ptr<Coordinate::Vect> newPts(snapper.snapTo(snapPts));
const CoordinateSequenceFactory* cfact = factory->getCoordinateSequenceFactory();
return auto_ptr<CoordinateSequence>(cfact->create(newPts.release()));
@@ -105,7 +105,7 @@
using geom::util::GeometryTransformer;
// Get snap points
- auto_ptr<Coordinate::ConstVect> snapPts=extractTargetCoordinates(g);
+ auto_ptr<Coordinate::ConstVect> snapPts(extractTargetCoordinates(g));
// Apply a SnapTransformer to source geometry
// (we need a pointer for dynamic polymorphism)
Modified: branches/3.1/source/simplify/DouglasPeuckerSimplifier.cpp
===================================================================
--- branches/3.1/source/simplify/DouglasPeuckerSimplifier.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/simplify/DouglasPeuckerSimplifier.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -108,9 +108,7 @@
const Coordinate::Vect* inputPts = coords->toVector();
assert(inputPts);
- std::auto_ptr<Coordinate::Vect> newPts =
- DouglasPeuckerLineSimplifier::simplify(*inputPts,
- distanceTolerance);
+ std::auto_ptr<Coordinate::Vect> newPts(DouglasPeuckerLineSimplifier::simplify(*inputPts, distanceTolerance));
return CoordinateSequence::AutoPtr(
factory->getCoordinateSequenceFactory()->create(
Modified: branches/3.1/source/simplify/LineSegmentIndex.cpp
===================================================================
--- branches/3.1/source/simplify/LineSegmentIndex.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/simplify/LineSegmentIndex.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -164,7 +164,7 @@
LineSegmentVisitor visitor(querySeg);
index->query(&env, visitor);
- auto_ptr< vector<LineSegment*> > itemsFound = visitor.getItems();
+ auto_ptr< vector<LineSegment*> > itemsFound(visitor.getItems());
return itemsFound;
}
Modified: branches/3.1/source/simplify/TaggedLineString.cpp
===================================================================
--- branches/3.1/source/simplify/TaggedLineString.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/simplify/TaggedLineString.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -131,7 +131,7 @@
<< resultSegs.size() << endl;
#endif
- CoordVectPtr pts = extractCoordinates(resultSegs);
+ CoordVectPtr pts(extractCoordinates(resultSegs));
#if GEOS_DEBUG
cerr << __FUNCTION__ << " extracted Coords.size: "
@@ -213,16 +213,16 @@
auto_ptr<Geometry>
TaggedLineString::asLineString() const
{
- return parentLine->getFactory()->createLineString(
- getResultCoordinates());
+ CoordSeqPtr tempSeqPtr(getResultCoordinates());
+ return parentLine->getFactory()->createLineString(tempSeqPtr);
}
/*public*/
auto_ptr<Geometry>
TaggedLineString::asLinearRing() const
{
- return parentLine->getFactory()->createLinearRing(
- getResultCoordinates());
+ CoordSeqPtr tempSeqPtr(getResultCoordinates());
+ return parentLine->getFactory()->createLinearRing(tempSeqPtr);
}
/*public*/
Modified: branches/3.1/source/simplify/TaggedLineStringSimplifier.cpp
===================================================================
--- branches/3.1/source/simplify/TaggedLineStringSimplifier.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/source/simplify/TaggedLineStringSimplifier.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -155,7 +155,7 @@
if (isValidToSimplify)
{
- auto_ptr<TaggedLineSegment> newSeg = flatten(i, j);
+ auto_ptr<TaggedLineSegment> newSeg(flatten(i, j));
#if GEOS_DEBUG
std::cerr << "isValidToSimplify, adding seg "
@@ -209,8 +209,7 @@
TaggedLineStringSimplifier::hasBadOutputIntersection(
const LineSegment& candidateSeg)
{
- auto_ptr< vector<LineSegment*> > querySegs =
- outputIndex->query(&candidateSeg);
+ auto_ptr< vector<LineSegment*> > querySegs(outputIndex->query(&candidateSeg));
for (vector<LineSegment*>::iterator
it = querySegs->begin(), iEnd = querySegs->end();
@@ -245,8 +244,7 @@
const vector<size_t>& sectionIndex,
const LineSegment& candidateSeg)
{
- auto_ptr< vector<LineSegment*> > querySegs =
- inputIndex->query(&candidateSeg);
+ auto_ptr< vector<LineSegment*> > querySegs(inputIndex->query(&candidateSeg));
for (vector<LineSegment*>::iterator
it = querySegs->begin(), iEnd = querySegs->end();
Modified: branches/3.1/tests/unit/geos_unit.cpp
===================================================================
--- branches/3.1/tests/unit/geos_unit.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/tests/unit/geos_unit.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -14,10 +14,6 @@
// GEOS
#include <geos/unload.h>
-namespace tut
-{
- test_runner_singleton runner;
-}
void usage()
{
Modified: branches/3.1/tests/unit/operation/union/CascadedPolygonUnionTest.cpp
===================================================================
--- branches/3.1/tests/unit/operation/union/CascadedPolygonUnionTest.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/tests/unit/operation/union/CascadedPolygonUnionTest.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -113,7 +113,7 @@
test_runner(*this, &g);
- for_each(g.begin(), g.end(), delete_geometry);
+ std::for_each(g.begin(), g.end(), delete_geometry);
}
void create_discs(geos::geom::GeometryFactory& gf, int num, double radius,
Modified: branches/3.1/tests/unit/simplify/DouglasPeuckerSimplifierTest.cpp
===================================================================
--- branches/3.1/tests/unit/simplify/DouglasPeuckerSimplifierTest.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/tests/unit/simplify/DouglasPeuckerSimplifierTest.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -58,8 +58,7 @@
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
ensure( simplified->isValid() );
@@ -83,10 +82,8 @@
GeomPtr expected(wktreader.read(wkt_ex));
// TODO: This test blows because if instability of geos.index.strtree::yComparator() predicate
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
-
ensure( simplified->isValid() );
ensure( simplified->equalsExact(expected.get()) );
@@ -107,8 +104,7 @@
GeomPtr expected(wktreader.read(wkt_ex));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
ensure( simplified->isValid() );
@@ -131,8 +127,7 @@
GeomPtr expected(wktreader.read(wkt_ex));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
ensure( simplified->isValid() );
@@ -153,10 +148,8 @@
GeomPtr g(wktreader.read(wkt_in));
GeomPtr expected(wktreader.read(wkt_ex));
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
-
ensure( simplified->isValid() );
ensure( simplified->equalsExact(expected.get()) );
@@ -177,8 +170,7 @@
GeomPtr expected(wktreader.read(wkt_ex));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
ensure( simplified->isValid() );
@@ -198,8 +190,7 @@
GeomPtr expected(wktreader.read(wkt_ex));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
ensure( simplified->isValid() );
@@ -216,8 +207,7 @@
GeomPtr g(wktreader.read(wkt_in));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
// MultiPoint is *not* simplified
ensure( simplified->equalsExact(g.get()) );
@@ -237,8 +227,7 @@
GeomPtr expected(wktreader.read(wkt_ex));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
ensure( simplified->isValid() );
@@ -261,8 +250,7 @@
GeomPtr expected(wktreader.read(wkt_ex));
- GeomPtr simplified = DouglasPeuckerSimplifier::simplify(
- g.get(), 10.0);
+ GeomPtr simplified(DouglasPeuckerSimplifier::simplify(g.get(), 10.0));
ensure( simplified->isValid() );
Modified: branches/3.1/tests/unit/simplify/TopologyPreservingSimplifierTest.cpp
===================================================================
--- branches/3.1/tests/unit/simplify/TopologyPreservingSimplifierTest.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/tests/unit/simplify/TopologyPreservingSimplifierTest.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -57,7 +57,7 @@
60 180, 20 180, 20 220))");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure( "Simplified and original geometry inequal", simplified->equals(g.get()) );
@@ -73,7 +73,7 @@
160 240, 40 140, 40 240))");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure( "Topology has been changed by simplification!", simplified->equals(g.get()) );
@@ -92,7 +92,7 @@
(120 120, 220 120, 180 199, 160 200, 140 199, 120 120))");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure_equals_geometry( g.get(), simplified.get() );
@@ -111,7 +111,7 @@
70 1, 60 1, 50 1, 40 1, 0 0))");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure_equals_geometry( g.get(), simplified.get() );
@@ -128,7 +128,7 @@
GeomPtr g(wktreader.read(wkt));
GeomPtr g_expected(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure_equals_geometry( g.get(), simplified.get() );
@@ -143,7 +143,7 @@
std::string wkt("POLYGON ((0 5, 5 5, 5 0, 0 0, 0 1, 0 5))");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure_equals_geometry( g.get(), simplified.get() );
@@ -157,7 +157,7 @@
std::string wkt("LINESTRING (0 5, 1 5, 2 5, 5 5)");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure_equals_geometry(g.get(), simplified.get() );
@@ -172,7 +172,7 @@
80 60, 80 200, 140 199, 120 120)");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure_equals_geometry(g.get(), simplified.get() );
@@ -187,7 +187,7 @@
(0 0, 50 1, 60 1, 100 0))");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure_equals_geometry(g.get(), simplified.get() );
@@ -204,7 +204,7 @@
LINESTRING (80 200, 240 200, 240 60, 80 60, 80 200, 140 199, 120 120))");
GeomPtr g(wktreader.read(wkt));
- GeomPtr simplified = TopologyPreservingSimplifier::simplify(g.get(), 10.0);
+ GeomPtr simplified(TopologyPreservingSimplifier::simplify(g.get(), 10.0));
ensure( "Simplified geometry is invalid!", simplified->isValid() );
ensure_equals_geometry(g.get(), simplified.get() );
Modified: branches/3.1/tests/xmltester/XMLTester.cpp
===================================================================
--- branches/3.1/tests/xmltester/XMLTester.cpp 2009-11-18 01:28:33 UTC (rev 2717)
+++ branches/3.1/tests/xmltester/XMLTester.cpp 2009-11-18 17:55:20 UTC (rev 2718)
@@ -70,7 +70,7 @@
void
tolower(std::string& str)
{
- std::transform(str.begin(), str.end(), str.begin(), (int(*)(int))std::tolower);
+ std::transform(str.begin(), str.end(), str.begin(), (int(*)(int))tolower);
}
std::string
@@ -542,7 +542,7 @@
gRes->normalize();
//GeomAutoPtr gRealRes(gA->intersection(gB));
- GeomAutoPtr gRealRes = BinaryOp(gA, gB, overlayOp(OverlayOp::opINTERSECTION));
+ GeomAutoPtr gRealRes(BinaryOp(gA, gB, overlayOp(OverlayOp::opINTERSECTION)));
gRealRes->normalize();
if (gRes->compareTo(gRealRes.get())==0) success=1;
@@ -560,7 +560,7 @@
gRes->normalize();
//GeomAutoPtr gRealRes(gA->Union(gB));
- GeomAutoPtr gRealRes = BinaryOp(gA, gB, overlayOp(OverlayOp::opUNION));
+ GeomAutoPtr gRealRes(BinaryOp(gA, gB, overlayOp(OverlayOp::opUNION)));
gRealRes->normalize();
if (gRes->compareTo(gRealRes.get())==0) success=1;
@@ -578,7 +578,7 @@
gRes->normalize();
//GeomAutoPtr gRealRes(gA->difference(gB));
- GeomAutoPtr gRealRes = BinaryOp(gA, gB, overlayOp(OverlayOp::opDIFFERENCE));
+ GeomAutoPtr gRealRes(BinaryOp(gA, gB, overlayOp(OverlayOp::opDIFFERENCE)));
gRealRes->normalize();
@@ -597,7 +597,7 @@
gRes->normalize();
//GeomAutoPtr gRealRes(gA->symDifference(gB));
- GeomAutoPtr gRealRes = BinaryOp(gA, gB, overlayOp(OverlayOp::opSYMDIFFERENCE));
+ GeomAutoPtr gRealRes(BinaryOp(gA, gB, overlayOp(OverlayOp::opSYMDIFFERENCE)));
gRealRes->normalize();
if (gRes->compareTo(gRealRes.get())==0) success=1;
@@ -752,8 +752,7 @@
/// 1/1000 of the area of the expected result.
double areatol = expectedArea / 1e3;
- GeomAutoPtr gDiff = BinaryOp(gRes.get(), gRealRes.get(),
- overlayOp(OverlayOp::opDIFFERENCE));
+ GeomAutoPtr gDiff(BinaryOp(gRes.get(), gRealRes.get(), overlayOp(OverlayOp::opDIFFERENCE)));
double areaDiff = gDiff->getArea();
if ( areaDiff > areatol )
@@ -886,8 +885,7 @@
{
std::cerr << "Running intersection for areatest" << std::endl;
}
- GeomAutoPtr gI = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opINTERSECTION));
+ GeomAutoPtr gI(BinaryOp(gA, gB, overlayOp(OverlayOp::opINTERSECTION)));
if ( testValidOutput )
{
@@ -898,15 +896,13 @@
{
std::cerr << "Running difference(A,B) for areatest" << std::endl;
}
- GeomAutoPtr gDab = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opDIFFERENCE));
+ GeomAutoPtr gDab(BinaryOp(gA, gB, overlayOp(OverlayOp::opDIFFERENCE)));
if ( verbose > 1 )
{
std::cerr << "Running difference(B,A) for areatest" << std::endl;
}
- GeomAutoPtr gDba = BinaryOp(gB, gA,
- overlayOp(OverlayOp::opDIFFERENCE));
+ GeomAutoPtr gDba(BinaryOp(gB, gA, overlayOp(OverlayOp::opDIFFERENCE)));
if ( testValidOutput )
{
@@ -917,15 +913,13 @@
{
std::cerr << "Running symdifference for areatest" << std::endl;
}
- GeomAutoPtr gSD = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opSYMDIFFERENCE));
+ GeomAutoPtr gSD(BinaryOp(gA, gB, overlayOp(OverlayOp::opSYMDIFFERENCE)));
if ( verbose > 1 )
{
std::cerr << "Running union for areatest" << std::endl;
}
- GeomAutoPtr gU = BinaryOp(gA, gB,
- overlayOp(OverlayOp::opUNION));
+ GeomAutoPtr gU(BinaryOp(gA, gB, overlayOp(OverlayOp::opUNION)));
double areaA = gA->getArea();
double areaB = gB->getArea();
More information about the geos-commits
mailing list