diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:34:29 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:39:44 +0200 |
| commit | 01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6 (patch) | |
| tree | 544b07f3aa41abe7907bcd2040cdad11ebc324bb /common/iff_container.cpp | |
| parent | 9cf2c83e5e5a35816ab153bf8443dac691829ea8 (diff) | |
| parent | a41d72a44a660c72fdadbc3a8ef580e5e03cb890 (diff) | |
| download | scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.gz scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.bz2 scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.zip | |
Merge branch 'master'
Diffstat (limited to 'common/iff_container.cpp')
| -rw-r--r-- | common/iff_container.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/iff_container.cpp b/common/iff_container.cpp index 02b445ae05..7bcbf86e0f 100644 --- a/common/iff_container.cpp +++ b/common/iff_container.cpp @@ -25,7 +25,7 @@ namespace Common { -IFFParser::IFFParser(Common::ReadStream *stream, bool disposeStream) : _stream(stream), _disposeStream(disposeStream) { +IFFParser::IFFParser(ReadStream *stream, bool disposeStream) : _stream(stream), _disposeStream(disposeStream) { setInputStream(stream); } @@ -36,7 +36,7 @@ IFFParser::~IFFParser() { _stream = 0; } -void IFFParser::setInputStream(Common::ReadStream *stream) { +void IFFParser::setInputStream(ReadStream *stream) { assert(stream); _formChunk.setInputStream(stream); _chunk.setInputStream(stream); @@ -63,7 +63,7 @@ void IFFParser::parse(IFFCallback &callback) { _chunk.readHeader(); // invoke the callback - Common::SubReadStream stream(&_chunk, _chunk.size); + SubReadStream stream(&_chunk, _chunk.size); IFFChunk chunk(_chunk.id, _chunk.size, &stream); stop = callback(chunk); |