← Back to branch summary

~ubuntu-branches/ubuntu/wily/proj/wily

~ubuntu-branches/ubuntu/wily/proj/wily

« back to all changes in this revision

Viewing changes to src/proj_api.h

Committer: Package Import Robot
Author(s): Francesco Paolo Lovergine, Jerome Villeneuve Larouche, Francesco Paolo Lovergine
Date: 2013-11-25 15:11:25 UTC
mfrom: (1.2.7)
Revision ID: package-import@ubuntu.com-20131125151125-mvcw144wvgep1hev

Tags: 4.8.0-1

[ Jerome Villeneuve Larouche ]
* New upstream release
* Modified libproj-dev.install to remove nad_list.h and projects.h
* Modified proj-bin.install to remove nad2nad
* Modified proj-bin.manpages to remove nad2nad man
* Added symbols for libproj0

[ Francesco Paolo Lovergine ]
* Properly merged with current git master and sid version 4.7.0-2.
* Removed proj transitional package and obsolete conflicts/replaces against
series 4.6 and older.

files added:
.pc

.pc/.quilt_patches

.pc/.quilt_series

.pc/.version

.pc/applied-patches

debian/libproj0.symbols

jniwrap/org/proj4/PJ.java

jniwrap/org/proj4/PJException.java

jniwrap/org/proj4/package-info.java

nad/CH

proj.pc.in

src/PJ_healpix.c

src/PJ_igh.c

src/PJ_isea.c

src/PJ_natearth.c

src/multistresstest.c

src/pj_apply_vgridshift.c

src/pj_ctx.c

src/pj_log.c

src/proj_etmerc.c

files removed:
man/man1/nad2nad.1

src/nad2nad.c

src/nad_list.h

files modified:
ChangeLog

Makefile.am

Makefile.in

NEWS

aclocal.m4

configure

configure.in

debian/changelog

debian/control

debian/libproj-dev.install

debian/proj-bin.install

debian/proj-bin.manpages

debian/rules

jniwrap/Makefile.in

jniwrap/README

jniwrap/build.xml

jniwrap/doxygen.cfg

jniwrap/org/Makefile.in

jniwrap/org/proj4/LatLong.java

jniwrap/org/proj4/Makefile.am

jniwrap/org/proj4/Makefile.in

jniwrap/org/proj4/Others.java

jniwrap/org/proj4/Proj4.java

jniwrap/org/proj4/Proj4Factory.java

jniwrap/org/proj4/ProjectionData.java

jniwrap/org/proj4/Projections.java

ltmain.sh *

man/Makefile.in

man/man1/Makefile.am

man/man1/Makefile.in

man/man3/Makefile.in

nad/IGNF

nad/Makefile.am

nad/Makefile.in

nad/epsg

nad/esri.extra

nad/other.extra

nad/proj_outIGNF.dist

nad/td_out.dist

nad/test27

nad/test83

nad/testIGNF

nad/testdatumfile

nad/testntv2

nad/testvarious

nad/tv_out.dist

nmake.opt

src/Makefile.am

src/Makefile.in

src/PJ_aea.c

src/PJ_aeqd.c

src/PJ_airy.c

src/PJ_aitoff.c

src/PJ_bipc.c

src/PJ_bonne.c

src/PJ_cass.c

src/PJ_cea.c

src/PJ_chamb.c

src/PJ_eck4.c

src/PJ_eqc.c

src/PJ_eqdc.c

src/PJ_fouc_s.c

src/PJ_geos.c

src/PJ_gn_sinu.c

src/PJ_goode.c

src/PJ_gstmerc.c

src/PJ_hammer.c

src/PJ_imw_p.c

src/PJ_krovak.c

src/PJ_labrd.c

src/PJ_lagrng.c

src/PJ_lcc.c

src/PJ_lcca.c

src/PJ_loxim.c

src/PJ_lsat.c

src/PJ_mbt_fps.c

src/PJ_merc.c

src/PJ_mod_ster.c

src/PJ_moll.c

src/PJ_nell.c

src/PJ_nsper.c

src/PJ_ob_tran.c

src/PJ_ocea.c

src/PJ_oea.c

src/PJ_omerc.c

src/PJ_putp2.c

src/PJ_putp4p.c

src/PJ_putp6.c

src/PJ_robin.c

src/PJ_rpoly.c

src/PJ_sconics.c

src/PJ_somerc.c

src/PJ_stere.c

src/PJ_sterea.c

src/PJ_sts.c

src/PJ_tmerc.c

src/PJ_tpeqd.c

src/PJ_urm5.c

src/PJ_urmfps.c

src/PJ_wag2.c

