IMAGES: Use ScopedPtr in the DDS decoder

xoreos · Oct 29, 2016 · 8b6f561 · 8b6f561
1 parent 79e7fb8
commit 8b6f561
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/images/dds.cpp b/src/images/dds.cpp
@@ -22,6 +22,7 @@
  *  DDS (DirectDraw Surface) loading.
  */
 
+#include "src/common/scopedptr.h"
 #include "src/common/util.h"
 #include "src/common/error.h"
 #include "src/common/readstream.h"
@@ -196,22 +197,20 @@ void DDS::readBioWareHeader(Common::SeekableReadStream &dds, DataType &dataType)
 
 	// Detect how many mip maps are in the DDS
 	do {
-		MipMap *mipMap = new MipMap;
+		Common::ScopedPtr<MipMap> mipMap(new MipMap);
 
 		mipMap->width  = MAX<uint32>(width,  1);
 		mipMap->height = MAX<uint32>(height, 1);
 
 		setSize(*mipMap);
 
-		if (fullDataSize < mipMap->size) {
-			// Wouldn't fit
-			delete mipMap;
+		// Wouldn't fit
+		if (fullDataSize < mipMap->size)
 			break;
-		}
 
 		fullDataSize -= mipMap->size;
 
-		_mipMaps.push_back(mipMap);
+		_mipMaps.push_back(mipMap.release());
 
 		width  >>= 1;
 		height >>= 1;