Some build fixes

nyalldawson · nyalldawson · commit 8ae914387a0b · 2019-04-17T10:06:41.000+10:00
diff --git a/src/3d/terrain/qgsdemterraingenerator.cpp b/src/3d/terrain/qgsdemterraingenerator.cpp
@@ -27,7 +27,7 @@ QgsDemTerrainGenerator::~QgsDemTerrainGenerator()
 void QgsDemTerrainGenerator::setLayer( QgsRasterLayer *layer )
 {
   mLayer = QgsMapLayerRef( layer );
-  updateGenerator( mTransformContext );
+  updateGenerator();
 }
 
 QgsRasterLayer *QgsDemTerrainGenerator::layer() const
@@ -39,7 +39,7 @@ void QgsDemTerrainGenerator::setCrs( const QgsCoordinateReferenceSystem &crs, co
 {
   mCrs = crs;
   mTransformContext = context;
-  updateGenerator( context );
+  updateGenerator();
 }
 
 QgsTerrainGenerator *QgsDemTerrainGenerator::clone() const
@@ -49,7 +49,7 @@ QgsTerrainGenerator *QgsDemTerrainGenerator::clone() const
   cloned->mLayer = mLayer;
   cloned->mResolution = mResolution;
   cloned->mSkirtHeight = mSkirtHeight;
-  cloned->updateGenerator( mTransformContext );
+  cloned->updateGenerator();
   return cloned;
 }
 
@@ -93,15 +93,15 @@ void QgsDemTerrainGenerator::readXml( const QDomElement &elem )
 void QgsDemTerrainGenerator::resolveReferences( const QgsProject &project )
 {
   mLayer = QgsMapLayerRef( project.mapLayer( mLayer.layerId ) );
-  updateGenerator( project.transformContext() );
+  updateGenerator();
 }
 
 QgsChunkLoader *QgsDemTerrainGenerator::createChunkLoader( QgsChunkNode *node ) const
 {
   return new QgsDemTerrainTileLoader( mTerrain, node );
 }
 
-void QgsDemTerrainGenerator::updateGenerator( const QgsCoordinateTransformContext &transformContext )
+void QgsDemTerrainGenerator::updateGenerator()
 {
   QgsRasterLayer *dem = layer();
   if ( dem )
@@ -112,7 +112,7 @@ void QgsDemTerrainGenerator::updateGenerator( const QgsCoordinateTransformContex
 
     mTerrainTilingScheme = QgsTilingScheme( te, mCrs );
     delete mHeightMapGenerator;
-    mHeightMapGenerator = new QgsDemHeightMapGenerator( dem, mTerrainTilingScheme, mResolution, transformContext );
+    mHeightMapGenerator = new QgsDemHeightMapGenerator( dem, mTerrainTilingScheme, mResolution, mTransformContext );
   }
   else
   {
diff --git a/src/3d/terrain/qgsdemterraingenerator.h b/src/3d/terrain/qgsdemterraingenerator.h
@@ -72,7 +72,7 @@ class _3D_EXPORT QgsDemTerrainGenerator : public QgsTerrainGenerator
     QgsChunkLoader *createChunkLoader( QgsChunkNode *node ) const override SIP_FACTORY;
 
   private:
-    void updateGenerator( const QgsCoordinateTransformContext &transformContext );
+    void updateGenerator();
 
     QgsDemHeightMapGenerator *mHeightMapGenerator = nullptr;
 
diff --git a/src/3d/terrain/qgsonlineterraingenerator.cpp b/src/3d/terrain/qgsonlineterraingenerator.cpp
@@ -113,5 +113,5 @@ void QgsOnlineTerrainGenerator::updateGenerator()
     mTerrainTilingScheme = QgsTilingScheme( mExtent, mCrs );
   }
 
-  mHeightMapGenerator.reset( new QgsDemHeightMapGenerator( nullptr, mTerrainTilingScheme, mResolution ) );
+  mHeightMapGenerator.reset( new QgsDemHeightMapGenerator( nullptr, mTerrainTilingScheme, mResolution, mTransformContext ) );
 }
diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
@@ -6237,7 +6237,7 @@ void TestQgsProcessing::checkParamValues()
 void TestQgsProcessing::combineLayerExtent()
 {
   QgsProcessingContext context;
-  QgsRectangle ext = QgsProcessingUtils::combineLayerExtents( QList< QgsMapLayer *>(), context );
+  QgsRectangle ext = QgsProcessingUtils::combineLayerExtents( QList< QgsMapLayer *>(), QgsCoordinateReferenceSystem(), context );
   QVERIFY( ext.isNull() );
 
   QString testDataDir = QStringLiteral( TEST_DATA_DIR ) + '/'; //defined in CmakeLists.txt
@@ -6249,13 +6249,13 @@ void TestQgsProcessing::combineLayerExtent()
   QFileInfo fi2( raster2 );
   std::unique_ptr< QgsRasterLayer > r2( new QgsRasterLayer( fi2.filePath(), "R2" ) );
 
-  ext = QgsProcessingUtils::combineLayerExtents( QList< QgsMapLayer *>() << r1.get(), context );
+  ext = QgsProcessingUtils::combineLayerExtents( QList< QgsMapLayer *>() << r1.get(), QgsCoordinateReferenceSystem(), context );
   QGSCOMPARENEAR( ext.xMinimum(), 1535375.000000, 10 );
   QGSCOMPARENEAR( ext.xMaximum(), 1535475, 10 );
   QGSCOMPARENEAR( ext.yMinimum(), 5083255, 10 );
   QGSCOMPARENEAR( ext.yMaximum(), 5083355, 10 );
 
-  ext = QgsProcessingUtils::combineLayerExtents( QList< QgsMapLayer *>() << r1.get() << r2.get(), context );
+  ext = QgsProcessingUtils::combineLayerExtents( QList< QgsMapLayer *>() << r1.get() << r2.get(), QgsCoordinateReferenceSystem(), context );
   QGSCOMPARENEAR( ext.xMinimum(), 781662, 10 );
   QGSCOMPARENEAR( ext.xMaximum(), 1535475, 10 );
   QGSCOMPARENEAR( ext.yMinimum(), 3339523, 10 );

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ QgsDemTerrainGenerator::~QgsDemTerrainGenerator()`
`27`	`27`	`void QgsDemTerrainGenerator::setLayer( QgsRasterLayer *layer )`
`28`	`28`	`{`
`29`	`29`	`mLayer = QgsMapLayerRef( layer );`
`30`		`- updateGenerator( mTransformContext );`
	`30`	`+ updateGenerator();`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`QgsRasterLayer *QgsDemTerrainGenerator::layer() const`
`@@ -39,7 +39,7 @@ void QgsDemTerrainGenerator::setCrs( const QgsCoordinateReferenceSystem &crs, co`
`39`	`39`	`{`
`40`	`40`	`mCrs = crs;`
`41`	`41`	`mTransformContext = context;`
`42`		`- updateGenerator( context );`
	`42`	`+ updateGenerator();`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`QgsTerrainGenerator *QgsDemTerrainGenerator::clone() const`
`@@ -49,7 +49,7 @@ QgsTerrainGenerator *QgsDemTerrainGenerator::clone() const`
`49`	`49`	`cloned->mLayer = mLayer;`
`50`	`50`	`cloned->mResolution = mResolution;`
`51`	`51`	`cloned->mSkirtHeight = mSkirtHeight;`
`52`		`- cloned->updateGenerator( mTransformContext );`
	`52`	`+ cloned->updateGenerator();`
`53`	`53`	`return cloned;`
`54`	`54`	`}`
`55`	`55`
`@@ -93,15 +93,15 @@ void QgsDemTerrainGenerator::readXml( const QDomElement &elem )`
`93`	`93`	`void QgsDemTerrainGenerator::resolveReferences( const QgsProject &project )`
`94`	`94`	`{`
`95`	`95`	`mLayer = QgsMapLayerRef( project.mapLayer( mLayer.layerId ) );`
`96`		`- updateGenerator( project.transformContext() );`
	`96`	`+ updateGenerator();`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`QgsChunkLoader QgsDemTerrainGenerator::createChunkLoader( QgsChunkNode node ) const`
`100`	`100`	`{`
`101`	`101`	`return new QgsDemTerrainTileLoader( mTerrain, node );`
`102`	`102`	`}`
`103`	`103`
`104`		`-void QgsDemTerrainGenerator::updateGenerator( const QgsCoordinateTransformContext &transformContext )`
	`104`	`+void QgsDemTerrainGenerator::updateGenerator()`
`105`	`105`	`{`
`106`	`106`	`QgsRasterLayer *dem = layer();`
`107`	`107`	`if ( dem )`
`@@ -112,7 +112,7 @@ void QgsDemTerrainGenerator::updateGenerator( const QgsCoordinateTransformContex`
`112`	`112`
`113`	`113`	`mTerrainTilingScheme = QgsTilingScheme( te, mCrs );`
`114`	`114`	`delete mHeightMapGenerator;`
`115`		`- mHeightMapGenerator = new QgsDemHeightMapGenerator( dem, mTerrainTilingScheme, mResolution, transformContext );`
	`115`	`+ mHeightMapGenerator = new QgsDemHeightMapGenerator( dem, mTerrainTilingScheme, mResolution, mTransformContext );`
`116`	`116`	`}`
`117`	`117`	`else`
`118`	`118`	`{`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,5 @@ void QgsOnlineTerrainGenerator::updateGenerator()`
`113`	`113`	`mTerrainTilingScheme = QgsTilingScheme( mExtent, mCrs );`
`114`	`114`	`}`
`115`	`115`
`116`		`- mHeightMapGenerator.reset( new QgsDemHeightMapGenerator( nullptr, mTerrainTilingScheme, mResolution ) );`
	`116`	`+ mHeightMapGenerator.reset( new QgsDemHeightMapGenerator( nullptr, mTerrainTilingScheme, mResolution, mTransformContext ) );`
`117`	`117`	`}`