[postgis-tickets] r14352 - cleanup whitespace and comments
Regina Obe
lr at pcorp.us
Tue Nov 3 02:54:45 PST 2015
Author: robe
Date: 2015-11-03 02:54:45 -0800 (Tue, 03 Nov 2015)
New Revision: 14352
Modified:
trunk/postgis/geography_inout.c
trunk/postgis/geography_measurement.c
Log:
cleanup whitespace and comments
references #3356 (for 2.3 branch)
references #3355 (for 2.3 branch for segmentize)
Modified: trunk/postgis/geography_inout.c
===================================================================
--- trunk/postgis/geography_inout.c 2015-11-03 10:31:51 UTC (rev 14351)
+++ trunk/postgis/geography_inout.c 2015-11-03 10:54:45 UTC (rev 14352)
@@ -598,19 +598,16 @@
);
}
- /* 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);
Modified: trunk/postgis/geography_measurement.c
===================================================================
--- trunk/postgis/geography_measurement.c 2015-11-03 10:31:51 UTC (rev 14351)
+++ trunk/postgis/geography_measurement.c 2015-11-03 10:54:45 UTC (rev 14352)
@@ -1066,21 +1066,21 @@
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 @@
lwgeom_free(lwgeom1);
lwgeom_free(lwgeom2);
PG_FREE_IF_COPY(g1, 0);
-
+
PG_RETURN_POINTER(g2);
}
More information about the postgis-tickets
mailing list