[postgis-commits] svn - r3276 - trunk/lwgeom

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-11-07 06:18:25 -0800 (Fri, 07 Nov 2008)
New Revision: 3276

Modified:
   trunk/lwgeom/lwgeom_functions_basic.c
Log:
Fix GBT#70: ST_NPoints Crashes with Curves. lwgeom_npoints() needs to know about the new lwgeom_getcurve_inspected() function.


Modified: trunk/lwgeom/lwgeom_functions_basic.c
===================================================================
--- trunk/lwgeom/lwgeom_functions_basic.c	2008-11-07 14:05:53 UTC (rev 3275)
+++ trunk/lwgeom/lwgeom_functions_basic.c	2008-11-07 14:18:25 UTC (rev 3276)
@@ -207,6 +207,7 @@
 		LWLINE *line=NULL;
 		LWPOINT *point=NULL;
 		LWPOLY *poly=NULL;
+		LWCURVE *curve=NULL;
 		uchar *subgeom=NULL;
 
 		point = lwgeom_getpoint_inspected(inspected, i);
@@ -233,6 +234,13 @@
 			continue;
 		}
 
+		curve = lwgeom_getcurve_inspected(inspected, i);
+		if (curve != NULL)
+		{
+			npoints += curve->points->npoints;
+			continue;
+		}
+
 		subgeom = lwgeom_getsubgeometry_inspected(inspected, i);
 		if ( subgeom != NULL )
 		{