diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:55:01 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:47:44 +0200 |
| commit | 102299630901d08a44ef3aec367fcbcae065b9fe (patch) | |
| tree | 98db4bbe0c54176c0a43e2f5076f8b3d63b8065c /graphics/decoders/pict.cpp | |
| parent | 583f9abaf98f64895546b75573e9442ca47426e3 (diff) | |
| parent | 78ba3210a57094086d44b25d5a8507c33ce9bef3 (diff) | |
| download | scummvm-rg350-102299630901d08a44ef3aec367fcbcae065b9fe.tar.gz scummvm-rg350-102299630901d08a44ef3aec367fcbcae065b9fe.tar.bz2 scummvm-rg350-102299630901d08a44ef3aec367fcbcae065b9fe.zip | |
Merge branch 'master'
Diffstat (limited to 'graphics/decoders/pict.cpp')
| -rw-r--r-- | graphics/decoders/pict.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/graphics/decoders/pict.cpp b/graphics/decoders/pict.cpp index d35e5c3064..b1d408ebc3 100644 --- a/graphics/decoders/pict.cpp +++ b/graphics/decoders/pict.cpp @@ -235,10 +235,13 @@ bool PICTDecoder::loadStream(Common::SeekableReadStream &stream) { // PICT v2 opcodes are two bytes uint16 opcode = stream.readUint16BE(); - if (opNum == 0 && opcode != 0x0011) - error("Cannot find PICT version opcode"); - else if (opNum == 1 && opcode != 0x0C00) - error("Cannot find PICT header opcode"); + if (opNum == 0 && opcode != 0x0011) { + warning("Cannot find PICT version opcode"); + return false; + } else if (opNum == 1 && opcode != 0x0C00) { + warning("Cannot find PICT header opcode"); + return false; + } // Since opcodes are word-aligned, we need to mark our starting // position here. |