[QGIS Commit] r12570 - trunk/qgis/src/core/raster

[svn_qgis at osgeo.org]

Author: ersts
Date: 2009-12-21 23:14:47 -0500 (Mon, 21 Dec 2009)
New Revision: 12570

Modified:
   trunk/qgis/src/core/raster/qgsrasterlayer.cpp
Log:
-fixed nodata bug when calculating min/max from current extent
-Closes ticket #2309

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2009-12-21 22:11:45 UTC (rev 12569)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2009-12-22 04:14:47 UTC (rev 12570)
@@ -1314,6 +1314,10 @@
       for ( int myColumn = 0; myColumn < mLastViewPort.drawableAreaXDim; ++myColumn )
       {
         myValue = readValue( myGdalScanData, myDataType, myRow * mLastViewPort.drawableAreaXDim + myColumn );
+        if ( mValidNoDataValue && ( fabs( myValue - mNoDataValue ) <= TINY_VALUE || myValue != myValue ) )
+        {
+          continue;
+        }
         myMin = qMin( myMin, myValue );
         myMax = qMax( myMax, myValue );
       }