Fix image format conversion (used e.g. for WMS client) and two memory…

… leaks
qgis · Oct 19, 2012 · 7e5435c · 7e5435c
1 parent 6461a01
commit 7e5435c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
@@ -54,7 +54,7 @@ QgsRasterBlock::QgsRasterBlock( DataType theDataType, int theWidth, int theHeigh
 QgsRasterBlock::~QgsRasterBlock()
 {
   QgsFree( mData );
-
+  delete mImage;
 }
 
 bool QgsRasterBlock::reset( DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
@@ -416,12 +416,9 @@ bool QgsRasterBlock::convert( QgsRasterBlock::DataType destDataType )
   }
   else if ( typeIsColor( mDataType ) && typeIsColor( destDataType ) )
   {
-    // It would be probably faster to convert value by value here instead of
-    // creating new image, QImage (4.8) does not have any method to convert in place
     QImage::Format format = imageFormat( destDataType );
     QImage image = mImage->convertToFormat( format );
-    memcpy( mImage->bits(), image.bits(), mImage->byteCount() );
-    //mImage = new QImage( mWidth, mHeight, format );
+    *mImage = image;
   }
   else
   {

diff --git a/src/core/raster/qgsrasterprojector.cpp b/src/core/raster/qgsrasterprojector.cpp
@@ -708,6 +708,7 @@ QgsRasterBlock * QgsRasterProjector::block( int bandNo, QgsRectangle  const & ex
   if ( ! mSrcCRS.isValid() || ! mDestCRS.isValid() || mSrcCRS == mDestCRS )
   {
     QgsDebugMsg( "No projection necessary" );
+    delete outputBlock;
     return mInput->block( bandNo, extent, width, height );
   }