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

Clipping the rendering to the output surface.

Browse Source 
This should fix the crash in the Italian version of Woodruff (#1981031 - "Crash after dancing at Puh-Let Party!!")

svn-id: r38784
This commit is contained in:
Sven Hesse 2009-02-22 14:04:07 +00:00
parent b5ce8d9320
commit 462ef2c78c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/gob/coktelvideo.cpp
View File

@ -1388,6 +1388,7 @@ uint32 Vmd::renderFrame(int16 &left, int16 &top, int16 &right, int16 &bottom) {
int16 width = right - left + 1;
int16 height = bottom - top + 1;
int16 sW = _vidMemWidth;
int16 sH = _vidMemHeight;
uint32 dataLen = _frameDataLen;
byte *dataPtr = _frameData;
byte *imdVidMem = _vidMem + sW * top + left;
@ -1427,6 +1428,7 @@ uint32 Vmd::renderFrame(int16 &left, int16 &top, int16 &right, int16 &bottom) {
dest = _vidMemBuffer + postScaleX(_width) * (top - _y) + postScaleX((left - _x));
imdVidMem = _vidMem + _vidMemWidth * top + preScaleX(left);
sW = postScaleX(_width);
sH = _height;
}
if (type & 0x80) { // Frame data is compressed
@ -1468,11 +1470,15 @@ uint32 Vmd::renderFrame(int16 &left, int16 &top, int16 &right, int16 &bottom) {
dest = destBak;
}
} else if (type == 2) { // Whole block
for (int i = 0; i < height; i++) {
memcpy(dest, srcPtr, postScaleX(width));
int16 w = MIN<int32>(postScaleX(width), sW);
int16 h = MIN(height, sH);
for (int i = 0; i < h; i++) {
memcpy(dest, srcPtr, w);
srcPtr += postScaleX(width);
dest += sW;
}
} else if (type == 3) { // RLE block
for (int i = 0; i < height; i++) {
destBak = dest;