[Scummvm-cvs-logs] scummvm master -> 0b1cb0ebbb9a3779f8e3d1fb0d3a44252394fe0c

bgK bastien.bouclet at gmail.com
Sat Jul 2 22:16:47 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0b1cb0ebbb SDL: Remove an unnecessary memset


Commit: 0b1cb0ebbb9a3779f8e3d1fb0d3a44252394fe0c
    https://github.com/scummvm/scummvm/commit/0b1cb0ebbb9a3779f8e3d1fb0d3a44252394fe0c
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2011-07-02T13:14:13-07:00

Commit Message:
SDL: Remove an unnecessary memset

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp



diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 3739cb2..2d41ece 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -157,12 +157,6 @@ SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSou
 	_currentPalette = (SDL_Color *)calloc(sizeof(SDL_Color), 256);
 	_cursorPalette = (SDL_Color *)calloc(sizeof(SDL_Color), 256);
 
-	// Init palette with black :
-	// SDL 1.2 palettes default to all black,
-	// SDL 1.3 palettes default to all white,
-	// thus we have to set our own default.
-	memset(_currentPalette, 0, sizeof(SDL_Color) * 256);
-
 	_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
 
 	memset(&_mouseCurState, 0, sizeof(_mouseCurState));
@@ -758,7 +752,10 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {
 		error("allocating _screen failed");
 #endif
 
-	// Set a default palette. SDL_SetColors does nothing for non indexed surfaces.
+	// SDL 1.2 palettes default to all black,
+	// SDL 1.3 palettes default to all white,
+	// Thus set our own default palette to all black.
+	// SDL_SetColors does nothing for non indexed surfaces.
 	SDL_SetColors(_screen, _currentPalette, 0, 256);
 
 	//






More information about the Scummvm-git-logs mailing list