[geos-commits] r3302 - in trunk: . capi
svn_geos at osgeo.org
svn_geos at osgeo.org
Wed Apr 27 07:13:28 EDT 2011
Author: strk
Date: 2011-04-27 04:13:28 -0700 (Wed, 27 Apr 2011)
New Revision: 3302
Modified:
trunk/NEWS
trunk/capi/geos_c.cpp
trunk/capi/geos_c.h.in
trunk/capi/geos_ts_c.cpp
Log:
Add GEOSOffsetCurve C-API interface deprecating GEOSSingleSidedBuffer
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-04-27 09:42:31 UTC (rev 3301)
+++ trunk/NEWS 2011-04-27 11:13:28 UTC (rev 3302)
@@ -2,6 +2,7 @@
????-??-??
- New things:
+ - CAPI: GEOSOffsetCurve deprecates GEOSSingleSidedBuffer
- CAPI: GEOSUnaryUnion deprecates GEOSCascadedUnion
- CAPI: GEOSisValidDetail: tell state, reason & location apart. allows
passing flags.
Modified: trunk/capi/geos_c.cpp
===================================================================
--- trunk/capi/geos_c.cpp 2011-04-27 09:42:31 UTC (rev 3301)
+++ trunk/capi/geos_c.cpp 2011-04-27 11:13:28 UTC (rev 3302)
@@ -393,6 +393,14 @@
}
Geometry *
+GEOSOffsetCurve(const Geometry *g1, double width, int quadsegs,
+ int joinStyle, double mitreLimit, int leftSide)
+{
+ return GEOSOffsetCurve_r( handle, g1, width, quadsegs,
+ joinStyle, mitreLimit, leftSide );
+}
+
+Geometry *
GEOSConvexHull(const Geometry *g1)
{
return GEOSConvexHull_r( handle, g1 );
Modified: trunk/capi/geos_c.h.in
===================================================================
--- trunk/capi/geos_c.h.in 2011-04-27 09:42:31 UTC (rev 3301)
+++ trunk/capi/geos_c.h.in 2011-04-27 11:13:28 UTC (rev 3302)
@@ -399,6 +399,7 @@
int joinStyle, double mitreLimit);
/* These functions return NULL on exception. Only LINESTRINGs are accepted. */
+/* @deprecated: use GEOSOffsetCurve instead */
extern GEOSGeometry GEOS_DLL *GEOSSingleSidedBuffer(const GEOSGeometry* g1,
double width, int quadsegs, int joinStyle, double mitreLimit,
int leftSide);
@@ -407,7 +408,16 @@
const GEOSGeometry* g1, double width, int quadsegs,
int joinStyle, double mitreLimit, int leftSide);
+/* These functions return NULL on exception. Only LINESTRINGs are accepted. */
+extern GEOSGeometry GEOS_DLL *GEOSOffsetCurve(const GEOSGeometry* g1,
+ double width, int quadsegs, int joinStyle, double mitreLimit,
+ int leftSide);
+extern GEOSGeometry GEOS_DLL *GEOSOffsetCurve_r(
+ GEOSContextHandle_t handle,
+ const GEOSGeometry* g1, double width, int quadsegs,
+ int joinStyle, double mitreLimit, int leftSide);
+
/************************************************************************
*
* Geometry Constructors.
Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp 2011-04-27 09:42:31 UTC (rev 3301)
+++ trunk/capi/geos_ts_c.cpp 2011-04-27 11:13:28 UTC (rev 3302)
@@ -1710,7 +1710,7 @@
}
Geometry *
-GEOSSingleSidedBuffer_r(GEOSContextHandle_t extHandle, const Geometry *g1, double width, int quadsegs, int joinStyle, double mitreLimit, int leftSide)
+GEOSOffsetCurve_r(GEOSContextHandle_t extHandle, const Geometry *g1, double width, int quadsegs, int joinStyle, double mitreLimit, int leftSide)
{
using geos::operation::buffer::BufferParameters;
using geos::operation::buffer::BufferBuilder;
@@ -1763,6 +1763,13 @@
}
Geometry *
+GEOSSingleSidedBuffer_r(GEOSContextHandle_t extHandle, const Geometry *g1, double width, int quadsegs, int joinStyle, double mitreLimit, int leftSide)
+{
+ return GEOSOffsetCurve_r(extHandle, g1, width, quadsegs,
+ joinStyle, mitreLimit, leftSide);
+}
+
+Geometry *
GEOSConvexHull_r(GEOSContextHandle_t extHandle, const Geometry *g1)
{
if ( 0 == extHandle )
More information about the geos-commits
mailing list