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

jef-n · jef-n · commit fbb0b4608427 · 2018-07-06T23:33:15.000+02:00
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -4496,8 +4496,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;
     }
   }
@@ -4660,8 +4660,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 == "POINT" )
       {

Original file line number	Diff line number	Diff line change
`@@ -4496,8 +4496,8 @@ void QgsSpatiaLiteProvider::getViewSpatialIndexName()`
`4496`	`4496`	`{`
`4497`	`4497`	`for ( i = 1; i <= rows; i++ )`
`4498`	`4498`	`{`
`4499`		`- mIndexTable = results[( i * columns ) + 0];`
`4500`		`- mIndexGeometry = results[( i * columns ) + 1];`
	`4499`	`+ mIndexTable = QString::fromUtf8(( const char * ) results[( i * columns ) + 0] );`
	`4500`	`+ mIndexGeometry = QString::fromUtf8(( const char * ) results[( i * columns ) + 1] );`
`4501`	`4501`	`mSpatialIndexRTree = true;`
`4502`	`4502`	`}`
`4503`	`4503`	`}`
`@@ -4660,8 +4660,8 @@ bool QgsSpatiaLiteProvider::getViewGeometryDetails()`
`4660`	`4660`	`QString fType = results[( i * columns ) + 0];`
`4661`	`4661`	`QString xSrid = results[( i * columns ) + 1];`
`4662`	`4662`	`QString spatialIndex = results[( i * columns ) + 2];`
`4663`		`- mIndexTable = results[( i * columns ) + 3];`
`4664`		`- mIndexGeometry = results[( i * columns ) + 4];`
	`4663`	`+ mIndexTable = QString::fromUtf8(( const char * ) results[( i * columns ) + 3] );`
	`4664`	`+ mIndexGeometry = QString::fromUtf8(( const char * ) results[( i * columns ) + 4] );`
`4665`	`4665`
`4666`	`4666`	`if ( fType == "POINT" )`
`4667`	`4667`	`{`