[Scummvm-cvs-logs] SF.net SVN: scummvm:[41183] scummvm/branches/gsoc2009-16bit/graphics/scaler /thumbnail_intern.cpp

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Fri Jun 5 02:28:07 CEST 2009


Revision: 41183
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41183&view=rev
Author:   Kirben
Date:     2009-06-05 00:28:07 +0000 (Fri, 05 Jun 2009)

Log Message:
-----------
Ooops, update asserts in grabScreen565() too.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/graphics/scaler/thumbnail_intern.cpp

Modified: scummvm/branches/gsoc2009-16bit/graphics/scaler/thumbnail_intern.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/graphics/scaler/thumbnail_intern.cpp	2009-06-05 00:21:10 UTC (rev 41182)
+++ scummvm/branches/gsoc2009-16bit/graphics/scaler/thumbnail_intern.cpp	2009-06-05 00:28:07 UTC (rev 41183)
@@ -99,7 +99,8 @@
 	if (!screen)
 		return false;
 
-	assert(screen->bytesPerPixel == 1 && screen->pixels != 0);
+	assert(screen->bytesPerPixel == 1 || screen->bytesPerPixel == 2);
+	assert(screen->pixels != 0);
 
 	byte palette[256 * 4];
 	g_system->grabPalette(&palette[0], 0, 256);


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




More information about the Scummvm-git-logs mailing list