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

Committer: Bazaar Package Importer
Author(s): Francesco Paolo Lovergine
Date: 2009-10-05 16:28:55 UTC
mfrom: (1.2.6 upstream)
Revision ID: james.westby@ubuntu.com-20091005162855-gnsd4jzn7wtw8uwg

Tags: 4.7.0-1

http://bugs.debian.org/548297

* New upstream release
* Datum grids files updated to version 1.5.
(closes: #548297)
* Removed manpages.dpatch, applied upstream.
* Generalized libproj0.install file.
* Policy changed to 3.8.3, without futher changes.
* Minor change to nad2bin.1 man page.

files added:
nad/testdatumfile

nad/tv_out.dist

src/pj_initcache.c

src/pj_mutex.c

files removed:
debian/patches/manpages.dpatch

files modified:
AUTHORS

ChangeLog

Makefile.in

NEWS

README

configure

configure.in

debian/TODO

debian/changelog

debian/control

debian/datumgrids.shar

debian/libproj0.install

debian/nad2bin.1

debian/patches/00list

jniwrap/Makefile.in

jniwrap/org/Makefile.in

jniwrap/org/proj4/Makefile.in

makefile.vc

man/Makefile.in

man/man1/Makefile.in

man/man1/cs2cs.1

man/man1/geod.1

man/man1/nad2nad.1

man/man1/proj.1

man/man3/Makefile.in

man/man3/pj_init.3

mkinstalldirs

nad/Makefile.am

nad/Makefile.in

nad/epsg

nad/makefile.vc

nad/td_out.dist

nad/testIGNF

nad/testvarious

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_august.c

src/PJ_bacon.c

src/PJ_bipc.c

src/PJ_boggs.c

src/PJ_bonne.c

src/PJ_cass.c

src/PJ_cc.c

src/PJ_cea.c

src/PJ_chamb.c

src/PJ_collg.c

src/PJ_crast.c

src/PJ_denoy.c

src/PJ_eck1.c

src/PJ_eck2.c

src/PJ_eck3.c

src/PJ_eck4.c

src/PJ_eck5.c

src/PJ_eqc.c

src/PJ_eqdc.c

src/PJ_fahey.c

src/PJ_fouc_s.c

src/PJ_gall.c

src/PJ_geos.c

src/PJ_gins8.c

src/PJ_gn_sinu.c

src/PJ_gnom.c

src/PJ_goode.c

src/PJ_gstmerc.c

src/PJ_hammer.c

src/PJ_hatano.c

src/PJ_imw_p.c

src/PJ_krovak.c

src/PJ_labrd.c

src/PJ_laea.c

src/PJ_lagrng.c

src/PJ_larr.c

src/PJ_lask.c

src/PJ_lcc.c

src/PJ_lcca.c

src/PJ_loxim.c

src/PJ_lsat.c

src/PJ_mbt_fps.c

src/PJ_mbtfpp.c

src/PJ_mbtfpq.c

src/PJ_merc.c

src/PJ_mill.c

src/PJ_mod_ster.c

src/PJ_moll.c

src/PJ_nell.c

src/PJ_nell_h.c

src/PJ_nocol.c

src/PJ_nsper.c

src/PJ_nzmg.c

src/PJ_ob_tran.c

src/PJ_ocea.c

src/PJ_oea.c

src/PJ_omerc.c

src/PJ_ortho.c

src/PJ_poly.c

src/PJ_putp2.c

src/PJ_putp3.c

src/PJ_putp4p.c

src/PJ_putp5.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_tcc.c

src/PJ_tcea.c

src/PJ_tmerc.c

src/PJ_tpeqd.c

src/PJ_urm5.c

src/PJ_urmfps.c

src/PJ_vandg.c

src/PJ_vandg2.c

src/PJ_vandg4.c

src/PJ_wag2.c

src/PJ_wag3.c

src/PJ_wag7.c

src/PJ_wink1.c

src/PJ_wink2.c

src/aasincos.c

src/adjlon.c

src/bch2bps.c

src/bchgen.c

src/biveval.c

src/cs2cs.c

src/dmstor.c

src/emess.c

src/gen_cheb.c

src/geocent.c

src/geod.c

src/geod_for.c

src/geod_inv.c

src/geod_set.c

src/jniproj.c

src/makefile.vc

src/mk_cheby.c

src/nad2bin.c

src/nad2nad.c

src/nad_cvt.c

src/nad_init.c

src/nad_intr.c

src/p_series.c

src/pj_apply_gridshift.c

src/pj_auth.c

src/pj_datum_set.c

src/pj_datums.c

src/pj_deriv.c

src/pj_ell_set.c

src/pj_ellps.c

src/pj_errno.c

src/pj_factors.c

src/pj_fwd.c

src/pj_gauss.c

src/pj_geocent.c

src/pj_gridinfo.c

src/pj_gridlist.c

src/pj_init.c

src/pj_inv.c

src/pj_latlong.c

src/pj_list.c

src/pj_malloc.c

src/pj_mlfn.c

src/pj_msfn.c

src/pj_open_lib.c

src/pj_param.c

src/pj_phi2.c

src/pj_pr_list.c

src/pj_qsfn.c

src/pj_release.c

src/pj_strerrno.c

src/pj_transform.c

src/pj_tsfn.c

src/pj_units.c

src/pj_utils.c

src/pj_zpoly1.c

src/proj.c

src/proj_api.h

src/proj_mdist.c

src/proj_rouss.c

src/projects.h

src/rtodms.c

src/vector1.c

Show diffs side-by-side

added added

removed removed

src/pj_initcache.c

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

* $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

******************************************************************************

* Permission is hereby granted, free of charge, to any person obtaining a

* copy of this software and associated documentation files (the "Software"),

* to deal in the Software without restriction, including without limitation

* the rights to use, copy, modify, merge, publish, distribute, sublicense,

* and/or sell copies of the Software, and to permit persons to whom the

* Software is furnished to do so, subject to the following conditions:

* The above copyright notice and this permission notice shall be included

* in all copies or substantial portions of the Software.

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

* 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.

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

#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;

static paralist **cache_paralist = NULL;

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

/* pj_clone_paralist() */

/* */

/* Allocate a copy of a parameter list. */

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

paralist *pj_clone_paralist( const paralist *list)

{

paralist *list_copy = NULL, *next_copy = NULL;

for( ; list != NULL; list = list->next )

{

paralist *newitem = (paralist *)

pj_malloc(sizeof(paralist) + strlen(list->param));

newitem->used = 0;

newitem->next = 0;

strcpy( newitem->param, list->param );

if( list_copy == NULL )

list_copy = newitem;

else

next_copy->next = newitem;

next_copy = newitem;

}

return list_copy;

}

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

/* pj_clear_initcache() */

/* */

/* Clear out all memory held in the init file cache. */

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

void pj_clear_initcache()

{

if( cache_alloc > 0 )

{

int i;

pj_acquire_lock();

for( i = 0; i < cache_count; i++ )

{

paralist *n, *t = cache_paralist[i];

pj_dalloc( cache_key[i] );

/* free parameter list elements */

for (; t != NULL; t = n) {

n = t->next;

pj_dalloc(t);

}

pj_dalloc( cache_key );

pj_dalloc( cache_paralist );

cache_count = 0;

100

cache_alloc= 0;

101

cache_key = NULL;

102

cache_paralist = NULL;

103

104

pj_release_lock();

105

}

106

}

107

108

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

109

/* pj_search_initcache() */

110

/* */

111

/* Search for a matching definition in the init cache. */

112

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

113

114

paralist *pj_search_initcache( const char *filekey )

115

116

{

117

int i;

118

paralist *result = NULL;

119

120

pj_acquire_lock();

121

122

for( i = 0; result == NULL && i < cache_count; i++)

123

{

124

if( strcmp(filekey,cache_key[i]) == 0 )

125

{

126

result = pj_clone_paralist( cache_paralist[i] );

127

}

128

}

129

130

pj_release_lock();

131

132

return result;

133

}

134

135

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

136

/* pj_insert_initcache() */

137

/* */

138

/* Insert a paralist definition in the init file cache. */

139

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

140

141

void pj_insert_initcache( const char *filekey, const paralist *list )

142

143

{

144

pj_acquire_lock();

145

146

147

** Grow list if required.

148

149

if( cache_count == cache_alloc )

150

{

151

char **cache_key_new;

152

paralist **cache_paralist_new;

153

154

cache_alloc = cache_alloc * 2 + 15;

155

156

cache_key_new = (char **) pj_malloc(sizeof(char*) * cache_alloc);

157

memcpy( cache_key, cache_key_new, sizeof(char*) * cache_count);

158

pj_dalloc( cache_key );

159

cache_key = cache_key_new;

160

161

cache_paralist_new = (paralist **)

162

pj_malloc(sizeof(paralist*) * cache_alloc);

163

memcpy( cache_paralist_new, cache_paralist,

164

sizeof(paralist*) * cache_count );

165

pj_dalloc( cache_paralist );

166

cache_paralist = cache_paralist_new;

167

}

168

169

170

** Duplicate the filekey and paralist, and insert in cache.

171

172

cache_key[cache_count] = (char *) pj_malloc(strlen(filekey)+1);

173

strcpy( cache_key[cache_count], filekey );

174

175

cache_paralist[cache_count] = pj_clone_paralist( list );

176

177

cache_count++;

178

179

pj_release_lock();

180

}

181

Older »