diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2011-03-15 18:16:10 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2011-03-15 18:16:10 +0000 |
| commit | 7327ac23c34e92debfd8ef21c872559eb26b16c3 (patch) | |
| tree | c269fd02ae2de624f76530b92a10ba0ecd854fde /src | |
| parent | c174749873eaa0143e96d89138b47fc1e3a15a6d (diff) | |
| download | PROJ-7327ac23c34e92debfd8ef21c872559eb26b16c3.tar.gz PROJ-7327ac23c34e92debfd8ef21c872559eb26b16c3.zip | |
fix up a few items for windows
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1985 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.vc | 3 | ||||
| -rw-r--r-- | src/proj.def | 2 | ||||
| -rw-r--r-- | src/proj_etmerc.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/makefile.vc b/src/makefile.vc index 57dec809..f8a1a7e7 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -18,7 +18,8 @@ cylinder = \ PJ_cass.obj PJ_cc.obj PJ_cea.obj PJ_eqc.obj \ PJ_gall.obj PJ_labrd.obj PJ_lsat.obj PJ_merc.obj \ PJ_mill.obj PJ_ocea.obj PJ_omerc.obj PJ_somerc.obj \ - PJ_tcc.obj PJ_tcea.obj PJ_tmerc.obj PJ_geos.obj PJ_gstmerc.obj + PJ_tcc.obj PJ_tcea.obj PJ_tmerc.obj PJ_geos.obj \ + PJ_gstmerc.obj proj_etmerc.obj misc = \ PJ_airy.obj PJ_aitoff.obj PJ_august.obj PJ_bacon.obj \ diff --git a/src/proj.def b/src/proj.def index 08b6ee5f..f4d60cab 100644 --- a/src/proj.def +++ b/src/proj.def @@ -53,4 +53,4 @@ EXPORTS pj_ctx_set_app_data @51 pj_ctx_get_app_data @52 pj_log @53 - + pj_clear_initcache @54 diff --git a/src/proj_etmerc.c b/src/proj_etmerc.c index 4b42f23a..3a389600 100644 --- a/src/proj_etmerc.c +++ b/src/proj_etmerc.c @@ -145,7 +145,7 @@ FORWARD(e_forward); /* ellipsoid */ Cn = atan2(sin_Cn, cos_Ce*cos_Cn); Ce = atan2(sin_Ce*cos_Cn, hypot(sin_Cn, cos_Cn*cos_Ce)); /* compl. sph. N, E -> ell. norm. N, E */ - Ce = log(tan(M_PI_4 + Ce*0.5)); + Ce = log(tan(FORTPI + Ce*0.5)); Cn += clenS(P->gtu, 5, 2.*Cn, 2.*Ce, &dCn, &dCe); Ce += dCe; if (FABS(Ce) <= 2.623395162778) { @@ -168,7 +168,7 @@ INVERSE(e_inverse); /* ellipsoid */ /* norm. N, E -> compl. sph. LAT, LNG */ Cn += clenS(P->utg, 5, 2.*Cn, 2.*Ce, &dCn, &dCe); Ce += dCe; - Ce = 2.0*(atan(exp(Ce)) - M_PI_4); + Ce = 2.0*(atan(exp(Ce)) - FORTPI); /* compl. sph. LAT -> Gaussian LAT, LNG */ #ifdef _GNU_SOURCE sincos(Cn, &sin_Cn, &cos_Cn); |