[Scummvm-cvs-logs] CVS: scummvm/backends/dc icon.cpp,1.1.1.1,1.2

Marcus Comstedt marcus_c at users.sourceforge.net
Fri Mar 7 07:20:04 CET 2003


Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1:/tmp/cvs-serv6091

Modified Files:
	icon.cpp 
Log Message:
Handle slightly broken icons (The Dig).

Index: icon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/icon.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- icon.cpp	21 Aug 2002 16:07:09 -0000	1.1.1.1
+++ icon.cpp	7 Mar 2003 15:19:07 -0000	1.2
@@ -148,8 +148,11 @@
   if(!hdr.used)
     hdr.used = 1<<hdr.bitcnt;
   hdr.h >>= 1;
-  if(hdr.size + (hdr.used<<2) + hdr.sizeimg > len ||
-     hdr.sizeimg < ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3))
+  /* Fix incorrect sizeimg (The Dig) */
+  if(hdr.sizeimg < ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3))
+    hdr.sizeimg = ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3);
+  if(hdr.size + (hdr.used<<2) + hdr.sizeimg > len /* ||
+     hdr.sizeimg < ((hdr.w*hdr.h*(1+hdr.bitcnt)+7)>>3) */)
     return false;
   if(hdr.w != 32 || hdr.h != 32 || hdr.bitcnt != 4 || hdr.used > 16)
     return false;





More information about the Scummvm-git-logs mailing list