diff options
89 files changed, 240 insertions, 337 deletions
@@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # # Autotools boostrapping script # diff --git a/jniwrap/org/proj4/PJ.java b/jniwrap/org/proj4/PJ.java index b1b30c20..f82fe07c 100644 --- a/jniwrap/org/proj4/PJ.java +++ b/jniwrap/org/proj4/PJ.java @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Java/JNI wrappers for PROJ.4 API. * Author: Martin Desruisseaux diff --git a/jniwrap/org/proj4/PJException.java b/jniwrap/org/proj4/PJException.java index ed0dba98..18a58851 100644 --- a/jniwrap/org/proj4/PJException.java +++ b/jniwrap/org/proj4/PJException.java @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Java/JNI wrappers for PROJ.4 API. * Author: Martin Desruisseaux diff --git a/jniwrap/org/proj4/package-info.java b/jniwrap/org/proj4/package-info.java index 30e8ffe7..8a6b75a3 100644 --- a/jniwrap/org/proj4/package-info.java +++ b/jniwrap/org/proj4/package-info.java @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Java/JNI wrappers for PROJ.4 API. * Author: Martin Desruisseaux diff --git a/makefile.vc b/makefile.vc index efc5422f..6c9bb58f 100644 --- a/makefile.vc +++ b/makefile.vc @@ -1,4 +1,3 @@ -# $Id$ # # NMAKE Makefile to build PROJ.4 on Windows # diff --git a/mkinstalldirs b/mkinstalldirs index 6b3b5fc5..5e17cd39 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -4,8 +4,6 @@ # Created: 1993-05-16 # Public domain -# $Id$ - errstatus=0 for file diff --git a/nad/makefile.vc b/nad/makefile.vc index 26c41338..d2bba083 100644 --- a/nad/makefile.vc +++ b/nad/makefile.vc @@ -1,6 +1,4 @@ # -# $Id$ -# # makefile.vc - builds PROJ.4 library with Visual C++ # diff --git a/src/PJ_aea.c b/src/PJ_aea.c index 7729a13e..0881ba78 100644 --- a/src/PJ_aea.c +++ b/src/PJ_aea.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of the aea (Albers Equal Area) projection. * Author: Gerald Evenden @@ -43,8 +41,6 @@ #define PJ_LIB__ #include <projects.h> -PJ_CVSID("$Id$"); - # define EPS10 1.e-10 # define TOL7 1.e-7 diff --git a/src/PJ_aeqd.c b/src/PJ_aeqd.c index c1cd481e..739dfdd6 100644 --- a/src/PJ_aeqd.c +++ b/src/PJ_aeqd.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of the aeqd (Azimuthal Equidistant) projection. * Author: Gerald Evenden @@ -42,8 +40,6 @@ #include "geodesic.h" #include <projects.h> -PJ_CVSID("$Id$"); - PROJ_HEAD(aeqd, "Azimuthal Equidistant") "\n\tAzi, Sph&Ell\n\tlat_0 guam"; #define EPS10 1.e-10 diff --git a/src/PJ_airy.c b/src/PJ_airy.c index 1675df1e..73a51e5b 100644 --- a/src/PJ_airy.c +++ b/src/PJ_airy.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of the airy (Airy) projection. * Author: Gerald Evenden @@ -37,8 +35,6 @@ #define PJ_LIB__ #include <projects.h> -PJ_CVSID("$Id$"); - PROJ_HEAD(airy, "Airy") "\n\tMisc Sph, no inv.\n\tno_cut lat_b="; # define EPS 1.e-10 diff --git a/src/PJ_aitoff.c b/src/PJ_aitoff.c index 62922c63..d5350f2c 100644 --- a/src/PJ_aitoff.c +++ b/src/PJ_aitoff.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of the aitoff (Aitoff) and wintri (Winkel Tripel) * projections. @@ -41,8 +39,6 @@ # define M_PI_2 1.57079632679489661923 #endif -PJ_CVSID("$Id$"); - PROJ_HEAD(aitoff, "Aitoff") "\n\tMisc Sph"; PROJ_HEAD(wintri, "Winkel Tripel") "\n\tMisc Sph\n\tlat_1"; diff --git a/src/PJ_august.c b/src/PJ_august.c index 4e6dab98..496fc3c3 100644 --- a/src/PJ_august.c +++ b/src/PJ_august.c @@ -4,6 +4,7 @@ PROJ_HEAD(august, "August Epicycloidal") "\n\tMisc Sph, no inv."; #define M 1.333333333333333 FORWARD(s_forward); /* spheroid */ double t, c1, c, x1, x12, y1, y12; + (void) P; t = tan(.5 * lp.phi); c1 = sqrt(1. - t * t); diff --git a/src/PJ_boggs.c b/src/PJ_boggs.c index 48fdc9ab..b22a25ff 100644 --- a/src/PJ_boggs.c +++ b/src/PJ_boggs.c @@ -11,6 +11,7 @@ PROJ_HEAD(boggs, "Boggs Eumorphic") "\n\tPCyl., no inv., Sph."; FORWARD(s_forward); /* spheroid */ double theta, th1, c; int i; + (void) P; theta = lp.phi; if (fabs(fabs(lp.phi) - HALFPI) < EPS) diff --git a/src/PJ_cc.c b/src/PJ_cc.c index be1191b6..0f573929 100644 --- a/src/PJ_cc.c +++ b/src/PJ_cc.c @@ -11,6 +11,7 @@ FORWARD(s_forward); /* spheroid */ return (xy); } INVERSE(s_inverse); /* spheroid */ + (void) P; lp.phi = atan(xy.y); lp.lam = xy.x; return (lp); diff --git a/src/PJ_cea.c b/src/PJ_cea.c index f5b78838..aa544db6 100644 --- a/src/PJ_cea.c +++ b/src/PJ_cea.c @@ -42,9 +42,12 @@ FREEUP; ENTRY1(cea, apa) double t; - if (pj_param(P->ctx, P->params, "tlat_ts").i && - (P->k0 = cos(t = pj_param(P->ctx, P->params, "rlat_ts").f)) < 0.) - E_ERROR(-24); + if (pj_param(P->ctx, P->params, "tlat_ts").i) { + P->k0 = cos(t = pj_param(P->ctx, P->params, "rlat_ts").f); + if (P->k0 < 0.) { + E_ERROR(-24); + } + } if (P->es) { t = sin(t); P->k0 /= sqrt(1. - P->es * t * t); diff --git a/src/PJ_collg.c b/src/PJ_collg.c index ca389a63..871dfc97 100644 --- a/src/PJ_collg.c +++ b/src/PJ_collg.c @@ -5,6 +5,7 @@ PROJ_HEAD(collg, "Collignon") "\n\tPCyl, Sph."; #define FYC 1.77245385090551602729 #define ONEEPS 1.0000001 FORWARD(s_forward); /* spheroid */ + (void) P; if ((xy.y = 1. - sin(lp.phi)) <= 0.) xy.y = 0.; else diff --git a/src/PJ_crast.c b/src/PJ_crast.c index 5351a390..3f251ac6 100644 --- a/src/PJ_crast.c +++ b/src/PJ_crast.c @@ -8,12 +8,14 @@ PROJ_HEAD(crast, "Craster Parabolic (Putnins P4)") #define RYM 0.32573500793527994772 #define THIRD 0.333333333333333333 FORWARD(s_forward); /* spheroid */ + (void) P; lp.phi *= THIRD; xy.x = XM * lp.lam * (2. * cos(lp.phi + lp.phi) - 1.); xy.y = YM * sin(lp.phi); return (xy); } INVERSE(s_inverse); /* spheroid */ + (void) P; lp.phi = 3. * asin(xy.y * RYM); lp.lam = xy.x * RXM / (2. * cos((lp.phi + lp.phi) * THIRD) - 1); return (lp); diff --git a/src/PJ_denoy.c b/src/PJ_denoy.c index 8b800318..b1a6fe80 100644 --- a/src/PJ_denoy.c +++ b/src/PJ_denoy.c @@ -7,6 +7,7 @@ PROJ_HEAD(denoy, "Denoyer Semi-Elliptical") "\n\tPCyl., no inv., Sph."; #define D1 0.9 #define D5 0.03 FORWARD(s_forward); /* spheroid */ + (void) P; xy.y = lp.phi; xy.x = lp.lam; lp.lam = fabs(lp.lam); diff --git a/src/PJ_eck1.c b/src/PJ_eck1.c index 9b31b095..b0b43da5 100644 --- a/src/PJ_eck1.c +++ b/src/PJ_eck1.c @@ -4,11 +4,13 @@ PROJ_HEAD(eck1, "Eckert I") "\n\tPCyl., Sph."; #define FC .92131773192356127802 #define RP .31830988618379067154 FORWARD(s_forward); /* spheroid */ + (void) P; xy.x = FC * lp.lam * (1. - RP * fabs(lp.phi)); xy.y = FC * lp.phi; return (xy); } INVERSE(s_inverse); /* spheroid */ + (void) P; lp.phi = xy.y / FC; lp.lam = xy.x / (FC * (1. - RP * fabs(lp.phi))); return (lp); diff --git a/src/PJ_eck2.c b/src/PJ_eck2.c index f8e0154e..08b65595 100644 --- a/src/PJ_eck2.c +++ b/src/PJ_eck2.c @@ -6,6 +6,7 @@ PROJ_HEAD(eck2, "Eckert II") "\n\tPCyl. Sph."; #define C13 0.33333333333333333333 #define ONEEPS 1.0000001 FORWARD(s_forward); /* spheroid */ + (void) P; xy.x = FXC * lp.lam * (xy.y = sqrt(4. - 3. * sin(fabs(lp.phi)))); xy.y = FYC * (2. - xy.y); if ( lp.phi < 0.) xy.y = -xy.y; diff --git a/src/PJ_eck4.c b/src/PJ_eck4.c index f90267dd..0bedbbc9 100644 --- a/src/PJ_eck4.c +++ b/src/PJ_eck4.c @@ -11,6 +11,7 @@ PROJ_HEAD(eck4, "Eckert IV") "\n\tPCyl, Sph."; FORWARD(s_forward); /* spheroid */ double p, V, s, c; int i; + (void) P; p = C_p * sin(lp.phi); V = lp.phi * lp.phi; diff --git a/src/PJ_eck5.c b/src/PJ_eck5.c index 3eeb3326..029c18e0 100644 --- a/src/PJ_eck5.c +++ b/src/PJ_eck5.c @@ -6,11 +6,13 @@ PROJ_HEAD(eck5, "Eckert V") "\n\tPCyl, Sph."; #define YF 0.88202554344910296438 #define RYF 1.13375401361911319568 FORWARD(s_forward); /* spheroid */ + (void) P; xy.x = XF * (1. + cos(lp.phi)) * lp.lam; xy.y = YF * lp.phi; return (xy); } INVERSE(s_inverse); /* spheroid */ + (void) P; lp.lam = RXF * xy.x / (1. + cos( lp.phi = RYF * xy.y)); return (lp); } diff --git a/src/PJ_fahey.c b/src/PJ_fahey.c index 93e9b38d..007fc906 100644 --- a/src/PJ_fahey.c +++ b/src/PJ_fahey.c @@ -3,11 +3,13 @@ PROJ_HEAD(fahey, "Fahey") "\n\tPcyl, Sph."; #define TOL 1e-6 FORWARD(s_forward); /* spheroid */ + (void) P; xy.y = 1.819152 * ( xy.x = tan(0.5 * lp.phi) ); xy.x = 0.819152 * lp.lam * asqrt(1 - xy.x * xy.x); return (xy); } INVERSE(s_inverse); /* spheroid */ + (void) P; lp.phi = 2. * atan(xy.y /= 1.819152); lp.lam = fabs(xy.y = 1. - xy.y * xy.y) < TOL ? 0. : xy.x / (0.819152 * sqrt(xy.y)); diff --git a/src/PJ_gall.c b/src/PJ_gall.c index 3c507bd0..1acd7d09 100644 --- a/src/PJ_gall.c +++ b/src/PJ_gall.c @@ -6,11 +6,13 @@ PROJ_HEAD(gall, "Gall (Gall Stereographic)") "\n\tCyl, Sph"; #define RYF 0.58578643762690495119 #define RXF 1.41421356237309504880 FORWARD(s_forward); /* spheroid */ + (void) P; xy.x = XF * lp.lam; xy.y = YF * tan(.5 * lp.phi); return (xy); } INVERSE(s_inverse); /* spheroid */ + (void) P; lp.lam = RXF * xy.x; lp.phi = 2. * atan(xy.y * RYF); return (lp); diff --git a/src/PJ_geos.c b/src/PJ_geos.c index 7952c508..09393adf 100644 --- a/src/PJ_geos.c +++ b/src/PJ_geos.c @@ -4,8 +4,6 @@ ** Copyright (c) 2004 Gerald I. Evenden ** Copyright (c) 2012 Martin Raspaud */ -static const char -LIBPROJ_ID[] = "$Id$"; /* ** See also (section 4.4.3.2): ** http://www.eumetsat.int/en/area4/msg/news/us_doc/cgms_03_26.pdf diff --git a/src/PJ_gins8.c b/src/PJ_gins8.c index 0747d761..b7f38ad9 100644 --- a/src/PJ_gins8.c +++ b/src/PJ_gins8.c @@ -6,6 +6,7 @@ PROJ_HEAD(gins8, "Ginsburg VIII (TsNIIGAiK)") "\n\tPCyl, Sph., no inv."; #define C12 0.08333333333333333 FORWARD(s_forward); /* spheroid */ double t = lp.phi * lp.phi; + (void) P; xy.y = lp.phi * (1. + t * C12); xy.x = lp.lam * (1. - Cp * t); diff --git a/src/PJ_hatano.c b/src/PJ_hatano.c index 8e0ff5ce..7516ba6e 100644 --- a/src/PJ_hatano.c +++ b/src/PJ_hatano.c @@ -17,6 +17,7 @@ PROJ_HEAD(hatano, "Hatano Asymmetrical Equal Area") "\n\tPCyl, Sph."; FORWARD(s_forward); /* spheroid */ double th1, c; int i; + (void) P; c = sin(lp.phi) * (lp.phi < 0. ? CS : CN); for (i = NITER; i; --i) { diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c index 2cc918bb..12d57ff2 100644 --- a/src/PJ_healpix.c +++ b/src/PJ_healpix.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id: PJ_healpix.c 1504 2011-10-18 14:58:57Z landcare $ - * * Project: PROJ.4 * Purpose: Implementation of the HEALPix and rHEALPix projections. * For background see <http://code.scenzgrid.org/index.php/p/scenzgrid-py/source/tree/master/docs/rhealpix_dggs.pdf>. @@ -466,6 +464,7 @@ static XY combine_caps(double x, double y, int north_square, int south_square, } } FORWARD(s_healpix_forward); /* sphere */ + (void) P; (void) xy; return healpix_sphere(lp); } diff --git a/src/PJ_isea.c b/src/PJ_isea.c index c68861d9..7c09189c 100644 --- a/src/PJ_isea.c +++ b/src/PJ_isea.c @@ -59,7 +59,7 @@ int hex_iso(struct hex *h) { } ISEA_STATIC -int hexbin2(int horizontal, double width, double x, double y, +int hexbin2(double width, double x, double y, int *i, int *j) { double z, rx, ry, rz; double abs_dx, abs_dy, abs_dz; @@ -160,10 +160,10 @@ ISEA_STATIC struct snyder_constants constants[] = { {23.80018260, 62.15458023, 60.0, 3.75, 1.033, 0.968, 5.09, 1.195, 1.0}, {20.07675127, 55.69063953, 54.0, 2.65, 1.030, 0.983, 3.59, 1.141, 1.027}, - {0.0}, - {0.0}, - {0.0}, - {0.0}, + {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}, + {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}, + {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}, + {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}, {37.37736814, 36.0, 30.0, 17.27, 1.163, 0.860, 13.14, 1.584, 1.0}, }; @@ -369,23 +369,14 @@ isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) center = icostriangles[i]; /* step 1 */ -#if 0 - z = sph_distance(center.lon, center.lat, ll->lon, ll->lat); -#else z = acos(sin(center.lat) * sin(ll->lat) + cos(center.lat) * cos(ll->lat) * cos(ll->lon - center.lon)); -#endif - /* not on this triangle */ if (z > g + 0.000005) { /* TODO DBL_EPSILON */ continue; } - Az = sph_azimuth(ll->lon, ll->lat, center.lon, center.lat); - Az = atan2(cos(ll->lat) * sin(ll->lon - center.lon), - cos(center.lat) * sin(ll->lat) - - sin(center.lat) * cos(ll->lat) * cos(ll->lon - center.lon) - ); + Az = sph_azimuth(center.lon, center.lat, ll->lon, ll->lat); /* step 2 */ @@ -735,7 +726,7 @@ isea_dddi_ap3odd(struct isea_dgg *g, int quad, struct isea_pt *pt, struct isea_p maxcoord = (int) (sidelength * 2.0 + 0.5); v = *pt; - hexbin2(0, hexwidth, v.x, v.y, &h.x, &h.y); + hexbin2(hexwidth, v.x, v.y, &h.x, &h.y); h.iso = 0; hex_iso(&h); @@ -813,7 +804,7 @@ isea_dddi(struct isea_dgg *g, int quad, struct isea_pt *pt, struct isea_pt *di) v = *pt; isea_rotate(&v, -30.0); - hexbin2(0, hexwidth, v.x, v.y, &h.x, &h.y); + hexbin2(hexwidth, v.x, v.y, &h.x, &h.y); h.iso = 0; hex_iso(&h); @@ -976,13 +967,11 @@ ISEA_STATIC struct isea_pt isea_forward(struct isea_dgg *g, struct isea_geo *in) { - int tri, downtri; + int tri; struct isea_pt out, coord; tri = isea_transform(g, in, &out); - downtri = (((tri - 1) / 5) % 2 == 1); - if (g->output == ISEA_PLANE) { isea_tri_plane(tri, &out, g->radius); return out; diff --git a/src/PJ_krovak.c b/src/PJ_krovak.c index 46038fba..dd250134 100644 --- a/src/PJ_krovak.c +++ b/src/PJ_krovak.c @@ -37,8 +37,6 @@ #include <string.h> #include <stdio.h> -PJ_CVSID("$Id$"); - PROJ_HEAD(krovak, "Krovak") "\n\tPCyl., Ellps."; /** diff --git a/src/PJ_larr.c b/src/PJ_larr.c index 5bab2b09..118bef00 100644 --- a/src/PJ_larr.c +++ b/src/PJ_larr.c @@ -4,6 +4,7 @@ PROJ_HEAD(larr, "Larrivee") "\n\tMisc Sph, no inv."; #define SIXTH .16666666666666666 FORWARD(s_forward); /* sphere */ + (void) P; xy.x = 0.5 * lp.lam * (1. + sqrt(cos(lp.phi))); xy.y = lp.phi / (cos(0.5 * lp.phi) * cos(SIXTH * lp.lam)); return (xy); diff --git a/src/PJ_lask.c b/src/PJ_lask.c index 05e80a19..797b580d 100644 --- a/src/PJ_lask.c +++ b/src/PJ_lask.c @@ -14,6 +14,7 @@ PROJ_HEAD(lask, "Laskowski") "\n\tMisc Sph, no inv."; #define b05 -0.0491032 FORWARD(s_forward); /* sphere */ double l2, p2; + (void) P; l2 = lp.lam * lp.lam; p2 = lp.phi * lp.phi; diff --git a/src/PJ_lcca.c b/src/PJ_lcca.c index dc27a282..320d52db 100644 --- a/src/PJ_lcca.c +++ b/src/PJ_lcca.c @@ -1,4 +1,3 @@ -static const char RCS_ID[] = "$Id$"; /* PROJ.4 Cartographic Projection System */ #define MAX_ITER 10 @@ -51,7 +50,7 @@ INVERSE(e_inverse); /* ellipsoid & spheroid */ } FREEUP; if (P) { if (P->en) pj_dalloc(P->en); pj_dalloc(P); } } ENTRY0(lcca) - double s2p0, N0, R0, tan0, tan20; + double s2p0, N0, R0, tan0; if (!(P->en = pj_enfn(P->es))) E_ERROR_0; if (!pj_param(P->ctx, P->params, "tlat_0").i) E_ERROR(50); @@ -63,7 +62,6 @@ ENTRY0(lcca) N0 = sqrt(R0); R0 *= P->one_es * N0; tan0 = tan(P->phi0); - tan20 = tan0 * tan0; P->r0 = N0 / tan0; P->C = 1. / (6. * R0 * N0); P->inv = e_inverse; diff --git a/src/PJ_mbt_fps.c b/src/PJ_mbt_fps.c index 57a96e72..3cd5e674 100644 --- a/src/PJ_mbt_fps.c +++ b/src/PJ_mbt_fps.c @@ -12,6 +12,7 @@ PROJ_HEAD(mbt_fps, "McBryde-Thomas Flat-Pole Sine (No. 2)") "\n\tCyl., Sph."; FORWARD(s_forward); /* spheroid */ double k, V, t; int i; + (void) P; k = C3 * sin(lp.phi); for (i = MAX_ITER; i ; --i) { diff --git a/src/PJ_mbtfpp.c b/src/PJ_mbtfpp.c index 9549a23a..433d3c8f 100644 --- a/src/PJ_mbtfpp.c +++ b/src/PJ_mbtfpp.c @@ -8,6 +8,7 @@ PROJ_HEAD(mbtfpp, "McBride-Thomas Flat-Polar Parabolic") "\n\tCyl., Sph."; #define C13 .33333333333333333333 #define ONEEPS 1.0000001 FORWARD(s_forward); /* spheroid */ + (void) P; lp.phi = asin(CS * sin(lp.phi)); xy.x = FXC * lp.lam * (2. * cos(C23 * lp.phi) - 1.); xy.y = FYC * sin(C13 * lp.phi); diff --git a/src/PJ_mbtfpq.c b/src/PJ_mbtfpq.c index 3298db4f..0d343fad 100644 --- a/src/PJ_mbtfpq.c +++ b/src/PJ_mbtfpq.c @@ -13,6 +13,7 @@ PROJ_HEAD(mbtfpq, "McBryde-Thomas Flat-Polar Quartic") "\n\tCyl., Sph."; FORWARD(s_forward); /* spheroid */ double th1, c; int i; + (void) P; c = C * sin(lp.phi); for (i = NITER; i; --i) { diff --git a/src/PJ_mill.c b/src/PJ_mill.c index 03c35598..c4cee7f5 100644 --- a/src/PJ_mill.c +++ b/src/PJ_mill.c @@ -2,11 +2,13 @@ # include <projects.h> PROJ_HEAD(mill, "Miller Cylindrical") "\n\tCyl, Sph"; FORWARD(s_forward); /* spheroid */ + (void) P; xy.x = lp.lam; xy.y = log(tan(FORTPI + lp.phi * .4)) * 1.25; return (xy); } INVERSE(s_inverse); /* spheroid */ + (void) P; lp.lam = xy.x; lp.phi = 2.5 * (atan(exp(.8 * xy.y)) - FORTPI); return (lp); diff --git a/src/PJ_natearth.c b/src/PJ_natearth.c index f83a3ffd..0f283415 100644 --- a/src/PJ_natearth.c +++ b/src/PJ_natearth.c @@ -36,6 +36,7 @@ PROJ_HEAD(natearth, "Natural Earth") "\n\tPCyl., Sph."; FORWARD(s_forward); /* spheroid */ double phi2, phi4; + (void) P; phi2 = lp.phi * lp.phi; phi4 = phi2 * phi2; @@ -45,6 +46,7 @@ FORWARD(s_forward); /* spheroid */ } INVERSE(s_inverse); /* spheroid */ double yc, tol, y2, y4, f, fder; + (void) P; /* make sure y is inside valid range */ if (xy.y > MAX_Y) { diff --git a/src/PJ_nell.c b/src/PJ_nell.c index dd41b468..77983de8 100644 --- a/src/PJ_nell.c +++ b/src/PJ_nell.c @@ -6,6 +6,7 @@ PROJ_HEAD(nell, "Nell") "\n\tPCyl., Sph."; FORWARD(s_forward); /* spheroid */ double k, V; int i; + (void) P; k = 2. * sin(lp.phi); V = lp.phi * lp.phi; diff --git a/src/PJ_nell_h.c b/src/PJ_nell_h.c index 670dea88..22061ea9 100644 --- a/src/PJ_nell_h.c +++ b/src/PJ_nell_h.c @@ -4,6 +4,7 @@ PROJ_HEAD(nell_h, "Nell-Hammer") "\n\tPCyl., Sph."; #define NITER 9 #define EPS 1e-7 FORWARD(s_forward); /* spheroid */ + (void) P; xy.x = 0.5 * lp.lam * (1. + cos(lp.phi)); xy.y = 2.0 * (lp.phi - tan(0.5 *lp.phi)); return (xy); @@ -11,6 +12,7 @@ FORWARD(s_forward); /* spheroid */ INVERSE(s_inverse); /* spheroid */ double V, c, p; int i; + (void) P; p = 0.5 * xy.y; for (i = NITER; i ; --i) { diff --git a/src/PJ_nocol.c b/src/PJ_nocol.c index f129eb25..2b005e1d 100644 --- a/src/PJ_nocol.c +++ b/src/PJ_nocol.c @@ -3,6 +3,8 @@ PROJ_HEAD(nicol, "Nicolosi Globular") "\n\tMisc Sph, no inv."; #define EPS 1e-10 FORWARD(s_forward); /* spheroid */ + (void) P; + if (fabs(lp.lam) < EPS) { xy.x = 0; xy.y = lp.phi; diff --git a/src/PJ_nzmg.c b/src/PJ_nzmg.c index 5fe22c24..60df0041 100644 --- a/src/PJ_nzmg.c +++ b/src/PJ_nzmg.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of the nzmg (New Zealand Map Grid) projection. * Very loosely based upon DMA code by Bradford W. Drew @@ -31,8 +29,6 @@ #define PJ_LIB__ #include <projects.h> -PJ_CVSID("$Id$"); - PROJ_HEAD(nzmg, "New Zealand Map Grid") "\n\tfixed Earth"; #define EPSLN 1e-10 diff --git a/src/PJ_putp2.c b/src/PJ_putp2.c index 33bc67ae..d6fcaea0 100644 --- a/src/PJ_putp2.c +++ b/src/PJ_putp2.c @@ -10,6 +10,7 @@ PROJ_HEAD(putp2, "Putnins P2") "\n\tPCyl., Sph."; FORWARD(s_forward); /* spheroid */ double p, c, s, V; int i; + (void) P; p = C_p * sin(lp.phi); s = lp.phi * lp.phi; diff --git a/src/PJ_qsc.c b/src/PJ_qsc.c index 1c7a4435..12cb9d63 100644 --- a/src/PJ_qsc.c +++ b/src/PJ_qsc.c @@ -105,11 +105,8 @@ qsc_shift_lon_origin(double lon, double offset) { /* Forward projection, ellipsoid */ FORWARD(e_forward); double lat, lon; - double sinlat, coslat; - double sinlon, coslon; - double q, r, s; double theta, phi; - double t, mu, nu; + double t, mu; /* nu; */ int area; /* Convert the geodetic latitude to a geocentric latitude. @@ -127,35 +124,7 @@ FORWARD(e_forward); * directly from phi, lam. For the other faces, we must use * unit sphere cartesian coordinates as an intermediate step. */ lon = lp.lam; - if (P->face != FACE_TOP && P->face != FACE_BOTTOM) { - if (P->face == FACE_RIGHT) { - lon = qsc_shift_lon_origin(lon, +HALFPI); - } else if (P->face == FACE_BACK) { - lon = qsc_shift_lon_origin(lon, +PI); - } else if (P->face == FACE_LEFT) { - lon = qsc_shift_lon_origin(lon, -HALFPI); - } - sinlat = sin(lat); - coslat = cos(lat); - sinlon = sin(lon); - coslon = cos(lon); - q = coslat * coslon; - r = coslat * sinlon; - s = sinlat; - } - if (P->face == FACE_FRONT) { - phi = acos(q); - theta = qsc_fwd_equat_face_theta(phi, s, r, &area); - } else if (P->face == FACE_RIGHT) { - phi = acos(r); - theta = qsc_fwd_equat_face_theta(phi, s, -q, &area); - } else if (P->face == FACE_BACK) { - phi = acos(-q); - theta = qsc_fwd_equat_face_theta(phi, s, -r, &area); - } else if (P->face == FACE_LEFT) { - phi = acos(-r); - theta = qsc_fwd_equat_face_theta(phi, s, q, &area); - } else if (P->face == FACE_TOP) { + if (P->face == FACE_TOP) { phi = HALFPI - lat; if (lon >= FORTPI && lon <= HALFPI + FORTPI) { area = AREA_0; @@ -170,7 +139,7 @@ FORWARD(e_forward); area = AREA_3; theta = lon; } - } else /* P->face == FACE_BOTTOM */ { + } else if (P->face == FACE_BOTTOM) { phi = HALFPI + lat; if (lon >= FORTPI && lon <= HALFPI + FORTPI) { area = AREA_0; @@ -185,6 +154,43 @@ FORWARD(e_forward); area = AREA_3; theta = (lon > 0.0 ? -lon + PI : -lon - PI); } + } else { + double q, r, s; + double sinlat, coslat; + double sinlon, coslon; + + if (P->face == FACE_RIGHT) { + lon = qsc_shift_lon_origin(lon, +HALFPI); + } else if (P->face == FACE_BACK) { + lon = qsc_shift_lon_origin(lon, +PI); + } else if (P->face == FACE_LEFT) { + lon = qsc_shift_lon_origin(lon, -HALFPI); + } + sinlat = sin(lat); + coslat = cos(lat); + sinlon = sin(lon); + coslon = cos(lon); + q = coslat * coslon; + r = coslat * sinlon; + s = sinlat; + + if (P->face == FACE_FRONT) { + phi = acos(q); + theta = qsc_fwd_equat_face_theta(phi, s, r, &area); + } else if (P->face == FACE_RIGHT) { + phi = acos(r); + theta = qsc_fwd_equat_face_theta(phi, s, -q, &area); + } else if (P->face == FACE_BACK) { + phi = acos(-q); + theta = qsc_fwd_equat_face_theta(phi, s, -r, &area); + } else if (P->face == FACE_LEFT) { + phi = acos(-r); + theta = qsc_fwd_equat_face_theta(phi, s, q, &area); + } else { + /* Impossible */ + phi = theta = 0.0; + area = AREA_0; + } } /* Compute mu and nu for the area of definition. diff --git a/src/PJ_robin.c b/src/PJ_robin.c index 39513e2a..e8572ae4 100644 --- a/src/PJ_robin.c +++ b/src/PJ_robin.c @@ -69,6 +69,7 @@ static const struct COEFS Y[] = { FORWARD(s_forward); /* spheroid */ int i; double dphi; + (void) P; i = floor((dphi = fabs(lp.phi)) * C1); if (i >= NODES) i = NODES - 1; diff --git a/src/PJ_sterea.c b/src/PJ_sterea.c index d73fa9bb..fff2e952 100644 --- a/src/PJ_sterea.c +++ b/src/PJ_sterea.c @@ -3,8 +3,6 @@ ** ** Copyright (c) 2003 Gerald I. Evenden */ -static const char -LIBPROJ_ID[] = "$Id$"; /* ** Permission is hereby granted, free of charge, to any person obtaining ** a copy of this software and associated documentation files (the diff --git a/src/PJ_vandg4.c b/src/PJ_vandg4.c index d6705031..0229042b 100644 --- a/src/PJ_vandg4.c +++ b/src/PJ_vandg4.c @@ -5,6 +5,7 @@ PROJ_HEAD(vandg4, "van der Grinten IV") "\n\tMisc Sph, no inv."; #define TWORPI 0.63661977236758134308 FORWARD(s_forward); /* spheroid */ double x1, t, bt, ct, ft, bt2, ct2, dt, dt2; + (void) P; if (fabs(lp.phi) < TOL) { xy.x = lp.lam; diff --git a/src/PJ_wag7.c b/src/PJ_wag7.c index 5f6f1bb1..db29ffb1 100644 --- a/src/PJ_wag7.c +++ b/src/PJ_wag7.c @@ -3,6 +3,7 @@ PROJ_HEAD(wag7, "Wagner VII") "\n\tMisc Sph, no inv."; FORWARD(s_forward); /* sphere */ double theta, ct, D; + (void) P; theta = asin(xy.y = 0.90630778703664996 * sin(lp.phi)); xy.x = 2.66723 * (ct = cos(theta)) * sin(lp.lam /= 3.); diff --git a/src/cs2cs.c b/src/cs2cs.c index 357c4859..43f7bf86 100644 --- a/src/cs2cs.c +++ b/src/cs2cs.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Mainline program sort of like ``proj'' for converting between * two coordinate systems. @@ -53,7 +51,6 @@ tag = '#'; /* beginning of line tag character */ "%s\nusage: %s [ -eEfIlrstvwW [args] ] [ +opts[=arg] ]\n" " [+to [+opts[=arg] [ files ]\n"; -static struct FACTORS facs; static double (*informat)(const char *, char **); /* input data deformatter function */ diff --git a/src/gen_cheb.c b/src/gen_cheb.c index 82cd926a..f06a7449 100644 --- a/src/gen_cheb.c +++ b/src/gen_cheb.c @@ -10,7 +10,7 @@ #endif void gen_cheb(int inverse, projUV (*proj)(projUV), char *s, PJ *P, int iargc, char **iargv) { - int NU = 15, NV = 15, i, res = -1, errin = 0, pwr; + int NU = 15, NV = 15, res = -1, errin = 0, pwr; char *arg, fmt[15]; projUV low, upp, resid; Tseries *F; @@ -33,7 +33,7 @@ gen_cheb(int inverse, projUV (*proj)(projUV), char *s, PJ *P, int iargc, char ** if (iargc > 0) { /* proj execution audit trail */ int n = 0, L; - for( i = 0 ; iargc ; --iargc) { + for ( ; iargc ; --iargc) { arg = *iargv++; if (*arg != '+') { if (!n) { putchar('#'); ++n; } diff --git a/src/geocent.c b/src/geocent.c index d95a778b..6ac6c40b 100644 --- a/src/geocent.c +++ b/src/geocent.c @@ -362,10 +362,8 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, double CPHI; /* cos of searched geodetic latitude */ double SPHI; /* sin of searched geodetic latitude */ double SDPHI; /* end-criterium: addition-theorem of sin(Latitude(iter)-Latitude(iter-1)) */ - int At_Pole; /* indicates location is in polar region */ int iter; /* # of continous iteration, max. 30 is always enough (s.a.) */ - At_Pole = FALSE; P = sqrt(X*X+Y*Y); RR = sqrt(X*X+Y*Y+Z*Z); @@ -373,7 +371,6 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, if (P/gi->Geocent_a < genau) { /* special case, if P=0. (X=0., Y=0.) */ - At_Pole = TRUE; *Longitude = 0.; /* if (X,Y,Z)=(0.,0.,0.) then Height becomes semi-minor axis @@ -55,7 +55,7 @@ do_geod(void) { } printLL(phil, laml); putchar('\n'); } - void static /* file processing function */ + static void /* file processing function */ process(FILE *fid) { char line[MAXLINE+3], *s; diff --git a/src/geod_set.c b/src/geod_set.c index eaadce52..e687c512 100644 --- a/src/geod_set.c +++ b/src/geod_set.c @@ -15,11 +15,11 @@ geod_set(int argc, char **argv) { /* put arguments into internal linked list */ if (argc <= 0) emess(1, "no arguments in initialization list"); - for (i = 0; i < argc; ++i) - if (i) - curr = curr->next = pj_mkparam(argv[i]); - else - start = curr = pj_mkparam(argv[i]); + start = curr = pj_mkparam(argv[0]); + for (i = 1; i < argc; ++i) { + curr->next = pj_mkparam(argv[i]); + curr = curr->next; + } /* set elliptical parameters */ if (pj_ell_set(pj_get_default_ctx(),start, &geod_a, &es)) emess(1,"ellipse setup failure"); /* set units */ diff --git a/src/jniproj.c b/src/jniproj.c index 5db64051..6094d577 100644 --- a/src/jniproj.c +++ b/src/jniproj.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Java/JNI wrappers for PROJ.4 API. * Author: Antonello Andrea @@ -58,9 +56,6 @@ /* The PJ_MAX_DIMENSION value appears also in quoted strings. Please perform a search-and-replace if this value is changed. */ -PJ_CVSID("$Id$"); - - /*! * \brief * Internal method returning the address of the PJ structure wrapped by the given Java object. diff --git a/src/makefile.vc b/src/makefile.vc index 00559656..5e57c716 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -1,4 +1,3 @@ -# $Id$ # # makefile.vc - builds PROJ.4 library with Visual C++ # diff --git a/src/mk_cheby.c b/src/mk_cheby.c index 0ff0a22d..32f22f1a 100644 --- a/src/mk_cheby.c +++ b/src/mk_cheby.c @@ -36,7 +36,7 @@ Tseries * mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV), int nu, int nv, int power) { int j, i, nru, nrv, *ncu, *ncv; - Tseries *T; + Tseries *T = NULL; projUV **w; double cutres; diff --git a/src/nad2bin.c b/src/nad2bin.c index 69515527..6587c638 100644 --- a/src/nad2bin.c +++ b/src/nad2bin.c @@ -359,7 +359,7 @@ int main(int argc, char **argv) { swap_words( row_buf, 4, ct.lim.lam * 4 ); if( fwrite( row_buf, sizeof(float), ct.lim.lam*4, fp ) - != 4 * ct.lim.lam ) + != (size_t)( 4 * ct.lim.lam ) ) { perror( "write()" ); exit( 2 ); diff --git a/src/nad_init.c b/src/nad_init.c index 84dc9867..3b35ea63 100644 --- a/src/nad_init.c +++ b/src/nad_init.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Load datum shift files into memory. * Author: Frank Warmerdam, warmerdam@pobox.com @@ -85,7 +83,7 @@ static void swap_words( void *data_in, int word_size, int word_count ) int nad_ctable_load( projCtx ctx, struct CTABLE *ct, PAFile fid ) { - int a_size; + size_t a_size; pj_ctx_fseek( ctx, fid, sizeof(struct CTABLE), SEEK_SET ); @@ -158,7 +156,7 @@ struct CTABLE *nad_ctable_init( projCtx ctx, PAFile fid ) int nad_ctable2_load( projCtx ctx, struct CTABLE *ct, PAFile fid ) { - int a_size; + size_t a_size; pj_ctx_fseek( ctx, fid, 160, SEEK_SET ); diff --git a/src/pj_apply_gridshift.c b/src/pj_apply_gridshift.c index a9441b5e..d6141905 100644 --- a/src/pj_apply_gridshift.c +++ b/src/pj_apply_gridshift.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Apply datum shifts based on grid shift files (normally NAD27 to * NAD83 or the reverse). This module is responsible for keeping @@ -119,6 +117,7 @@ int pj_apply_gridshift_3( projCtx ctx, PJ_GRIDINFO **tables, int grid_count, { int i; static int debug_count = 0; + (void) z; if( tables == NULL || grid_count == 0 ) { diff --git a/src/pj_apply_vgridshift.c b/src/pj_apply_vgridshift.c index d6a15761..7f82d838 100644 --- a/src/pj_apply_vgridshift.c +++ b/src/pj_apply_vgridshift.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id: pj_apply_gridshift.c 1831 2010-03-16 12:44:36Z warmerdam $ - * * Project: PROJ.4 * Purpose: Apply vertical datum shifts based on grid shift files, normally * geoid grids mapping WGS84 to NAVD88 or something similar. diff --git a/src/pj_ctx.c b/src/pj_ctx.c index 048baf4a..43d12255 100644 --- a/src/pj_ctx.c +++ b/src/pj_ctx.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of the projCtx thread context object. * Author: Frank Warmerdam, warmerdam@pobox.com @@ -30,8 +28,6 @@ #include <projects.h> #include <string.h> -PJ_CVSID("$Id$"); - static projCtx_t default_context; static volatile int default_context_initialized = 0; diff --git a/src/pj_datum_set.c b/src/pj_datum_set.c index 5e351b21..69b60469 100644 --- a/src/pj_datum_set.c +++ b/src/pj_datum_set.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Apply datum definition to PJ structure from initialization string. * Author: Frank Warmerdam, warmerda@home.com @@ -118,7 +116,6 @@ int pj_datum_set(projCtx ctx, paralist *pl, PJ *projdef) memset( projdef->datum_params, 0, sizeof(double) * 7); /* parse out the parameters */ - s = towgs84; for( s = towgs84; *s != '\0' && parm_count < 7; ) { projdef->datum_params[parm_count++] = atof(s); diff --git a/src/pj_datums.c b/src/pj_datums.c index 13488481..c9655cd6 100644 --- a/src/pj_datums.c +++ b/src/pj_datums.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Built in datum list. * Author: Frank Warmerdam, warmerda@home.com @@ -40,21 +38,30 @@ C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = { /* id definition ellipse comments */ /* -- ---------- ------- -------- */ -"WGS84", "towgs84=0,0,0", "WGS84", "", -"GGRS87", "towgs84=-199.87,74.79,246.62", "GRS80", - "Greek_Geodetic_Reference_System_1987", -"NAD83", "towgs84=0,0,0", "GRS80", - "North_American_Datum_1983", -"NAD27", "nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat", - "clrk66", - "North_American_Datum_1927", -"potsdam", "towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7", "bessel", "Potsdam Rauenberg 1950 DHDN", -"carthage", "towgs84=-263.0,6.0,431.0", "clrk80ign", "Carthage 1934 Tunisia", -"hermannskogel", "towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232", "bessel", "Hermannskogel", -"ire65", "towgs84=482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15", "mod_airy", "Ireland 1965", -"nzgd49", "towgs84=59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993", "intl", "New Zealand Geodetic Datum 1949", -"OSGB36", "towgs84=446.448,-125.157,542.060,0.1502,0.2470,0.8421,-20.4894", "airy", "Airy 1830", -NULL, NULL, NULL, NULL +{"WGS84", "towgs84=0,0,0", "WGS84", ""}, +{"GGRS87", "towgs84=-199.87,74.79,246.62", "GRS80", + "Greek_Geodetic_Reference_System_1987"}, +{"NAD83", "towgs84=0,0,0", "GRS80", + "North_American_Datum_1983"}, +{"NAD27", "nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat", + "clrk66", + "North_American_Datum_1927"}, +{"potsdam", "towgs84=598.1,73.7,418.2,0.202,0.045,-2.455,6.7", + "bessel", + "Potsdam Rauenberg 1950 DHDN"}, +{"carthage","towgs84=-263.0,6.0,431.0", "clrk80ign", + "Carthage 1934 Tunisia"}, +{"hermannskogel", "towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232", + "bessel", + "Hermannskogel"}, +{"ire65", "towgs84=482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15", + "mod_airy", + "Ireland 1965"}, +{"nzgd49", "towgs84=59.47,-5.04,187.44,0.47,-0.1,1.024,-4.5993", + "intl", "New Zealand Geodetic Datum 1949"}, +{"OSGB36", "towgs84=446.448,-125.157,542.060,0.1502,0.2470,0.8421,-20.4894", + "airy", "Airy 1830"}, +{NULL, NULL, NULL, NULL} }; struct PJ_DATUMS *pj_get_datums_ref() @@ -66,20 +73,20 @@ struct PJ_DATUMS *pj_get_datums_ref() C_NAMESPACE_VAR struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { /* id definition */ /* -- ---------- */ - "greenwich", "0dE", - "lisbon", "9d07'54.862\"W", - "paris", "2d20'14.025\"E", - "bogota", "74d04'51.3\"W", - "madrid", "3d41'16.58\"W", - "rome", "12d27'8.4\"E", - "bern", "7d26'22.5\"E", - "jakarta", "106d48'27.79\"E", - "ferro", "17d40'W", - "brussels", "4d22'4.71\"E", - "stockholm", "18d3'29.8\"E", - "athens", "23d42'58.815\"E", - "oslo", "10d43'22.5\"E", - NULL, NULL + {"greenwich", "0dE"}, + {"lisbon", "9d07'54.862\"W"}, + {"paris", "2d20'14.025\"E"}, + {"bogota", "74d04'51.3\"W"}, + {"madrid", "3d41'16.58\"W"}, + {"rome", "12d27'8.4\"E"}, + {"bern", "7d26'22.5\"E"}, + {"jakarta", "106d48'27.79\"E"}, + {"ferro", "17d40'W"}, + {"brussels", "4d22'4.71\"E"}, + {"stockholm", "18d3'29.8\"E"}, + {"athens", "23d42'58.815\"E"}, + {"oslo", "10d43'22.5\"E"}, + {NULL, NULL} }; struct PJ_PRIME_MERIDIANS *pj_get_prime_meridians_ref() diff --git a/src/pj_ell_set.c b/src/pj_ell_set.c index 857bd78c..af825bed 100644 --- a/src/pj_ell_set.c +++ b/src/pj_ell_set.c @@ -11,7 +11,7 @@ pj_ell_set(projCtx ctx, paralist *pl, double *a, double *es) { int i; double b=0.0, e; char *name; - paralist *start = 0, *curr; + paralist *start = 0; /* clear any previous error */ pj_ctx_set_errno(ctx,0); @@ -28,11 +28,10 @@ pj_ell_set(projCtx ctx, paralist *pl, double *a, double *es) { char *s; for (start = pl; start && start->next ; start = start->next) ; - curr = start; for (i = 0; (s = pj_ellps[i].id) && strcmp(name, s) ; ++i) ; if (!s) { pj_ctx_set_errno( ctx, -9); return 1; } - curr = curr->next = pj_mkparam(pj_ellps[i].major); - curr = curr->next = pj_mkparam(pj_ellps[i].ell); + start->next = pj_mkparam(pj_ellps[i].major); + start->next->next = pj_mkparam(pj_ellps[i].ell); } *a = pj_param(ctx,pl, "da").f; if (pj_param(ctx,pl, "tes").i) /* eccentricity squared */ diff --git a/src/pj_ellps.c b/src/pj_ellps.c index 3da162b4..32fbbd42 100644 --- a/src/pj_ellps.c +++ b/src/pj_ellps.c @@ -4,50 +4,50 @@ C_NAMESPACE_VAR struct PJ_ELLPS pj_ellps[] = { -"MERIT", "a=6378137.0", "rf=298.257", "MERIT 1983", -"SGS85", "a=6378136.0", "rf=298.257", "Soviet Geodetic System 85", -"GRS80", "a=6378137.0", "rf=298.257222101", "GRS 1980(IUGG, 1980)", -"IAU76", "a=6378140.0", "rf=298.257", "IAU 1976", -"airy", "a=6377563.396", "b=6356256.910", "Airy 1830", -"APL4.9", "a=6378137.0.", "rf=298.25", "Appl. Physics. 1965", -"NWL9D", "a=6378145.0.", "rf=298.25", "Naval Weapons Lab., 1965", -"mod_airy", "a=6377340.189", "b=6356034.446", "Modified Airy", -"andrae", "a=6377104.43", "rf=300.0", "Andrae 1876 (Den., Iclnd.)", -"aust_SA", "a=6378160.0", "rf=298.25", "Australian Natl & S. Amer. 1969", -"GRS67", "a=6378160.0", "rf=298.2471674270", "GRS 67(IUGG 1967)", -"bessel", "a=6377397.155", "rf=299.1528128", "Bessel 1841", -"bess_nam", "a=6377483.865", "rf=299.1528128", "Bessel 1841 (Namibia)", -"clrk66", "a=6378206.4", "b=6356583.8", "Clarke 1866", -"clrk80", "a=6378249.145", "rf=293.4663", "Clarke 1880 mod.", -"clrk80ign","a=6378249.2", "rf=293.4660212936269", "Clarke 1880 (IGN).", -"CPM", "a=6375738.7", "rf=334.29", "Comm. des Poids et Mesures 1799", -"delmbr", "a=6376428.", "rf=311.5", "Delambre 1810 (Belgium)", -"engelis", "a=6378136.05", "rf=298.2566", "Engelis 1985", -"evrst30", "a=6377276.345", "rf=300.8017", "Everest 1830", -"evrst48", "a=6377304.063", "rf=300.8017", "Everest 1948", -"evrst56", "a=6377301.243", "rf=300.8017", "Everest 1956", -"evrst69", "a=6377295.664", "rf=300.8017", "Everest 1969", -"evrstSS", "a=6377298.556", "rf=300.8017", "Everest (Sabah & Sarawak)", -"fschr60", "a=6378166.", "rf=298.3", "Fischer (Mercury Datum) 1960", -"fschr60m", "a=6378155.", "rf=298.3", "Modified Fischer 1960", -"fschr68", "a=6378150.", "rf=298.3", "Fischer 1968", -"helmert", "a=6378200.", "rf=298.3", "Helmert 1906", -"hough", "a=6378270.0", "rf=297.", "Hough", -"intl", "a=6378388.0", "rf=297.", "International 1909 (Hayford)", -"krass", "a=6378245.0", "rf=298.3", "Krassovsky, 1942", -"kaula", "a=6378163.", "rf=298.24", "Kaula 1961", -"lerch", "a=6378139.", "rf=298.257", "Lerch 1979", -"mprts", "a=6397300.", "rf=191.", "Maupertius 1738", -"new_intl", "a=6378157.5", "b=6356772.2", "New International 1967", -"plessis", "a=6376523.", "b=6355863.", "Plessis 1817 (France)", -"SEasia", "a=6378155.0", "b=6356773.3205", "Southeast Asia", -"walbeck", "a=6376896.0", "b=6355834.8467", "Walbeck", -"WGS60", "a=6378165.0", "rf=298.3", "WGS 60", -"WGS66", "a=6378145.0", "rf=298.25", "WGS 66", -"WGS72", "a=6378135.0", "rf=298.26", "WGS 72", -"WGS84", "a=6378137.0", "rf=298.257223563", "WGS 84", -"sphere", "a=6370997.0", "b=6370997.0", "Normal Sphere (r=6370997)", -0,0,0,0 +{"MERIT", "a=6378137.0", "rf=298.257", "MERIT 1983"}, +{"SGS85", "a=6378136.0", "rf=298.257", "Soviet Geodetic System 85"}, +{"GRS80", "a=6378137.0", "rf=298.257222101", "GRS 1980(IUGG, 1980)"}, +{"IAU76", "a=6378140.0", "rf=298.257", "IAU 1976"}, +{"airy", "a=6377563.396", "b=6356256.910", "Airy 1830"}, +{"APL4.9", "a=6378137.0.", "rf=298.25", "Appl. Physics. 1965"}, +{"NWL9D", "a=6378145.0.", "rf=298.25", "Naval Weapons Lab., 1965"}, +{"mod_airy", "a=6377340.189", "b=6356034.446", "Modified Airy"}, +{"andrae", "a=6377104.43", "rf=300.0", "Andrae 1876 (Den., Iclnd.)"}, +{"aust_SA", "a=6378160.0", "rf=298.25", "Australian Natl & S. Amer. 1969"}, +{"GRS67", "a=6378160.0", "rf=298.2471674270", "GRS 67(IUGG 1967)"}, +{"bessel", "a=6377397.155", "rf=299.1528128", "Bessel 1841"}, +{"bess_nam", "a=6377483.865", "rf=299.1528128", "Bessel 1841 (Namibia)"}, +{"clrk66", "a=6378206.4", "b=6356583.8", "Clarke 1866"}, +{"clrk80", "a=6378249.145", "rf=293.4663", "Clarke 1880 mod."}, +{"clrk80ign", "a=6378249.2", "rf=293.4660212936269", "Clarke 1880 (IGN)."}, +{"CPM", "a=6375738.7", "rf=334.29", "Comm. des Poids et Mesures 1799"}, +{"delmbr", "a=6376428.", "rf=311.5", "Delambre 1810 (Belgium)"}, +{"engelis", "a=6378136.05", "rf=298.2566", "Engelis 1985"}, +{"evrst30", "a=6377276.345", "rf=300.8017", "Everest 1830"}, +{"evrst48", "a=6377304.063", "rf=300.8017", "Everest 1948"}, +{"evrst56", "a=6377301.243", "rf=300.8017", "Everest 1956"}, +{"evrst69", "a=6377295.664", "rf=300.8017", "Everest 1969"}, +{"evrstSS", "a=6377298.556", "rf=300.8017", "Everest (Sabah & Sarawak)"}, +{"fschr60", "a=6378166.", "rf=298.3", "Fischer (Mercury Datum) 1960"}, +{"fschr60m", "a=6378155.", "rf=298.3", "Modified Fischer 1960"}, +{"fschr68", "a=6378150.", "rf=298.3", "Fischer 1968"}, +{"helmert", "a=6378200.", "rf=298.3", "Helmert 1906"}, +{"hough", "a=6378270.0", "rf=297.", "Hough"}, +{"intl", "a=6378388.0", "rf=297.", "International 1909 (Hayford)"}, +{"krass", "a=6378245.0", "rf=298.3", "Krassovsky, 1942"}, +{"kaula", "a=6378163.", "rf=298.24", "Kaula 1961"}, +{"lerch", "a=6378139.", "rf=298.257", "Lerch 1979"}, +{"mprts", "a=6397300.", "rf=191.", "Maupertius 1738"}, +{"new_intl", "a=6378157.5", "b=6356772.2", "New International 1967"}, +{"plessis", "a=6376523.", "b=6355863.", "Plessis 1817 (France)"}, +{"SEasia", "a=6378155.0", "b=6356773.3205", "Southeast Asia"}, +{"walbeck", "a=6376896.0", "b=6355834.8467", "Walbeck"}, +{"WGS60", "a=6378165.0", "rf=298.3", "WGS 60"}, +{"WGS66", "a=6378145.0", "rf=298.25", "WGS 66"}, +{"WGS72", "a=6378135.0", "rf=298.26", "WGS 72"}, +{"WGS84", "a=6378137.0", "rf=298.257223563", "WGS 84"}, +{"sphere", "a=6370997.0", "b=6370997.0", "Normal Sphere (r=6370997)"}, +{NULL, NULL, NULL, NULL} }; struct PJ_ELLPS *pj_get_ellps_ref() diff --git a/src/pj_fileapi.c b/src/pj_fileapi.c index c0b33693..fa35f30a 100644 --- a/src/pj_fileapi.c +++ b/src/pj_fileapi.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of the pj_ctx_* file api, and the default stdio * based implementation. @@ -31,8 +29,6 @@ #include <projects.h> #include <string.h> -PJ_CVSID("$Id$"); - static PAFile pj_stdio_fopen(projCtx ctx, const char *filename, const char *access); static size_t pj_stdio_fread(void *buffer, size_t size, size_t nmemb, @@ -185,7 +181,7 @@ char *pj_ctx_fgets(projCtx ctx, char *line, int size, PAFile file) bytes_read = pj_ctx_fread(ctx, line, 1, size-1, file); if(bytes_read == 0) return NULL; - if(bytes_read < size) + if(bytes_read < (size_t)size) { line[bytes_read] = '\0'; } diff --git a/src/pj_gauss.c b/src/pj_gauss.c index c852c097..b4b965fb 100644 --- a/src/pj_gauss.c +++ b/src/pj_gauss.c @@ -3,8 +3,6 @@ ** ** Copyright (c) 2003 Gerald I. Evenden */ -static const char -LIBPROJ_ID[] = "$Id$"; /* ** Permission is hereby granted, free of charge, to any person obtaining ** a copy of this software and associated documentation files (the @@ -66,6 +64,7 @@ pj_gauss_ini(double e, double phi0, double *chi, double *rc) { LP pj_gauss(projCtx ctx, LP elp, const void *en) { LP slp; + (void) ctx; slp.phi = 2. * atan( EN->K * pow(tan(.5 * elp.phi + FORTPI), EN->C) * diff --git a/src/pj_gc_reader.c b/src/pj_gc_reader.c index 1845fca0..81d0fb26 100644 --- a/src/pj_gc_reader.c +++ b/src/pj_gc_reader.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Code to read a grid catalog from a .cvs file. * Author: Frank Warmerdam, warmerdam@pobox.com @@ -34,7 +32,6 @@ #include <ctype.h> static int pj_gc_readentry(projCtx ctx, PAFile fid, PJ_GridCatalogEntry *entry); -static void pj_gc_sortcatalog( projCtx ctx, PJ_GridCatalog *catalog ); /************************************************************************/ /* pj_gc_readcatalog() */ @@ -82,24 +79,10 @@ PJ_GridCatalog *pj_gc_readcatalog( projCtx ctx, const char *catalog_name ) } } - pj_gc_sortcatalog( ctx, catalog ); - return catalog; } /************************************************************************/ -/* pj_gc_sortcatalog() */ -/* */ -/* Sort all the entries in ascending date and within a date in */ -/* descending priority order. */ -/************************************************************************/ - -static void pj_gc_sortcatalog( projCtx ctx, PJ_GridCatalog *catalog ) - -{ -} - -/************************************************************************/ /* pj_gc_read_csv_line() */ /* */ /* Simple csv line splitter with fixed maximum line size and */ @@ -155,6 +138,8 @@ static int pj_gc_read_csv_line( projCtx ctx, PAFile fid, double pj_gc_parsedate( projCtx ctx, const char *date_string ) { + (void) ctx; + if( strlen(date_string) == 10 && date_string[4] == '-' && date_string[7] == '-' ) { diff --git a/src/pj_geocent.c b/src/pj_geocent.c index e94e6e5b..6b2f3026 100644 --- a/src/pj_geocent.c +++ b/src/pj_geocent.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Stub projection for geocentric. The transformation isn't * really done here since this code is 2D. The real transformation @@ -32,16 +30,16 @@ #define PJ_LIB__ #include <projects.h> -PJ_CVSID("$Id$"); - PROJ_HEAD(geocent, "Geocentric") "\n\t"; FORWARD(forward); + (void) P; xy.x = lp.lam; xy.y = lp.phi; return xy; } INVERSE(inverse); + (void) P; lp.phi = xy.y; lp.lam = xy.x; return lp; diff --git a/src/pj_gridcatalog.c b/src/pj_gridcatalog.c index 76f52c85..79543185 100644 --- a/src/pj_gridcatalog.c +++ b/src/pj_gridcatalog.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Code in support of grid catalogs * Author: Frank Warmerdam, warmerdam@pobox.com @@ -43,8 +41,9 @@ static PJ_GridCatalog *grid_catalog_list = NULL; /************************************************************************/ void pj_gc_unloadall( projCtx ctx ) - { + (void) ctx; + while( grid_catalog_list != NULL ) { int i; @@ -105,6 +104,7 @@ int pj_gc_apply_gridshift( PJ *defn, int inverse, { int i; + (void) z; if( defn->catalog == NULL ) { diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index 9bb1db64..3d34dd7e 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Functions for handling individual PJ_GRIDINFO's. Includes * loaders for all formats but CTABLE (in nad_init.c). @@ -52,7 +50,7 @@ /************************************************************************/ static int byte_order_test = 1; -#define IS_LSB (((unsigned char *) (&byte_order_test))[0] == 1) +#define IS_LSB (1 == ((unsigned char *) (&byte_order_test))[0]) static void swap_words( unsigned char *data, int word_size, int word_count ) @@ -227,7 +225,7 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi ) if( pj_ctx_fread( ctx, row_buf, sizeof(double), gi->ct->lim.lam * 2, fid ) - != 2 * gi->ct->lim.lam ) + != (size_t)( 2 * gi->ct->lim.lam ) ) { pj_dalloc( row_buf ); pj_dalloc( ct_tmp.cvs ); @@ -305,7 +303,7 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi ) if( pj_ctx_fread( ctx, row_buf, sizeof(float), gi->ct->lim.lam*4, fid ) - != 4 * gi->ct->lim.lam ) + != (size_t)( 4 * gi->ct->lim.lam ) ) { pj_dalloc( row_buf ); pj_dalloc( ct_tmp.cvs ); @@ -370,7 +368,7 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi ) } if( pj_ctx_fread( ctx, ct_tmp.cvs, sizeof(float), words, fid ) - != words ) + != (size_t)words ) { pj_dalloc( ct_tmp.cvs ); pj_release_lock(); diff --git a/src/pj_gridlist.c b/src/pj_gridlist.c index 0ed66310..0cfab76e 100644 --- a/src/pj_gridlist.c +++ b/src/pj_gridlist.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Code to manage the list of currently loaded (cached) PJ_GRIDINFOs * See pj_gridinfo.c for details of loading individual grids. @@ -178,7 +176,7 @@ PJ_GRIDINFO **pj_gridlist_from_nadgrids( projCtx ctx, const char *nadgrids, /* -------------------------------------------------------------------- */ for( s = nadgrids; *s != '\0'; ) { - int end_char; + size_t end_char; int required = 1; char name[128]; diff --git a/src/pj_init.c b/src/pj_init.c index 59bd2c88..622e80bf 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Initialize projection object from string definition. Includes * pj_init(), pj_init_plus() and pj_free() function. @@ -37,8 +35,6 @@ #include <locale.h> #include <ctype.h> -PJ_CVSID("$Id$"); - typedef struct { projCtx ctx; PAFile fid; @@ -54,7 +50,7 @@ typedef struct { static const char *fill_buffer(pj_read_state *state, const char *last_char) { size_t bytes_read; - int char_remaining, char_requested; + size_t char_remaining, char_requested; /* -------------------------------------------------------------------- */ /* Don't bother trying to read more if we are at eof, or if the */ @@ -414,16 +410,15 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) { /* put arguments into internal linked list */ if (argc <= 0) { pj_ctx_set_errno( ctx, -1 ); goto bum_call; } - for (i = 0; i < argc; ++i) - if (i) - curr = curr->next = pj_mkparam(argv[i]); - else - start = curr = pj_mkparam(argv[i]); + start = curr = pj_mkparam(argv[0]); + for (i = 1; i < argc; ++i) { + curr->next = pj_mkparam(argv[i]); + curr = curr->next; + } if (ctx->last_errno) goto bum_call; /* check if +init present */ if (pj_param(ctx, start, "tinit").i) { - paralist *last = curr; int found_def = 0; if (!(curr = get_init(ctx,&start, curr, @@ -643,7 +638,7 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) { void pj_free(PJ *P) { if (P) { - paralist *t = P->params, *n; + paralist *t, *n; /* free parameter list elements */ for (t = P->params; t; t = n) { diff --git a/src/pj_initcache.c b/src/pj_initcache.c index 71036f23..e36b0abc 100644 --- a/src/pj_initcache.c +++ b/src/pj_initcache.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id: pj_transform.c 1504 2009-01-06 02:11:57Z warmerdam $ - * * Project: PROJ.4 * Purpose: init file definition cache. * Author: Frank Warmerdam, warmerdam@pobox.com @@ -30,8 +28,6 @@ #include <projects.h> #include <string.h> -PJ_CVSID("$Id: pj_transform.c 1504 2009-01-06 02:11:57Z warmerdam $"); - static int cache_count = 0; static int cache_alloc = 0; static char **cache_key = NULL; diff --git a/src/pj_latlong.c b/src/pj_latlong.c index cce003c8..b7a771a8 100644 --- a/src/pj_latlong.c +++ b/src/pj_latlong.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Stub projection implementation for lat/long coordinates. We * don't actually change the coordinates, but we want proj=latlong diff --git a/src/pj_log.c b/src/pj_log.c index 630a3cfe..54b83a05 100644 --- a/src/pj_log.c +++ b/src/pj_log.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of pj_log() function. * Author: Frank Warmerdam, warmerdam@pobox.com @@ -31,8 +29,6 @@ #include <string.h> #include <stdarg.h> -PJ_CVSID("$Id$"); - /************************************************************************/ /* pj_stderr_logger() */ /************************************************************************/ @@ -40,6 +36,8 @@ PJ_CVSID("$Id$"); void pj_stderr_logger( void *app_data, int level, const char *msg ) { + (void) app_data; + (void) level; fprintf( stderr, "%s\n", msg ); } diff --git a/src/pj_mutex.c b/src/pj_mutex.c index ee5a6550..f61be2e2 100644 --- a/src/pj_mutex.c +++ b/src/pj_mutex.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id: pj_transform.c 1504 2009-01-06 02:11:57Z warmerdam $ - * * Project: PROJ.4 * Purpose: Mutex (thread lock) functions. * Author: Frank Warmerdam, warmerdam@pobox.com @@ -32,7 +30,6 @@ #ifndef _WIN32 #include <projects.h> -PJ_CVSID("$Id: pj_transform.c 1504 2009-01-06 02:11:57Z warmerdam $"); #else #include <proj_api.h> #endif diff --git a/src/pj_open_lib.c b/src/pj_open_lib.c index 524a7505..0a2e7fec 100644 --- a/src/pj_open_lib.c +++ b/src/pj_open_lib.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of pj_open_lib(), and pj_set_finder(). These * provide a standard interface for opening projections support @@ -36,8 +34,6 @@ #include <string.h> #include <errno.h> -PJ_CVSID("$Id$"); - static const char *(*pj_finder)(const char *) = NULL; static int path_count = 0; static char **search_path = NULL; diff --git a/src/pj_pr_list.c b/src/pj_pr_list.c index e14b20d9..95aab4a0 100644 --- a/src/pj_pr_list.c +++ b/src/pj_pr_list.c @@ -58,7 +58,8 @@ char *pj_get_def( PJ *P, int options ) paralist *t; int l; char *definition; - int def_max = 10; + size_t def_max = 10; + (void) options; definition = (char *) pj_malloc(def_max); definition[0] = '\0'; diff --git a/src/pj_strerrno.c b/src/pj_strerrno.c index 9d237039..b46f143c 100644 --- a/src/pj_strerrno.c +++ b/src/pj_strerrno.c @@ -71,7 +71,7 @@ pj_strerrno(int err) } #endif else if (err < 0) { - int adjusted_err = - err - 1; + size_t adjusted_err = - err - 1; if (adjusted_err < (sizeof(pj_err_list) / sizeof(char *))) return(pj_err_list[adjusted_err]); else diff --git a/src/pj_transform.c b/src/pj_transform.c index 2545db16..c8b68281 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Perform overall coordinate system to coordinate system * transformations (pj_transform() function) including reprojection @@ -34,8 +32,6 @@ #include <math.h> #include "geocent.h" -PJ_CVSID("$Id$"); - static int pj_adjust_axis( projCtx ctx, const char *axis, int denormalize_flag, long point_count, int point_offset, double *x, double *y, double *z ); diff --git a/src/pj_units.c b/src/pj_units.c index bb39f91b..c6b5ae37 100644 --- a/src/pj_units.c +++ b/src/pj_units.c @@ -6,28 +6,28 @@ ** numerator/denomenator values (e.g. 1/1000) */ C_NAMESPACE_VAR struct PJ_UNITS pj_units[] = { - "km", "1000.", "Kilometer", - "m", "1.", "Meter", - "dm", "1/10", "Decimeter", - "cm", "1/100", "Centimeter", - "mm", "1/1000", "Millimeter", - "kmi", "1852.0", "International Nautical Mile", - "in", "0.0254", "International Inch", - "ft", "0.3048", "International Foot", - "yd", "0.9144", "International Yard", - "mi", "1609.344", "International Statute Mile", - "fath", "1.8288", "International Fathom", - "ch", "20.1168", "International Chain", - "link", "0.201168", "International Link", - "us-in", "1./39.37", "U.S. Surveyor's Inch", - "us-ft", "0.304800609601219", "U.S. Surveyor's Foot", - "us-yd", "0.914401828803658", "U.S. Surveyor's Yard", - "us-ch", "20.11684023368047", "U.S. Surveyor's Chain", - "us-mi", "1609.347218694437", "U.S. Surveyor's Statute Mile", - "ind-yd", "0.91439523", "Indian Yard", - "ind-ft", "0.30479841", "Indian Foot", - "ind-ch", "20.11669506", "Indian Chain", -(char *)0, (char *)0, (char *)0 + {"km", "1000.", "Kilometer"}, + {"m", "1.", "Meter"}, + {"dm", "1/10", "Decimeter"}, + {"cm", "1/100", "Centimeter"}, + {"mm", "1/1000", "Millimeter"}, + {"kmi", "1852.0", "International Nautical Mile"}, + {"in", "0.0254", "International Inch"}, + {"ft", "0.3048", "International Foot"}, + {"yd", "0.9144", "International Yard"}, + {"mi", "1609.344", "International Statute Mile"}, + {"fath", "1.8288", "International Fathom"}, + {"ch", "20.1168", "International Chain"}, + {"link", "0.201168", "International Link"}, + {"us-in", "1./39.37", "U.S. Surveyor's Inch"}, + {"us-ft", "0.304800609601219", "U.S. Surveyor's Foot"}, + {"us-yd", "0.914401828803658", "U.S. Surveyor's Yard"}, + {"us-ch", "20.11684023368047", "U.S. Surveyor's Chain"}, + {"us-mi", "1609.347218694437", "U.S. Surveyor's Statute Mile"}, + {"ind-yd", "0.91439523", "Indian Yard"}, + {"ind-ft", "0.30479841", "Indian Foot"}, + {"ind-ch", "20.11669506", "Indian Chain"}, + {NULL, NULL, NULL} }; struct PJ_UNITS *pj_get_units_ref() diff --git a/src/pj_utils.c b/src/pj_utils.c index f3d642ad..bb4b6ae6 100644 --- a/src/pj_utils.c +++ b/src/pj_utils.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Some utility functions we don't want to bother putting in * their own source files. diff --git a/src/proj_api.h b/src/proj_api.h index ccef7132..0c4be974 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Public (application) include file for PROJ.4 API, and constants. * Author: Frank Warmerdam, <warmerdam@pobox.com> diff --git a/src/proj_config.h.wince b/src/proj_config.h.wince index d24d13eb..9e2c8a67 100644 --- a/src/proj_config.h.wince +++ b/src/proj_config.h.wince @@ -1,5 +1,3 @@ -/* $Id$ */ - /* * Windows CE platform config. */ diff --git a/src/proj_mdist.c b/src/proj_mdist.c index 9c588a27..d7e43443 100644 --- a/src/proj_mdist.c +++ b/src/proj_mdist.c @@ -3,8 +3,6 @@ ** ** Copyright (c) 2003, 2006 Gerald I. Evenden */ -static const char -LIBPROJ_ID[] = "$Id$"; /* ** Permission is hereby granted, free of charge, to any person obtaining ** a copy of this software and associated documentation files (the diff --git a/src/proj_rouss.c b/src/proj_rouss.c index 64075abe..f1c2f5a1 100644 --- a/src/proj_rouss.c +++ b/src/proj_rouss.c @@ -3,8 +3,6 @@ ** ** Copyright (c) 2003, 2006 Gerald I. Evenden */ -static const char -LIBPROJ_ID[] = "$Id$"; /* ** Permission is hereby granted, free of charge, to any person obtaining ** a copy of this software and associated documentation files (the diff --git a/src/projects.h b/src/projects.h index 5a9519c5..062bd07d 100644 --- a/src/projects.h +++ b/src/projects.h @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Primary (private) include file for PROJ.4 library. * Author: Gerald Evenden @@ -512,17 +510,6 @@ struct PJ_UNITS *pj_get_units_ref( void ); struct PJ_LIST *pj_get_list_ref( void ); struct PJ_PRIME_MERIDIANS *pj_get_prime_meridians_ref( void ); -#ifndef DISABLE_CVSID -# if defined(__GNUC__) && __GNUC__ >= 4 -# 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) : pj_cvsid ); } -# endif -#else -# define PJ_CVSID(string) -#endif - #ifdef __cplusplus } #endif diff --git a/wince/msvc80/README.txt b/wince/msvc80/README.txt index 4c2a19d8..46f42ba6 100644 --- a/wince/msvc80/README.txt +++ b/wince/msvc80/README.txt @@ -1,4 +1,3 @@ -$Id$ ------------------------------------------------------------------------------- PROJ.4 port for Windows CE Author: Mateusz Loskot (mateusz@loskot.net) |