[geos-commits] r3848 - trunk/capi
svn_geos at osgeo.org
svn_geos at osgeo.org
Tue Jul 23 04:01:38 PDT 2013
Author: strk
Date: 2013-07-23 04:01:38 -0700 (Tue, 23 Jul 2013)
New Revision: 3848
Modified:
trunk/capi/geos_c.cpp
trunk/capi/geos_c.h.in
Log:
Cosmetic changes into the CAPI code, by Mike Toews
- Replace "reader" with "writer" in prototypes
- describe "_r" functions
- Function arguments with only one geometry changed from g1 to g
- Rename nf -> ef for GEOSContext_setErrorHandler_rsetErrorHandler_r
- Move GEOSBuffer* declaration to top of buffer related function section
- Change char* mat to char *mat
- Fix typos in comments
- Clip trailing white space, and other white space consistencies
- Other minor rearrangements for consistency
Modified: trunk/capi/geos_c.cpp
===================================================================
--- trunk/capi/geos_c.cpp 2013-07-17 16:11:54 UTC (rev 3847)
+++ trunk/capi/geos_c.cpp 2013-07-23 11:01:38 UTC (rev 3848)
@@ -8,14 +8,14 @@
*
* This is free software; you can redistribute and/or modify it under
* the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation.
* See the COPYING file for more information.
*
* Author: Sandro Santilli <strk at keybit.net>
*
***********************************************************************/
-#include <geos/geom/prep/PreparedGeometryFactory.h>
+#include <geos/geom/prep/PreparedGeometryFactory.h>
#include <geos/index/strtree/STRtree.h>
#include <geos/io/WKTReader.h>
#include <geos/io/WKBReader.h>
@@ -133,11 +133,11 @@
geos::util::Interrupt::cancel();
}
-void
-GEOSFree (void* buffer)
-{
- GEOSFree_r( handle, buffer );
-}
+void
+GEOSFree (void* buffer)
+{
+ GEOSFree_r( handle, buffer );
+}
/****************************************************************
** relate()-related functions
@@ -238,15 +238,15 @@
char
-GEOSisValid(const Geometry *g1)
+GEOSisValid(const Geometry *g)
{
- return GEOSisValid_r( handle, g1 );
+ return GEOSisValid_r( handle, g );
}
char *
-GEOSisValidReason(const Geometry *g1)
+GEOSisValidReason(const Geometry *g)
{
- return GEOSisValidReason_r( handle, g1 );
+ return GEOSisValidReason_r( handle, g );
}
char
@@ -315,9 +315,9 @@
}
char *
-GEOSGeomToWKT(const Geometry *g1)
+GEOSGeomToWKT(const Geometry *g)
{
- return GEOSGeomToWKT_r( handle, g1 );
+ return GEOSGeomToWKT_r( handle, g );
}
// Remember to free the result!
@@ -348,15 +348,15 @@
}
char
-GEOSisEmpty(const Geometry *g1)
+GEOSisEmpty(const Geometry *g)
{
- return GEOSisEmpty_r( handle, g1 );
+ return GEOSisEmpty_r( handle, g );
}
char
-GEOSisSimple(const Geometry *g1)
+GEOSisSimple(const Geometry *g)
{
- return GEOSisSimple_r( handle, g1 );
+ return GEOSisSimple_r( handle, g );
}
char
@@ -369,16 +369,16 @@
//free the result of this
char *
-GEOSGeomType(const Geometry *g1)
+GEOSGeomType(const Geometry *g)
{
- return GEOSGeomType_r( handle, g1 );
+ return GEOSGeomType_r( handle, g );
}
// Return postgis geometry type index
int
-GEOSGeomTypeId(const Geometry *g1)
+GEOSGeomTypeId(const Geometry *g)
{
- return GEOSGeomTypeId_r( handle, g1 );
+ return GEOSGeomTypeId_r( handle, g );
}
@@ -389,9 +389,9 @@
//-------------------------------------------------------------------
Geometry *
-GEOSEnvelope(const Geometry *g1)
+GEOSEnvelope(const Geometry *g)
{
- return GEOSEnvelope_r( handle, g1 );
+ return GEOSEnvelope_r( handle, g );
}
Geometry *
@@ -401,39 +401,39 @@
}
Geometry *
-GEOSBuffer(const Geometry *g1, double width, int quadrantsegments)
+GEOSBuffer(const Geometry *g, double width, int quadrantsegments)
{
- return GEOSBuffer_r( handle, g1, width, quadrantsegments );
+ return GEOSBuffer_r( handle, g, width, quadrantsegments );
}
Geometry *
-GEOSBufferWithStyle(const Geometry *g1, double width, int quadsegs,
+GEOSBufferWithStyle(const Geometry *g, double width, int quadsegs,
int endCapStyle, int joinStyle, double mitreLimit)
{
- return GEOSBufferWithStyle_r( handle, g1, width, quadsegs, endCapStyle,
+ return GEOSBufferWithStyle_r( handle, g, width, quadsegs, endCapStyle,
joinStyle, mitreLimit );
}
Geometry *
-GEOSSingleSidedBuffer(const Geometry *g1, double width, int quadsegs,
+GEOSSingleSidedBuffer(const Geometry *g, double width, int quadsegs,
int joinStyle, double mitreLimit, int leftSide)
{
- return GEOSSingleSidedBuffer_r( handle, g1, width, quadsegs,
+ return GEOSSingleSidedBuffer_r( handle, g, width, quadsegs,
joinStyle, mitreLimit, leftSide );
}
Geometry *
-GEOSOffsetCurve(const Geometry *g1, double width, int quadsegs,
+GEOSOffsetCurve(const Geometry *g, double width, int quadsegs,
int joinStyle, double mitreLimit)
{
- return GEOSOffsetCurve_r( handle, g1, width, quadsegs,
+ return GEOSOffsetCurve_r( handle, g, width, quadsegs,
joinStyle, mitreLimit );
}
Geometry *
-GEOSConvexHull(const Geometry *g1)
+GEOSConvexHull(const Geometry *g)
{
- return GEOSConvexHull_r( handle, g1 );
+ return GEOSConvexHull_r( handle, g );
}
Geometry *
@@ -443,9 +443,9 @@
}
Geometry *
-GEOSBoundary(const Geometry *g1)
+GEOSBoundary(const Geometry *g)
{
- return GEOSBoundary_r( handle, g1 );
+ return GEOSBoundary_r( handle, g );
}
Geometry *
@@ -461,9 +461,9 @@
}
Geometry *
-GEOSUnaryUnion(const Geometry *g1)
+GEOSUnaryUnion(const Geometry *g)
{
- return GEOSUnaryUnion_r( handle, g1);
+ return GEOSUnaryUnion_r( handle, g);
}
Geometry *
@@ -473,15 +473,15 @@
}
Geometry *
-GEOSUnionCascaded(const Geometry *g1)
+GEOSUnionCascaded(const Geometry *g)
{
- return GEOSUnionCascaded_r( handle, g1 );
+ return GEOSUnionCascaded_r( handle, g );
}
Geometry *
-GEOSPointOnSurface(const Geometry *g1)
+GEOSPointOnSurface(const Geometry *g)
{
- return GEOSPointOnSurface_r( handle, g1 );
+ return GEOSPointOnSurface_r( handle, g );
}
@@ -501,33 +501,33 @@
int
-GEOSGetNumCoordinates(const Geometry *g1)
+GEOSGetNumCoordinates(const Geometry *g)
{
- return GEOSGetNumCoordinates_r( handle, g1 );
+ return GEOSGetNumCoordinates_r( handle, g );
}
/*
- * Return -1 on exception, 0 otherwise.
+ * Return -1 on exception, 0 otherwise.
* Converts Geometry to normal form (or canonical form).
*/
int
-GEOSNormalize(Geometry *g1)
+GEOSNormalize(Geometry *g)
{
- return GEOSNormalize_r( handle, g1 );
+ return GEOSNormalize_r( handle, g );
}
int
-GEOSGetNumInteriorRings(const Geometry *g1)
+GEOSGetNumInteriorRings(const Geometry *g)
{
- return GEOSGetNumInteriorRings_r( handle, g1 );
+ return GEOSGetNumInteriorRings_r( handle, g );
}
// returns -1 on error and 1 for non-multi geometries
int
-GEOSGetNumGeometries(const Geometry *g1)
+GEOSGetNumGeometries(const Geometry *g)
{
- return GEOSGetNumGeometries_r( handle, g1 );
+ return GEOSGetNumGeometries_r( handle, g );
}
@@ -536,9 +536,9 @@
* Return a pointer to the internal Geometry.
*/
const Geometry *
-GEOSGetGeometryN(const Geometry *g1, int n)
+GEOSGetGeometryN(const Geometry *g, int n)
{
- return GEOSGetGeometryN_r( handle, g1, n );
+ return GEOSGetGeometryN_r( handle, g, n );
}
/*
@@ -546,27 +546,27 @@
* Returns NULL on exception
*/
Geometry *
-GEOSGeomGetPointN(const Geometry *g1, int n)
+GEOSGeomGetPointN(const Geometry *g, int n)
{
- return GEOSGeomGetPointN_r(handle, g1, n);
+ return GEOSGeomGetPointN_r(handle, g, n);
}
/*
* Call only on LINESTRING
*/
Geometry *
-GEOSGeomGetStartPoint(const Geometry *g1)
+GEOSGeomGetStartPoint(const Geometry *g)
{
- return GEOSGeomGetStartPoint_r(handle, g1);
+ return GEOSGeomGetStartPoint_r(handle, g);
}
/*
* Call only on LINESTRING
*/
Geometry *
-GEOSGeomGetEndPoint(const Geometry *g1)
+GEOSGeomGetEndPoint(const Geometry *g)
{
- return GEOSGeomGetEndPoint_r(handle, g1);
+ return GEOSGeomGetEndPoint_r(handle, g);
}
/*
@@ -574,9 +574,9 @@
* return 2 on exception, 1 on true, 0 on false
*/
char
-GEOSisClosed(const Geometry *g1)
+GEOSisClosed(const Geometry *g)
{
- return GEOSisClosed_r(handle, g1);
+ return GEOSisClosed_r(handle, g);
}
/*
@@ -584,9 +584,9 @@
* returns 0 on exception, otherwise 1
*/
int
-GEOSGeomGetLength(const Geometry *g1, double *length)
+GEOSGeomGetLength(const Geometry *g, double *length)
{
- return GEOSGeomGetLength_r(handle, g1, length);
+ return GEOSGeomGetLength_r(handle, g, length);
}
/*
@@ -594,9 +594,9 @@
* returns -1 on exception
*/
int
-GEOSGeomGetNumPoints(const Geometry *g1)
+GEOSGeomGetNumPoints(const Geometry *g)
{
- return GEOSGeomGetNumPoints_r(handle, g1);
+ return GEOSGeomGetNumPoints_r(handle, g);
}
/*
@@ -604,9 +604,9 @@
* returns 0 on exception, otherwise 1
*/
int
-GEOSGeomGetX(const Geometry *g1, double *x)
+GEOSGeomGetX(const Geometry *g, double *x)
{
- return GEOSGeomGetX_r(handle, g1, x);
+ return GEOSGeomGetX_r(handle, g, x);
}
/*
@@ -614,9 +614,9 @@
* returns 0 on exception, otherwise 1
*/
int
-GEOSGeomGetY(const Geometry *g1, double *y)
+GEOSGeomGetY(const Geometry *g, double *y)
{
- return GEOSGeomGetY_r(handle, g1, y);
+ return GEOSGeomGetY_r(handle, g, y);
}
/*
@@ -624,9 +624,9 @@
* Return a copy of the internal Geometry.
*/
const Geometry *
-GEOSGetExteriorRing(const Geometry *g1)
+GEOSGetExteriorRing(const Geometry *g)
{
- return GEOSGetExteriorRing_r( handle, g1 );
+ return GEOSGetExteriorRing_r( handle, g );
}
/*
@@ -634,9 +634,9 @@
* Return a pointer to internal storage, do not destroy it.
*/
const Geometry *
-GEOSGetInteriorRingN(const Geometry *g1, int n)
+GEOSGetInteriorRingN(const Geometry *g, int n)
{
- return GEOSGetInteriorRingN_r( handle, g1, n );
+ return GEOSGetInteriorRingN_r( handle, g, n );
}
Geometry *
@@ -688,7 +688,7 @@
return GEOSSetSRID_r( handle, g, srid );
}
-char
+char
GEOSHasZ(const Geometry *g)
{
return GEOSHasZ_r( handle, g );
@@ -846,15 +846,15 @@
}
Geometry *
-GEOSSimplify(const Geometry *g1, double tolerance)
+GEOSSimplify(const Geometry *g, double tolerance)
{
- return GEOSSimplify_r( handle, g1, tolerance );
+ return GEOSSimplify_r( handle, g, tolerance );
}
Geometry *
-GEOSTopologyPreserveSimplify(const Geometry *g1, double tolerance)
+GEOSTopologyPreserveSimplify(const Geometry *g, double tolerance)
{
- return GEOSTopologyPreserveSimplify_r( handle, g1, tolerance );
+ return GEOSTopologyPreserveSimplify_r( handle, g, tolerance );
}
@@ -1019,7 +1019,7 @@
//-----------------------------------------------------------------
-// Prepared Geometry
+// Prepared Geometry
//-----------------------------------------------------------------
const geos::geom::prep::PreparedGeometry*
@@ -1110,14 +1110,14 @@
void
GEOSSTRtree_query (geos::index::strtree::STRtree *tree,
- const geos::geom::Geometry *g,
+ const geos::geom::Geometry *g,
GEOSQueryCallback cb,
void *userdata)
{
GEOSSTRtree_query_r( handle, tree, g, cb, userdata );
}
-void
+void
GEOSSTRtree_iterate(geos::index::strtree::STRtree *tree,
GEOSQueryCallback callback,
void *userdata)
Modified: trunk/capi/geos_c.h.in
===================================================================
--- trunk/capi/geos_c.h.in 2013-07-17 16:11:54 UTC (rev 3847)
+++ trunk/capi/geos_c.h.in 2013-07-23 11:01:38 UTC (rev 3848)
@@ -8,7 +8,7 @@
*
* This is free software; you can redistribute and/or modify it under
* the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation.
* See the COPYING file for more information.
*
* Author: Sandro Santilli <strk at keybit.net>
@@ -22,8 +22,11 @@
*
* - Currently you have to explicitly GEOSGeom_destroy() all
* GEOSGeom objects to avoid memory leaks, and to GEOSFree()
- * all returned char * (unless const).
+ * all returned char * (unless const).
*
+ * - Functions ending with _r are thread safe; see details in RFC 3
+ * http://trac.osgeo.org/geos/wiki/RFC3
+ *
***********************************************************************/
#ifndef GEOS_C_H_INCLUDED
@@ -80,7 +83,7 @@
#define GEOS_CAPI_VERSION "@VERSION at -CAPI-@CAPI_VERSION@"
#endif
-#define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
+#define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
#define GEOS_CAPI_LAST_INTERFACE (GEOS_CAPI_VERSION_MAJOR+GEOS_CAPI_VERSION_MINOR)
/************************************************************************
@@ -93,8 +96,8 @@
/* When we're included by geos_c.cpp, those are #defined to the original
* JTS definitions via preprocessor. We don't touch them to allow the
- * compiler to cross-check the declarations. However, for all "normal"
- * C-API users, we need to define them as "opaque" struct pointers, as
+ * compiler to cross-check the declarations. However, for all "normal"
+ * C-API users, we need to define them as "opaque" struct pointers, as
* those clients don't have access to the original C++ headers, by design.
*/
#ifndef GEOSGeometry
@@ -171,7 +174,7 @@
extern GEOSMessageHandler GEOS_DLL GEOSContext_setNoticeHandler_r(GEOSContextHandle_t extHandle,
GEOSMessageHandler nf);
extern GEOSMessageHandler GEOS_DLL GEOSContext_setErrorHandler_r(GEOSContextHandle_t extHandle,
- GEOSMessageHandler nf);
+ GEOSMessageHandler ef);
extern const char GEOS_DLL *GEOSversion();
@@ -203,7 +206,7 @@
int newDims);
/*
- * Specify whether the WKB byte order is big or little endian.
+ * Specify whether the WKB byte order is big or little endian.
* The return value is the previous byte order.
*/
extern int GEOS_DLL GEOS_getWKBByteOrder();
@@ -340,12 +343,12 @@
/************************************************************************
*
- * Linearref functions -- there are more, but these two are probably
- * sufficient for most purposes
+ * Linear referencing functions -- there are more, but these are
+ * probably sufficient for most purposes
*
***********************************************************************/
-/*
+/*
* GEOSGeometry ownership is retained by caller
*/
@@ -385,6 +388,14 @@
*
***********************************************************************/
+
+/* @return NULL on exception */
+extern GEOSGeometry GEOS_DLL *GEOSBuffer(const GEOSGeometry* g,
+ double width, int quadsegs);
+extern GEOSGeometry GEOS_DLL *GEOSBuffer_r(GEOSContextHandle_t handle,
+ const GEOSGeometry* g,
+ double width, int quadsegs);
+
enum GEOSBufCapStyles {
GEOSBUF_CAP_ROUND=1,
GEOSBUF_CAP_FLAT=2,
@@ -452,53 +463,46 @@
GEOSBufferParams* p,
int singleSided);
-/* @return NULL on exception. */
+/* @return NULL on exception */
extern GEOSGeometry GEOS_DLL *GEOSBufferWithParams(
- const GEOSGeometry* g1,
+ const GEOSGeometry* g,
const GEOSBufferParams* p,
double width);
extern GEOSGeometry GEOS_DLL *GEOSBufferWithParams_r(
GEOSContextHandle_t handle,
- const GEOSGeometry* g1,
+ const GEOSGeometry* g,
const GEOSBufferParams* p,
double width);
/* These functions return NULL on exception. */
-extern GEOSGeometry GEOS_DLL *GEOSBuffer(const GEOSGeometry* g1,
- double width, int quadsegs);
-extern GEOSGeometry GEOS_DLL *GEOSBuffer_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1,
- double width, int quadsegs);
-
-/* These functions return NULL on exception. */
-extern GEOSGeometry GEOS_DLL *GEOSBufferWithStyle(const GEOSGeometry* g1,
+extern GEOSGeometry GEOS_DLL *GEOSBufferWithStyle(const GEOSGeometry* g,
double width, int quadsegs, int endCapStyle, int joinStyle,
double mitreLimit);
extern GEOSGeometry GEOS_DLL *GEOSBufferWithStyle_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1, double width, int quadsegs, int endCapStyle,
+ const GEOSGeometry* g, double width, int quadsegs, int endCapStyle,
int joinStyle, double mitreLimit);
/* These functions return NULL on exception. Only LINESTRINGs are accepted. */
/* @deprecated in 3.3.0: use GEOSOffsetCurve instead */
-extern GEOSGeometry GEOS_DLL *GEOSSingleSidedBuffer(const GEOSGeometry* g1,
+extern GEOSGeometry GEOS_DLL *GEOSSingleSidedBuffer(const GEOSGeometry* g,
double width, int quadsegs, int joinStyle, double mitreLimit,
int leftSide);
extern GEOSGeometry GEOS_DLL *GEOSSingleSidedBuffer_r(
GEOSContextHandle_t handle,
- const GEOSGeometry* g1, double width, int quadsegs,
+ const GEOSGeometry* g, double width, int quadsegs,
int joinStyle, double mitreLimit, int leftSide);
-/*
+/*
* Only LINESTRINGs are accepted.
* @param width : offset distance.
* negative for right side offset.
* positive for left side offset.
* @return NULL on exception
*/
-extern GEOSGeometry GEOS_DLL *GEOSOffsetCurve(const GEOSGeometry* g1,
+extern GEOSGeometry GEOS_DLL *GEOSOffsetCurve(const GEOSGeometry* g,
double width, int quadsegs, int joinStyle, double mitreLimit);
extern GEOSGeometry GEOS_DLL *GEOSOffsetCurve_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1, double width, int quadsegs,
+ const GEOSGeometry* g, double width, int quadsegs,
int joinStyle, double mitreLimit);
@@ -578,31 +582,28 @@
*
***********************************************************************/
-extern GEOSGeometry GEOS_DLL *GEOSEnvelope(const GEOSGeometry* g1);
+extern GEOSGeometry GEOS_DLL *GEOSEnvelope(const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSIntersection(const GEOSGeometry* g1, const GEOSGeometry* g2);
-extern GEOSGeometry GEOS_DLL *GEOSConvexHull(const GEOSGeometry* g1);
+extern GEOSGeometry GEOS_DLL *GEOSConvexHull(const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSDifference(const GEOSGeometry* g1, const GEOSGeometry* g2);
-extern GEOSGeometry GEOS_DLL *GEOSSymDifference(const GEOSGeometry* g1,
- const GEOSGeometry* g2);
-extern GEOSGeometry GEOS_DLL *GEOSBoundary(const GEOSGeometry* g1);
+extern GEOSGeometry GEOS_DLL *GEOSSymDifference(const GEOSGeometry* g1, const GEOSGeometry* g2);
+extern GEOSGeometry GEOS_DLL *GEOSBoundary(const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSUnion(const GEOSGeometry* g1, const GEOSGeometry* g2);
-extern GEOSGeometry GEOS_DLL *GEOSUnaryUnion(const GEOSGeometry* g1);
-extern GEOSGeometry GEOS_DLL *GEOSNode(const GEOSGeometry* g);
+extern GEOSGeometry GEOS_DLL *GEOSUnaryUnion(const GEOSGeometry* g);
/* @deprecated in 3.3.0: use GEOSUnaryUnion instead */
-extern GEOSGeometry GEOS_DLL *GEOSUnionCascaded(const GEOSGeometry* g1);
-extern GEOSGeometry GEOS_DLL *GEOSUnionCascaded_r(GEOSContextHandle_t handle, const GEOSGeometry* g1);
-
-extern GEOSGeometry GEOS_DLL *GEOSPointOnSurface(const GEOSGeometry* g1);
+extern GEOSGeometry GEOS_DLL *GEOSUnionCascaded(const GEOSGeometry* g);
+extern GEOSGeometry GEOS_DLL *GEOSPointOnSurface(const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSGetCentroid(const GEOSGeometry* g);
+extern GEOSGeometry GEOS_DLL *GEOSNode(const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSEnvelope_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSIntersection_r(GEOSContextHandle_t handle,
const GEOSGeometry* g1,
const GEOSGeometry* g2);
extern GEOSGeometry GEOS_DLL *GEOSConvexHull_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSDifference_r(GEOSContextHandle_t handle,
const GEOSGeometry* g1,
const GEOSGeometry* g2);
@@ -610,14 +611,16 @@
const GEOSGeometry* g1,
const GEOSGeometry* g2);
extern GEOSGeometry GEOS_DLL *GEOSBoundary_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSUnion_r(GEOSContextHandle_t handle,
const GEOSGeometry* g1,
const GEOSGeometry* g2);
extern GEOSGeometry GEOS_DLL *GEOSUnaryUnion_r(GEOSContextHandle_t handle,
const GEOSGeometry* g);
+extern GEOSGeometry GEOS_DLL *GEOSUnionCascaded_r(GEOSContextHandle_t handle,
+ const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSPointOnSurface_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSGetCentroid_r(GEOSContextHandle_t handle,
const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSNode_r(GEOSContextHandle_t handle,
@@ -630,16 +633,16 @@
extern GEOSGeometry GEOS_DLL *GEOSPolygonize(const GEOSGeometry * const geoms[], unsigned int ngeoms);
extern GEOSGeometry GEOS_DLL *GEOSPolygonizer_getCutEdges(const GEOSGeometry * const geoms[], unsigned int ngeoms);
/*
- * Polygonizes a set of Geometrys which contain linework that
+ * Polygonizes a set of Geometries which contain linework that
* represents the edges of a planar graph.
*
* Any dimension of Geometry is handled - the constituent linework
* is extracted to form the edges.
*
* The edges must be correctly noded; that is, they must only meet
- * at their endpoints.
+ * at their endpoints.
* The Polygonizer will still run on incorrectly noded input
- * but will not form polygons from incorrected noded edges.
+ * but will not form polygons from incorrectly noded edges.
*
* The Polygonizer reports the follow kinds of errors:
*
@@ -652,7 +655,7 @@
*
* Errors are reported to output parameters "cuts", "dangles" and
* "invalid" (if not-null). Formed polygons are returned as a
- * collection. NULL is returned on exception. All returned
+ * collection. NULL is returned on exception. All returned
* geometries must be destroyed by caller.
*
*/
@@ -660,8 +663,8 @@
GEOSGeometry** cuts, GEOSGeometry** dangles, GEOSGeometry** invalid);
extern GEOSGeometry GEOS_DLL *GEOSLineMerge(const GEOSGeometry* g);
-extern GEOSGeometry GEOS_DLL *GEOSSimplify(const GEOSGeometry* g1, double tolerance);
-extern GEOSGeometry GEOS_DLL *GEOSTopologyPreserveSimplify(const GEOSGeometry* g1,
+extern GEOSGeometry GEOS_DLL *GEOSSimplify(const GEOSGeometry* g, double tolerance);
+extern GEOSGeometry GEOS_DLL *GEOSTopologyPreserveSimplify(const GEOSGeometry* g,
double tolerance);
extern GEOSGeometry GEOS_DLL *GEOSPolygonize_r(GEOSContextHandle_t handle,
@@ -678,11 +681,11 @@
extern GEOSGeometry GEOS_DLL *GEOSLineMerge_r(GEOSContextHandle_t handle,
const GEOSGeometry* g);
extern GEOSGeometry GEOS_DLL *GEOSSimplify_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1,
+ const GEOSGeometry* g,
double tolerance);
extern GEOSGeometry GEOS_DLL *GEOSTopologyPreserveSimplify_r(
GEOSContextHandle_t handle,
- const GEOSGeometry* g1, double tolerance);
+ const GEOSGeometry* g, double tolerance);
/*
* Return all distinct vertices of input geometry as a MULTIPOINT.
@@ -703,7 +706,7 @@
* having the _same_ direction on both inputs
* - second element is a MULTILINESTRING containing shared paths
* having the _opposite_ direction on the two inputs
- *
+ *
* Returns NULL on exception
*/
extern GEOSGeometry GEOS_DLL *GEOSSharedPaths(const GEOSGeometry* g1,
@@ -730,16 +733,16 @@
*
* @return a newly allocated geometry, or NULL on exception
*/
-extern GEOSGeometry GEOS_DLL * GEOSDelaunayTriangulation(
+extern GEOSGeometry GEOS_DLL * GEOSDelaunayTriangulation(
const GEOSGeometry *g,
double tolerance,
- int onlyEdges );
+ int onlyEdges);
-extern GEOSGeometry GEOS_DLL * GEOSDelaunayTriangulation_r(
+extern GEOSGeometry GEOS_DLL * GEOSDelaunayTriangulation_r(
GEOSContextHandle_t handle,
const GEOSGeometry *g,
double tolerance,
- int onlyEdges );
+ int onlyEdges);
/************************************************************************
*
@@ -800,7 +803,7 @@
*
***********************************************************************/
-/*
+/*
* GEOSGeometry ownership is retained by caller
*/
extern const GEOSPreparedGeometry GEOS_DLL *GEOSPrepare(const GEOSGeometry* g);
@@ -818,7 +821,7 @@
extern char GEOS_DLL GEOSPreparedTouches(const GEOSPreparedGeometry* pg1, const GEOSGeometry* g2);
extern char GEOS_DLL GEOSPreparedWithin(const GEOSPreparedGeometry* pg1, const GEOSGeometry* g2);
-/*
+/*
* GEOSGeometry ownership is retained by caller
*/
extern const GEOSPreparedGeometry GEOS_DLL *GEOSPrepare_r(
@@ -865,7 +868,7 @@
*
***********************************************************************/
-/*
+/*
* GEOSGeometry ownership is retained by caller
*/
@@ -916,22 +919,22 @@
*
***********************************************************************/
-extern char GEOS_DLL GEOSisEmpty(const GEOSGeometry* g1);
-extern char GEOS_DLL GEOSisSimple(const GEOSGeometry* g1);
-extern char GEOS_DLL GEOSisRing(const GEOSGeometry* g1);
-extern char GEOS_DLL GEOSHasZ(const GEOSGeometry* g1);
-extern char GEOS_DLL GEOSisClosed(const GEOSGeometry *g1);
+extern char GEOS_DLL GEOSisEmpty(const GEOSGeometry* g);
+extern char GEOS_DLL GEOSisSimple(const GEOSGeometry* g);
+extern char GEOS_DLL GEOSisRing(const GEOSGeometry* g);
+extern char GEOS_DLL GEOSHasZ(const GEOSGeometry* g);
+extern char GEOS_DLL GEOSisClosed(const GEOSGeometry *g);
extern char GEOS_DLL GEOSisEmpty_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
extern char GEOS_DLL GEOSisSimple_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
extern char GEOS_DLL GEOSisRing_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
extern char GEOS_DLL GEOSHasZ_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
extern char GEOS_DLL GEOSisClosed_r(GEOSContextHandle_t handle,
- const GEOSGeometry *g1);
+ const GEOSGeometry *g);
/************************************************************************
*
@@ -965,9 +968,9 @@
const GEOSGeometry* g2);
/* return 2 on exception, 1 on true, 0 on false */
-extern char GEOS_DLL GEOSRelatePatternMatch(const char* mat, const char *pat);
+extern char GEOS_DLL GEOSRelatePatternMatch(const char *mat, const char *pat);
extern char GEOS_DLL GEOSRelatePatternMatch_r(GEOSContextHandle_t handle,
- const char* mat,
+ const char *mat,
const char *pat);
/* return NULL on exception, a string to GEOSFree otherwise */
@@ -991,14 +994,14 @@
};
/* return 2 on exception, 1 on true, 0 on false */
-extern char GEOS_DLL GEOSisValid(const GEOSGeometry* g1);
+extern char GEOS_DLL GEOSisValid(const GEOSGeometry* g);
extern char GEOS_DLL GEOSisValid_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
/* return NULL on exception, a string to GEOSFree otherwise */
-extern char GEOS_DLL *GEOSisValidReason(const GEOSGeometry *g1);
+extern char GEOS_DLL *GEOSisValidReason(const GEOSGeometry *g);
extern char GEOS_DLL *GEOSisValidReason_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
/*
* Caller has the responsibility to destroy 'reason' (GEOSFree)
@@ -1021,16 +1024,16 @@
***********************************************************************/
/* Return NULL on exception, result must be freed by caller. */
-extern char GEOS_DLL *GEOSGeomType(const GEOSGeometry* g1);
+extern char GEOS_DLL *GEOSGeomType(const GEOSGeometry* g);
extern char GEOS_DLL *GEOSGeomType_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
/* Return -1 on exception */
-extern int GEOS_DLL GEOSGeomTypeId(const GEOSGeometry* g1);
+extern int GEOS_DLL GEOSGeomTypeId(const GEOSGeometry* g);
extern int GEOS_DLL GEOSGeomTypeId_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
/* Return 0 on exception */
extern int GEOS_DLL GEOSGetSRID(const GEOSGeometry* g);
@@ -1042,9 +1045,9 @@
GEOSGeometry* g, int SRID);
/* May be called on all geometries in GEOS 3.x, returns -1 on error and 1
- * for non-multi geometries. Older GEOS versions only accept
+ * for non-multi geometries. Older GEOS versions only accept
* GeometryCollections or Multi* geometries here, and are likely to crash
- * when feeded simple geometries, so beware if you need compatibility with
+ * when fed simple geometries, so beware if you need compatibility with
* old GEOS versions.
*/
extern int GEOS_DLL GEOSGetNumGeometries(const GEOSGeometry* g);
@@ -1067,29 +1070,29 @@
const GEOSGeometry* g, int n);
/* Return -1 on exception */
-extern int GEOS_DLL GEOSNormalize(GEOSGeometry* g1);
+extern int GEOS_DLL GEOSNormalize(GEOSGeometry* g);
extern int GEOS_DLL GEOSNormalize_r(GEOSContextHandle_t handle,
- GEOSGeometry* g1);
+ GEOSGeometry* g);
/* Return -1 on exception */
-extern int GEOS_DLL GEOSGetNumInteriorRings(const GEOSGeometry* g1);
+extern int GEOS_DLL GEOSGetNumInteriorRings(const GEOSGeometry* g);
extern int GEOS_DLL GEOSGetNumInteriorRings_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
/* Return -1 on exception, Geometry must be a LineString. */
-extern int GEOS_DLL GEOSGeomGetNumPoints(const GEOSGeometry* g1);
+extern int GEOS_DLL GEOSGeomGetNumPoints(const GEOSGeometry* g);
extern int GEOS_DLL GEOSGeomGetNumPoints_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
/* Return -1 on exception, Geometry must be a Point. */
-extern int GEOS_DLL GEOSGeomGetX(const GEOSGeometry *g1, double *x);
-extern int GEOS_DLL GEOSGeomGetY(const GEOSGeometry *g1, double *y);
+extern int GEOS_DLL GEOSGeomGetX(const GEOSGeometry *g, double *x);
+extern int GEOS_DLL GEOSGeomGetY(const GEOSGeometry *g, double *y);
-extern int GEOS_DLL GEOSGeomGetX_r(GEOSContextHandle_t handle, const GEOSGeometry *g1, double *x);
-extern int GEOS_DLL GEOSGeomGetY_r(GEOSContextHandle_t handle, const GEOSGeometry *g1, double *y);
+extern int GEOS_DLL GEOSGeomGetX_r(GEOSContextHandle_t handle, const GEOSGeometry *g, double *x);
+extern int GEOS_DLL GEOSGeomGetY_r(GEOSContextHandle_t handle, const GEOSGeometry *g, double *y);
/*
* Return NULL on exception, Geometry must be a Polygon.
@@ -1114,10 +1117,10 @@
const GEOSGeometry* g);
/* Return -1 on exception */
-extern int GEOS_DLL GEOSGetNumCoordinates(const GEOSGeometry* g1);
+extern int GEOS_DLL GEOSGetNumCoordinates(const GEOSGeometry* g);
extern int GEOS_DLL GEOSGetNumCoordinates_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1);
+ const GEOSGeometry* g);
/*
* Return NULL on exception.
@@ -1149,34 +1152,35 @@
* Return NULL on exception.
* Must be LineString and must be freed by called.
*/
-extern GEOSGeometry GEOS_DLL *GEOSGeomGetPointN(const GEOSGeometry *g1, int n);
-extern GEOSGeometry GEOS_DLL *GEOSGeomGetStartPoint(const GEOSGeometry *g1);
-extern GEOSGeometry GEOS_DLL *GEOSGeomGetEndPoint(const GEOSGeometry *g1);
+extern GEOSGeometry GEOS_DLL *GEOSGeomGetPointN(const GEOSGeometry *g, int n);
+extern GEOSGeometry GEOS_DLL *GEOSGeomGetStartPoint(const GEOSGeometry *g);
+extern GEOSGeometry GEOS_DLL *GEOSGeomGetEndPoint(const GEOSGeometry *g);
-extern GEOSGeometry GEOS_DLL *GEOSGeomGetPointN_r(GEOSContextHandle_t handle, const GEOSGeometry *g1, int n);
-extern GEOSGeometry GEOS_DLL *GEOSGeomGetStartPoint_r(GEOSContextHandle_t handle, const GEOSGeometry *g1);
-extern GEOSGeometry GEOS_DLL *GEOSGeomGetEndPoint_r(GEOSContextHandle_t handle, const GEOSGeometry *g1);
+extern GEOSGeometry GEOS_DLL *GEOSGeomGetPointN_r(GEOSContextHandle_t handle, const GEOSGeometry *g, int n);
+extern GEOSGeometry GEOS_DLL *GEOSGeomGetStartPoint_r(GEOSContextHandle_t handle, const GEOSGeometry *g);
+extern GEOSGeometry GEOS_DLL *GEOSGeomGetEndPoint_r(GEOSContextHandle_t handle, const GEOSGeometry *g);
/************************************************************************
*
- * Misc functions
+ * Misc functions
*
***********************************************************************/
/* Return 0 on exception, 1 otherwise */
-extern int GEOS_DLL GEOSArea(const GEOSGeometry* g1, double *area);
-extern int GEOS_DLL GEOSLength(const GEOSGeometry* g1, double *length);
+extern int GEOS_DLL GEOSArea(const GEOSGeometry* g, double *area);
+extern int GEOS_DLL GEOSLength(const GEOSGeometry* g, double *length);
extern int GEOS_DLL GEOSDistance(const GEOSGeometry* g1, const GEOSGeometry* g2,
double *dist);
extern int GEOS_DLL GEOSHausdorffDistance(const GEOSGeometry *g1,
const GEOSGeometry *g2, double *dist);
extern int GEOS_DLL GEOSHausdorffDistanceDensify(const GEOSGeometry *g1,
const GEOSGeometry *g2, double densifyFrac, double *dist);
-extern int GEOS_DLL GEOSGeomGetLength(const GEOSGeometry *g1, double *length);
+extern int GEOS_DLL GEOSGeomGetLength(const GEOSGeometry *g, double *length);
+
extern int GEOS_DLL GEOSArea_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1, double *area);
+ const GEOSGeometry* g, double *area);
extern int GEOS_DLL GEOSLength_r(GEOSContextHandle_t handle,
- const GEOSGeometry* g1, double *length);
+ const GEOSGeometry* g, double *length);
extern int GEOS_DLL GEOSDistance_r(GEOSContextHandle_t handle,
const GEOSGeometry* g1,
const GEOSGeometry* g2, double *dist);
@@ -1189,7 +1193,7 @@
const GEOSGeometry *g2,
double densifyFrac, double *dist);
extern int GEOS_DLL GEOSGeomGetLength_r(GEOSContextHandle_t handle,
- const GEOSGeometry *g1, double *length);
+ const GEOSGeometry *g, double *length);
/* Return 0 on exception, the closest points of the two geometries otherwise.
* The first point comes from g1 geometry and the second point comes from g2.
@@ -1248,7 +1252,7 @@
/* WKT Writer */
extern GEOSWKTWriter GEOS_DLL *GEOSWKTWriter_create();
extern void GEOS_DLL GEOSWKTWriter_destroy(GEOSWKTWriter* writer);
-extern char GEOS_DLL *GEOSWKTWriter_write(GEOSWKTWriter* reader, const GEOSGeometry* g);
+extern char GEOS_DLL *GEOSWKTWriter_write(GEOSWKTWriter* writer, const GEOSGeometry* g);
extern void GEOS_DLL GEOSWKTWriter_setTrim(GEOSWKTWriter *writer, char trim);
extern void GEOS_DLL GEOSWKTWriter_setRoundingPrecision(GEOSWKTWriter *writer, int precision);
extern void GEOS_DLL GEOSWKTWriter_setOutputDimension(GEOSWKTWriter *writer, int dim);
@@ -1260,7 +1264,7 @@
extern void GEOS_DLL GEOSWKTWriter_destroy_r(GEOSContextHandle_t handle,
GEOSWKTWriter* writer);
extern char GEOS_DLL *GEOSWKTWriter_write_r(GEOSContextHandle_t handle,
- GEOSWKTWriter* reader,
+ GEOSWKTWriter* writer,
const GEOSGeometry* g);
extern void GEOS_DLL GEOSWKTWriter_setTrim_r(GEOSContextHandle_t handle,
GEOSWKTWriter *writer,
@@ -1321,7 +1325,7 @@
const GEOSGeometry* g,
size_t *size);
-/*
+/*
* Specify whether output WKB should be 2d or 3d.
* Return previously set number of dimensions.
*/
@@ -1336,7 +1340,7 @@
GEOSWKBWriter* writer, int newDimension);
/*
- * Specify whether the WKB byte order is big or little endian.
+ * Specify whether the WKB byte order is big or little endian.
* The return value is the previous byte order.
*/
extern int GEOS_DLL GEOSWKBWriter_getByteOrder(const GEOSWKBWriter* writer);
@@ -1349,7 +1353,7 @@
int byteOrder);
/*
- * Specify whether SRID values should be output.
+ * Specify whether SRID values should be output.
*/
extern char GEOS_DLL GEOSWKBWriter_getIncludeSRID(const GEOSWKBWriter* writer);
extern void GEOS_DLL GEOSWKBWriter_setIncludeSRID(GEOSWKBWriter* writer, const char writeSRID);
@@ -1361,11 +1365,11 @@
/*
- * Free buffers returned by stuff like GEOSWKBWriter_write(),
- * GEOSWKBWriter_writeHEX() and GEOSWKTWriter_write().
+ * Free buffers returned by stuff like GEOSWKBWriter_write(),
+ * GEOSWKBWriter_writeHEX() and GEOSWKTWriter_write().
*/
-extern void GEOS_DLL GEOSFree( void *buffer );
-extern void GEOS_DLL GEOSFree_r( GEOSContextHandle_t handle, void *buffer );
+extern void GEOS_DLL GEOSFree(void *buffer);
+extern void GEOS_DLL GEOSFree_r(GEOSContextHandle_t handle, void *buffer);
#ifdef __cplusplus
} // extern "C"
More information about the geos-commits
mailing list