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

[postgis-commits at postgis.refractions.net]

Author: pramsey
Date: 2009-02-02 14:21:27 -0800 (Mon, 02 Feb 2009)
New Revision: 3619

Modified:
   trunk/liblwgeom/lwalgorithm.c
   trunk/liblwgeom/lwalgorithm.h
   trunk/lwgeom/lwgeom_geos.c
Log:
formatting


Modified: trunk/liblwgeom/lwalgorithm.c
===================================================================
--- trunk/liblwgeom/lwalgorithm.c	2009-02-02 19:22:43 UTC (rev 3618)
+++ trunk/liblwgeom/lwalgorithm.c	2009-02-02 22:21:27 UTC (rev 3619)
@@ -25,20 +25,20 @@
 	return ( (q->x - p1->x) * (p2->y - p1->y) - (p2->x - p1->x) * (q->y - p1->y) );
 }
 
-int lw_segment_envelope_intersects(POINT2D *p1, POINT2D *p2, POINT2D *q1, POINT2D *q2) 
+int lw_segment_envelope_intersects(POINT2D p1, POINT2D p2, POINT2D q1, POINT2D q2) 
 {
-	double minq=LW_MIN(q1->x,q2->x);
-	double maxq=LW_MAX(q1->x,q2->x);
-	double minp=LW_MIN(p1->x,p2->x);
-	double maxp=LW_MAX(p1->x,p2->x);
+	double minq=LW_MIN(q1.x,q2.x);
+	double maxq=LW_MAX(q1.x,q2.x);
+	double minp=LW_MIN(p1.x,p2.x);
+	double maxp=LW_MAX(p1.x,p2.x);
 
 	if(minp>maxq || maxp<minq) 
 		return LW_FALSE;
 
-	minq=LW_MIN(q1->y,q2->y);
-	maxq=LW_MAX(q1->y,q2->y);
-	minp=LW_MIN(p1->y,p2->y);
-	maxp=LW_MAX(p1->y,p2->y);
+	minq=LW_MIN(q1.y,q2.y);
+	maxq=LW_MAX(q1.y,q2.y);
+	minp=LW_MIN(p1.y,p2.y);
+	maxp=LW_MAX(p1.y,p2.y);
 
 	if(minp>maxq || maxp<minq) 
 		return LW_FALSE;
@@ -64,7 +64,7 @@
 	double pq1, pq2, qp1, qp2;
 	
 	/* No envelope interaction => we are done. */
-	if (!lw_segment_envelope_intersects(p1, p2, q1, p2))	
+	if (!lw_segment_envelope_intersects(*p1, *p2, *q1, *p2))	
 	{
 		return SEG_NO_INTERSECTION;
 	}

Modified: trunk/liblwgeom/lwalgorithm.h
===================================================================
--- trunk/liblwgeom/lwalgorithm.h	2009-02-02 19:22:43 UTC (rev 3618)
+++ trunk/liblwgeom/lwalgorithm.h	2009-02-02 22:21:27 UTC (rev 3619)
@@ -25,7 +25,7 @@
 
 double lw_segment_side(POINT2D *p1, POINT2D *p2, POINT2D *q);
 int lw_segment_intersects(POINT2D *p1, POINT2D *p2, POINT2D *q1, POINT2D *q2);
-int lw_segment_envelope_intersects(POINT2D *p1, POINT2D *p2, POINT2D *q1, POINT2D *q2);
+int lw_segment_envelope_intersects(POINT2D p1, POINT2D p2, POINT2D q1, POINT2D q2);
 
 
 enum CG_LINE_CROSS_TYPE {

Modified: trunk/lwgeom/lwgeom_geos.c
===================================================================
--- trunk/lwgeom/lwgeom_geos.c	2009-02-02 19:22:43 UTC (rev 3618)
+++ trunk/lwgeom/lwgeom_geos.c	2009-02-02 22:21:27 UTC (rev 3619)
@@ -1219,7 +1219,7 @@
 	 * Do the test IFF BOUNDING BOX AVAILABLE.
 	 */
 	if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
-	                getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
+	     getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
 	{
 		if ( box2.xmax < box1.xmin ) PG_RETURN_BOOL(FALSE);
 		if ( box2.xmin > box1.xmax ) PG_RETURN_BOOL(FALSE);
@@ -1290,7 +1290,7 @@
 	** Do the test IFF BOUNDING BOX AVAILABLE.
 	*/
 	if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
-	                getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
+	     getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
 	{
 		if ( ( box2.xmin < box1.xmin ) || ( box2.xmax > box1.xmax ) ||
 		     ( box2.ymin < box1.ymin ) || ( box2.ymax > box1.ymax ) )
@@ -1622,7 +1622,7 @@
 	 * Do the test IFF BOUNDING BOX AVAILABLE.
 	 */
 	if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
-	                getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
+	     getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
 	{
 		if ( ( box1.xmin < box2.xmin ) || ( box1.xmax > box2.xmax ) ||
 		     ( box1.ymin < box2.ymin ) || ( box1.ymax > box2.ymax ) )
@@ -1751,7 +1751,7 @@
 	 * Do the test IFF BOUNDING BOX AVAILABLE.
 	 */
 	if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
-	                getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
+	     getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
 	{
 		if ( ( box1.xmin < box2.xmin ) || ( box1.xmax > box2.xmax ) ||
 		     ( box1.ymin < box2.ymin ) || ( box1.ymax > box2.ymax ) )
@@ -1944,7 +1944,7 @@
 	 * Do the test IFF BOUNDING BOX AVAILABLE.
 	 */
 	if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
-	                getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
+	     getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
 	{
 		if ( ( box2.xmax < box1.xmin ) || ( box2.xmin > box1.xmax ) ||
 		     ( box2.ymax < box1.ymin ) || ( box2.ymin > box1.ymax ) )
@@ -1960,7 +1960,7 @@
 	type1 = lwgeom_getType((uchar)SERIALIZED_FORM(geom1)[0]);
 	type2 = lwgeom_getType((uchar)SERIALIZED_FORM(geom2)[0]);
 	if ( (type1 == POINTTYPE && (type2 == POLYGONTYPE || type2 == MULTIPOLYGONTYPE)) ||
-	                (type2 == POINTTYPE && (type1 == POLYGONTYPE || type1 == MULTIPOLYGONTYPE)))
+	     (type2 == POINTTYPE && (type1 == POLYGONTYPE || type1 == MULTIPOLYGONTYPE)))
 	{
 		POSTGIS_DEBUG(3, "Point in Polygon test requested...short-circuiting.");
 
@@ -2085,7 +2085,7 @@
 	 * Do the test IFF BOUNDING BOX AVAILABLE.
 	 */
 	if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
-	                getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
+	     getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
 	{
 		if ( ( box2.xmax < box1.xmin ) || ( box2.xmin > box1.xmax ) ||
 		     ( box2.ymax < box1.ymin ) || ( box2.ymin > box1.ymax ) )
@@ -2150,7 +2150,7 @@
 	 * Do the test IFF BOUNDING BOX AVAILABLE.
 	 */
 	if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
-	                getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
+	     getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
 	{
 		if ( ( box2.xmax < box1.xmin ) || ( box2.xmin > box1.xmax ) ||
 		     ( box2.ymax < box1.ymin ) || ( box2.ymin > box1.ymax ) )