[Scummvm-cvs-logs] SF.net SVN: scummvm:[35146] scummvm/trunk/backends/platform/psp/osys_psp_gu .cpp

joostp at users.sourceforge.net joostp at users.sourceforge.net
Sat Nov 22 00:36:43 CET 2008


Revision: 35146
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35146&view=rev
Author:   joostp
Date:     2008-11-21 23:36:43 +0000 (Fri, 21 Nov 2008)

Log Message:
-----------
fix wrong uncompress() error check (Z_OK == 0) -- thanks whoever wrecked this ;)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp

Modified: scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp	2008-11-21 21:47:13 UTC (rev 35145)
+++ scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp	2008-11-21 23:36:43 UTC (rev 35146)
@@ -94,22 +94,22 @@
 	//decompress keyboard data
 	uLongf kbdSize = KBD_DATA_SIZE;
 	keyboard_letters = (unsigned char *)memalign(16, KBD_DATA_SIZE);
-	if (!uncompress((Bytef *)keyboard_letters, &kbdSize, (const Bytef *)keyboard_letters_compressed, size_keyboard_letters_compressed))
+	if (Z_OK != uncompress((Bytef *)keyboard_letters, &kbdSize, (const Bytef *)keyboard_letters_compressed, size_keyboard_letters_compressed))
 		error("OSystem_PSP_GU: uncompressing keyboard_letters failed");
 		
 	kbdSize = KBD_DATA_SIZE;
 	keyboard_letters_shift = (unsigned char *)memalign(16, KBD_DATA_SIZE);
-	if (!uncompress((Bytef *)keyboard_letters_shift, &kbdSize, (const Bytef *)keyboard_letters_shift_compressed, size_keyboard_letters_shift_compressed))
+	if (Z_OK != uncompress((Bytef *)keyboard_letters_shift, &kbdSize, (const Bytef *)keyboard_letters_shift_compressed, size_keyboard_letters_shift_compressed))
 		error("OSystem_PSP_GU: uncompressing keyboard_letters_shift failed");
 
 	kbdSize = KBD_DATA_SIZE;
 	keyboard_symbols = (unsigned char *)memalign(16, KBD_DATA_SIZE);
-	if (!uncompress((Bytef *)keyboard_symbols, &kbdSize, (const Bytef *)keyboard_symbols_compressed, size_keyboard_symbols_compressed))
+	if (Z_OK != uncompress((Bytef *)keyboard_symbols, &kbdSize, (const Bytef *)keyboard_symbols_compressed, size_keyboard_symbols_compressed))
 		error("OSystem_PSP_GU: uncompressing keyboard_symbols failed");
 
 	kbdSize = KBD_DATA_SIZE;
 	keyboard_symbols_shift = (unsigned char *)memalign(16, KBD_DATA_SIZE);
-	if (!uncompress((Bytef *)keyboard_symbols_shift, &kbdSize, (const Bytef *)keyboard_symbols_shift_compressed, size_keyboard_symbols_shift_compressed))
+	if (Z_OK != uncompress((Bytef *)keyboard_symbols_shift, &kbdSize, (const Bytef *)keyboard_symbols_shift_compressed, size_keyboard_symbols_shift_compressed))
 		error("OSystem_PSP_GU: uncompressing keyboard_symbols_shift failed");
 
 	_keyboardVisible = false;


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