From c4652f88854954749ddd5dd2345e2b3e6e1b2dd9 Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Sat, 3 Mar 2012 21:50:46 +0000 Subject: 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 --- ChangeLog | 2 ++ src/PJ_omerc.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 751b1829..f7a04fcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-03-03 Frank Warmerdam + * 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 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; -- cgit v1.2.3