[Scummvm-cvs-logs] scummvm master -> e6c7544fe296b7dd427265151a6170f3a4eb05bf

lordhoto lordhoto at gmail.com
Sun Feb 20 05:44:45 CET 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:
e6c7544fe2 GRAPHICS: Fix cursor palette buffering after RGBA->RGB change.


Commit: e6c7544fe296b7dd427265151a6170f3a4eb05bf
    https://github.com/scummvm/scummvm/commit/e6c7544fe296b7dd427265151a6170f3a4eb05bf
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-19T20:43:04-08:00

Commit Message:
GRAPHICS: Fix cursor palette buffering after RGBA->RGB change.

Thanks to clone2727 for noticing this.

Changed paths:
    graphics/cursorman.cpp



diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp
index fe90545..8f31421 100644
--- a/graphics/cursorman.cpp
+++ b/graphics/cursorman.cpp
@@ -206,7 +206,7 @@ void CursorManager::replaceCursorPalette(const byte *colors, uint start, uint nu
 	}
 
 	Palette *pal = _cursorPaletteStack.top();
-	uint size = 4 * num;
+	uint size = 3 * num;
 
 	if (pal->_size < size) {
 		// Could not re-use the old buffer. Create a new one.
@@ -219,7 +219,7 @@ void CursorManager::replaceCursorPalette(const byte *colors, uint start, uint nu
 	pal->_num = num;
 
 	if (num) {
-		memcpy(pal->_data, colors, 4 * num);
+		memcpy(pal->_data, colors, size);
 		g_system->setCursorPalette(pal->_data, pal->_start, pal->_num);
 	} else {
 		g_system->disableCursorPalette(true);
@@ -256,7 +256,7 @@ CursorManager::Cursor::~Cursor() {
 CursorManager::Palette::Palette(const byte *colors, uint start, uint num) {
 	_start = start;
 	_num = num;
-	_size = 4 * num;
+	_size = 3 * num;
 
 	if (num) {
 		_data = new byte[_size];






More information about the Scummvm-git-logs mailing list