Skip to content
Permalink
Browse files

Fix the build

  • Loading branch information
wonder-sk committed Jul 24, 2016
1 parent 963ff92 commit b216138d273e9da274e58ec2d44d622e80afb485
@@ -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 );
@@ -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;
@@ -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 );

0 comments on commit b216138

Please sign in to comment.
You can’t perform that action at this time.