aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2016-05-24 22:23:40 +0200
committerKristian Evers <kristianevers@gmail.com>2016-05-24 22:23:40 +0200
commitc560bca6ac324c8d839d564d5d3798ae8ce7b6bd (patch)
tree270267d2dd6381e7841ff0b47d5e202d6544208c /src
parenta112ea3172e89230fa307567be3d70e286b1eeb5 (diff)
downloadPROJ-c560bca6ac324c8d839d564d5d3798ae8ce7b6bd.tar.gz
PROJ-c560bca6ac324c8d839d564d5d3798ae8ce7b6bd.zip
Removed unused opaque object (the only parameter, C_x, never used)
Diffstat (limited to 'src')
-rw-r--r--src/PJ_krovak.c28
1 files changed, 5 insertions, 23 deletions
diff --git a/src/PJ_krovak.c b/src/PJ_krovak.c
index 4a9a4e53..9ea0239b 100644
--- a/src/PJ_krovak.c
+++ b/src/PJ_krovak.c
@@ -36,9 +36,6 @@
PROJ_HEAD(krovak, "Krovak") "\n\tPCyl., Ellps.";
-struct pj_opaque {
- double C_x;
-};
/**
NOTES: According to EPSG the full Krovak projection method should have
@@ -213,10 +210,7 @@ static LP e_inverse (XY xy, PJ *P) { /* Ellipsoidal, inverse */
static void *freeup_new (PJ *P) { /* Destructor */
if (0==P)
return 0;
- if (0==P->opaque)
- return pj_dealloc (P);
- pj_dealloc (P->opaque);
return pj_dealloc(P);
}
@@ -227,33 +221,21 @@ static void freeup (PJ *P) {
PJ *PROJECTION(krovak) {
- double ts;
- struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
- if (0==Q)
- return freeup_new (P);
- P->opaque = Q;
-
- /* read some Parameters,
- * here Latitude Truescale */
-
- ts = pj_param(P->ctx, P->params, "rlat_ts").f;
- Q->C_x = ts;
-
/* we want Bessel as fixed ellipsoid */
P->a = 6377397.155;
P->e = sqrt(P->es = 0.006674372230614);
- /* if latitude of projection center is not set, use 49d30'N */
+ /* if latitude of projection center is not set, use 49d30'N */
if (!pj_param(P->ctx, P->params, "tlat_0").i)
P->phi0 = 0.863937979737193;
- /* if center long is not set use 42d30'E of Ferro - 17d40' for Ferro */
- /* that will correspond to using longitudes relative to greenwich */
- /* as input and output, instead of lat/long relative to Ferro */
+ /* if center long is not set use 42d30'E of Ferro - 17d40' for Ferro */
+ /* that will correspond to using longitudes relative to greenwich */
+ /* as input and output, instead of lat/long relative to Ferro */
if (!pj_param(P->ctx, P->params, "tlon_0").i)
P->lam0 = 0.7417649320975901 - 0.308341501185665;
- /* if scale not set default to 0.9999 */
+ /* if scale not set default to 0.9999 */
if (!pj_param(P->ctx, P->params, "tk").i)
P->k0 = 0.9999;