From: Regina Obe Date: Wed, 20 Dec 2017 20:50:58 +0000 (+0000) Subject: Get rid of no longer used variables in geography measurenment X-Git-Tag: 2.5.0alpha~267 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1f6de48cd205e620e56aca8157080d7a34a6888;p=postgis Get rid of no longer used variables in geography measurenment Closes #3947 for PostGIS 2.5 (trunk) git-svn-id: http://svn.osgeo.org/postgis/trunk@16174 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/postgis/geography_measurement.c b/postgis/geography_measurement.c index a1f31f021..9deba4fce 100644 --- a/postgis/geography_measurement.c +++ b/postgis/geography_measurement.c @@ -207,7 +207,6 @@ Datum geography_distance(PG_FUNCTION_ARGS) GSERIALIZED* g1 = NULL; GSERIALIZED* g2 = NULL; double distance; - double tolerance = 0.0; bool use_spheroid = true; SPHEROID s; @@ -215,10 +214,6 @@ Datum geography_distance(PG_FUNCTION_ARGS) g1 = PG_GETARG_GSERIALIZED_P(0); g2 = PG_GETARG_GSERIALIZED_P(1); - /* Read our tolerance value. */ - if ( PG_NARGS() > 2 && ! PG_ARGISNULL(2) ) - tolerance = PG_GETARG_FLOAT8(2); - /* Read our calculation type. */ if ( PG_NARGS() > 3 && ! PG_ARGISNULL(3) ) use_spheroid = PG_GETARG_BOOL(3); @@ -737,16 +732,12 @@ Datum geography_covers(PG_FUNCTION_ARGS) LWGEOM *lwgeom2 = NULL; GSERIALIZED *g1 = NULL; GSERIALIZED *g2 = NULL; - int type1, type2; int result = LW_FALSE; /* Get our geometry objects loaded into memory. */ g1 = PG_GETARG_GSERIALIZED_P(0); g2 = PG_GETARG_GSERIALIZED_P(1); - type1 = gserialized_get_type(g1); - type2 = gserialized_get_type(g2); - /* Construct our working geometries */ lwgeom1 = lwgeom_from_gserialized(g1); lwgeom2 = lwgeom_from_gserialized(g2);