[rastercalc] Fix use of uninitialized variable

qgis · Jun 15, 2015 · 00e0473 · 00e0473
1 parent 93649bc
commit 00e0473
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/analysis/raster/qgsrastercalculator.cpp b/src/analysis/raster/qgsrastercalculator.cpp
@@ -124,7 +124,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
   }
 
   QgsRasterMatrix resultMatrix;
-  resultMatrix.setNodataValue( -FLT_MAX );
+  resultMatrix.setNodataValue( outputNodataValue );
 
   //read / write line by line
   for ( int i = 0; i < mNumOutputRows; ++i )
@@ -146,8 +146,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
 
       for ( int j = 0; j < mNumOutputColumns; ++j )
       {
-        double result = resultIsNumber ? resultMatrix.number() : resultMatrix.data()[j];
-        calcData[j] = ( calcData[j] == resultMatrix.nodataValue() ? outputNodataValue : ( float ) result );
+        calcData[j] = ( float )( resultIsNumber ? resultMatrix.number() : resultMatrix.data()[j] );
       }
 
       //write scanline to the dataset