]> granicus.if.org Git - postgis/commitdiff
cleanup whitespace and comments
authorRegina Obe <lr@pcorp.us>
Tue, 3 Nov 2015 10:54:45 +0000 (10:54 +0000)
committerRegina Obe <lr@pcorp.us>
Tue, 3 Nov 2015 10:54:45 +0000 (10:54 +0000)
references #3356 (for 2.3 branch)
references #3355 (for 2.3 branch for segmentize)

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

postgis/geography_inout.c
postgis/geography_measurement.c

index 12235bca8a4d07c8be8251adb8c44fc82641eb72..7659d882cb5c72989f838db0ed43e62a2633368d 100644 (file)
@@ -598,19 +598,16 @@ Datum geography_from_geometry(PG_FUNCTION_ARGS)
                );
        }
 
-       /* Recalculate the boxes after re-setting the geodetic bit */
+       /* force recalculate of box by dropping */
        lwgeom_drop_bbox(lwgeom);
        
        g_ser = gserialized_geography_from_lwgeom(lwgeom, -1);
 
-       /*
-       ** Replace the unaligned lwgeom with a new aligned one based on GSERIALIZED.
-       */
+
        lwgeom_free(lwgeom);
 
        PG_FREE_IF_COPY(geom, 0);
        PG_RETURN_POINTER(g_ser);
-
 }
 
 PG_FUNCTION_INFO_V1(geometry_from_geography);
index 06b363704caaf41fc38e8ec807011e1b2fe8741b..5d19fd7b8ca5e357ea72fb09b5ca79ebaf9a2c91 100644 (file)
@@ -1066,21 +1066,21 @@ Datum geography_segmentize(PG_FUNCTION_ARGS)
        GSERIALIZED *g2 = NULL;
        double max_seg_length;
        uint32_t type1;
-
+       
        /* Get our geometry object loaded into memory. */
        g1 = PG_GETARG_GSERIALIZED_P(0);
        type1 = gserialized_get_type(g1);
-
+       
        /* Convert max_seg_length from metric units to radians */
        max_seg_length = PG_GETARG_FLOAT8(1) / WGS84_RADIUS;
-
+       
        /* We can't densify points or points, reflect them back */
        if ( type1 == POINTTYPE || type1 == MULTIPOINTTYPE || gserialized_is_empty(g1) )
                PG_RETURN_POINTER(g1);
-
+       
        /* Deserialize */
        lwgeom1 = lwgeom_from_gserialized(g1);
-
+       
        /* Calculate the densified geometry */
        lwgeom2 = lwgeom_segmentize_sphere(lwgeom1, max_seg_length);
        
@@ -1093,7 +1093,7 @@ Datum geography_segmentize(PG_FUNCTION_ARGS)
        lwgeom_free(lwgeom1);
        lwgeom_free(lwgeom2);
        PG_FREE_IF_COPY(g1, 0);
-
+       
        PG_RETURN_POINTER(g2);
 }