Merge 380eb83 into 22de779

OSGeo · Jul 21, 2018 · 0e4de17 · 0e4de17
2 parents 22de779 + 380eb83
commit 0e4de17
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/PJ_imw_p.c b/src/PJ_imw_p.c
@@ -32,7 +32,7 @@ static int phi12(PJ *P, double *del, double *sig) {
 
     if (!pj_param(P->ctx, P->params, "tlat_1").i ||
         !pj_param(P->ctx, P->params, "tlat_2").i) {
-        err = -41;
+        err = PJD_ERR_LAT_1_2_UNSPECIFIED;
     } else {
         Q->phi_1 = pj_param(P->ctx, P->params, "rlat_1").f;
         Q->phi_2 = pj_param(P->ctx, P->params, "rlat_2").f;

diff --git a/src/PJ_krovak.c b/src/PJ_krovak.c
@@ -196,8 +196,8 @@ PJ *PROJECTION(krovak) {
             P->lam0 = 0.7417649320975901 - 0.308341501185665;
 
     /* if scale not set default to 0.9999 */
-    if (!pj_param(P->ctx, P->params, "tk").i)
-            P->k0 = 0.9999;
+    if (!pj_param(P->ctx, P->params, "tk").i && !pj_param(P->ctx, P->params, "tk_0").i)
+        P->k0 = 0.9999;
 
     Q->czech = 1;
     if( !pj_param(P->ctx, P->params, "tczech").i )

diff --git a/src/PJ_labrd.c b/src/PJ_labrd.c
@@ -9,8 +9,7 @@ PROJ_HEAD(labrd, "Laborde") "\n\tCyl, Sph\n\tSpecial for Madagascar";
 #define EPS 1.e-10
 
 struct pj_opaque {
-    double  kRg, p0s, A, C, Ca, Cb, Cc, Cd; \
-    int     rot;
+    double  kRg, p0s, A, C, Ca, Cb, Cc, Cd;
 };
 
 
@@ -106,7 +105,6 @@ PJ *PROJECTION(labrd) {
         return pj_default_destructor (P, ENOMEM);
     P->opaque = Q;
 
-    Q->rot  = pj_param(P->ctx, P->params, "bno_rot").i == 0;
     Az = pj_param(P->ctx, P->params, "razi").f;
     sinp = sin(P->phi0);
     t = 1. - P->es * sinp * sinp;