[Scummvm-cvs-logs] SF.net SVN: scummvm:[49383] scummvm/trunk/backends/platform/sdl

[fingolfin at users.sourceforge.net]

Revision: 49383
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49383&view=rev
Author:   fingolfin
Date:     2010-06-01 22:28:24 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
Inline palettes in SDL backend into class OSystem_SDL

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/sdl.cpp
    scummvm/trunk/backends/platform/sdl/sdl.h

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-06-01 22:06:52 UTC (rev 49382)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-06-01 22:28:24 UTC (rev 49383)
@@ -251,9 +251,9 @@
 	_screenIsLocked(false),
 	_graphicsMutex(0), _transactionMode(kTransactionNone) {
 
-	// allocate palette storage
-	_currentPalette = (SDL_Color *)calloc(sizeof(SDL_Color), 256);
-	_cursorPalette = (SDL_Color *)calloc(sizeof(SDL_Color), 256);
+	// clear palette storage
+	memset(_currentPalette, 0, sizeof(_currentPalette));
+	memset(_cursorPalette, 0, sizeof(_cursorPalette));
 
 	_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
 
@@ -282,8 +282,6 @@
 	closeMixer();
 
 	free(_dirtyChecksums);
-	free(_currentPalette);
-	free(_cursorPalette);
 	free(_mouseData);
 
 	delete _savefile;
@@ -513,8 +511,6 @@
 	closeMixer();
 
 	free(_dirtyChecksums);
-	free(_currentPalette);
-	free(_cursorPalette);
 	free(_mouseData);
 
 	delete _timer;

Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h	2010-06-01 22:06:52 UTC (rev 49382)
+++ scummvm/trunk/backends/platform/sdl/sdl.h	2010-06-01 22:28:24 UTC (rev 49383)
@@ -422,11 +422,11 @@
 	int _newShakePos;
 
 	// Palette data
-	SDL_Color *_currentPalette;
+	SDL_Color _currentPalette[256];
 	uint _paletteDirtyStart, _paletteDirtyEnd;
 
 	// Cursor palette data
-	SDL_Color *_cursorPalette;
+	SDL_Color _cursorPalette[256];
 
 	/**
 	 * Mutex which prevents multiple threads from interfering with each other


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