Fix the build

wonder-sk · wonder-sk · commit b216138d273e · 2016-07-24T23:58:08.000+02:00
diff --git a/src/providers/arcgisrest/qgsamsprovider.cpp b/src/providers/arcgisrest/qgsamsprovider.cpp
@@ -437,8 +437,10 @@ QgsRasterIdentifyResult QgsAmsProvider::identify( const QgsPoint & thePoint, Qgs
   return QgsRasterIdentifyResult( theFormat, entries );
 }
 
-void QgsAmsProvider::readBlock( int /*bandNo*/, const QgsRectangle & viewExtent, int width, int height, void *data )
+void QgsAmsProvider::readBlock( int /*bandNo*/, const QgsRectangle & viewExtent, int width, int height, void *data, QgsRasterBlockFeedback* feedback )
 {
+  Q_UNUSED( feedback );  // TODO: make use of the feedback object
+
   // TODO: optimize to avoid writing to QImage
   // returned image is actually mCachedImage, no need to delete
   QImage *image = draw( viewExtent, width, height );
diff --git a/src/providers/arcgisrest/qgsamsprovider.h b/src/providers/arcgisrest/qgsamsprovider.h
@@ -87,7 +87,7 @@ class QgsAmsProvider : public QgsRasterDataProvider
     QgsRasterIdentifyResult identify( const QgsPoint & thePoint, QgsRaster::IdentifyFormat theFormat, const QgsRectangle &theExtent = QgsRectangle(), int theWidth = 0, int theHeight = 0, int theDpi = 96 ) override;
 
   protected:
-    void readBlock( int bandNo, const QgsRectangle & viewExtent, int width, int height, void *data ) override;
+    void readBlock( int bandNo, const QgsRectangle & viewExtent, int width, int height, void *data, QgsRasterBlockFeedback* feedback = nullptr ) override;
 
   private:
     bool mValid;
diff --git a/src/providers/gdal/qgsgdalproviderbase.cpp b/src/providers/gdal/qgsgdalproviderbase.cpp
@@ -280,7 +280,7 @@ GDALDatasetH QgsGdalProviderBase::gdalOpen( const char *pszFilename, GDALAccess
   return hDS;
 }
 
-static int CPL_STDCALL _gdalProgressFnWithFeedback( double dfComplete, const char *pszMessage, void *pProgressArg )
+int CPL_STDCALL _gdalProgressFnWithFeedback( double dfComplete, const char *pszMessage, void *pProgressArg )
 {
   Q_UNUSED( dfComplete );
   Q_UNUSED( pszMessage );

Original file line number	Diff line number	Diff line change
`@@ -437,8 +437,10 @@ QgsRasterIdentifyResult QgsAmsProvider::identify( const QgsPoint & thePoint, Qgs`
`437`	`437`	`return QgsRasterIdentifyResult( theFormat, entries );`
`438`	`438`	`}`
`439`	`439`
`440`		`-void QgsAmsProvider::readBlock( int /bandNo/, const QgsRectangle & viewExtent, int width, int height, void *data )`
	`440`	`+void QgsAmsProvider::readBlock( int /bandNo/, const QgsRectangle & viewExtent, int width, int height, void data, QgsRasterBlockFeedback feedback )`
`441`	`441`	`{`
	`442`	`+ Q_UNUSED( feedback ); // TODO: make use of the feedback object`
	`443`	`+`
`442`	`444`	`// TODO: optimize to avoid writing to QImage`
`443`	`445`	`// returned image is actually mCachedImage, no need to delete`
`444`	`446`	`QImage *image = draw( viewExtent, width, height );`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ GDALDatasetH QgsGdalProviderBase::gdalOpen( const char *pszFilename, GDALAccess`
`280`	`280`	`return hDS;`
`281`	`281`	`}`
`282`	`282`
`283`		`-static int CPL_STDCALL _gdalProgressFnWithFeedback( double dfComplete, const char pszMessage, void pProgressArg )`
	`283`	`+int CPL_STDCALL _gdalProgressFnWithFeedback( double dfComplete, const char pszMessage, void pProgressArg )`
`284`	`284`	`{`
`285`	`285`	`Q_UNUSED( dfComplete );`
`286`	`286`	`Q_UNUSED( pszMessage );`