raster no data speed up

blazek · blazek · commit 5280e212ecd9 · 2013-04-13T16:42:21.000+02:00
diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
@@ -269,6 +269,11 @@ QGis::DataType QgsRasterBlock::typeWithNoDataValue( QGis::DataType dataType, dou
   return newDataType;
 }
 
+bool QgsRasterBlock::hasNoData() const
+{
+  return mHasNoDataValue || mNoDataBitmap != 0;
+}
+
 bool QgsRasterBlock::isNoDataValue( double value, double noDataValue )
 {
   // More precise would be qIsNaN(value) && qIsNaN(noDataValue(bandNo)), but probably
@@ -302,6 +307,7 @@ QRgb QgsRasterBlock::color( int row, int column ) const
 
 bool QgsRasterBlock::isNoData( size_t index )
 {
+  if ( !mHasNoDataValue && !mNoDataBitmap ) return false;
   if ( index >= ( size_t )mWidth*mHeight )
   {
     QgsDebugMsg( QString( "Index %1 out of range (%2 x %3)" ).arg( index ).arg( mWidth ).arg( mHeight ) );
@@ -662,7 +668,7 @@ bool QgsRasterBlock::convert( QGis::DataType destDataType )
   return true;
 }
 
-void QgsRasterBlock::applyNodataValues( const QgsRasterRangeList & rangeList )
+void QgsRasterBlock::applyNoDataValues( const QgsRasterRangeList & rangeList )
 {
   if ( rangeList.isEmpty() )
   {
diff --git a/src/core/raster/qgsrasterblock.h b/src/core/raster/qgsrasterblock.h
@@ -144,6 +144,12 @@ class CORE_EXPORT QgsRasterBlock
      * @return true if the block has no data value */
     bool hasNoDataValue() const { return mHasNoDataValue; }
 
+    /** Returns true if thee block may contain no data. It does not guarantee
+     * that it really contains any no data. It can be used to speed up processing.
+     * Not the difference between this method and hasNoDataValue().
+     * @return true if the block may contain no data */
+    bool hasNoData() const;
+
     /** Return no data value.
      * @return No data value */
     double noDataValue() const { return mNoDataValue; }
@@ -292,7 +298,7 @@ class CORE_EXPORT QgsRasterBlock
 
     inline static void writeValue( void *data, QGis::DataType type, size_t index, double value );
 
-    void applyNodataValues( const QgsRasterRangeList & rangeList );
+    void applyNoDataValues( const QgsRasterRangeList & rangeList );
 
     /** \brief Get error */
     QgsError error() const { return mError; }
diff --git a/src/core/raster/qgsrasterdataprovider.cpp b/src/core/raster/qgsrasterdataprovider.cpp
@@ -233,7 +233,7 @@ QgsRasterBlock * QgsRasterDataProvider::block( int theBandNo, QgsRectangle  cons
 
   // apply user no data values
   // TODO: there are other readBlock methods where no data are not applied
-  block->applyNodataValues( userNoDataValue( theBandNo ) );
+  block->applyNoDataValues( userNoDataValue( theBandNo ) );
   return block;
 }
 
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -386,7 +386,7 @@ QgsRasterBlock* QgsGdalProvider::block( int theBandNo, const QgsRectangle &theEx
     block->setIsNoDataExcept( subRect );
   }
   readBlock( theBandNo, theExtent, theWidth, theHeight, block->data() );
-  block->applyNodataValues( userNoDataValue( theBandNo ) );
+  block->applyNoDataValues( userNoDataValue( theBandNo ) );
   return block;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,11 @@ QGis::DataType QgsRasterBlock::typeWithNoDataValue( QGis::DataType dataType, dou`
`269`	`269`	`return newDataType;`
`270`	`270`	`}`
`271`	`271`
	`272`	`+bool QgsRasterBlock::hasNoData() const`
	`273`	`+{`
	`274`	`+ return mHasNoDataValue \|\| mNoDataBitmap != 0;`
	`275`	`+}`
	`276`	`+`
`272`	`277`	`bool QgsRasterBlock::isNoDataValue( double value, double noDataValue )`
`273`	`278`	`{`
`274`	`279`	`// More precise would be qIsNaN(value) && qIsNaN(noDataValue(bandNo)), but probably`
`@@ -302,6 +307,7 @@ QRgb QgsRasterBlock::color( int row, int column ) const`
`302`	`307`
`303`	`308`	`bool QgsRasterBlock::isNoData( size_t index )`
`304`	`309`	`{`
	`310`	`+ if ( !mHasNoDataValue && !mNoDataBitmap ) return false;`
`305`	`311`	`if ( index >= ( size_t )mWidth*mHeight )`
`306`	`312`	`{`
`307`	`313`	`QgsDebugMsg( QString( "Index %1 out of range (%2 x %3)" ).arg( index ).arg( mWidth ).arg( mHeight ) );`
`@@ -662,7 +668,7 @@ bool QgsRasterBlock::convert( QGis::DataType destDataType )`
`662`	`668`	`return true;`
`663`	`669`	`}`
`664`	`670`
`665`		`-void QgsRasterBlock::applyNodataValues( const QgsRasterRangeList & rangeList )`
	`671`	`+void QgsRasterBlock::applyNoDataValues( const QgsRasterRangeList & rangeList )`
`666`	`672`	`{`
`667`	`673`	`if ( rangeList.isEmpty() )`
`668`	`674`	`{`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ QgsRasterBlock * QgsRasterDataProvider::block( int theBandNo, QgsRectangle cons`
`233`	`233`
`234`	`234`	`// apply user no data values`
`235`	`235`	`// TODO: there are other readBlock methods where no data are not applied`
`236`		`- block->applyNodataValues( userNoDataValue( theBandNo ) );`
	`236`	`+ block->applyNoDataValues( userNoDataValue( theBandNo ) );`
`237`	`237`	`return block;`
`238`	`238`	`}`
`239`	`239`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ QgsRasterBlock* QgsGdalProvider::block( int theBandNo, const QgsRectangle &theEx`
`386`	`386`	`block->setIsNoDataExcept( subRect );`
`387`	`387`	`}`
`388`	`388`	`readBlock( theBandNo, theExtent, theWidth, theHeight, block->data() );`
`389`		`- block->applyNodataValues( userNoDataValue( theBandNo ) );`
	`389`	`+ block->applyNoDataValues( userNoDataValue( theBandNo ) );`
`390`	`390`	`return block;`
`391`	`391`	`}`
`392`	`392`