Use unique_ptr

nyalldawson · nyalldawson · commit 919f5588775e · 2018-06-08T10:13:13.000+10:00
diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp
@@ -455,7 +455,7 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( const QgsGeometry &p
   QgsRectangle featureBBox = poly.boundingBox().intersect( &rasterBBox );
   QgsRectangle intersectBBox = rasterBBox.intersect( &featureBBox );
 
-  QgsRasterBlock *block = mRasterProvider->block( mRasterBand, intersectBBox, nCellsX, nCellsY );
+  std::unique_ptr< QgsRasterBlock > block( mRasterProvider->block( mRasterBand, intersectBBox, nCellsX, nCellsY ) );
   for ( int i = 0; i < nCellsY; ++i )
   {
     double currentX = rasterBBox.xMinimum() + cellSizeX / 2.0 + pixelOffsetX * cellSizeX;
@@ -486,7 +486,6 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( const QgsGeometry &p
     }
     currentY -= cellSizeY;
   }
-  delete block;
 }
 
 bool QgsZonalStatistics::validPixel( float value ) const

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( const QgsGeometry &p`
`455`	`455`	`QgsRectangle featureBBox = poly.boundingBox().intersect( &rasterBBox );`
`456`	`456`	`QgsRectangle intersectBBox = rasterBBox.intersect( &featureBBox );`
`457`	`457`
`458`		`- QgsRasterBlock *block = mRasterProvider->block( mRasterBand, intersectBBox, nCellsX, nCellsY );`
	`458`	`+ std::unique_ptr< QgsRasterBlock > block( mRasterProvider->block( mRasterBand, intersectBBox, nCellsX, nCellsY ) );`
`459`	`459`	`for ( int i = 0; i < nCellsY; ++i )`
`460`	`460`	`{`
`461`	`461`	`double currentX = rasterBBox.xMinimum() + cellSizeX / 2.0 + pixelOffsetX * cellSizeX;`
`@@ -486,7 +486,6 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( const QgsGeometry &p`
`486`	`486`	`}`
`487`	`487`	`currentY -= cellSizeY;`
`488`	`488`	`}`
`489`		`- delete block;`
`490`	`489`	`}`
`491`	`490`
`492`	`491`	`bool QgsZonalStatistics::validPixel( float value ) const`