aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2009-05-13 13:40:01 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2009-05-13 13:40:01 +0000
commitb104cfc03060c27b08e45460d60082190349bafc (patch)
treed89da2b2526c89c9a3dbd916d9d39f04199b6151 /src
parent00a1b41e0c73e81e46305bcf1ab271c2937ae534 (diff)
downloadPROJ-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
Diffstat (limited to 'src')
-rw-r--r--src/PJ_imw_p.c10
1 files changed, 5 insertions, 5 deletions
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;