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

TITANIC: Fix assert on bad video frame in the Promenade

Browse Source
This commit is contained in:
Paul Gilbert 2017-01-03 15:17:47 -05:00
parent 93cf19209a
commit 2ebb0a37b5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/titanic/support/avi_surface.cpp
View File

@ -273,12 +273,14 @@ void AVISurface::setupDecompressor() {
}
void AVISurface::copyMovieFrame(const Graphics::Surface &src, Graphics::ManagedSurface &dest) {
assert(src.w == dest.w && src.h == dest.h);
// WORKAROUND: A bad video in the Promenade has a frame with a width slightly larger
// than the defined width for the movie it's in. Hence the assert below is >=
assert(src.w >= dest.w && src.h == dest.h);
if (src.format.bytesPerPixel == 1) {
// Paletted 8-bit, so convert to 16-bit and copy over
Graphics::Surface *s = src.convertTo(dest.format, _decoder->getPalette());
dest.blitFrom(*s);
dest.blitFrom(*s, Common::Rect(0, 0, dest.w, dest.h), Common::Point(0, 0));
s->free();
delete s;
} else if (src.format.bytesPerPixel == 2) {