Skip to content
This repository has been archived by the owner on May 9, 2018. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
o Updated Proj4 to 4.7.0 (with some fixes to silence compiler warnings)
  • Loading branch information
Thomas Rasch committed Feb 6, 2012
1 parent a6b1a10 commit ef491e8
Show file tree
Hide file tree
Showing 158 changed files with 1,045 additions and 1,413 deletions.
9 changes: 5 additions & 4 deletions Proj4/Makefile.am
@@ -1,6 +1,7 @@
bin_PROGRAMS = proj nad2nad nad2bin geod cs2cs

INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" @JNI_INCLUDE@
INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \
-DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@

include_HEADERS = projects.h nad_list.h proj_api.h org_proj4_Projections.h

Expand All @@ -20,7 +21,7 @@ geod_LDADD = libproj.la

lib_LTLIBRARIES = libproj.la

libproj_la_LDFLAGS = -version-info 5:4:5
libproj_la_LDFLAGS = -no-undefined -version-info 6:6:6

libproj_la_SOURCES = \
projects.h pj_list.h \
Expand All @@ -40,7 +41,7 @@ libproj_la_SOURCES = \
PJ_wag7.c PJ_lcca.c PJ_geos.c \
PJ_boggs.c PJ_collg.c PJ_crast.c PJ_denoy.c \
PJ_eck1.c PJ_eck2.c PJ_eck3.c PJ_eck4.c \
PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c \
PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c PJ_gstmerc.c \
PJ_gn_sinu.c PJ_goode.c PJ_hatano.c PJ_loxim.c \
PJ_mbt_fps.c PJ_mbtfpp.c PJ_mbtfpq.c PJ_moll.c \
PJ_nell.c PJ_nell_h.c PJ_putp2.c PJ_putp3.c \
Expand All @@ -59,7 +60,7 @@ libproj_la_SOURCES = \
nad_cvt.c nad_init.c nad_intr.c emess.c emess.h \
pj_apply_gridshift.c pj_datums.c pj_datum_set.c pj_transform.c \
geocent.c geocent.h pj_utils.c pj_gridinfo.c pj_gridlist.c \
jniproj.c
jniproj.c pj_mutex.c pj_initcache.c


install-exec-local:
Expand Down
38 changes: 22 additions & 16 deletions Proj4/Makefile.in
Expand Up @@ -70,23 +70,23 @@ am_libproj_la_OBJECTS = PJ_aeqd.lo PJ_gnom.lo PJ_laea.lo \
PJ_vandg.lo PJ_vandg2.lo PJ_vandg4.lo PJ_wag7.lo PJ_lcca.lo \
PJ_geos.lo PJ_boggs.lo PJ_collg.lo PJ_crast.lo PJ_denoy.lo \
PJ_eck1.lo PJ_eck2.lo PJ_eck3.lo PJ_eck4.lo PJ_eck5.lo \
PJ_fahey.lo PJ_fouc_s.lo PJ_gins8.lo PJ_gn_sinu.lo PJ_goode.lo \
PJ_hatano.lo PJ_loxim.lo PJ_mbt_fps.lo PJ_mbtfpp.lo \
PJ_mbtfpq.lo PJ_moll.lo PJ_nell.lo PJ_nell_h.lo PJ_putp2.lo \
PJ_putp3.lo PJ_putp4p.lo PJ_putp5.lo PJ_putp6.lo PJ_robin.lo \
PJ_sts.lo PJ_urm5.lo PJ_urmfps.lo PJ_wag2.lo PJ_wag3.lo \
PJ_wink1.lo PJ_wink2.lo pj_latlong.lo pj_geocent.lo \
aasincos.lo adjlon.lo bch2bps.lo bchgen.lo biveval.lo \
dmstor.lo mk_cheby.lo pj_auth.lo pj_deriv.lo pj_ell_set.lo \
pj_ellps.lo pj_errno.lo pj_factors.lo pj_fwd.lo pj_init.lo \
pj_inv.lo pj_list.lo pj_malloc.lo pj_mlfn.lo pj_msfn.lo \
proj_mdist.lo pj_open_lib.lo pj_param.lo pj_phi2.lo \
PJ_fahey.lo PJ_fouc_s.lo PJ_gins8.lo PJ_gstmerc.lo \
PJ_gn_sinu.lo PJ_goode.lo PJ_hatano.lo PJ_loxim.lo \
PJ_mbt_fps.lo PJ_mbtfpp.lo PJ_mbtfpq.lo PJ_moll.lo PJ_nell.lo \
PJ_nell_h.lo PJ_putp2.lo PJ_putp3.lo PJ_putp4p.lo PJ_putp5.lo \
PJ_putp6.lo PJ_robin.lo PJ_sts.lo PJ_urm5.lo PJ_urmfps.lo \
PJ_wag2.lo PJ_wag3.lo PJ_wink1.lo PJ_wink2.lo pj_latlong.lo \
pj_geocent.lo aasincos.lo adjlon.lo bch2bps.lo bchgen.lo \
biveval.lo dmstor.lo mk_cheby.lo pj_auth.lo pj_deriv.lo \
pj_ell_set.lo pj_ellps.lo pj_errno.lo pj_factors.lo pj_fwd.lo \
pj_init.lo pj_inv.lo pj_list.lo pj_malloc.lo pj_mlfn.lo \
pj_msfn.lo proj_mdist.lo pj_open_lib.lo pj_param.lo pj_phi2.lo \
pj_pr_list.lo pj_qsfn.lo pj_strerrno.lo pj_tsfn.lo pj_units.lo \
pj_zpoly1.lo rtodms.lo vector1.lo pj_release.lo pj_gauss.lo \
nad_cvt.lo nad_init.lo nad_intr.lo emess.lo \
pj_apply_gridshift.lo pj_datums.lo pj_datum_set.lo \
pj_transform.lo geocent.lo pj_utils.lo pj_gridinfo.lo \
pj_gridlist.lo jniproj.lo
pj_gridlist.lo jniproj.lo pj_mutex.lo pj_initcache.lo
libproj_la_OBJECTS = $(am_libproj_la_OBJECTS)
libproj_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
Expand Down Expand Up @@ -174,6 +174,7 @@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MUTEX_SETTING = @MUTEX_SETTING@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Expand Down Expand Up @@ -239,7 +240,9 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" @JNI_INCLUDE@
INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \
-DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@

