libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MTROPOLIS: Fix crash on Immediate Action clock puzzle

Browse Source
This commit is contained in:
elasota 2022-06-26 15:14:04 -04:00
parent 9a377abceb
commit aa9b9f5ce9
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/mtropolis/assets.cpp
View File

@ -436,16 +436,12 @@ void CachedMToon::loadUncompressedFrame(const Common::Array<uint8> &data, size_t
void CachedMToon::decompressQuickTimeFrame(const Common::Array<uint8> &data, size_t frameIndex) {
const MToonMetadata::FrameDef &frameDef = _metadata->frames[frameIndex];
uint16 bpp = _metadata->bitsPerPixel;
size_t w = frameDef.rect.width();
size_t h = frameDef.rect.height();
if (_metadata->codecData.size() < 86) {
error("Unknown codec data block size");
}
if (READ_BE_UINT16(&_metadata->codecData[32]) != w || READ_BE_UINT16(&_metadata->codecData[34]) != h || READ_BE_UINT16(&_metadata->codecData[82]) != bpp) {
error("Codec data block didn't match mToon metadata");
}
// We used to validate that these match the sample desc, but that actually breaks in Obsidian
// on the Bureau Immediate Action clock puzzle, because the frames have different sizes and
// the codec data encodes the size of the last frame.
uint16 w = frameDef.rect.width();
uint16 h = frameDef.rect.height();
uint16 bpp = READ_BE_UINT16(&_metadata->codecData[82]);
Image::Codec *codec = Image::createQuickTimeCodec(_metadata->codecID, w, h, bpp);
if (!codec) {

3
engines/mtropolis/data.h
View File

@ -1694,6 +1694,9 @@ struct MToonAsset : public DataObject {
Common::Array<FrameDef> frames;
// Codec data appears to be a 16-byte header followed by a QuickTime sample description
// Note that the sample description is partly useless because frames can have different sizes
// and the sample desc is only for the last frame!
//
// The 16-byte header is:
// uint32be size of codec data
// char[4] codec ID