Merge pull request #548 from minorua/raster_memory_leaks

Fix some memory leaks Fix #6795
qgis · Apr 22, 2013 · 13d35ac · 13d35ac
2 parents 2073f87 + f3ab812
commit 13d35ac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/src/core/raster/qgscontrastenhancement.cpp b/src/core/raster/qgscontrastenhancement.cpp
@@ -77,6 +77,8 @@ QgsContrastEnhancement::QgsContrastEnhancement( const QgsContrastEnhancement& ce
 
 QgsContrastEnhancement::~QgsContrastEnhancement()
 {
+  delete [] mLookupTable;
+  delete mContrastEnhancementFunction;
 }
 /*
  *

diff --git a/src/core/raster/qgsrasterinterface.cpp b/src/core/raster/qgsrasterinterface.cpp
@@ -219,6 +219,7 @@ QgsRasterBandStats QgsRasterInterface::bandStatistics( int theBandNo,
         myMean += myDelta / myRasterBandStats.elementCount;
         mySumOfSquares += myDelta * ( myValue - myMean );
       }
+      delete blk;
     }
   }
 
@@ -478,6 +479,7 @@ QgsRasterHistogram QgsRasterInterface::histogram( int theBandNo,
         myHistogram.histogramVector[myBinIndex] += 1;
         myHistogram.nonNullCount++;
       }
+      delete blk;
     }
   }
 

diff --git a/src/core/raster/qgsrasternuller.cpp b/src/core/raster/qgsrasternuller.cpp
@@ -50,9 +50,9 @@ QGis::DataType QgsRasterNuller::dataType( int bandNo ) const
 QgsRasterBlock * QgsRasterNuller::block( int bandNo, QgsRectangle  const & extent, int width, int height )
 {
   QgsDebugMsg( "Entered" );
-  QgsRasterBlock *outputBlock = new QgsRasterBlock();
   if ( !mInput )
   {
+    QgsRasterBlock *outputBlock = new QgsRasterBlock();
     return outputBlock;
   }
 

diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -971,6 +971,7 @@ QgsRasterIdentifyResult QgsGdalProvider::identify( const QgsPoint & thePoint, Id
     {
       results.insert( i, value );
     }
+    delete myBlock;
   }
   return QgsRasterIdentifyResult( QgsRasterDataProvider::IdentifyFormatValue, results );
 }