diff options
| author | Max Horn | 2010-11-23 22:25:53 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-23 22:25:53 +0000 |
| commit | ae919f3ebda7d74644816b35f4b8815ff2b1d258 (patch) | |
| tree | bf0de01e422058601c615aa1cb03019309945f96 /common | |
| parent | 09ba53dcfb3acb4d4041c30ccde095e89e89517c (diff) | |
| download | scummvm-rg350-ae919f3ebda7d74644816b35f4b8815ff2b1d258.tar.gz scummvm-rg350-ae919f3ebda7d74644816b35f4b8815ff2b1d258.tar.bz2 scummvm-rg350-ae919f3ebda7d74644816b35f4b8815ff2b1d258.zip | |
COMMON: Remove XOR decoding capability from MemoryReadStream
svn-id: r54436
Diffstat (limited to 'common')
| -rw-r--r-- | common/memstream.h | 4 | ||||
| -rw-r--r-- | common/stream.cpp | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/common/memstream.h b/common/memstream.h index 0cb88b6126..5ba259b842 100644 --- a/common/memstream.h +++ b/common/memstream.h @@ -40,7 +40,6 @@ private: const byte *_ptr; const uint32 _size; uint32 _pos; - byte _encbyte; DisposeAfterUse::Flag _disposeMemory; bool _eos; @@ -56,7 +55,6 @@ public: _ptr(dataPtr), _size(dataSize), _pos(0), - _encbyte(0), _disposeMemory(disposeMemory), _eos(false) {} @@ -65,8 +63,6 @@ public: free(const_cast<byte *>(_ptrOrig)); } - void setEnc(byte value) { _encbyte = value; } - uint32 read(void *dataPtr, uint32 dataSize); bool eos() const { return _eos; } diff --git a/common/stream.cpp b/common/stream.cpp index 89653592f4..c0783b2352 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -52,13 +52,6 @@ uint32 MemoryReadStream::read(void *dataPtr, uint32 dataSize) { } memcpy(dataPtr, _ptr, dataSize); - if (_encbyte) { - byte *p = (byte *)dataPtr; - byte *end = p + dataSize; - while (p < end) - *p++ ^= _encbyte; - } - _ptr += dataSize; _pos += dataSize; |