From e2a586c10d2dbd0aede3587cd906e9ce637d8c5f Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 30 Sep 2004 16:06:05 +0000 Subject: [PATCH] bug fixes git-svn-id: http://svn.osgeo.org/postgis/trunk@916 b70326c6-7e19-0410-871a-916f4a2858ee --- lwgeom/TODO | 4 +++- lwgeom/liblwgeom.c | 2 +- lwgeom/lwgeom.h | 6 ++++++ lwgeom/lwgeom_functions_basic.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lwgeom/TODO b/lwgeom/TODO index 12dd6dbac..4f1d821c4 100644 --- a/lwgeom/TODO +++ b/lwgeom/TODO @@ -1,10 +1,12 @@ -- Flatten(geometry) +- LWGEOM editor (insert/append a geom, remove a geom, ....) - Make collect() avoid flatting - Make GEOS2POSTGIS() avoid flatting +- Flatten(geometry) + - F linemerge(linestring, linestring) - A linemerge(linestring, linestring) diff --git a/lwgeom/liblwgeom.c b/lwgeom/liblwgeom.c index 5c43e406c..a8671c625 100644 --- a/lwgeom/liblwgeom.c +++ b/lwgeom/liblwgeom.c @@ -11,7 +11,7 @@ #define DEFAULT_CONTEXT CONTEXT_PG /* Global variables */ -#if DEFAULT_CONTEXT == SA +#if DEFAULT_CONTEXT == CONTEXT_SA lwallocator lwalloc = default_allocator; lwreallocator lwrealloc = default_reallocator; lwfreeor lwfree = default_freeor; diff --git a/lwgeom/lwgeom.h b/lwgeom/lwgeom.h index 70f5ca78d..025a8612a 100644 --- a/lwgeom/lwgeom.h +++ b/lwgeom/lwgeom.h @@ -1,4 +1,10 @@ typedef struct LWGEOM_T LWGEOM; +// Serialization / deserialization +extern LWGEOM *lwgeom_deserialize(char *serializedform); +extern char *lwgeom_serialize(LWGEOM *lwgeom); +extern char *lwgeom_serialize_size(LWGEOM *lwgeom); +extern void lwgeom_serialize_buf(LWGEOM *lwgeom, char *buf); + extern void lwgeom_reverse(LWGEOM *lwgeom); extern void lwgeom_forceRHR(LWGEOM *lwgeom); diff --git a/lwgeom/lwgeom_functions_basic.c b/lwgeom/lwgeom_functions_basic.c index c43b0b419..dd166832e 100644 --- a/lwgeom/lwgeom_functions_basic.c +++ b/lwgeom/lwgeom_functions_basic.c @@ -2173,7 +2173,7 @@ Datum LWGEOM_collect(PG_FUNCTION_ARGS) PG_FUNCTION_INFO_V1(LWGEOM_accum); Datum LWGEOM_accum(PG_FUNCTION_ARGS) { - ArrayType *array; + ArrayType *array = NULL; int nelems, nbytes; Datum datum; PG_LWGEOM *geom; -- 2.50.1