spatialite provider: fix retrieval of unicode name of spatial index on views

jef-n · jef-n · commit 9aab40e4bf16 · 2018-07-06T23:40:51.000+02:00
(cherry picked from commit fbb0b46)
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -4782,8 +4782,8 @@ void QgsSpatiaLiteProvider::getViewSpatialIndexName()
   {
     for ( i = 1; i <= rows; i++ )
     {
-      mIndexTable = results[( i * columns ) + 0];
-      mIndexGeometry = results[( i * columns ) + 1];
+      mIndexTable = QString::fromUtf8(( const char * ) results[( i * columns ) + 0] );
+      mIndexGeometry = QString::fromUtf8(( const char * ) results[( i * columns ) + 1] );
       mSpatialIndexRTree = true;
     }
   }
@@ -4939,8 +4939,8 @@ bool QgsSpatiaLiteProvider::getViewGeometryDetails()
       QString fType = results[( i * columns ) + 0];
       QString xSrid = results[( i * columns ) + 1];
       QString spatialIndex = results[( i * columns ) + 2];
-      mIndexTable = results[( i * columns ) + 3];
-      mIndexGeometry = results[( i * columns ) + 4];
+      mIndexTable = QString::fromUtf8(( const char * ) results[( i * columns ) + 3] );
+      mIndexGeometry = QString::fromUtf8(( const char * ) results[( i * columns ) + 4] );
 
       if ( fType == QLatin1String( "POINT" ) )
       {

Original file line number	Diff line number	Diff line change
`@@ -4782,8 +4782,8 @@ void QgsSpatiaLiteProvider::getViewSpatialIndexName()`
`4782`	`4782`	`{`
`4783`	`4783`	`for ( i = 1; i <= rows; i++ )`
`4784`	`4784`	`{`
`4785`		`- mIndexTable = results[( i * columns ) + 0];`
`4786`		`- mIndexGeometry = results[( i * columns ) + 1];`
	`4785`	`+ mIndexTable = QString::fromUtf8(( const char * ) results[( i * columns ) + 0] );`
	`4786`	`+ mIndexGeometry = QString::fromUtf8(( const char * ) results[( i * columns ) + 1] );`
`4787`	`4787`	`mSpatialIndexRTree = true;`
`4788`	`4788`	`}`
`4789`	`4789`	`}`
`@@ -4939,8 +4939,8 @@ bool QgsSpatiaLiteProvider::getViewGeometryDetails()`
`4939`	`4939`	`QString fType = results[( i * columns ) + 0];`
`4940`	`4940`	`QString xSrid = results[( i * columns ) + 1];`
`4941`	`4941`	`QString spatialIndex = results[( i * columns ) + 2];`
`4942`		`- mIndexTable = results[( i * columns ) + 3];`
`4943`		`- mIndexGeometry = results[( i * columns ) + 4];`
	`4942`	`+ mIndexTable = QString::fromUtf8(( const char * ) results[( i * columns ) + 3] );`
	`4943`	`+ mIndexGeometry = QString::fromUtf8(( const char * ) results[( i * columns ) + 4] );`
`4944`	`4944`
`4945`	`4945`	`if ( fType == QLatin1String( "POINT" ) )`
`4946`	`4946`	`{`