aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2012-03-03 21:50:46 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2012-03-03 21:50:46 +0000
commitc4652f88854954749ddd5dd2345e2b3e6e1b2dd9 (patch)
tree4d5df58aec18f9e0af8b5d9f65cfc283538da2c7
parentb75f02e24f570b6e4d113da2944ef69dc396f54f (diff)
downloadPROJ-c4652f88854954749ddd5dd2345e2b3e6e1b2dd9.tar.gz
PROJ-c4652f88854954749ddd5dd2345e2b3e6e1b2dd9.zip
Add support for no_uoff and no_off for omerc (#128)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2181 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rw-r--r--ChangeLog2
-rw-r--r--src/PJ_omerc.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 751b1829..f7a04fcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-03-03 Frank Warmerdam <warmerdam@pobox.com>
+ * src/PJ_omerc.c: Support +no_uoff and +no_off (#128)
+
* src/PJ_stere.c: Cleanup odd code construct (#147)
2012-02-26 Frank Warmerdam <warmerdam@pobox.com>
diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c
index 51d398d2..c8888a83 100644
--- a/src/PJ_omerc.c
+++ b/src/PJ_omerc.c
@@ -104,7 +104,11 @@ ENTRY0(omerc)
gamma = pj_param(P->ctx, P->params, "rgamma").f;
if (alp || gam) {
lamc = pj_param(P->ctx, P->params, "rlonc").f;
- no_off = pj_param(P->ctx, P->params, "tno_off").i;
+ no_off =
+ /* For libproj4 compatability */
+ pj_param(P->ctx, P->params, "tno_off").i
+ /* for backward compatibility */
+ || pj_param(P->ctx, P->params, "tno_uoff").i;
} else {
lam1 = pj_param(P->ctx, P->params, "rlon_1").f;
phi1 = pj_param(P->ctx, P->params, "rlat_1").f;