Fix leaks in raster calculator

nyalldawson · nyalldawson · commit a417dcf73219 · 2015-08-26T22:53:37.000+10:00
diff --git a/src/analysis/raster/qgsrastercalculator.cpp b/src/analysis/raster/qgsrastercalculator.cpp
@@ -90,12 +90,12 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
     // if crs transform needed
     if ( it->raster->crs() != mOutputCrs )
     {
-      QgsRasterProjector* proj = new QgsRasterProjector();
-      proj->setCRS( it->raster->crs(), mOutputCrs );
-      proj->setInput( it->raster->dataProvider()->clone() );
-      proj->setPrecision( QgsRasterProjector::Exact );
+      QgsRasterProjector proj;
+      proj.setCRS( it->raster->crs(), mOutputCrs );
+      proj.setInput( it->raster->dataProvider() );
+      proj.setPrecision( QgsRasterProjector::Exact );
 
-      block = proj->block( it->bandNumber, mOutputRectangle, mNumOutputColumns, mNumOutputRows );
+      block = proj.block( it->bandNumber, mOutputRectangle, mNumOutputColumns, mNumOutputRows );
     }
     else
     {
@@ -155,10 +155,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
         qWarning( "RasterIO error!" );
       }
 
-      if ( resultIsNumber )
-      {
-        delete[] calcData;
-      }
+      delete[] calcData;
     }
 
   }

Original file line number	Diff line number	Diff line change
`@@ -90,12 +90,12 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )`
`90`	`90`	`// if crs transform needed`
`91`	`91`	`if ( it->raster->crs() != mOutputCrs )`
`92`	`92`	`{`
`93`		`- QgsRasterProjector* proj = new QgsRasterProjector();`
`94`		`- proj->setCRS( it->raster->crs(), mOutputCrs );`
`95`		`- proj->setInput( it->raster->dataProvider()->clone() );`
`96`		`- proj->setPrecision( QgsRasterProjector::Exact );`
	`93`	`+ QgsRasterProjector proj;`
	`94`	`+ proj.setCRS( it->raster->crs(), mOutputCrs );`
	`95`	`+ proj.setInput( it->raster->dataProvider() );`
	`96`	`+ proj.setPrecision( QgsRasterProjector::Exact );`
`97`	`97`
`98`		`- block = proj->block( it->bandNumber, mOutputRectangle, mNumOutputColumns, mNumOutputRows );`
	`98`	`+ block = proj.block( it->bandNumber, mOutputRectangle, mNumOutputColumns, mNumOutputRows );`
`99`	`99`	`}`
`100`	`100`	`else`
`101`	`101`	`{`
`@@ -155,10 +155,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )`
`155`	`155`	`qWarning( "RasterIO error!" );`
`156`	`156`	`}`
`157`	`157`
`158`		`- if ( resultIsNumber )`
`159`		`- {`
`160`		`- delete[] calcData;`
`161`		`- }`
	`158`	`+ delete[] calcData;`
`162`	`159`	`}`
`163`	`160`
`164`	`161`	`}`