~ubuntu-branches/ubuntu/breezy/proj/breezy

« back to all changes in this revision

Viewing changes to src/geod_for.c

  • Committer: Bazaar Package Importer
  • Author(s): Peter S Galbraith
  • Date: 2004-11-06 19:44:53 UTC
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20041106194453-axnsmkh1zplal8mz
Tags: upstream-4.4.9
ImportĀ upstreamĀ versionĀ 4.4.9

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
                        D *= D;
33
33
                        P = c2 / D;
34
34
                } else {
35
 
                        c1 = f * M;
 
35
                        c1 = geod_f * M;
36
36
                        c2 = f4 * (1. - M * M);
37
37
                        D = (1. - c2)*(1. - c2 - c1 * M);
38
38
                        P = (1. + .5 * c1 * M) * c2 / D;
50
50
        double d,sind,u,V,X,ds,cosds,sinds,ss,de;
51
51
 
52
52
        if (ellipse) {
53
 
                d = S / (D * a);
 
53
                d = geod_S / (D * geod_a);
54
54
                if (signS) d = -d;
55
55
                u = 2. * (s1 - d);
56
56
                V = cos(u + d);
58
58
                ds = d + X - 2. * P * V * (1. - 2. * P * cos(u)) * sind;
59
59
                ss = s1 + s1 - ds;
60
60
        } else {
61
 
                ds = S / a;
 
61
                ds = geod_S / geod_a;
62
62
                if (signS) ds = - ds;
63
63
        }
64
64
        cosds = cos(ds);