aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorperes2013-10-26 23:05:20 +0900
committerperes2013-10-26 23:26:22 +0900
commit69be9adf52b643188c2a2e37aa7e4d79ecf2eae1 (patch)
treead7aa0c2dc18b1421c9d082048b5aae575d32aef /graphics
parent091bcbf3132f5f78e9814577d444458892183aa9 (diff)
downloadscummvm-rg350-69be9adf52b643188c2a2e37aa7e4d79ecf2eae1.tar.gz
scummvm-rg350-69be9adf52b643188c2a2e37aa7e4d79ecf2eae1.tar.bz2
scummvm-rg350-69be9adf52b643188c2a2e37aa7e4d79ecf2eae1.zip
Revert "GRAPHICS: do not clear the internal state of IFFDecoder on loadStream()."
This reverts commit 92c1ff31d6d8d78e58caa4d123ceb0fea43a48ed.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/decoders/iff.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/graphics/decoders/iff.cpp b/graphics/decoders/iff.cpp
index 485b2846a8..7b37969fc1 100644
--- a/graphics/decoders/iff.cpp
+++ b/graphics/decoders/iff.cpp
@@ -59,8 +59,7 @@ void IFFDecoder::destroy() {
}
bool IFFDecoder::loadStream(Common::SeekableReadStream &stream) {
- // NOTE: we cannot call destroy() here, like most other decoders do, otherwise the
- // settings (stored in _numRelevantPlanes and _pixelPacking) will be cleared.
+ destroy();
const uint32 form = stream.readUint32BE();