Change more getpoint2d_p to const point calls

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

diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index 23efa18f6b3133c8a7d4814bb38ba76f785d5eec..c2fc6ae41cfd20988302688abb7c23f6a6a41b9f 100644 (file)
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -565,18 +565,18 @@ lwgeom_same(const LWGEOM *lwgeom1, const LWGEOM *lwgeom2)
 int
 lwpoint_inside_circle(const LWPOINT *p, double cx, double cy, double rad)
 {
+       const POINT2D *pt;
        POINT2D center;
-       POINT2D pt;
 
        if ( ! p || ! p->point )
                return LW_FALSE;
                
-       getPoint2d_p(p->point, 0, &pt);
+       pt = getPoint2d_cp(p->point, 0);
 
        center.x = cx;
        center.y = cy;
 
-       if ( distance2d_pt_pt(&pt, &center) < rad ) 
+       if ( distance2d_pt_pt(pt, &center) < rad ) 
                return LW_TRUE;
 
        return LW_FALSE;

diff --git a/liblwgeom/lwprint.c b/liblwgeom/lwprint.c
index dcf47679d39fd70d38599b55162f325be5568842..1dd4e100eec9d21aa306fce90ba4857dabab6e7b 100644 (file)
--- a/liblwgeom/lwprint.c
+++ b/liblwgeom/lwprint.c
@@ -390,7 +390,7 @@ static char * lwdoubles_to_latlon(double lat, double lon, const char * format)
  */
 char* lwpoint_to_latlon(const LWPOINT * pt, const char *format)
 {
-       POINT2D p;
+       const POINT2D *p;
        if (NULL == pt)
        {
                lwerror("Cannot convert a null point into formatted text.");
@@ -399,6 +399,6 @@ char* lwpoint_to_latlon(const LWPOINT * pt, const char *format)
        {
                lwerror("Cannot convert an empty point into formatted text.");
        }
-       getPoint2d_p(pt->point, 0, &p);
-       return lwdoubles_to_latlon(p.y, p.x, format);
+       p = getPoint2d_cp(pt->point, 0);
+       return lwdoubles_to_latlon(p->y, p->x, format);
 }

diff --git a/postgis/geometry_inout.c b/postgis/geometry_inout.c
index 5c5a97d192288194eaa654e19f359db1079496ab..69197368d2c31c4f1cce15d1cd320f6a23c6f557 100644 (file)
--- a/postgis/geometry_inout.c
+++ b/postgis/geometry_inout.c
@@ -88,7 +88,7 @@ Datum geometry_to_path(PG_FUNCTION_ARGS)
        GSERIALIZED *geom;
        POINTARRAY *pa;
        int i;
-       POINT2D pt;
+       const POINT2D *pt;
        size_t size;
 
        POSTGIS_DEBUG(2, "geometry_to_path called");
@@ -116,9 +116,9 @@ Datum geometry_to_path(PG_FUNCTION_ARGS)
 
        for ( i = 0; i < pa->npoints; i++ )
        {
-               getPoint2d_p(pa, i, &pt);
-               (path->p[i]).x = pt.x;
-               (path->p[i]).y = pt.y;
+               pt = getPoint2d_cp(pa, i);
+               (path->p[i]).x = pt->x;
+               (path->p[i]).y = pt->y;
        }
        
        lwgeom_free(lwgeom);
@@ -207,10 +207,9 @@ Datum geometry_to_polygon(PG_FUNCTION_ARGS)
                
        for ( i = 0; i < pa->npoints; i++ )
        {
-               POINT2D pt;
-               getPoint2d_p(pa, i, &pt);
-               (polygon->p[i]).x = pt.x;
-               (polygon->p[i]).y = pt.y;
+               const POINT2D *pt = getPoint2d_cp(pa, i);
+               (polygon->p[i]).x = pt->x;
+               (polygon->p[i]).y = pt->y;
        }
 
        lwgeom_free(lwgeom);

diff --git a/postgis/lwgeom_ogc.c b/postgis/lwgeom_ogc.c
index 4763e3662dbc720800c296f4a4738277ac4b587a..b2715be8b2ac07cc5cb03c369ac21df4b74fab43 100644 (file)
--- a/postgis/lwgeom_ogc.c
+++ b/postgis/lwgeom_ogc.c
@@ -571,7 +571,7 @@ Datum LWGEOM_x_point(PG_FUNCTION_ARGS)
        geom = PG_GETARG_GSERIALIZED_P(0);
 
        if ( gserialized_get_type(geom) != POINTTYPE )
-               lwerror("Argument to X() must be a point");
+               lwerror("Argument to ST_X() must be a point");
 
        lwgeom = lwgeom_from_gserialized(geom);
        point = lwgeom_as_lwpoint(lwgeom);
@@ -600,7 +600,7 @@ Datum LWGEOM_y_point(PG_FUNCTION_ARGS)
        geom = PG_GETARG_GSERIALIZED_P(0);
 
        if ( gserialized_get_type(geom) != POINTTYPE )
-               lwerror("Argument to Y() must be a point");
+               lwerror("Argument to ST_Y() must be a point");
 
        lwgeom = lwgeom_from_gserialized(geom);
        point = lwgeom_as_lwpoint(lwgeom);
@@ -631,7 +631,7 @@ Datum LWGEOM_z_point(PG_FUNCTION_ARGS)
        geom = PG_GETARG_GSERIALIZED_P(0);
 
        if ( gserialized_get_type(geom) != POINTTYPE )
-               lwerror("Argument to Z() must be a point");
+               lwerror("Argument to ST_Z() must be a point");
 
        lwgeom = lwgeom_from_gserialized(geom);
        point = lwgeom_as_lwpoint(lwgeom);
@@ -664,7 +664,7 @@ Datum LWGEOM_m_point(PG_FUNCTION_ARGS)
        geom = PG_GETARG_GSERIALIZED_P(0);
 
        if ( gserialized_get_type(geom) != POINTTYPE )
-               lwerror("Argument to M() must be a point");
+               lwerror("Argument to ST_M() must be a point");
 
        lwgeom = lwgeom_from_gserialized(geom);
        point = lwgeom_as_lwpoint(lwgeom);