bug fixes

git-svn-id: http://svn.osgeo.org/postgis/trunk@916 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/lwgeom/TODO b/lwgeom/TODO
index 12dd6dbac831e0bbf349dea569202d51f430bfe9..4f1d821c42ba7d96478bf1779b241f90a4d3d08f 100644 (file)
--- 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 5c43e406cee7d615a6f305dfc574c502d2e6508f..a8671c625fdb53ad4e9e40d0ce7331ce2e5a9805 100644 (file)
--- 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 70f5ca78d8eeb3dc205423e73d1f5ec0b96252a2..025a8612a0a53fdad347bf404104b4c0c492a3fd 100644 (file)
--- 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 c43b0b4191a4d7dba026c4b124faadc10d486ef8..dd166832e1a40e9870b946e57425c942d6f8eb2e 100644 (file)
--- 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;