[Scummvm-cvs-logs] CVS: tools compress_san.cpp,1.10,1.11

Travis Howell kirben at users.sourceforge.net
Wed Apr 28 07:12:04 CEST 2004


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19104

Modified Files:
	compress_san.cpp 
Log Message:

Update from aquadran:
fix for ft smush video


Index: compress_san.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_san.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- compress_san.cpp	23 Apr 2004 21:05:51 -0000	1.10
+++ compress_san.cpp	28 Apr 2004 14:11:38 -0000	1.11
@@ -111,10 +111,12 @@
 				fseek(input, -4, SEEK_CUR);
 				break;
 			} else if ((tag == TO_LE_32('FOBJ')) && (first_fobj)) {
-				first_fobj = false;
 				size = readUint32BE(input); // FOBJ size
 				if ((size & 1) != 0)
 					size++;
+				if (size < 100)
+					goto normal_block;
+				first_fobj = false;
 				unsigned long outputSize = size + (size / 9);
 				byte *zlibInputBuffer = (byte *)malloc(size);
 				byte *zlibOutputBuffer = (byte *)malloc(outputSize);
@@ -140,6 +142,7 @@
 				continue;
 			} else {
 				size = readUint32BE(input); // chunk size
+normal_block:
 				writeUint32BE(output, tag);
 				writeUint32BE(output, size);
 				if ((size & 1) != 0)





More information about the Scummvm-git-logs mailing list