[spatialite] 01/05: Imported Upstream version 4.3.0a

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository spatialite.

commit ef81fe5d381b731f7f8574370442333810d414ba
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 9 08:10:50 2015 +0200

    Imported Upstream version 4.3.0a
---
 configure                 | 20 +++++++++---------
 configure.ac              |  2 +-
 src/spatialite/srid_aux.c | 54 ++++++++---------------------------------------
 3 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/configure b/configure
index a1bf4cb..aafdad5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libspatialite 4.3.0.
+# Generated by GNU Autoconf 2.69 for libspatialite 4.3.0a.
 #
 # Report bugs to <a.furieri at lqt.it>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libspatialite'
 PACKAGE_TARNAME='libspatialite'
-PACKAGE_VERSION='4.3.0'
-PACKAGE_STRING='libspatialite 4.3.0'
+PACKAGE_VERSION='4.3.0a'
+PACKAGE_STRING='libspatialite 4.3.0a'
 PACKAGE_BUGREPORT='a.furieri at lqt.it'
 PACKAGE_URL=''
 
@@ -1363,7 +1363,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libspatialite 4.3.0 to adapt to many kinds of systems.
+\`configure' configures libspatialite 4.3.0a to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1433,7 +1433,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libspatialite 4.3.0:";;
+     short | recursive ) echo "Configuration of libspatialite 4.3.0a:";;
    esac
   cat <<\_ACEOF
 
@@ -1568,7 +1568,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libspatialite configure 4.3.0
+libspatialite configure 4.3.0a
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2112,7 +2112,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libspatialite $as_me 4.3.0, which was
+It was created by libspatialite $as_me 4.3.0a, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2983,7 +2983,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libspatialite'
- VERSION='4.3.0'
+ VERSION='4.3.0a'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19178,7 +19178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libspatialite $as_me 4.3.0, which was
+This file was extended by libspatialite $as_me 4.3.0a, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19244,7 +19244,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libspatialite config.status 4.3.0
+libspatialite config.status 4.3.0a
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index c1f724b..06ebe98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(libspatialite, 4.3.0, a.furieri at lqt.it)
+AC_INIT(libspatialite, 4.3.0a, a.furieri at lqt.it)
 AC_LANG(C)
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/src/spatialite/srid_aux.c b/src/spatialite/srid_aux.c
index d019cb6..79523a9 100644
--- a/src/spatialite/srid_aux.c
+++ b/src/spatialite/srid_aux.c
@@ -1887,56 +1887,20 @@ getProjParamsFromGeopackageTable (sqlite3 * sqlite, int srid,
     spatialite_e ("unknown SRID: %d\n", srid);
 }
 
-static int
-exists_gpkg_spatial_ref_sys (void *p_sqlite)
-{
-/* checking if the GPKG_SPATIAL_REF_SYS table exists */
-    int ret;
-    int ok = 0;
-    char sql[1024];
-    char **results;
-    int n_rows;
-    int n_columns;
-    char *err_msg = NULL;
-
-    sqlite3 *handle = (sqlite3 *) p_sqlite;
-
-    strcpy (sql,
-	    "SELECT name FROM sqlite_master WHERE type = 'table' AND name LIKE 'gpkg_spatial_ref_sys'");
-    ret =
-	sqlite3_get_table (handle, sql, &results, &n_rows, &n_columns,
-			   &err_msg);
-    if (ret != SQLITE_OK)
-      {
-/* some error occurred */
-	  spatialite_e ("XX %s\n", err_msg);
-	  sqlite3_free (err_msg);
-	  return 0;
-      }
-    if (n_rows > 0)
-	ok = 1;
-    sqlite3_free_table (results);
-    return ok;
-}
-
 SPATIALITE_PRIVATE void
 getProjParamsEx (void *p_sqlite, int srid, char **proj_params,
 		 int gpkg_amphibious_mode)
 {
-/* retrives the PROJ params - generic interface */
-    sqlite3 *sqlite = (sqlite3 *) p_sqlite;
+/* retrives the PROJ params - generic interface */sqlite3 *sqlite = (sqlite3 *) p_sqlite;
     *proj_params = NULL;
-    if (exists_spatial_ref_sys (sqlite))
-      {
-	  /* normal Spatialite case */
-	  getProjParamsFromSpatialReferenceSystemTable (sqlite, srid,
-							proj_params);
-      }
-    else if (exists_gpkg_spatial_ref_sys (sqlite) && gpkg_amphibious_mode)
-      {
-	  /* geopackage case */
-	  getProjParamsFromGeopackageTable (sqlite, srid, proj_params);
-      }
+
+/* searching within "vanilla" spatial_reference_sys */
+    getProjParamsFromSpatialReferenceSystemTable (sqlite, srid, proj_params);
+    if (*proj_params != NULL)
+	return;
+
+/* last opportunity: search within GPKG srs */
+    getProjParamsFromGeopackageTable (sqlite, srid, proj_params);
 }
 
 SPATIALITE_PRIVATE void

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite.git