include_HEADERS = projects.h nad_list.h proj_api.h org_proj4_Projections.h
EXTRA_DIST = makefile.vc proj.def
proj_SOURCES = proj.c gen_cheb.c p_series.c
Expand All @@ -253,7 +256,7 @@ nad2nad_LDADD = libproj.la
nad2bin_LDADD = libproj.la
geod_LDADD = libproj.la
lib_LTLIBRARIES = libproj.la
libproj_la_LDFLAGS = -version-info 5:4:5
libproj_la_LDFLAGS = -no-undefined -version-info 6:6:6
libproj_la_SOURCES = \
projects.h pj_list.h \
PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \
Expand All @@ -272,7 +275,7 @@ libproj_la_SOURCES = \
PJ_wag7.c PJ_lcca.c PJ_geos.c \
PJ_boggs.c PJ_collg.c PJ_crast.c PJ_denoy.c \
PJ_eck1.c PJ_eck2.c PJ_eck3.c PJ_eck4.c \
PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c \
PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c PJ_gstmerc.c \
PJ_gn_sinu.c PJ_goode.c PJ_hatano.c PJ_loxim.c \
PJ_mbt_fps.c PJ_mbtfpp.c PJ_mbtfpq.c PJ_moll.c \
PJ_nell.c PJ_nell_h.c PJ_putp2.c PJ_putp3.c \
Expand All @@ -291,7 +294,7 @@ libproj_la_SOURCES = \
nad_cvt.c nad_init.c nad_intr.c emess.c emess.h \
pj_apply_gridshift.c pj_datums.c pj_datum_set.c pj_transform.c \
geocent.c geocent.h pj_utils.c pj_gridinfo.c pj_gridlist.c \
jniproj.c
jniproj.c pj_mutex.c pj_initcache.c

all: proj_config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
Expand Down Expand Up @@ -454,6 +457,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gn_sinu.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gnom.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_goode.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gstmerc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_hammer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_hatano.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_imw_p.Plo@am__quote@
Expand Down Expand Up @@ -548,12 +552,14 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_gridinfo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_gridlist.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_init.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_initcache.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_inv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_latlong.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_list.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_malloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_mlfn.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_msfn.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_mutex.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_open_lib.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_param.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pj_phi2.Plo@am__quote@
Expand Down
17 changes: 4 additions & 13 deletions Proj4/PJ_aea.c
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id: PJ_aea.c,v 1.4 2003/08/18 15:21:23 warmerda Exp $
* $Id: PJ_aea.c 1504 2009-01-06 02:11:57Z warmerdam $
*
* Project: PROJ.4
* Purpose: Implementation of the aea (Albers Equal Area) projection.
Expand All @@ -25,16 +25,7 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
*
* $Log: PJ_aea.c,v $
* Revision 1.4 2003/08/18 15:21:23 warmerda
* fixed initialization of en variable
*
* Revision 1.3 2002/12/14 19:27:06 warmerda
* updated header
*
*/
*****************************************************************************/

