Remove build warnings

qgis · Apr 10, 2019 · bdd7a1cc7748afd98363f256f61a1ba1be6d5bbc · bdd7a1c
1 parent 6d55e72
commit bdd7a1cc7748afd98363f256f61a1ba1be6d5bbc
Unified Split

Showing with 3 additions and 4 deletions.

+1 −1 src/3d/terrain/qgsdemterraintileloader_p.cpp

+2 −3 src/core/raster/qgsrasterprojector.cpp
diff --git a/src/3d/terrain/qgsdemterraintileloader_p.cpp b/src/3d/terrain/qgsdemterraintileloader_p.cpp
@@ -176,7 +176,7 @@ static QByteArray _readDtmData( QgsRasterDataProvider *provider, const QgsRectan
   if ( provider->crs() != destCrs )
   {
     projector.reset( new QgsRasterProjector );
-    projector->setCrs( provider->crs(), destCrs );
+    projector->setCrs( provider->crs(), destCrs, provider->transformContext() );
     projector->setInput( provider );
     input = projector.get();
   }

diff --git a/src/core/raster/qgsrasterprojector.cpp b/src/core/raster/qgsrasterprojector.cpp
@@ -59,7 +59,6 @@ Qgis::DataType QgsRasterProjector::dataType( int bandNo ) const
 
 /// @cond PRIVATE
 
-
 void QgsRasterProjector::setCrs( const QgsCoordinateReferenceSystem &srcCRS,
                                  const QgsCoordinateReferenceSystem &destCRS,
                                  int srcDatumTransform,
@@ -192,8 +191,8 @@ ProjectorData::ProjectorData( const QgsRectangle &extent, int width, int height,
     }
   }
   QgsDebugMsgLevel( QStringLiteral( "CPMatrix size: mCPRows = %1 mCPCols = %2" ).arg( mCPRows ).arg( mCPCols ), 4 );
-  mDestRowsPerMatrixRow = static_cast< float >( mDestRows ) / ( mCPRows - 1 );
-  mDestColsPerMatrixCol = static_cast< float >( mDestCols ) / ( mCPCols - 1 );
+  mDestRowsPerMatrixRow = static_cast< double >( mDestRows ) / ( mCPRows - 1 );
+  mDestColsPerMatrixCol = static_cast< double >( mDestCols ) / ( mCPCols - 1 );
 
   QgsDebugMsgLevel( QStringLiteral( "CPMatrix:" ), 5 );
   QgsDebugMsgLevel( cpToString(), 5 );