From 69eec45ee67eb9e3cb261268a0e3186e870bfed4 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 9 Jan 2012 15:03:36 +0000 Subject: [PATCH] Fix compiler warnings git-svn-id: http://svn.osgeo.org/postgis/trunk@8715 b70326c6-7e19-0410-871a-916f4a2858ee --- liblwgeom/liblwgeom.h.in | 4 ++-- liblwgeom/lwgeom_geos.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/liblwgeom/liblwgeom.h.in b/liblwgeom/liblwgeom.h.in index c59541fc3..6cb7ef227 100644 --- a/liblwgeom/liblwgeom.h.in +++ b/liblwgeom/liblwgeom.h.in @@ -1786,11 +1786,11 @@ LWGEOM* lwgeom_sharedpaths(const LWGEOM* geom1, const LWGEOM* geom2); * @param quadsegs number of quadrature segments in curves (try 8) * @param joinStyle (1 = round, 2 = mitre, 3 = bevel) * @param mitreLimit (try 5.0) - * @return derived geometry + * @return derived geometry (linestring or multilinestring) * * Requires GEOS-3.2.0+ */ -LWLINE* lwgeom_offsetcurve(const LWLINE *lwline, double size, int quadsegs, int joinStyle, double mitreLimit); +LWGEOM* lwgeom_offsetcurve(const LWLINE *lwline, double size, int quadsegs, int joinStyle, double mitreLimit); /******************************************************************************* diff --git a/liblwgeom/lwgeom_geos.c b/liblwgeom/lwgeom_geos.c index 7960d5216..ccb024918 100644 --- a/liblwgeom/lwgeom_geos.c +++ b/liblwgeom/lwgeom_geos.c @@ -1044,7 +1044,7 @@ lwgeom_sharedpaths(const LWGEOM* geom1, const LWGEOM* geom2) #endif /* POSTGIS_GEOS_VERSION >= 33 */ } -LWLINE* +LWGEOM* lwgeom_offsetcurve(const LWLINE *lwline, double size, int quadsegs, int joinStyle, double mitreLimit) { #if POSTGIS_GEOS_VERSION < 32 @@ -1055,7 +1055,7 @@ lwgeom_offsetcurve(const LWLINE *lwline, double size, int quadsegs, int joinStyl initGEOS(lwnotice, lwgeom_geos_error); - g1 = (GEOSGeometry *)LWGEOM2GEOS(lwline); + g1 = (GEOSGeometry *)LWGEOM2GEOS(lwline_as_lwgeom(lwline)); if ( ! g1 ) { lwerror("lwgeom_offsetcurve: Geometry could not be converted to GEOS: %s", lwgeom_geos_errmsg); @@ -1082,9 +1082,9 @@ lwgeom_offsetcurve(const LWLINE *lwline, double size, int quadsegs, int joinStyl LWDEBUGF(3, "result: %s", GEOSGeomToWKT(g3)); - GEOSSetSRID(g3, lwgeom_get_srid(lwline)); + GEOSSetSRID(g3, lwgeom_get_srid(lwline_as_lwgeom(lwline))); - lwgeom_result = GEOS2LWGEOM(g3, lwgeom_has_z(lwline)); + lwgeom_result = GEOS2LWGEOM(g3, lwgeom_has_z(lwline_as_lwgeom(lwline))); GEOSGeom_destroy(g3); if (lwgeom_result == NULL) @@ -1096,4 +1096,4 @@ lwgeom_offsetcurve(const LWLINE *lwline, double size, int quadsegs, int joinStyl return lwgeom_result; #endif /* POSTGIS_GEOS_VERSION < 32 */ -} \ No newline at end of file +} -- 2.50.1