Implement readBlock in gdal provider for performance reason

qgis · Dec 14, 2012 · 7505792 · 7505792
1 parent d1a976e
commit 7505792
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -363,6 +363,36 @@ QImage* QgsGdalProvider::draw( QgsRectangle  const & viewExtent, int pixelWidth,
   return image;
 }
 
+QgsRasterBlock* QgsGdalProvider::block( int theBandNo, const QgsRectangle &theExtent, int theWidth, int theHeight )
+{
+  QgsRasterBlock *block = new QgsRasterBlock( dataType( theBandNo ), theWidth, theHeight, noDataValue( theBandNo ) );
+
+  if ( block->isEmpty() )
+  {
+    return block;
+  }
+
+  readBlock( theBandNo, theExtent, theWidth, theHeight, block->data() );
+
+  // apply user no data values
+  QList<QgsRasterBlock::Range> myNoDataRangeList = userNoDataValue( theBandNo );
+  if ( !myNoDataRangeList.isEmpty() )
+  {
+    double myNoDataValue = noDataValue( theBandNo );
+    size_t size = theWidth * theHeight;
+    for ( size_t i = 0; i < size; i++ )
+    {
+      double value = block->value( i );
+
+      if ( QgsRasterBlock::valueInRange( value, myNoDataRangeList ) )
+      {
+        block->setValue( i, myNoDataValue );
+      }
+    }
+  }
+  return block;
+}
+
 
 void QgsGdalProvider::readBlock( int theBandNo, int xBlock, int yBlock, void *block )
 {

diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h
@@ -166,6 +166,8 @@ class QgsGdalProvider : public QgsRasterDataProvider, QgsGdalProviderBase
     int xSize() const;
     int ySize() const;
 
+    /**Reimplemented from QgsRasterDataProvider to bypass second resampling (more efficient for local file based sources)*/
+    QgsRasterBlock *block( int theBandNo, const QgsRectangle &theExtent, int theWidth, int theHeight );
 
     void readBlock( int bandNo, int xBlock, int yBlock, void *data );
     void readBlock( int bandNo, QgsRectangle  const & viewExtent, int width, int height, void *data );