diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2011-05-10 01:32:08 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2011-05-10 01:32:08 +0000 |
| commit | 6d16e577e73d94a8ec98e1b62b4dbe23d30fbb21 (patch) | |
| tree | 328347376f77240f5d6e209a9130c055515a4ab7 /src | |
| parent | f7bb18dd65b3ca478b66bc3f26de93c650c45303 (diff) | |
| download | PROJ-6d16e577e73d94a8ec98e1b62b4dbe23d30fbb21.tar.gz PROJ-6d16e577e73d94a8ec98e1b62b4dbe23d30fbb21.zip | |
fix up builds on windows
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1999 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_igh.c | 6 | ||||
| -rw-r--r-- | src/makefile.vc | 2 | ||||
| -rw-r--r-- | src/projects.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/PJ_igh.c b/src/PJ_igh.c index 40a6f89c..6f8b6c40 100644 --- a/src/PJ_igh.c +++ b/src/PJ_igh.c @@ -77,12 +77,13 @@ INVERSE(s_inverse); /* spheroid */ if (z) { + int ok = 0; + xy.x -= P->pj[z-1]->x0; xy.y -= P->pj[z-1]->y0; lp = P->pj[z-1]->inv(xy, P->pj[z-1]); lp.lam += P->pj[z-1]->lam0; - int ok = 0; switch (z) { case 1: ok = (lp.lam >= -d180-EPSLN && lp.lam <= -d40+EPSLN) || ((lp.lam >= -d40-EPSLN && lp.lam <= -d10+EPSLN) && @@ -111,8 +112,9 @@ INVERSE(s_inverse); /* spheroid */ if (!z) lp.phi = HUGE_VAL; return (lp); } -FREEUP; int i; +FREEUP; if (P) { + int i; for (i = 0; i < 12; ++i) if (P->pj[i]) free(P->pj[i]); free(P); diff --git a/src/makefile.vc b/src/makefile.vc index f8a1a7e7..000dd091 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -32,7 +32,7 @@ pseudo = \ PJ_boggs.obj PJ_collg.obj PJ_crast.obj PJ_denoy.obj \ PJ_eck1.obj PJ_eck2.obj PJ_eck3.obj PJ_eck4.obj \ PJ_eck5.obj PJ_fahey.obj PJ_fouc_s.obj PJ_gins8.obj \ - PJ_gn_sinu.obj PJ_goode.obj PJ_hatano.obj PJ_loxim.obj \ + PJ_gn_sinu.obj PJ_goode.obj PJ_igh.obj PJ_hatano.obj PJ_loxim.obj \ PJ_mbt_fps.obj PJ_mbtfpp.obj PJ_mbtfpq.obj PJ_moll.obj \ PJ_nell.obj PJ_nell_h.obj PJ_putp2.obj PJ_putp3.obj \ PJ_putp4p.obj PJ_putp5.obj PJ_putp6.obj PJ_robin.obj \ diff --git a/src/projects.h b/src/projects.h index eb998d3a..38377697 100644 --- a/src/projects.h +++ b/src/projects.h @@ -458,7 +458,7 @@ struct PJ_PRIME_MERIDIANS *pj_get_prime_meridians_ref( void ); # define PJ_CVSID(string) static char pj_cvsid[] __attribute__((used)) = string; # else # define PJ_CVSID(string) static char pj_cvsid[] = string; \ -static char *cvsid_aw() { return( cvsid_aw() ? ((char *) NULL) : cpl_cvsid ); } +static char *cvsid_aw() { return( cvsid_aw() ? ((char *) NULL) : pj_cvsid ); } # endif #else # define PJ_CVSID(string) |