[Scummvm-cvs-logs] SF.net SVN: scummvm:[48732] scummvm/branches/branch-1-1-0/backends/platform /wii/osystem_gfx.cpp

[dhewg at users.sourceforge.net]

Revision: 48732
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48732&view=rev
Author:   dhewg
Date:     2010-04-19 20:33:38 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
Workaround for Bug #2964893.

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/backends/platform/wii/osystem_gfx.cpp

Modified: scummvm/branches/branch-1-1-0/backends/platform/wii/osystem_gfx.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/wii/osystem_gfx.cpp	2010-04-19 20:28:36 UTC (rev 48731)
+++ scummvm/branches/branch-1-1-0/backends/platform/wii/osystem_gfx.cpp	2010-04-19 20:33:38 UTC (rev 48732)
@@ -308,7 +308,9 @@
 
 void OSystem_Wii::setPalette(const byte *colors, uint start, uint num) {
 #ifdef USE_RGB_COLOR
-	assert(_pfGame.bytesPerPixel == 1);
+	// work around nonsense calls
+	if (_pfGame.bytesPerPixel > 1)
+		return;
 #endif
 
 	const byte *s = colors;
@@ -338,7 +340,9 @@
 
 void OSystem_Wii::grabPalette(byte *colors, uint start, uint num) {
 #ifdef USE_RGB_COLOR
-	assert(_pfGame.bytesPerPixel == 1);
+	// work around nonsense calls from graphics/scaler/thumbnail_intern.cpp
+	if (_pfGame.bytesPerPixel > 1)
+		return;
 #endif
 
 	u16 *s = _texGame.palette;


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