#define PROJ_PARMS__ \
double ec; \
Expand All @@ -50,9 +41,9 @@
int ellips;

#define PJ_LIB__
#include "projects.h"
#include <projects.h>

PJ_CVSID("$Id: PJ_aea.c,v 1.4 2003/08/18 15:21:23 warmerda Exp $");
PJ_CVSID("$Id: PJ_aea.c 1504 2009-01-06 02:11:57Z warmerdam $");

# define EPS10 1.e-10
# define TOL7 1.e-7
Expand Down
14 changes: 4 additions & 10 deletions Proj4/PJ_aeqd.c
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id: PJ_aeqd.c,v 1.3 2002/12/14 19:27:06 warmerda Exp $
* $Id: PJ_aeqd.c 1504 2009-01-06 02:11:57Z warmerdam $
*
* Project: PROJ.4
* Purpose: Implementation of the aeqd (Azimuthal Equidistant) projection.
Expand All @@ -25,13 +25,7 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
*
* $Log: PJ_aeqd.c,v $
* Revision 1.3 2002/12/14 19:27:06 warmerda
* updated header
*
*/
*****************************************************************************/

#define PROJ_PARMS__ \
double sinph0; \
Expand All @@ -44,9 +38,9 @@
double G; \
int mode;
#define PJ_LIB__
#include "projects.h"
#include <projects.h>

PJ_CVSID("$Id: PJ_aeqd.c,v 1.3 2002/12/14 19:27:06 warmerda Exp $");
PJ_CVSID("$Id: PJ_aeqd.c 1504 2009-01-06 02:11:57Z warmerdam $");

PROJ_HEAD(aeqd, "Azimuthal Equidistant") "\n\tAzi, Sph&Ell\n\tlat_0 guam";

Expand Down
14 changes: 4 additions & 10 deletions Proj4/PJ_airy.c
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id: PJ_airy.c,v 1.2 2002/12/14 19:30:40 warmerda Exp $
* $Id: PJ_airy.c 1504 2009-01-06 02:11:57Z warmerdam $
*
* Project: PROJ.4
* Purpose: Implementation of the airy (Airy) projection.
Expand All @@ -25,13 +25,7 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
*
* $Log: PJ_airy.c,v $
* Revision 1.2 2002/12/14 19:30:40 warmerda
* updated header
*
*/
*****************************************************************************/

#define PROJ_PARMS__ \
double p_halfpi; \
Expand All @@ -41,9 +35,9 @@
int mode; \
int no_cut; /* do not cut at hemisphere limit */
#define PJ_LIB__
#include "projects.h"
#include <projects.h>

PJ_CVSID("$Id: PJ_airy.c,v 1.2 2002/12/14 19:30:40 warmerda Exp $");
PJ_CVSID("$Id: PJ_airy.c 1504 2009-01-06 02:11:57Z warmerdam $");

PROJ_HEAD(airy, "Airy") "\n\tMisc Sph, no inv.\n\tno_cut lat_b=";

Expand Down
14 changes: 4 additions & 10 deletions Proj4/PJ_aitoff.c
@@ -1,5 +1,5 @@
/******************************************************************************
* $Id: PJ_aitoff.c,v 1.3 2002/12/14 19:32:27 warmerda Exp $
* $Id: PJ_aitoff.c 1504 2009-01-06 02:11:57Z warmerdam $
*
* Project: PROJ.4
* Purpose: Implementation of the aitoff (Aitoff) and wintri (Winkel Tripel)
Expand All @@ -26,21 +26,15 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
*
* $Log: PJ_aitoff.c,v $
* Revision 1.3 2002/12/14 19:32:27 warmerda
* updated header
*
*/
*****************************************************************************/

#define PROJ_PARMS__ \
double cosphi1; \
int mode;
#define PJ_LIB__
#include "projects.h"
#include <projects.h>

PJ_CVSID("$Id: PJ_aitoff.c,v 1.3 2002/12/14 19:32:27 warmerda Exp $");
PJ_CVSID("$Id: PJ_aitoff.c 1504 2009-01-06 02:11:57Z warmerdam $");

