[Scummvm-cvs-logs] SF.net SVN: scummvm:[33794] residual/trunk/engine/smush/smush.cpp

[aquadran at users.sourceforge.net]

Revision: 33794
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33794&view=rev
Author:   aquadran
Date:     2008-08-12 14:31:38 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
clenaup

Modified Paths:
--------------
    residual/trunk/engine/smush/smush.cpp

Modified: residual/trunk/engine/smush/smush.cpp
===================================================================
--- residual/trunk/engine/smush/smush.cpp	2008-08-12 00:13:27 UTC (rev 33793)
+++ residual/trunk/engine/smush/smush.cpp	2008-08-12 14:31:38 UTC (rev 33794)
@@ -386,7 +386,8 @@
 
 bool zlibFile::open(const char *filename) {
 	char flags = 0;
-	_inBuf = (byte *)calloc(1, BUFFER_SIZE);
+	_inBuf = new byte[BUFFER_SIZE];
+	memset(_inBuf, 0, BUFFER_SIZE);
 
 	if (_handle) {
 		if (debugLevel == DEBUG_SMUSH || debugLevel == DEBUG_WARN || debugLevel == DEBUG_ALL)
@@ -451,10 +452,8 @@
 		_handle = NULL;
 	}
 
-	if (_inBuf) {
-		free(_inBuf);
- 		_inBuf = NULL;
-	}
+	delete _inBuf;
+	_inBuf = NULL;
 }
 
 bool zlibFile::isOpen() {
@@ -511,7 +510,7 @@
 		}
 	}
 
-	return (int)(len - _stream.avail_out);
+	return (uint32)(len - _stream.avail_out);
 }
  
 byte zlibFile::readByte() {


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