-fixed nodata bug when calculating min/max from current extent

ersts · ersts · commit 20ee96250471 · 2009-12-22T04:14:47.000Z
-Closes ticket #2309 git-svn-id: http://svn.osgeo.org/qgis/trunk@12570 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1314,6 +1314,10 @@ void QgsRasterLayer::computeMinimumMaximumFromLastExtent( int theBand, double* t
       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 );
       }

Original file line number	Diff line number	Diff line change
`@@ -1314,6 +1314,10 @@ void QgsRasterLayer::computeMinimumMaximumFromLastExtent( int theBand, double* t`
`1314`	`1314`	`for ( int myColumn = 0; myColumn < mLastViewPort.drawableAreaXDim; ++myColumn )`
`1315`	`1315`	`{`
`1316`	`1316`	`myValue = readValue( myGdalScanData, myDataType, myRow * mLastViewPort.drawableAreaXDim + myColumn );`
	`1317`	`+ if ( mValidNoDataValue && ( fabs( myValue - mNoDataValue ) <= TINY_VALUE \|\| myValue != myValue ) )`
	`1318`	`+ {`
	`1319`	`+ continue;`
	`1320`	`+ }`
`1317`	`1321`	`myMin = qMin( myMin, myValue );`
`1318`	`1322`	`myMax = qMax( myMax, myValue );`
`1319`	`1323`	`}`