diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-02-26 00:22:03 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-02-26 11:25:14 +0100 |
| commit | 66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d (patch) | |
| tree | f148438285557a491088b4042a1dfab80f80d577 /src/nad2bin.c | |
| parent | b288ee6bbc345baf2ef56aaec49184c34a6cd0dd (diff) | |
| download | PROJ-66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d.tar.gz PROJ-66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d.zip | |
Fix warnings related to -Wshadow -Wnull-dereference -Wfloat-conversionr -Wmissing-prototypes -Wmissing-declarations
Diffstat (limited to 'src/nad2bin.c')
| -rw-r--r-- | src/nad2bin.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/nad2bin.c b/src/nad2bin.c index 59ec1658..859134e6 100644 --- a/src/nad2bin.c +++ b/src/nad2bin.c @@ -127,16 +127,16 @@ int main(int argc, char **argv) { fprintf(stderr,"format check on row\n"); exit(1); } - t.lam = laml * U_SEC_TO_RAD; - t.phi = phil * U_SEC_TO_RAD; + t.lam = (float) (laml * U_SEC_TO_RAD); + t.phi = (float) (phil * U_SEC_TO_RAD); *p++ = t; for (j = 1; j < ct.lim.lam; ++j) { if ( EOF == scanf("%ld %ld", &lam, &phi) ) { perror("scanf on column"); exit(1); } - t.lam = (laml += lam) * U_SEC_TO_RAD; - t.phi = (phil += phi) * U_SEC_TO_RAD; + t.lam = (float) ((laml += lam) * U_SEC_TO_RAD); + t.phi = (float) ((phil += phi) * U_SEC_TO_RAD); *p++ = t; } } @@ -342,16 +342,14 @@ int main(int argc, char **argv) { for( row = 0; row < ct.lim.phi; row++ ) { - int i; - for( i = 0; i < ct.lim.lam; i++ ) { FLP *cvs = ct.cvs + (row) * ct.lim.lam + (ct.lim.lam - i - 1); /* convert radians to seconds */ - row_buf[i*4+0] = cvs->phi * (3600.0 / (M_PI/180.0)); - row_buf[i*4+1] = cvs->lam * (3600.0 / (M_PI/180.0)); + row_buf[i*4+0] = (float) (cvs->phi * (3600.0 / (M_PI/180.0))); + row_buf[i*4+1] = (float) (cvs->lam * (3600.0 / (M_PI/180.0))); /* We leave the accuracy values as zero */ } |