PROJ_HEAD(aitoff, "Aitoff") "\n\tMisc Sph";
PROJ_HEAD(wintri, "Winkel Tripel") "\n\tMisc Sph\n\tlat_1";
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_august.c
@@ -1,8 +1,5 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_august.c 4.1 94/02/15 GIE REL";
#endif
#define PJ_LIB__
#include "projects.h"
#include <projects.h>
PROJ_HEAD(august, "August Epicycloidal") "\n\tMisc Sph, no inv.";
#define M 1.333333333333333
FORWARD(s_forward); /* spheroid */
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_bacon.c
@@ -1,13 +1,10 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_bacon.c 4.1 94/02/15 GIE REL";
#endif
# define HLFPI2 2.46740110027233965467
# define EPS 1e-10
#define PROJ_PARMS__ \
int bacn; \
int ortl;
#define PJ_LIB__
#include "projects.h"
#include <projects.h>
PROJ_HEAD(apian, "Apian Globular I") "\n\tMisc Sph, no inv.";
PROJ_HEAD(ortel, "Ortelius Oval") "\n\tMisc Sph, no inv.";
PROJ_HEAD(bacon, "Bacon Globular") "\n\tMisc Sph, no inv.";
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_bipc.c
@@ -1,10 +1,7 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_bipc.c 4.1 94/02/15 GIE REL";
#endif
#define PROJ_PARMS__ \
int noskew;
#define PJ_LIB__
# include "projects.h"
# include <projects.h>
PROJ_HEAD(bipc, "Bipolar conic of western hemisphere")
"\n\tConic Sph.";
# define EPS 1e-10
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_boggs.c
@@ -1,8 +1,5 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_boggs.c 4.1 94/02/15 GIE REL";
#endif
#define PJ_LIB__
# include "projects.h"
# include <projects.h>
PROJ_HEAD(boggs, "Boggs Eumorphic") "\n\tPCyl., no inv., Sph.";
# define NITER 20
# define EPS 1e-7
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_bonne.c
@@ -1,14 +1,11 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_bonne.c 4.1 94/02/15 GIE REL";
#endif
#define PROJ_PARMS__ \
double phi1; \
double cphi1; \
double am1; \
double m1; \
double *en;
#define PJ_LIB__
#include "projects.h"
#include <projects.h>
PROJ_HEAD(bonne, "Bonne (Werner lat_1=90)")
"\n\tConic Sph&Ell\n\tlat_1=";
#define EPS10 1e-10
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_cass.c
@@ -1,6 +1,3 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_cass.c 4.1 94/02/15 GIE REL";
#endif
#define PROJ_PARMS__ \
double m0; \
double n; \
Expand All @@ -14,7 +11,7 @@ static const char SCCSID[]="@(#)PJ_cass.c 4.1 94/02/15 GIE REL";
double tn; \
double *en;
#define PJ_LIB__
# include "projects.h"
# include <projects.h>
PROJ_HEAD(cass, "Cassini") "\n\tCyl, Sph&Ell";
# define EPS10 1e-10
# define C1 .16666666666666666666
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_cc.c
@@ -1,10 +1,7 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_cc.c 4.1 94/02/15 GIE REL";
#endif
#define PROJ_PARMS__ \
double ap;
#define PJ_LIB__
#include "projects.h"
#include <projects.h>
PROJ_HEAD(cc, "Central Cylindrical") "\n\tCyl, Sph";
#define EPS10 1.e-10
FORWARD(s_forward); /* spheroid */
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_cea.c
@@ -1,11 +1,8 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_cea.c 4.1 94/02/15 GIE REL";
#endif
#define PROJ_PARMS__ \
double qp; \
double *apa;
#define PJ_LIB__
# include "projects.h"
# include <projects.h>
PROJ_HEAD(cea, "Equal Area Cylindrical") "\n\tCyl, Sph&Ell\n\tlat_ts=";
# define EPS 1e-10
FORWARD(e_forward); /* spheroid */
Expand Down
5 changes: 1 addition & 4 deletions Proj4/PJ_chamb.c
@@ -1,6 +1,3 @@
#ifndef lint
static const char SCCSID[]="@(#)PJ_chamb.c 4.1 94/02/15 GIE REL";
#endif
typedef struct { double r, Az; } VECT;
#define PROJ_PARMS__ \
struct { /* control point data */ \
Expand All @@ -13,7 +10,7 @@ typedef struct { double r, Az; } VECT;
XY p; \
double beta_0, beta_1, beta_2;
#define PJ_LIB__
#include "projects.h"
#include <projects.h>
PROJ_HEAD(chamb, "Chamberlin Trimetric") "\n\tMisc Sph, no inv."
"\n\tlat_1= lon_1= lat_2= lon_2= lat_3= lon_3=";
#include <stdio.h>
Expand Down

0 comments on commit ef491e8

Please sign in to comment.