[spatialite-gui] 01/04: Imported Upstream version 2.0.0~devel2

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository spatialite-gui.

commit 0d72836ced421b57d88397a89f21f3010e49f068
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jun 29 20:07:00 2015 +0200

    Imported Upstream version 2.0.0~devel2
---
 Styles.cpp             | 20 ++++++++++++--------
 VectorSymbolizers2.cpp | 26 ++++++++------------------
 configure              |  4 ++--
 configure.ac           |  4 ++--
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/Styles.cpp b/Styles.cpp
index fee917a..2e40607 100644
--- a/Styles.cpp
+++ b/Styles.cpp
@@ -2835,7 +2835,7 @@ void ReloadVectorStyleDialog::OnOk(wxCommandEvent & WXUNUSED(event))
   if (MainFrame->ValidateVectorStyle(Path.ToUTF8(), &blob, &blob_size) == true)
     {
       char dummy[80];
-      sprintf(dummy, "%d", style_id);
+      sprintf(dummy, "%ld", style_id);
       if (DoReloadVectorStyle(style_id, blob, blob_size) == true)
         {
           ::wxEndBusyCursor();
@@ -3047,7 +3047,7 @@ void ReloadRasterStyleDialog::OnOk(wxCommandEvent & WXUNUSED(event))
   if (MainFrame->ValidateRasterStyle(Path.ToUTF8(), &blob, &blob_size) == true)
     {
       char dummy[80];
-      sprintf(dummy, "%d", style_id);
+      sprintf(dummy, "%ld", style_id);
       if (DoReloadRasterStyle(style_id, blob, blob_size) == true)
         {
           ::wxEndBusyCursor();
@@ -3284,7 +3284,7 @@ void UnregisterRasterStyleDialog::OnOk(wxCommandEvent & WXUNUSED(event))
     }
   ::wxBeginBusyCursor();
   char dummy[80];
-  sprintf(dummy, "%d", style_id);
+  sprintf(dummy, "%ld", style_id);
   if (DoCheckUnreferencedRasterStyle(style_id) == true)
     {
       if (DoUnregisterRasterStyle(style_id) == true)
@@ -3526,7 +3526,7 @@ void UnregisterVectorStyleDialog::OnOk(wxCommandEvent & WXUNUSED(event))
     }
   ::wxBeginBusyCursor();
   char dummy[80];
-  sprintf(dummy, "%d", style_id);
+  sprintf(dummy, "%ld", style_id);
   if (DoCheckUnreferencedVectorStyle(style_id) == true)
     {
       if (DoUnregisterVectorStyle(style_id) == true)
@@ -3956,7 +3956,8 @@ VectorCoverageSRIDsList *MyFrame::FindVectorAlternativeSRIDs(wxString &
   char *sql;
   char cvg[1024];
 
-  sprintf(cvg, coverage.ToUTF8());
+  wxCharBuffer buffer = coverage.ToUTF8();
+  sprintf(cvg, "%s", buffer.data());
   sql =
     sqlite3_mprintf
     ("SELECT 1, s.srid, s.auth_name, s.auth_srid, s.ref_sys_name FROM vector_coverages AS v "
@@ -4337,7 +4338,8 @@ VectorCoverageKeywordsList *MyFrame::FindVectorKeywords(wxString & coverage)
   char *sql;
   char cvg[1024];
 
-  sprintf(cvg, coverage.ToUTF8());
+  wxCharBuffer buffer = coverage.ToUTF8();
+  sprintf(cvg, "%s", buffer.data());
   sql =
     sqlite3_mprintf
     ("SELECT keyword FROM vector_coverages_keyword WHERE coverage_name = %Q ORDER BY 1",
@@ -4767,7 +4769,8 @@ RasterCoverageSRIDsList *MyFrame::FindRasterAlternativeSRIDs(wxString &
   char *sql;
   char cvg[1024];
 
-  sprintf(cvg, coverage.ToUTF8());
+  wxCharBuffer buffer = coverage.ToUTF8();
+  sprintf(cvg, "%s", buffer.data());
   sql =
     sqlite3_mprintf
     ("SELECT 1, s.srid, s.auth_name, s.auth_srid, s.ref_sys_name FROM raster_coverages AS v "
@@ -5147,7 +5150,8 @@ RasterCoverageKeywordsList *MyFrame::FindRasterKeywords(wxString & coverage)
   char *sql;
   char cvg[1024];
 
-  sprintf(cvg, coverage.ToUTF8());
+  wxCharBuffer buffer = coverage.ToUTF8();
+  sprintf(cvg, "%s", buffer.data());
   sql =
     sqlite3_mprintf
     ("SELECT keyword FROM raster_coverages_keyword WHERE coverage_name = %Q ORDER BY 1",
diff --git a/VectorSymbolizers2.cpp b/VectorSymbolizers2.cpp
index 1cc2467..1ec2320 100644
--- a/VectorSymbolizers2.cpp
+++ b/VectorSymbolizers2.cpp
@@ -1361,15 +1361,10 @@ void SimplePointSymbolizerDialog::UpdateMainPage()
       maxCtrl->Enable(false);
     }
   wxRadioBox *typeBox = (wxRadioBox *) FindWindow(ID_SYMBOLIZER_TYPE);
-  switch (HasGraphic)
-    {
-      case false:
-        typeBox->SetSelection(1);
-        break;
-      default:
-        typeBox->SetSelection(0);
-        break;
-    };
+  if (HasGraphic == false)
+    typeBox->SetSelection(1);
+  else
+    typeBox->SetSelection(0);
 }
 
 bool SimplePointSymbolizerDialog::RetrievePositionPage(bool check)
@@ -4771,15 +4766,10 @@ void SimpleTextSymbolizerDialog::UpdatePlacementPage()
 // updating the Placement page
 //
   wxRadioBox *typeBox = (wxRadioBox *) FindWindow(ID_SYMBOLIZER_TYPE);
-  switch (PointPlacement)
-    {
-      case false:
-        typeBox->SetSelection(1);
-        break;
-      default:
-        typeBox->SetSelection(0);
-        break;
-    };
+  if (PointPlacement == false)
+    typeBox->SetSelection(1);
+  else
+    typeBox->SetSelection(0);
   if (PointPlacement == true)
     {
       // Point Placement
diff --git a/configure b/configure
index 0c1881c..c730ad4 100755
--- a/configure
+++ b/configure
@@ -1467,7 +1467,7 @@ Optional Features:
   --enable-openjpeg       enables OpenJpeg inclusion [default=yes]
   --enable-webp           enables WebP inclusion [default=yes]
   --enable-charls         enables CharLS inclusion [default=yes]
-  --enable-rl2extra       enables RasterLite2 extended support [default=yes]
+  --enable-rl2extra       enables RasterLite2 extended support [default=no]
   --enable-sqlite_stmtstatus_autoindex
                           enables SQLITE_STMTSTATUS_AUTOINDEX [default=yes]
 
@@ -17585,7 +17585,7 @@ fi
 if test "${enable_rl2extra+set}" = set; then :
   enableval=$enable_rl2extra;
 else
-  enable_rl2extra=yes
+  enable_rl2extra=no
 fi
 
 if test x"$enable_rl2extra" != "xyes"; then
diff --git a/configure.ac b/configure.ac
index 33663d1..760943a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,8 +277,8 @@ AC_SUBST(LIBRASTERLITE2_LIBS)
 #   --enable-rl2extra
 #
 AC_ARG_ENABLE(rl2extra, [AS_HELP_STRING(
-  [--enable-rl2extra], [enables RasterLite2 extended support [default=yes]])],
-  [], [enable_rl2extra=yes])
+  [--enable-rl2extra], [enables RasterLite2 extended support [default=no]])],
+  [], [enable_rl2extra=no])
 if test x"$enable_rl2extra" != "xyes"; then
   AC_DEFINE(OMIT_RL2EXTRA)
 fi

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