diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2015-10-27 10:47:28 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2015-10-27 10:47:28 +0100 |
| commit | d227fcf36d550f244eccc5fedc2e08908451c27b (patch) | |
| tree | 303b2743989d0653bff13a45bd91ec713c22ccae | |
| parent | caf4c9b1f2fd5be5b8924e4335f77c47f976348f (diff) | |
| download | PROJ-d227fcf36d550f244eccc5fedc2e08908451c27b.tar.gz PROJ-d227fcf36d550f244eccc5fedc2e08908451c27b.zip | |
Fix compiler warnings with gcc 4.4
| -rw-r--r-- | src/PJ_omerc.c | 2 | ||||
| -rw-r--r-- | src/gen_cheb.c | 8 | ||||
| -rw-r--r-- | src/pj_zpoly1.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c index 310d774e..8a9fa0db 100644 --- a/src/PJ_omerc.c +++ b/src/PJ_omerc.c @@ -97,7 +97,7 @@ INVERSE(e_inverse); /* ellipsoid */ FREEUP; if (P) pj_dalloc(P); } ENTRY0(omerc) double con, com, cosph0, D, F, H, L, sinph0, p, J, gamma=0, - gamma0, lamc=0, lam1=0, lam2=0, phi1=0, phi2=0, alpha_c; + gamma0, lamc=0, lam1=0, lam2=0, phi1=0, phi2=0, alpha_c=0; int alp, gam, no_off = 0; P->no_rot = pj_param(P->ctx, P->params, "tno_rot").i; diff --git a/src/gen_cheb.c b/src/gen_cheb.c index f06a7449..f1736872 100644 --- a/src/gen_cheb.c +++ b/src/gen_cheb.c @@ -18,10 +18,10 @@ gen_cheb(int inverse, projUV (*proj)(projUV), char *s, PJ *P, int iargc, char ** double (*input)(const char *, char **); input = inverse ? strtod : dmstor; - if (*s) low.u = input(s, &s); else ++errin; - if (*s == ',') upp.u = input(s+1, &s); else ++errin; - if (*s == ',') low.v = input(s+1, &s); else ++errin; - if (*s == ',') upp.v = input(s+1, &s); else ++errin; + if (*s) low.u = input(s, &s); else { low.u = 0; ++errin; } + if (*s == ',') upp.u = input(s+1, &s); else { upp.u = 0; ++errin; } + if (*s == ',') low.v = input(s+1, &s); else { low.v = 0; ++errin; } + if (*s == ',') upp.v = input(s+1, &s); else { upp.v = 0; ++errin; } if (errin) emess(16,"null or absent -T parameters"); if (*s == ',') if (*++s != ',') res = strtol(s, &s, 10); diff --git a/src/pj_zpoly1.c b/src/pj_zpoly1.c index fa163deb..3d6418bb 100644 --- a/src/pj_zpoly1.c +++ b/src/pj_zpoly1.c @@ -26,10 +26,10 @@ pj_zpolyd1(COMPLEX z, COMPLEX *C, int n, COMPLEX *der) { int first = 1; a = *(C += n); + b = a; while (n-- > 0) { if (first) { first = 0; - b = a; } else { b.r = a.r + z.r * (t = b.r) - z.i * b.i; b.i = a.i + z.r * b.i + z.i * t; |