[postgis-tickets] r16174 - Get rid of no longer used variables in geography measurenment

Regina Obe lr at pcorp.us
Wed Dec 20 12:50:58 PST 2017


Author: robe
Date: 2017-12-20 12:50:58 -0800 (Wed, 20 Dec 2017)
New Revision: 16174

Modified:
   trunk/postgis/geography_measurement.c
Log:
Get rid of no longer used variables in geography measurenment
Closes #3947 for PostGIS 2.5 (trunk)

Modified: trunk/postgis/geography_measurement.c
===================================================================
--- trunk/postgis/geography_measurement.c	2017-12-20 19:34:43 UTC (rev 16173)
+++ trunk/postgis/geography_measurement.c	2017-12-20 20:50:58 UTC (rev 16174)
@@ -207,7 +207,6 @@
 	GSERIALIZED* g1 = NULL;
 	GSERIALIZED* g2 = NULL;
 	double distance;
-	double tolerance = 0.0;
 	bool use_spheroid = true;
 	SPHEROID s;
 
@@ -215,10 +214,6 @@
 	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 @@
 	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);



More information about the postgis-tickets mailing list