[geos-commits] r3146 - trunk/capi
svn_geos at osgeo.org
svn_geos at osgeo.org
Thu Dec 2 10:07:07 EST 2010
Author: strk
Date: 2010-12-02 07:07:07 -0800 (Thu, 02 Dec 2010)
New Revision: 3146
Modified:
trunk/capi/geos_c.cpp
trunk/capi/geos_ts_c.cpp
Log:
OOps.. this one build
Modified: trunk/capi/geos_c.cpp
===================================================================
--- trunk/capi/geos_c.cpp 2010-12-02 14:52:20 UTC (rev 3145)
+++ trunk/capi/geos_c.cpp 2010-12-02 15:07:07 UTC (rev 3146)
@@ -1103,7 +1103,7 @@
GEOSGeometry *
GEOSSnap(const GEOSGeometry* g1, const GEOSGeometry* g2, double tolerance)
{
- return GEOSSnap(handle, g1, g2);
+ return GEOSSnap_r(handle, g1, g2, tolerance);
}
} /* extern "C" */
Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp 2010-12-02 14:52:20 UTC (rev 3145)
+++ trunk/capi/geos_ts_c.cpp 2010-12-02 15:07:07 UTC (rev 3146)
@@ -5403,7 +5403,7 @@
}
GEOSGeometry *
-GEOSSnap_r(GEOSContextHandle_t handle, const GEOSGeometry* g1,
+GEOSSnap_r(GEOSContextHandle_t extHandle, const GEOSGeometry* g1,
const GEOSGeometry* g2, double tolerance)
{
using namespace geos::operation::overlay::snap;
@@ -5414,8 +5414,8 @@
if ( handle->initialized == 0 ) return 0;
try{
- GeometrySnapper snapper( g1 );
- std::auto_ptr<Geometry*> ret = snapper.snapTo(*g2, tolerance);
+ GeometrySnapper snapper( *g1 );
+ std::auto_ptr<Geometry> ret = snapper.snapTo(*g2, tolerance);
return ret.release();
}
catch (const std::exception &e)
More information about the geos-commits
mailing list