[postgis-commits] svn - r3429 - in trunk: liblwgeom lwgeom

[postgis-commits at postgis.refractions.net]

Author: pramsey
Date: 2008-12-16 21:32:03 -0800 (Tue, 16 Dec 2008)
New Revision: 3429

Modified:
   trunk/liblwgeom/lwalgorithm.c
   trunk/lwgeom/lwgeom_functions_analytic.c
   trunk/lwgeom/lwgeom_functions_basic.c
Log:
harmonize function names so things... compile


Modified: trunk/liblwgeom/lwalgorithm.c
===================================================================
--- trunk/liblwgeom/lwalgorithm.c	2008-12-17 05:28:54 UTC (rev 3428)
+++ trunk/liblwgeom/lwalgorithm.c	2008-12-17 05:32:03 UTC (rev 3429)
@@ -61,20 +61,20 @@
 	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 @@
 			
 			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;

Modified: trunk/lwgeom/lwgeom_functions_analytic.c
===================================================================
--- trunk/lwgeom/lwgeom_functions_analytic.c	2008-12-17 05:28:54 UTC (rev 3428)
+++ trunk/lwgeom/lwgeom_functions_analytic.c	2008-12-17 05:32:03 UTC (rev 3429)
@@ -984,7 +984,7 @@
 	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);	

Modified: trunk/lwgeom/lwgeom_functions_basic.c
===================================================================
--- trunk/lwgeom/lwgeom_functions_basic.c	2008-12-17 05:28:54 UTC (rev 3428)
+++ trunk/lwgeom/lwgeom_functions_basic.c	2008-12-17 05:32:03 UTC (rev 3429)
@@ -1928,7 +1928,7 @@
 		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);