[Scummvm-cvs-logs] SF.net SVN: scummvm:[53436] scummvm/branches/gsoc2010-opengl/backends/ platform/sdl/sdl.cpp

[lordhoto at users.sourceforge.net]

Revision: 53436
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53436&view=rev
Author:   lordhoto
Date:     2010-10-13 15:43:08 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
OPENGL: Cleanup.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp	2010-10-13 15:42:53 UTC (rev 53435)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp	2010-10-13 15:43:08 UTC (rev 53436)
@@ -226,7 +226,7 @@
 	_mutexManager = 0;
 
 #ifdef USE_OPENGL
-	free((void *)_graphicsModes),
+	delete[] _graphicsModes;
 #endif
 
 	SDL_Quit();
@@ -388,12 +388,12 @@
 	}
 	srcMode = openglGraphicsModes;
 	while (srcMode->name) {
-		_glModesCount ++;
+		_glModesCount++;
 		srcMode++;
 	}
 
 	// Allocate enough space for merged array of modes
-	_graphicsModes = (OSystem::GraphicsMode *)malloc(sizeof(OSystem::GraphicsMode) * (_glModesCount  + _sdlModesCount + 1));
+	_graphicsModes = new OSystem::GraphicsMode[_glModesCount  + _sdlModesCount + 1];
 
 	// Copy SDL graphics modes
 	memcpy((void *)_graphicsModes, sdlGraphicsModes, _sdlModesCount * sizeof(OSystem::GraphicsMode));
@@ -406,7 +406,7 @@
 
 	// Set new internal ids for all modes
 	int i = 0;
-	OSystem::GraphicsMode * mode = _graphicsModes;
+	OSystem::GraphicsMode *mode = _graphicsModes;
 	while (mode->name) {
 		mode->id = i++;
 		mode++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.