[Scummvm-cvs-logs] CVS: residual smush.cpp,1.49,1.50

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Dec 31 11:13:06 CET 2004


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

Modified Files:
	smush.cpp 
Log Message:
use diffrent file handles for one file

Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- smush.cpp	29 Dec 2004 06:32:07 -0000	1.49
+++ smush.cpp	31 Dec 2004 19:12:48 -0000	1.50
@@ -276,6 +276,9 @@
 		warning("zlibFile %s not found", filename);
 		return false;
 	}
+	int filePos = ftell(_handle);
+	_handle = fdopen(fileno(_handle), "rb");
+	fseek(_handle, filePos, SEEK_SET);
 
 	// Read in the GZ header
 	fread(_inBuf, 2, sizeof(char), _handle);				// Header
@@ -312,7 +315,11 @@
 }
 
 void zlibFile::close() {
-	_handle = NULL;
+	if (_handle) {
+		fclose(_handle);
+		_handle = NULL;
+	}
+
 	if (_inBuf) {
  		free(_inBuf);
  		_inBuf = NULL;





More information about the Scummvm-git-logs mailing list