release 0.6.0 (#261)

ver++
lutraconsulting · May 26, 2020 · b2dcea0 · b2dcea0
1 parent ac678ea
commit b2dcea0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/mdal/frmts/mdal_3di.cpp b/mdal/frmts/mdal_3di.cpp
@@ -433,7 +433,7 @@ void MDAL::Driver3Di::parse1DConnection( const std::vector<int> &nodesId,
   if ( ! stmt.prepare( &db, "SELECT id, start_node_idx, end_node_idx FROM flowlines" ) )
     throw MDAL::Error( MDAL_Status::Err_UnknownFormat, "Unable to read edges connectivity from sqlite database" );
 
-  if ( std::isnan( stmt.columnCount() ) || stmt.columnCount() != 3 )
+  if ( stmt.columnCount() < 0 || stmt.columnCount() != 3 )
     throw MDAL::Error( MDAL_Status::Err_UnknownFormat, "Invalid edges connectivity schema in sqlite database" );
 
   while ( stmt.next() )

diff --git a/mdal/frmts/mdal_sqlite3.cpp b/mdal/frmts/mdal_sqlite3.cpp
@@ -75,9 +75,8 @@ int Sqlite3Statement::getInt( int column ) const
 
 int Sqlite3Statement::columnCount() const
 {
-
   if ( mStatement )
     return sqlite3_column_count( mStatement );
   else
-    return std::numeric_limits<int>::quiet_NaN();
+    return -1;
 }
diff --git a/mdal/mdal.cpp b/mdal/mdal.cpp
@@ -21,7 +21,7 @@ static const char *EMPTY_STR = "";
 
 const char *MDAL_Version()
 {
-  return "0.5.92";
+  return "0.6.0";
 }
 
 MDAL_Status MDAL_LastStatus()

diff --git a/scripts/copy_to_qgis.bash b/scripts/copy_to_qgis.bash
@@ -21,7 +21,7 @@ rm -rf $QGIS_MDAL_DIR/*
 echo "Copy new version"
 cp -Rv ./cmake $QGIS_MDAL_DIR/
 # QGIS has its own FindSqlite3 script
-rm $QGIS_MDAL_DIR/cmake/FindSqlite3.cmake 
+rm $QGIS_MDAL_DIR/cmake/FindSQLite3.cmake 
 cp -Rv ./cmake_templates $QGIS_MDAL_DIR/
 cp -Rv ./mdal/* $QGIS_MDAL_DIR
 find $QGIS_MDAL_DIR -name "*CMakeLists.txt" -type f -delete