Fixed bug in pointArray_construct() misinterpreting hasZ and hasM parameters

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

diff --git a/CHANGES b/CHANGES
index 5349c13ea9a43d52fa8ea6d651a50be2ea9550d8..650205ce7b277081c4ac2b27c34a141874c35f1a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ PostGIS 1.0.4
        - GiST indexing cleanup
        - Loader: fixed string functions usage, reworked NULL objects check,
          fixed segfault on MULTILINESTRING input.
+       - Fixed bug in MakeLine dimension handling
 
 PostGIS 1.0.3
 2005/08/08

diff --git a/lwgeom/lwgeom_api.c b/lwgeom/lwgeom_api.c
index 05037da937ba9f8fcf64b5e7224f548af6d9ec3b..e8fd1d6d28ca376aa6ee72aa69a13ea8d381d7d2 100644 (file)
--- a/lwgeom/lwgeom_api.c
+++ b/lwgeom/lwgeom_api.c
@@ -622,12 +622,9 @@ pointArray_construct(uchar *points, char hasz, char hasm,
        pa = (POINTARRAY*)lwalloc(sizeof(POINTARRAY));
 
        pa->dims = 0;
-       TYPE_SETZM(pa->dims, hasz, hasm);
+       TYPE_SETZM(pa->dims, hasz?1:0, hasm?1:0);
        pa->npoints = npoints;
 
-       size=(2+hasz+hasm)*sizeof(double)*npoints;
-       //pa->serialized_pointlist = lwalloc(size);
-       //memcpy(pa->serialized_pointlist, points, size);
        pa->serialized_pointlist = points;
 
        return pa;