harmonize function names so things... compile

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

diff --git a/liblwgeom/lwalgorithm.c b/liblwgeom/lwalgorithm.c
index c980401783cb6f0437e3758b10c9e13f02dfe20c..f5a02c6b51a9ab78744d4d2957d46348328c48d0 100644 (file)
--- a/liblwgeom/lwalgorithm.c
+++ b/liblwgeom/lwalgorithm.c
@@ -61,20 +61,20 @@ int lw_segment_intersects(POINT2D *p1, POINT2D *p2, POINT2D *q1, POINT2D *q2) {
        double pq1, pq2, qp1, qp2;
        
        /* No envelope interaction => we are done. */
-       if (!segmentEnvelopeIntersects(p1, p2, q1, p2)) {
+       if (!lw_segment_envelope_intersects(p1, p2, q1, p2))    {
                return SEG_NO_INTERSECTION;
        }
 
        /* Are the start and end points of q on the same side of p? */
-       pq1=segmentSide(p1,p2,q1);
-       pq2=segmentSide(p1,p2,q2);
+       pq1=lw_segment_side(p1,p2,q1);
+       pq2=lw_segment_side(p1,p2,q2);
        if ((pq1>0 && pq2>0) || (pq1<0 && pq2<0)) {
                return SEG_NO_INTERSECTION;
        }
 
        /* Are the start and end points of p on the same side of q? */
-       qp1=segmentSide(q1,q2,p1);
-       qp2=segmentSide(q1,q2,p2);
+       qp1=lw_segment_side(q1,q2,p1);
+       qp2=lw_segment_side(q1,q2,p2);
        if ((qp1>0 && qp2>0) || (qp1<0 && qp2<0)) {
                return SEG_NO_INTERSECTION;
        }
@@ -171,7 +171,7 @@ int lwline_crossing_direction(LWLINE *l1, LWLINE *l2) {
                        
                        LWDEBUGF(4, "lineCrossingDirection: i=%d, j=%d", i, j);
                        
-                       this_cross = segmentIntersects(p1, p2, q1, q2);
+                       this_cross = lw_segment_intersects(p1, p2, q1, q2);
                
                        if( ! first_cross && this_cross )
                                first_cross = this_cross;

diff --git a/lwgeom/lwgeom_functions_analytic.c b/lwgeom/lwgeom_functions_analytic.c
index 7fc0606226cbb52f58df74992fe877013af9dab5..43d946d308069b990adbfb5f25916f2a2b7b1a20 100644 (file)
--- a/lwgeom/lwgeom_functions_analytic.c
+++ b/lwgeom/lwgeom_functions_analytic.c
@@ -984,7 +984,7 @@ Datum crossingDirection(PG_FUNCTION_ARGS)
        l1 = lwline_deserialize(SERIALIZED_FORM(geom1));
        l2 = lwline_deserialize(SERIALIZED_FORM(geom2));
 
-       rv = lw_line_crossing_direction(l1, l2);
+       rv = lwline_crossing_direction(l1, l2);
        
        PG_FREE_IF_COPY(geom1, 0);
        PG_FREE_IF_COPY(geom2, 0);      

diff --git a/lwgeom/lwgeom_functions_basic.c b/lwgeom/lwgeom_functions_basic.c
index e7d970547225eab46e7f2fd1d21e94db4a909424..1b153aa7ff7e9066c02ed557a7c60c5637d0b49c 100644 (file)
--- a/lwgeom/lwgeom_functions_basic.c
+++ b/lwgeom/lwgeom_functions_basic.c
@@ -1928,7 +1928,7 @@ Datum LWGEOM_accum(PG_FUNCTION_ARGS)
                POSTGIS_DEBUGF(3, " %d bytes allocated for array", (int)nbytes);
 
                POSTGIS_DEBUGF(3, " array start  @ %p", (void*)result);
-               POSTGIS_DEBUGF(3, " ARR_DATA_PTR @ %p (%ld)",
+               POSTGIS_DEBUGF(3, " ARR_DATA_PTR @ %p (%d)",
                               ARR_DATA_PTR(result), (uchar *)ARR_DATA_PTR(result)-(uchar *)result);
                POSTGIS_DEBUGF(3, " next element @ %p", (uchar *)result+oldsize);