[Scummvm-cvs-logs] SF.net SVN: scummvm:[54436] scummvm/trunk/common

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Nov 23 23:25:53 CET 2010


Revision: 54436
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54436&view=rev
Author:   fingolfin
Date:     2010-11-23 22:25:53 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
COMMON: Remove XOR decoding capability from MemoryReadStream

Modified Paths:
--------------
    scummvm/trunk/common/memstream.h
    scummvm/trunk/common/stream.cpp

Modified: scummvm/trunk/common/memstream.h
===================================================================
--- scummvm/trunk/common/memstream.h	2010-11-23 22:25:36 UTC (rev 54435)
+++ scummvm/trunk/common/memstream.h	2010-11-23 22:25:53 UTC (rev 54436)
@@ -40,7 +40,6 @@
 	const byte *_ptr;
 	const uint32 _size;
 	uint32 _pos;
-	byte _encbyte;
 	DisposeAfterUse::Flag _disposeMemory;
 	bool _eos;
 
@@ -56,7 +55,6 @@
 		_ptr(dataPtr),
 		_size(dataSize),
 		_pos(0),
-		_encbyte(0),
 		_disposeMemory(disposeMemory),
 		_eos(false) {}
 
@@ -65,8 +63,6 @@
 			free(const_cast<byte *>(_ptrOrig));
 	}
 
-	void setEnc(byte value) { _encbyte = value; }
-
 	uint32 read(void *dataPtr, uint32 dataSize);
 
 	bool eos() const { return _eos; }

Modified: scummvm/trunk/common/stream.cpp
===================================================================
--- scummvm/trunk/common/stream.cpp	2010-11-23 22:25:36 UTC (rev 54435)
+++ scummvm/trunk/common/stream.cpp	2010-11-23 22:25:53 UTC (rev 54436)
@@ -52,13 +52,6 @@
 	}
 	memcpy(dataPtr, _ptr, dataSize);
 
-	if (_encbyte) {
-		byte *p = (byte *)dataPtr;
-		byte *end = p + dataSize;
-		while (p < end)
-			*p++ ^= _encbyte;
-	}
-
 	_ptr += dataSize;
 	_pos += dataSize;
 


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