Remove build warnings

elpaso · nyalldawson · commit bdd7a1cc7748 · 2019-04-17T10:06:41.000+10:00
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 );

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ static QByteArray _readDtmData( QgsRasterDataProvider *provider, const QgsRectan`
`176`	`176`	`if ( provider->crs() != destCrs )`
`177`	`177`	`{`
`178`	`178`	`projector.reset( new QgsRasterProjector );`
`179`		`- projector->setCrs( provider->crs(), destCrs );`
	`179`	`+ projector->setCrs( provider->crs(), destCrs, provider->transformContext() );`
`180`	`180`	`projector->setInput( provider );`
`181`	`181`	`input = projector.get();`
`182`	`182`	`}`