aboutsummaryrefslogtreecommitdiff
path: root/src/pj_transform.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_transform.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_transform.c')
-rw-r--r--src/pj_transform.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pj_transform.c b/src/pj_transform.c
index 26a22ab9..86e0e70f 100644
--- a/src/pj_transform.c
+++ b/src/pj_transform.c
@@ -85,7 +85,6 @@ int pj_transform( PJ *srcdefn, PJ *dstdefn, long point_count, int point_offset,
{
long i;
- int err;
srcdefn->ctx->last_errno = 0;
dstdefn->ctx->last_errno = 0;
@@ -121,6 +120,7 @@ int pj_transform( PJ *srcdefn, PJ *dstdefn, long point_count, int point_offset,
/* -------------------------------------------------------------------- */
if( srcdefn->is_geocent )
{
+ int err;
if( z == NULL )
{
pj_ctx_set_errno( pj_get_ctx(srcdefn), PJD_ERR_GEOCENTRIC);
@@ -588,6 +588,7 @@ int pj_compare_datums( PJ *srcdefn, PJ *dstdefn )
/* pj_geocentic_to_wgs84() */
/************************************************************************/
+static
int pj_geocentric_to_wgs84( PJ *defn,
long point_count, int point_offset,
double *x, double *y, double *z )
@@ -636,6 +637,7 @@ int pj_geocentric_to_wgs84( PJ *defn,
/* pj_geocentic_from_wgs84() */
/************************************************************************/
+static
int pj_geocentric_from_wgs84( PJ *defn,
long point_count, int point_offset,
double *x, double *y, double *z )