Skip to content

Commit

Permalink
Small core formatting changes only
Browse files Browse the repository at this point in the history
  • Loading branch information
timlinux committed Apr 13, 2012
1 parent 6ebcd65 commit cfcf12f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
9 changes: 9 additions & 0 deletions python/core/qgsrasterdataprovider.sip
Expand Up @@ -151,5 +151,14 @@ class QgsRasterDataProvider : QgsDataProvider
/**Sets the output device resolution.
@note: this method was added in version 1.2*/
void setDpi( int dpi );

/** read block of data using give extent and size */
/*virtual void readBlock( int bandNo,
QgsRectangle const & viewExtent,
int width, int height,
QgsCoordinateReferenceSystem theSrcCRS,
QgsCoordinateReferenceSystem theDestCRS,
void *data ); */

};

7 changes: 6 additions & 1 deletion src/core/qgsrasterdataprovider.cpp
Expand Up @@ -23,7 +23,12 @@
#include <QMap>
#include <QByteArray>

void QgsRasterDataProvider::readBlock( int bandNo, QgsRectangle const & viewExtent, int width, int height, QgsCoordinateReferenceSystem theSrcCRS, QgsCoordinateReferenceSystem theDestCRS, void *data )
void QgsRasterDataProvider::readBlock( int bandNo, QgsRectangle
const & viewExtent, int width,
int height,
QgsCoordinateReferenceSystem theSrcCRS,
QgsCoordinateReferenceSystem theDestCRS,
void *data )
{
QgsDebugMsg( "Entered" );
QgsDebugMsg( "viewExtent = " + viewExtent.toString() );
Expand Down
6 changes: 5 additions & 1 deletion src/core/raster/qgsrasterlayer.cpp
Expand Up @@ -4580,7 +4580,11 @@ void *QgsRasterLayer::readData( int bandNo, QgsRasterViewPort *viewPort )
viewPort->mDrawnExtent.xMaximum(),
viewPort->mDrawnExtent.yMaximum()
);
mDataProvider->readBlock( bandNo, partExtent, viewPort->drawableAreaXDim, viewPort->drawableAreaYDim, viewPort->mSrcCRS, viewPort->mDestCRS, data );
mDataProvider->readBlock( bandNo, partExtent,
viewPort->drawableAreaXDim,
viewPort->drawableAreaYDim,
viewPort->mSrcCRS,
viewPort->mDestCRS, data );
}
return data;
}
Expand Down

0 comments on commit cfcf12f

Please sign in to comment.