diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2009-05-13 13:40:01 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2009-05-13 13:40:01 +0000 |
| commit | b104cfc03060c27b08e45460d60082190349bafc (patch) | |
| tree | d89da2b2526c89c9a3dbd916d9d39f04199b6151 | |
| parent | 00a1b41e0c73e81e46305bcf1ab271c2937ae534 (diff) | |
| download | PROJ-b104cfc03060c27b08e45460d60082190349bafc.tar.gz PROJ-b104cfc03060c27b08e45460d60082190349bafc.zip | |
Correct handling of yc in loc_for() (#39)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1575 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/PJ_imw_p.c | 10 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2009-05-13 Frank Warmerdam <warmerdam@pobox.com> + + * src/PJ_imw_p.c: Correct handling of yc in loc_for() (#39). + 2009-04-02 Frank Warmerdam <warmerdam@pobox.com> * nad/Makefile.am: Changes to ensure grid shift files are processed diff --git a/src/PJ_imw_p.c b/src/PJ_imw_p.c index b5974afb..135b3dab 100644 --- a/src/PJ_imw_p.c +++ b/src/PJ_imw_p.c @@ -33,7 +33,7 @@ loc_for(LP lp, PJ *P, double *yc) { xy.x = lp.lam; xy.y = 0.; } else { - double xa, ya, xb, yb, xc, yc, D, B, m, sp, t, R, C; + double xa, ya, xb, yb, xc, D, B, m, sp, t, R, C; sp = sin(lp.phi); m = pj_mlfn(lp.phi, sp, cos(lp.phi), P->en); @@ -53,14 +53,14 @@ loc_for(LP lp, PJ *P, double *yc) { } if (P->mode > 0) { xc = lp.lam; - yc = 0.; + *yc = 0.; } else { t = lp.lam * P->sphi_1; xc = P->R_1 * sin(t); - yc = P->R_1 * (1. - cos(t)); + *yc = P->R_1 * (1. - cos(t)); } - D = (xb - xc)/(yb - yc); - B = xc + D * (C + R - yc); + D = (xb - xc)/(yb - *yc); + B = xc + D * (C + R - *yc); xy.x = D * sqrt(R * R * (1 + D * D) - B * B); if (lp.phi > 0) xy.x = - xy.x; |