aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2015-05-31 02:53:25 -0400
committerElliott Sales de Andrade <quantum.analyst@gmail.com>2015-06-20 18:44:52 -0400
commit6073f5f3d33d401a7140611b8f3570caf5d17a3b (patch)
tree1bdfe95f871aee99fc5547e73c5eb12696493c0d /src
parente048c9f807df1d804c20089ca3c66bdb22296a66 (diff)
downloadPROJ-6073f5f3d33d401a7140611b8f3570caf5d17a3b.tar.gz
PROJ-6073f5f3d33d401a7140611b8f3570caf5d17a3b.zip
Remove dead assignments.
These variables are re-written immediately after.
Diffstat (limited to 'src')
-rw-r--r--src/PJ_isea.c11
-rw-r--r--src/pj_datum_set.c1
-rw-r--r--src/pj_init.c2
3 files changed, 2 insertions, 12 deletions
diff --git a/src/PJ_isea.c b/src/PJ_isea.c
index cd3314e6..7c09189c 100644
--- a/src/PJ_isea.c
+++ b/src/PJ_isea.c
@@ -369,23 +369,14 @@ isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out)
center = icostriangles[i];
/* step 1 */
-#if 0
- z = sph_distance(center.lon, center.lat, ll->lon, ll->lat);
-#else
z = acos(sin(center.lat) * sin(ll->lat)
+ cos(center.lat) * cos(ll->lat) * cos(ll->lon - center.lon));
-#endif
-
/* not on this triangle */
if (z > g + 0.000005) { /* TODO DBL_EPSILON */
continue;
}
- Az = sph_azimuth(ll->lon, ll->lat, center.lon, center.lat);
- Az = atan2(cos(ll->lat) * sin(ll->lon - center.lon),
- cos(center.lat) * sin(ll->lat)
- - sin(center.lat) * cos(ll->lat) * cos(ll->lon - center.lon)
- );
+ Az = sph_azimuth(center.lon, center.lat, ll->lon, ll->lat);
/* step 2 */
diff --git a/src/pj_datum_set.c b/src/pj_datum_set.c
index 7a18cb47..69b60469 100644
--- a/src/pj_datum_set.c
+++ b/src/pj_datum_set.c
@@ -116,7 +116,6 @@ int pj_datum_set(projCtx ctx, paralist *pl, PJ *projdef)
memset( projdef->datum_params, 0, sizeof(double) * 7);
/* parse out the parameters */
- s = towgs84;
for( s = towgs84; *s != '\0' && parm_count < 7; )
{
projdef->datum_params[parm_count++] = atof(s);
diff --git a/src/pj_init.c b/src/pj_init.c
index b45a5054..614af7fb 100644
--- a/src/pj_init.c
+++ b/src/pj_init.c
@@ -637,7 +637,7 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) {
void
pj_free(PJ *P) {
if (P) {
- paralist *t = P->params, *n;
+ paralist *t, *n;
/* free parameter list elements */
for (t = P->params; t; t = n) {