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

[svn_qgis at osgeo.org]

Author: mmassing
Date: 2010-08-12 08:43:26 +0000 (Thu, 12 Aug 2010)
New Revision: 14069

Modified:
   trunk/qgis/src/core/raster/qgsrasterlayer.cpp
Log:
Fix off-by-one calculation of element sum (raster stats).

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2010-08-11 22:20:33 UTC (rev 14068)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2010-08-12 08:43:26 UTC (rev 14069)
@@ -824,6 +824,8 @@
             continue; // NULL
           }
 
+          myRasterBandStats.sum += myValue;          
+          ++myRasterBandStats.elementCount;
           //only use this element if we have a non null element
           if ( myFirstIterationFlag )
           {
@@ -831,7 +833,6 @@
             myFirstIterationFlag = false;
             myRasterBandStats.minimumValue = myValue;
             myRasterBandStats.maximumValue = myValue;
-            ++myRasterBandStats.elementCount;
           }               //end of true part for first iteration check
           else
           {
@@ -844,9 +845,6 @@
             {
               myRasterBandStats.maximumValue = myValue;
             }
-
-            myRasterBandStats.sum += myValue;
-            ++myRasterBandStats.elementCount;
           }               //end of false part for first iteration check
         }
       }