aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2010-10-19 16:22:55 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2010-10-19 16:22:55 +0000
commit1b31e9bc2dc805feb29746b95b9b0ab206bce8b4 (patch)
treebe5bd7512513cedba0cfa702a2761e1d729cab05
parentab034ef9b3638a675e11683db071a8a1a3162903 (diff)
downloadPROJ-1b31e9bc2dc805feb29746b95b9b0ab206bce8b4.tar.gz
PROJ-1b31e9bc2dc805feb29746b95b9b0ab206bce8b4.zip
migrate pj_clear_initcache() to public api, and set pj_version to 4.8.0
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1925 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rw-r--r--ChangeLog5
-rwxr-xr-xlibtool6
-rw-r--r--src/proj_api.h3
-rw-r--r--src/projects.h1
4 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a3240d5..298ba557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-19 Frank Warmerdam <warmerdam@pobox.com>
+
+ * src/proj_api.h, src/projects.h: move pj_clear_initcache() to public
+ api and update to 4.8.0 PJ_VERSION to identify when this is available.
+
2010-08-31 Frank Warmerdam <warmerdam@pobox.com>
* src/pj_gridinfo.c: Move grids in 180 to 360 region to -180 to 0.
diff --git a/libtool b/libtool
index cdf0bd75..9141ebbf 100755
--- a/libtool
+++ b/libtool
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
# libtool - Provide generalized library-building support services.
# Generated automatically by config.status (proj) 4.7.0
@@ -132,7 +132,7 @@ old_postuninstall_cmds=""
LTCC="gcc"
# LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-g"
# Take the output of nm and produce a listing of raw symbols and C names.
global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
@@ -150,7 +150,7 @@ global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\
objdir=.libs
# Shell to use when invoking shell scripts.
-SHELL="/bin/bash"
+SHELL="/bin/sh"
# An echo program that does not interpret backslashes.
ECHO="echo"
diff --git a/src/proj_api.h b/src/proj_api.h
index 287d532f..739a09bd 100644
--- a/src/proj_api.h
+++ b/src/proj_api.h
@@ -40,7 +40,7 @@ extern "C" {
#endif
/* Try to update this every version! */
-#define PJ_VERSION 470
+#define PJ_VERSION 480
extern char const pj_release[]; /* global release id string */
@@ -83,6 +83,7 @@ int pj_apply_gridshift( projCtx, const char *, int,
long point_count, int point_offset,
double *x, double *y, double *z );
void pj_deallocate_grids(void);
+void pj_clear_initcache(void);
int pj_is_latlong(projPJ);
int pj_is_geocent(projPJ);
void pj_pr_list(projPJ);
diff --git a/src/projects.h b/src/projects.h
index 07fce9a4..6cf90f4e 100644
--- a/src/projects.h
+++ b/src/projects.h
@@ -365,7 +365,6 @@ int pj_prime_meridian_set(paralist *, PJ *);
int pj_angular_units_set(paralist *, PJ *);
paralist *pj_clone_paralist( const paralist* );
-void pj_clear_initcache(void);
paralist*pj_search_initcache( const char *filekey );
void pj_insert_initcache( const char *filekey, const paralist *list);