formatting

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

diff --git a/liblwgeom/lwalgorithm.c b/liblwgeom/lwalgorithm.c
index 65125ba79e82bbce6ae946973a075562c69b0244..888e73f5d67c1a8cdb9584d0fa2c12b0806325d0 100644 (file)
--- a/liblwgeom/lwalgorithm.c
+++ b/liblwgeom/lwalgorithm.c
@@ -25,20 +25,20 @@ double lw_segment_side(POINT2D *p1, POINT2D *p2, POINT2D *q)
        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 @@ int lw_segment_intersects(POINT2D *p1, POINT2D *p2, POINT2D *q1, POINT2D *q2)
        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;
        }

diff --git a/liblwgeom/lwalgorithm.h b/liblwgeom/lwalgorithm.h
index 276281e30780422596b4ed186f30e1a0c0381bd7..4f5fdfb1dd7c9d2ab92c72e2934279a0d3fcf848 100644 (file)
--- a/liblwgeom/lwalgorithm.h
+++ b/liblwgeom/lwalgorithm.h
@@ -25,7 +25,7 @@ enum CG_SEGMENT_INTERSECTION_TYPE {
 
 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 {

diff --git a/lwgeom/lwgeom_geos.c b/lwgeom/lwgeom_geos.c
index 5d9f695f2d834cfe8a61d499253e91c0ca5827cb..7dd9402cd437e2be19eabc69826c2ae3ee54f3da 100644 (file)
--- a/lwgeom/lwgeom_geos.c
+++ b/lwgeom/lwgeom_geos.c
@@ -1219,7 +1219,7 @@ Datum overlaps(PG_FUNCTION_ARGS)
         * 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 @@ Datum contains(PG_FUNCTION_ARGS)
        ** 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 @@ Datum within(PG_FUNCTION_ARGS)
         * 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 @@ Datum coveredby(PG_FUNCTION_ARGS)
         * 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 @@ Datum intersects(PG_FUNCTION_ARGS)
         * 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 @@ Datum intersects(PG_FUNCTION_ARGS)
        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 @@ Datum touches(PG_FUNCTION_ARGS)
         * 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 @@ Datum disjoint(PG_FUNCTION_ARGS)
         * 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 ) )