[rastercalc] Fix use of uninitialized variable

nyalldawson · nyalldawson · commit 00e047395c48 · 2015-06-16T07:27:53.000+10:00
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

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`QgsRasterMatrix resultMatrix;`
`127`		`- resultMatrix.setNodataValue( -FLT_MAX );`
	`127`	`+ resultMatrix.setNodataValue( outputNodataValue );`
`128`	`128`
`129`	`129`	`//read / write line by line`
`130`	`130`	`for ( int i = 0; i < mNumOutputRows; ++i )`
`@@ -146,8 +146,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )`
`146`	`146`
`147`	`147`	`for ( int j = 0; j < mNumOutputColumns; ++j )`
`148`	`148`	`{`
`149`		`- double result = resultIsNumber ? resultMatrix.number() : resultMatrix.data()[j];`
`150`		`- calcData[j] = ( calcData[j] == resultMatrix.nodataValue() ? outputNodataValue : ( float ) result );`
	`149`	`+ calcData[j] = ( float )( resultIsNumber ? resultMatrix.number() : resultMatrix.data()[j] );`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`//write scanline to the dataset`