]> granicus.if.org Git - postgis/commitdiff
Get rid of no longer used variables in geography measurenment
authorRegina Obe <lr@pcorp.us>
Wed, 20 Dec 2017 20:50:58 +0000 (20:50 +0000)
committerRegina Obe <lr@pcorp.us>
Wed, 20 Dec 2017 20:50:58 +0000 (20:50 +0000)
Closes #3947 for PostGIS 2.5 (trunk)

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

postgis/geography_measurement.c

index a1f31f0211b6682daf27724821d0a037b2256f93..9deba4fcee870a394d58a02d456a932370e7dcdd 100644 (file)
@@ -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);