aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2016-04-14 20:38:26 +0200
committerKristian Evers <kristianevers@gmail.com>2016-04-14 20:38:26 +0200
commit2d14c6a55bbc69560d71a42aec44e5cbd597ca7f (patch)
treea7105be910ea67358c94a954616cd8b697da6e5d
parentba4406f472fae0ca22d79a6fb75e2720c5a7a776 (diff)
downloadPROJ-2d14c6a55bbc69560d71a42aec44e5cbd597ca7f.tar.gz
PROJ-2d14c6a55bbc69560d71a42aec44e5cbd597ca7f.zip
Removed superfluous declarations in PROJECTION
-rw-r--r--src/PJ_cea.c2
-rw-r--r--src/PJ_chamb.c2
-rw-r--r--src/PJ_comill.c3
-rw-r--r--src/PJ_crast.c33
4 files changed, 15 insertions, 25 deletions
diff --git a/src/PJ_cea.c b/src/PJ_cea.c
index f4ff21f3..87c0da07 100644
--- a/src/PJ_cea.c
+++ b/src/PJ_cea.c
@@ -72,8 +72,6 @@ PJ *PROJECTION(cea) {
return freeup_new (P);
P->opaque = Q;
- P->pfree = freeup;
- P->descr = des_cea;
double t = 0.0;
if (pj_param(P->ctx, P->params, "tlat_ts").i) {
diff --git a/src/PJ_chamb.c b/src/PJ_chamb.c
index 091408b7..c35061f3 100644
--- a/src/PJ_chamb.c
+++ b/src/PJ_chamb.c
@@ -114,8 +114,6 @@ PJ *PROJECTION(chamb) {
return freeup_new (P);
P->opaque = Q;
- P->pfree = freeup;
- P->descr = des_chamb;
int i, j;
char line[10];
diff --git a/src/PJ_comill.c b/src/PJ_comill.c
index f84f4eb0..1d88dbd5 100644
--- a/src/PJ_comill.c
+++ b/src/PJ_comill.c
@@ -78,9 +78,6 @@ PJ *PROJECTION(comill) {
P->inv = s_inverse;
P->fwd = s_forward;
- P->pfree = freeup;
- P->descr = des_comill;
-
return P;
}
diff --git a/src/PJ_crast.c b/src/PJ_crast.c
index 9a896459..0c5b706a 100644
--- a/src/PJ_crast.c
+++ b/src/PJ_crast.c
@@ -1,31 +1,31 @@
#define PJ_LIB__
-# include <projects.h>
+# include <projects.h>
PROJ_HEAD(crast, "Craster Parabolic (Putnins P4)") "\n\tPCyl., Sph.";
-#define XM 0.97720502380583984317
-#define RXM 1.02332670794648848847
-#define YM 3.06998012383946546542
-#define RYM 0.32573500793527994772
-#define THIRD 0.333333333333333333
+#define XM 0.97720502380583984317
+#define RXM 1.02332670794648848847
+#define YM 3.06998012383946546542
+#define RYM 0.32573500793527994772
+#define THIRD 0.333333333333333333
static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */
XY xy = {0.0,0.0};
- (void) P;
- lp.phi *= THIRD;
- xy.x = XM * lp.lam * (2. * cos(lp.phi + lp.phi) - 1.);
- xy.y = YM * sin(lp.phi);
- return xy;
+ (void) P;
+ lp.phi *= THIRD;
+ xy.x = XM * lp.lam * (2. * cos(lp.phi + lp.phi) - 1.);
+ xy.y = YM * sin(lp.phi);
+ return xy;
}
static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */
LP lp = {0.0,0.0};
- (void) P;
- lp.phi = 3. * asin(xy.y * RYM);
- lp.lam = xy.x * RXM / (2. * cos((lp.phi + lp.phi) * THIRD) - 1);
- return lp;
+ (void) P;
+ lp.phi = 3. * asin(xy.y * RYM);
+ lp.lam = xy.x * RXM / (2. * cos((lp.phi + lp.phi) * THIRD) - 1);
+ return lp;
}
@@ -45,9 +45,6 @@ PJ *PROJECTION(crast) {
P->inv = s_inverse;
P->fwd = s_forward;
- P->pfree = freeup;
- P->descr = des_crast;
-
return P;
}