aboutsummaryrefslogtreecommitdiff
path: root/src/pj_gridinfo.c
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2017-02-26 00:22:03 +0100
committerEven Rouault <even.rouault@spatialys.com>2017-02-26 11:25:14 +0100
commit66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d (patch)
treef148438285557a491088b4042a1dfab80f80d577 /src/pj_gridinfo.c
parentb288ee6bbc345baf2ef56aaec49184c34a6cd0dd (diff)
downloadPROJ-66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d.tar.gz
PROJ-66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d.zip
Fix warnings related to -Wshadow -Wnull-dereference -Wfloat-conversionr -Wmissing-prototypes -Wmissing-declarations
Diffstat (limited to 'src/pj_gridinfo.c')
-rw-r--r--src/pj_gridinfo.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c
index 5f528de1..d54aadce 100644
--- a/src/pj_gridinfo.c
+++ b/src/pj_gridinfo.c
@@ -244,8 +244,8 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi )
cvs = ct_tmp.cvs + (row) * gi->ct->lim.lam
+ (gi->ct->lim.lam - i - 1);
- cvs->phi = *(diff_seconds++) * ((M_PI/180.0) / 3600.0);
- cvs->lam = *(diff_seconds++) * ((M_PI/180.0) / 3600.0);
+ cvs->phi = (float) (*(diff_seconds++) * ((M_PI/180.0) / 3600.0));
+ cvs->lam = (float) (*(diff_seconds++) * ((M_PI/180.0) / 3600.0));
}
}
@@ -324,8 +324,8 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi )
cvs = ct_tmp.cvs + (row) * gi->ct->lim.lam
+ (gi->ct->lim.lam - i - 1);
- cvs->phi = *(diff_seconds++) * ((M_PI/180.0) / 3600.0);
- cvs->lam = *(diff_seconds++) * ((M_PI/180.0) / 3600.0);
+ cvs->phi = (float) (*(diff_seconds++) * ((M_PI/180.0) / 3600.0));
+ cvs->lam = (float) (*(diff_seconds++) * ((M_PI/180.0) / 3600.0));
diff_seconds += 2; /* skip accuracy values */
}
}