Skip to content

Commit

Permalink
Fix compiler warnings with gcc 4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Oct 27, 2015
1 parent caf4c9b commit d227fcf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/PJ_omerc.c
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/gen_cheb.c
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/pj_zpoly1.c
Expand Up @@ -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;
Expand Down

0 comments on commit d227fcf

Please sign in to comment.