src/PJ_wag3.c

src/PJ_wink1.c

src/PJ_wink2.c

src/aasincos.c

src/biveval.c

src/cs2cs.c

src/dmstor.c

src/emess.h

src/geod.c

src/geod_set.c

src/jniproj.c

src/makefile.vc

src/mk_cheby.c

src/nad2bin.c

src/nad_init.c

src/pj_apply_gridshift.c

src/pj_auth.c

src/pj_datum_set.c

src/pj_datums.c

src/pj_ell_set.c

src/pj_factors.c

src/pj_fwd.c

src/pj_gauss.c

src/pj_gridinfo.c

src/pj_gridlist.c

src/pj_init.c

src/pj_initcache.c

src/pj_inv.c

src/pj_list.h

src/pj_malloc.c

src/pj_mlfn.c

src/pj_mutex.c

src/pj_open_lib.c

src/pj_param.c

src/pj_phi2.c

src/pj_pr_list.c

src/pj_release.c

src/pj_strerrno.c

src/pj_transform.c

src/pj_utils.c

src/proj.c

src/proj.def

src/proj_api.h

src/proj_mdist.c

src/proj_rouss.c

src/projects.h

src/vector1.c

Show diffs side-by-side

added added

removed removed

1

1

/******************************************************************************

2

* $Id: proj_api.h 1631 2009-09-24 02:26:05Z warmerdam $

2

* $Id: proj_api.h 2160 2012-02-15 23:51:45Z warmerdam $

3

3

*

4

4

* Project: PROJ.4

5

5

* Purpose: Public (application) include file for PROJ.4 API, and constants.

40

40

#endif

41

41

42

42

/* Try to update this every version! */

43

#define PJ_VERSION 470

43

#define PJ_VERSION 480

44

44

45

45

extern char const pj_release[]; /* global release id string */

46

46

55

55

typedef void *projPJ;

56

56

#define projXY projUV

57

57

#define projLP projUV

58

typedef void *projCtx;

58

59

#else

59

60

typedef PJ *projPJ;

61

typedef projCtx_t *projCtx;

60

62

# define projXY XY

61

63

# define projLP LP

62

64

#endif

77

79

long point_count, int point_offset,

78

80

double *x, double *y, double *z );

79

81

int pj_compare_datums( projPJ srcdefn, projPJ dstdefn );

80

int pj_apply_gridshift( const char *, int,

82

int pj_apply_gridshift( projCtx, const char *, int,

81

83

long point_count, int point_offset,

82

84

double *x, double *y, double *z );

83

85

void pj_deallocate_grids(void);

86

void pj_clear_initcache(void);

84

87

int pj_is_latlong(projPJ);

85

88

int pj_is_geocent(projPJ);

89

void pj_get_spheroid_defn(projPJ defn, double *major_axis, double *eccentricity_squared);

86

90

void pj_pr_list(projPJ);

87

91

void pj_free(projPJ);

88

92

void pj_set_finder( const char *(*)(const char *) );

89

93

void pj_set_searchpath ( int count, const char **path );

90

94

projPJ pj_init(int, char **);

91

95

projPJ pj_init_plus(const char *);

96

projPJ pj_init_ctx( projCtx, int, char ** );

97

projPJ pj_init_plus_ctx( projCtx, const char * );

92

98

char *pj_get_def(projPJ, int);

93

99

projPJ pj_latlong_from_proj( projPJ );

94

100

void *pj_malloc(size_t);

100

106

void pj_release_lock(void);

101

107

void pj_cleanup_lock(void);

102

108

109

projCtx pj_get_default_ctx(void);

110

projCtx pj_get_ctx( projPJ );

111

void pj_set_ctx( projPJ, projCtx );

112

projCtx pj_ctx_alloc(void);

113

void pj_ctx_free( projCtx );

114

int pj_ctx_get_errno( projCtx );

115

void pj_ctx_set_errno( projCtx, int );

116

void pj_ctx_set_debug( projCtx, int );

117

void pj_ctx_set_logger( projCtx, void (*)(void *, int, const char *) );

118

void pj_ctx_set_app_data( projCtx, void * );

119

void *pj_ctx_get_app_data( projCtx );

120

121

void pj_log( projCtx ctx, int level, const char *fmt, ... );

122

void pj_stderr_logger( void *, int, const char * );

123

124

#define PJ_LOG_NONE 0

125

#define PJ_LOG_ERROR 1

126

#define PJ_LOG_DEBUG_MAJOR 2

127

#define PJ_LOG_DEBUG_MINOR 3

128

103

129

#ifdef __cplusplus

104

130

}

105

131

#endif

Older »