aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/PJ_geos.c4
-rw-r--r--src/PJ_gn_sinu.c2
-rw-r--r--src/PJ_krovak.c7
-rw-r--r--src/PJ_lcca.c2
-rw-r--r--src/PJ_mbt_fps.c2
-rw-r--r--src/PJ_moll.c2
-rw-r--r--src/PJ_nell.c2
-rw-r--r--src/PJ_omerc.c4
-rw-r--r--src/biveval.c128
-rw-r--r--src/emess.h4
-rw-r--r--src/mk_cheby.c12
-rw-r--r--src/nad_init.c1
-rw-r--r--src/pj_auth.c2
-rw-r--r--src/pj_ell_set.c2
-rw-r--r--src/pj_init.c10
-rw-r--r--src/pj_mlfn.c2
-rw-r--r--src/pj_open_lib.c4
-rw-r--r--src/pj_param.c2
-rw-r--r--src/proj.c4
-rw-r--r--src/vector1.c2
20 files changed, 94 insertions, 104 deletions
diff --git a/src/PJ_geos.c b/src/PJ_geos.c
index 79a72711..ff99d7b3 100644
--- a/src/PJ_geos.c
+++ b/src/PJ_geos.c
@@ -79,7 +79,7 @@ FORWARD(e_forward); /* ellipsoid */
return (xy);
}
INVERSE(s_inverse); /* spheroid */
- double Vx, Vy, Vz, a, b, c, det, k;
+ double Vx, Vy, Vz, a, b, det, k;
/* Setting three components of vector from satellite to position.*/
Vx = -1.0;
@@ -100,7 +100,7 @@ INVERSE(s_inverse); /* spheroid */
return (lp);
}
INVERSE(e_inverse); /* ellipsoid */
- double Vx, Vy, Vz, a, b, c, det, k;
+ double Vx, Vy, Vz, a, b, det, k;
/* Setting three components of vector from satellite to position.*/
Vx = -1.0;
diff --git a/src/PJ_gn_sinu.c b/src/PJ_gn_sinu.c
index 3bf9854f..e08ba83c 100644
--- a/src/PJ_gn_sinu.c
+++ b/src/PJ_gn_sinu.c
@@ -52,8 +52,6 @@ FORWARD(s_forward); /* sphere */
return (xy);
}
INVERSE(s_inverse); /* sphere */
- double s;
-
xy.y /= P->C_y;
lp.phi = P->m ? aasin((P->m * xy.y + sin(xy.y)) / P->n) :
( P->n != 1. ? aasin(sin(xy.y) / P->n) : xy.y );
diff --git a/src/PJ_krovak.c b/src/PJ_krovak.c
index 997b2ac8..0b46b8db 100644
--- a/src/PJ_krovak.c
+++ b/src/PJ_krovak.c
@@ -69,12 +69,9 @@ PROJ_HEAD(krovak, "Krovak") "\n\tPCyl., Ellps.";
FORWARD(e_forward); /* ellipsoid */
/* calculate xy from lat/lon */
- char errmess[255];
- char tmp[16];
-
/* Constants, identical to inverse transform function */
double s45, s90, e2, e, alfa, uq, u0, g, k, k1, n0, ro0, ad, a, s0, n;
- double gfi, u, fi0, lon17, lamdd, deltav, s, d, eps, ro;
+ double gfi, u, fi0, deltav, s, d, eps, ro;
s45 = 0.785398163397448; /* 45° */
@@ -140,7 +137,7 @@ INVERSE(e_inverse); /* ellipsoid */
/* Constants, identisch wie in der Umkehrfunktion */
double s45, s90, fi0, e2, e, alfa, uq, u0, g, k, k1, n0, ro0, ad, a, s0, n;
- double u, l24, lamdd, deltav, s, d, eps, ro, fi1, xy0, lon17;
+ double u, deltav, s, d, eps, ro, fi1, xy0;
int ok;
s45 = 0.785398163397448; /* 45° */
diff --git a/src/PJ_lcca.c b/src/PJ_lcca.c
index 04336488..9d8fe90a 100644
--- a/src/PJ_lcca.c
+++ b/src/PJ_lcca.c
@@ -22,7 +22,7 @@ fSp(double S, double C) {
return(1. + 3.* S * S * C);
}
FORWARD(e_forward); /* ellipsoid */
- double S, S3, r, dr;
+ double S, r, dr;
S = pj_mlfn(lp.phi, sin(lp.phi), cos(lp.phi), P->en) - P->M0;
dr = fS(S, P->C);
diff --git a/src/PJ_mbt_fps.c b/src/PJ_mbt_fps.c
index 63e02ca3..c41f2e37 100644
--- a/src/PJ_mbt_fps.c
+++ b/src/PJ_mbt_fps.c
@@ -27,7 +27,7 @@ FORWARD(s_forward); /* spheroid */
return (xy);
}
INVERSE(s_inverse); /* spheroid */
- double t, s;
+ double t;
lp.phi = C2 * (t = aasin(xy.y / C_y));
lp.lam = xy.x / (C_x * (1. + 3. * cos(lp.phi)/cos(t)));
diff --git a/src/PJ_moll.c b/src/PJ_moll.c
index ce14cfbc..f63efdbd 100644
--- a/src/PJ_moll.c
+++ b/src/PJ_moll.c
@@ -27,8 +27,6 @@ FORWARD(s_forward); /* spheroid */
return (xy);
}
INVERSE(s_inverse); /* spheroid */
- double th, s;
-
lp.phi = aasin(xy.y / P->C_y);
lp.lam = xy.x / (P->C_x * cos(lp.phi));
lp.phi += lp.phi;
diff --git a/src/PJ_nell.c b/src/PJ_nell.c
index 5de57cbc..ed275860 100644
--- a/src/PJ_nell.c
+++ b/src/PJ_nell.c
@@ -21,8 +21,6 @@ FORWARD(s_forward); /* spheroid */
return (xy);
}
INVERSE(s_inverse); /* spheroid */
- double th, s;
-
lp.lam = 2. * xy.x / (1. + cos(xy.y));
lp.phi = aasin(0.5 * (xy.y + sin(xy.y)));
return (lp);
diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c
index ea2da93b..c8b61a71 100644
--- a/src/PJ_omerc.c
+++ b/src/PJ_omerc.c
@@ -98,9 +98,9 @@ ENTRY0(omerc)
int alp, gam, no_off = 0;
P->no_rot = pj_param(P->params, "tno_rot").i;
- if (alp = pj_param(P->params, "talpha").i)
+ if ((alp = pj_param(P->params, "talpha").i) != 0)
alpha_c = pj_param(P->params, "ralpha").f;
- if (gam = pj_param(P->params, "tgamma").i)
+ if ((gam = pj_param(P->params, "tgamma").i) != 0)
gamma = pj_param(P->params, "rgamma").f;
if (alp || gam) {
lamc = pj_param(P->params, "rlonc").f;
diff --git a/src/biveval.c b/src/biveval.c
index 40f2af41..59021ee5 100644
--- a/src/biveval.c
+++ b/src/biveval.c
@@ -2,75 +2,77 @@
# include <projects.h>
# define NEAR_ONE 1.00001
static double ceval(struct PW_COEF *C, int n, projUV w, projUV w2) {
- double d=0, dd=0, vd, vdd, tmp, *c;
- int j;
+ double d=0, dd=0, vd, vdd, tmp, *c;
+ int j;
- for (C += n ; n-- ; --C ) {
- if (j = C->m) {
- vd = vdd = 0.;
- for (c = C->c + --j; j ; --j ) {
- vd = w2.v * (tmp = vd) - vdd + *c--;
- vdd = tmp;
- }
- d = w2.u * (tmp = d) - dd + w.v * vd - vdd + 0.5 * *c;
- } else
- d = w2.u * (tmp = d) - dd;
- dd = tmp;
- }
- if (j = C->m) {
- vd = vdd = 0.;
- for (c = C->c + --j; j ; --j ) {
- vd = w2.v * (tmp = vd) - vdd + *c--;
- vdd = tmp;
- }
- return (w.u * d - dd + 0.5 * ( w.v * vd - vdd + 0.5 * *c ));
- } else
- return (w.u * d - dd);
+ for (C += n ; n-- ; --C ) {
+ if ( (j = C->m) != 0) {
+ vd = vdd = 0.;
+ for (c = C->c + --j; j ; --j ) {
+ vd = w2.v * (tmp = vd) - vdd + *c--;
+ vdd = tmp;
+ }
+ d = w2.u * (tmp = d) - dd + w.v * vd - vdd + 0.5 * *c;
+ } else
+ d = w2.u * (tmp = d) - dd;
+ dd = tmp;
+ }
+ if ( (j = C->m) != 0 ) {
+ vd = vdd = 0.;
+ for (c = C->c + --j; j ; --j ) {
+ vd = w2.v * (tmp = vd) - vdd + *c--;
+ vdd = tmp;
+ }
+ return (w.u * d - dd + 0.5 * ( w.v * vd - vdd + 0.5 * *c ));
+ } else
+ return (w.u * d - dd);
}
- projUV /* bivariate Chebyshev polynomial entry point */
+
+projUV /* bivariate Chebyshev polynomial entry point */
bcheval(projUV in, Tseries *T) {
- projUV w2, w;
- projUV out;
- /* scale to +-1 */
- w.u = ( in.u + in.u - T->a.u ) * T->b.u;
- w.v = ( in.v + in.v - T->a.v ) * T->b.v;
- if (fabs(w.u) > NEAR_ONE || fabs(w.v) > NEAR_ONE) {
- out.u = out.v = HUGE_VAL;
- pj_errno = -36;
- } else { /* double evaluation */
- w2.u = w.u + w.u;
- w2.v = w.v + w.v;
- out.u = ceval(T->cu, T->mu, w, w2);
- out.v = ceval(T->cv, T->mv, w, w2);
- }
- return out;
+ projUV w2, w;
+ projUV out;
+ /* scale to +-1 */
+ w.u = ( in.u + in.u - T->a.u ) * T->b.u;
+ w.v = ( in.v + in.v - T->a.v ) * T->b.v;
+ if (fabs(w.u) > NEAR_ONE || fabs(w.v) > NEAR_ONE) {
+ out.u = out.v = HUGE_VAL;
+ pj_errno = -36;
+ } else { /* double evaluation */
+ w2.u = w.u + w.u;
+ w2.v = w.v + w.v;
+ out.u = ceval(T->cu, T->mu, w, w2);
+ out.v = ceval(T->cv, T->mv, w, w2);
+ }
+ return out;
}
- projUV /* bivariate power polynomial entry point */
+
+projUV /* bivariate power polynomial entry point */
bpseval(projUV in, Tseries *T) {
- projUV out;
- double *c, row;
- int i, m;
+ projUV out;
+ double *c, row;
+ int i, m;
- out.u = out.v = 0.;
- for (i = T->mu; i >= 0; --i) {
- row = 0.;
- if (m = T->cu[i].m) {
- c = T->cu[i].c + m;
- while (m--)
- row = *--c + in.v * row;
- }
- out.u = row + in.u * out.u;
- }
- for (i = T->mv; i >= 0; --i) {
- row = 0.;
- if (m = T->cv[i].m) {
- c = T->cv[i].c + m;
- while (m--)
- row = *--c + in.v * row;
- }
- out.v = row + in.u * out.v;
- }
- return out;
+ out.u = out.v = 0.;
+ for (i = T->mu; i >= 0; --i) {
+ row = 0.;
+ if ((m = T->cu[i].m) != 0) {
+ c = T->cu[i].c + m;
+ while (m--)
+ row = *--c + in.v * row;
+ }
+ out.u = row + in.u * out.u;
+ }
+ for (i = T->mv; i >= 0; --i) {
+ row = 0.;
+ if ((m = T->cv[i].m) != 0) {
+ c = T->cv[i].c + m;
+ while (m--)
+ row = *--c + in.v * row;
+ }
+ out.v = row + in.u * out.v;
+ }
+ return out;
}
projUV /* general entry point selecting evaluation mode */
diff --git a/src/emess.h b/src/emess.h
index 6724a065..4106e11d 100644
--- a/src/emess.h
+++ b/src/emess.h
@@ -2,10 +2,6 @@
#ifndef EMESS_H
#define EMESS_H
-#ifndef lint
-static char EMESS_H_ID[] = "@(#)emess.h 4.1 93/03/08 GIE REL";
-#endif
-
struct EMESS {
char *File_name, /* input file name */
*Prog_name; /* name of program */
diff --git a/src/mk_cheby.c b/src/mk_cheby.c
index b3019004..2c99acaf 100644
--- a/src/mk_cheby.c
+++ b/src/mk_cheby.c
@@ -91,14 +91,14 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV),
if (ncu[j]) nru = j + 1; /* update row max */
if (ncv[j]) nrv = j + 1;
}
- if (T = makeT(nru, nrv)) {
+ if ((T = makeT(nru, nrv)) != NULL ) {
T->a = a;
T->b = b;
T->mu = nru - 1;
T->mv = nrv - 1;
T->power = 1;
for (i = 0; i < nru; ++i) /* store coefficient rows for u */
- if (T->cu[i].m = ncu[i])
+ if ((T->cu[i].m = ncu[i]) != NULL)
if ((p = T->cu[i].c =
(double *)pj_malloc(sizeof(double) * ncu[i])))
for (j = 0; j < ncu[i]; ++j)
@@ -106,7 +106,7 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV),
else
goto error;
for (i = 0; i < nrv; ++i) /* same for v */
- if (T->cv[i].m = ncv[i])
+ if ((T->cv[i].m = ncv[i]) != NULL)
if ((p = T->cv[i].c =
(double *)pj_malloc(sizeof(double) * ncv[i])))
for (j = 0; j < ncv[i]; ++j)
@@ -114,7 +114,7 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV),
else
goto error;
}
- } else if (T = makeT(nru, nrv)) {
+ } else if ((T = makeT(nru, nrv)) != NULL) {
/* else make returned Chebyshev coefficient structure */
T->mu = nru - 1; /* save row degree */
T->mv = nrv - 1;
@@ -124,7 +124,7 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV),
T->b.v = 1. / (b.v - a.v);
T->power = 0;
for (i = 0; i < nru; ++i) /* store coefficient rows for u */
- if (T->cu[i].m = ncu[i])
+ if ((T->cu[i].m = ncu[i]) != NULL)
if ((p = T->cu[i].c =
(double *)pj_malloc(sizeof(double) * ncu[i])))
for (j = 0; j < ncu[i]; ++j)
@@ -132,7 +132,7 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV),
else
goto error;
for (i = 0; i < nrv; ++i) /* same for v */
- if (T->cv[i].m = ncv[i])
+ if ((T->cv[i].m = ncv[i]) != NULL)
if ((p = T->cv[i].c =
(double *)pj_malloc(sizeof(double) * ncv[i])))
for (j = 0; j < ncv[i]; ++j)
diff --git a/src/nad_init.c b/src/nad_init.c
index d652b90f..56eb73d9 100644
--- a/src/nad_init.c
+++ b/src/nad_init.c
@@ -132,7 +132,6 @@ struct CTABLE *nad_init(char *name)
char fname[MAX_PATH_FILENAME+1];
struct CTABLE *ct;
FILE *fid;
- char header[512];
errno = pj_errno = 0;
diff --git a/src/pj_auth.c b/src/pj_auth.c
index 599b8f77..189e426c 100644
--- a/src/pj_auth.c
+++ b/src/pj_auth.c
@@ -11,7 +11,7 @@
pj_authset(double es) {
double t, *APA;
- if (APA = (double *)pj_malloc(APA_SIZE * sizeof(double))) {
+ if ((APA = (double *)pj_malloc(APA_SIZE * sizeof(double))) != NULL) {
APA[0] = es * P00;
t = es * es;
APA[0] += t * P01;
diff --git a/src/pj_ell_set.c b/src/pj_ell_set.c
index 989701ec..56cabd4c 100644
--- a/src/pj_ell_set.c
+++ b/src/pj_ell_set.c
@@ -21,7 +21,7 @@ pj_ell_set(paralist *pl, double *a, double *es) {
else { /* probable elliptical figure */
/* check if ellps present and temporarily append its values to pl */
- if (name = pj_param(pl, "sellps").s) {
+ if ((name = pj_param(pl, "sellps").s) != NULL) {
char *s;
for (start = pl; start && start->next ; start = start->next) ;
diff --git a/src/pj_init.c b/src/pj_init.c
index eb8cf268..9f336073 100644
--- a/src/pj_init.c
+++ b/src/pj_init.c
@@ -89,7 +89,7 @@ static paralist *
get_defaults(paralist **start, paralist *next, char *name) {
FILE *fid;
- if (fid = pj_open_lib("proj_def.dat", "rt")) {
+ if ( (fid = pj_open_lib("proj_def.dat", "rt")) != NULL) {
next = get_opt(start, fid, "general", next);
rewind(fid);
next = get_opt(start, fid, name, next);
@@ -128,10 +128,10 @@ get_init(paralist **start, paralist *next, char *name) {
/*
** Otherwise we try to open the file and search for it.
*/
- if (opt = strrchr(fname, ':'))
+ if ((opt = strrchr(fname, ':')) != NULL)
*opt++ = '\0';
else { pj_errno = -3; return(0); }
- if (fid = pj_open_lib(fname, "rt"))
+ if ( (fid = pj_open_lib(fname, "rt")) != NULL)
next = get_opt(start, fid, opt, next);
else
return(0);
@@ -360,7 +360,7 @@ pj_init(int argc, char **argv) {
/* set units */
s = 0;
- if (name = pj_param(start, "sunits").s) {
+ if ((name = pj_param(start, "sunits").s) != NULL) {
for (i = 0; (s = pj_units[i].id) && strcmp(name, s) ; ++i) ;
if (!s) { pj_errno = -7; goto bum_call; }
s = pj_units[i].to_meter;
@@ -375,7 +375,7 @@ pj_init(int argc, char **argv) {
/* prime meridian */
s = 0;
- if (name = pj_param(start, "spm").s) {
+ if ((name = pj_param(start, "spm").s) != NULL) {
const char *value = NULL;
char *next_str = NULL;
diff --git a/src/pj_mlfn.c b/src/pj_mlfn.c
index afd18b19..d62bd485 100644
--- a/src/pj_mlfn.c
+++ b/src/pj_mlfn.c
@@ -23,7 +23,7 @@
pj_enfn(double es) {
double t, *en;
- if (en = (double *)pj_malloc(EN_SIZE * sizeof(double))) {
+ if ((en = (double *)pj_malloc(EN_SIZE * sizeof(double))) != NULL) {
en[0] = C00 - es * (C02 + es * (C04 + es * (C06 + es * C08)));
en[1] = es * (C22 - es * (C04 + es * (C06 + es * C08)));
en[2] = (t = es * es) * (C44 - es * (C46 + es * C48));
diff --git a/src/pj_open_lib.c b/src/pj_open_lib.c
index 36e57dec..cb6aab30 100644
--- a/src/pj_open_lib.c
+++ b/src/pj_open_lib.c
@@ -115,7 +115,7 @@ pj_open_lib(char *name, char *mode) {
/* check if ~/name */
if (*name == '~' && strchr(dir_chars,name[1]) )
- if (sysname = getenv("HOME")) {
+ if ((sysname = getenv("HOME")) != NULL) {
(void)strcpy(fname, sysname);
fname[n = strlen(fname)] = DIR_CHAR;
fname[++n] = '\0';
@@ -145,7 +145,7 @@ pj_open_lib(char *name, char *mode) {
} else /* just try it bare bones */
sysname = name;
- if (fid = fopen(sysname, mode))
+ if ((fid = fopen(sysname, mode)) != NULL)
errno = 0;
/* If none of those work and we have a search path, try it */
diff --git a/src/pj_param.c b/src/pj_param.c
index 4dce136a..a95010d3 100644
--- a/src/pj_param.c
+++ b/src/pj_param.c
@@ -6,7 +6,7 @@
pj_mkparam(char *str) {
paralist *newitem;
- if (newitem = (paralist *)pj_malloc(sizeof(paralist) + strlen(str))) {
+ if((newitem = (paralist *)pj_malloc(sizeof(paralist) + strlen(str))) != NULL) {
newitem->used = 0;
newitem->next = 0;
if (*str == '+')
diff --git a/src/proj.c b/src/proj.c
index 81616f9e..23f9cca9 100644
--- a/src/proj.c
+++ b/src/proj.c
@@ -138,12 +138,14 @@ process(FILE *fid) {
}
}
if (dofactors) /* print scale factor data */
+ {
if (!facs_bad)
(void)printf("\t<%g %g %g %g %g %g>",
facs.h, facs.k, facs.s,
facs.omega * RAD_TO_DEG, facs.a, facs.b);
else
(void)fputs("\t<* * * * * *>", stdout);
+ }
(void)fputs(bin_in ? "\n" : s, stdout);
}
}
@@ -247,7 +249,7 @@ int main(int argc, char **argv) {
FILE *fid;
int pargc = 0, iargc = argc, eargc = 0, c, mon = 0;
- if (emess_dat.Prog_name = strrchr(*argv,DIR_CHAR))
+ if ( (emess_dat.Prog_name = strrchr(*argv,DIR_CHAR)) != NULL)
++emess_dat.Prog_name;
else emess_dat.Prog_name = *argv;
inverse = ! strncmp(emess_dat.Prog_name, "inv", 3);
diff --git a/src/vector1.c b/src/vector1.c
index 30fca1ca..b3023ee5 100644
--- a/src/vector1.c
+++ b/src/vector1.c
@@ -15,7 +15,7 @@ freev2(void **v, int nrows) {
vector2(int nrows, int ncols, int size) {
void **s;
- if (s = (void **)pj_malloc(sizeof(void *) * nrows)) {
+ if ((s = (void **)pj_malloc(sizeof(void *) * nrows)) != NULL) {
int rsize, i;
rsize = size * ncols;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-28 10:51:48 +0000