From e4c687d8dc2f76ae619ad7b6a12a5b90280d8b5c Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Fri, 10 Jan 2020 18:22:21 +0100 Subject: [PATCH] Fix warnings and QT < 5.10 chopped --- .../postgres/raster/qgspostgresrasterprovider.cpp | 9 +++++++-- src/providers/postgres/raster/qgspostgresrasterutils.cpp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/providers/postgres/raster/qgspostgresrasterprovider.cpp b/src/providers/postgres/raster/qgspostgresrasterprovider.cpp index 478472cb400..bd71b29b279 100644 --- a/src/providers/postgres/raster/qgspostgresrasterprovider.cpp +++ b/src/providers/postgres/raster/qgspostgresrasterprovider.cpp @@ -764,8 +764,13 @@ bool QgsPostgresRasterProvider::init() throw QgsPostgresRasterProviderException( tr( "Cannot get band count from value: '%1'" ).arg( result.PQgetvalue( 0, 2 ) ) ); } - const QStringList pxTypes { result.PQgetvalue( 0, 3 ).chopped( 1 ).mid( 1 ).split( ',' ) }; - const QStringList noDataValues { result.PQgetvalue( 0, 4 ).chopped( 1 ).mid( 1 ).split( ',' ) }; + QString pxTypesArray { result.PQgetvalue( 0, 3 ) }; + pxTypesArray.chop( 1 ); + const QStringList pxTypes { pxTypesArray.mid( 1 ).split( ',' ) }; + + QString noDataValuesArray { result.PQgetvalue( 0, 4 ) }; + noDataValuesArray.chop( 1 ); + const QStringList noDataValues { noDataValuesArray.mid( 1 ).split( ',' ) }; if ( mBandCount != pxTypes.count( ) || mBandCount != noDataValues.count() ) { diff --git a/src/providers/postgres/raster/qgspostgresrasterutils.cpp b/src/providers/postgres/raster/qgspostgresrasterutils.cpp index a240c258e96..4786e5276da 100644 --- a/src/providers/postgres/raster/qgspostgresrasterutils.cpp +++ b/src/providers/postgres/raster/qgspostgresrasterutils.cpp @@ -130,7 +130,7 @@ QVariantMap QgsPostgresRasterUtils::parseWkb( const QByteArray &wkb, int bandNo result[ QStringLiteral( "dataSize" ) ] = static_cast( pxSize * result[ QStringLiteral( "width" ) ].toInt() * result[ QStringLiteral( "height" ) ].toInt() ); }; - if ( bandNo > nBands ) + if ( static_cast( bandNo ) > nBands ) { QgsMessageLog::logMessage( QStringLiteral( "Band number is not valid: %1 (nBands: %2" ) .arg( bandNo ).arg( nBands ), QStringLiteral( "PostGIS" ), Qgis::Critical );