Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

TOON: Fix crash #3308220

Bug #3308220: "Crashes"
Added clipping to magnifier effect
  • Loading branch information...
commit 3429a14c119752daa8d17c499dbffb27a3fe23a5 1 parent 9717d5b
@sylvaintv sylvaintv authored
Showing with 6 additions and 2 deletions.
  1. +6 −2 engines/toon/toon.cpp
View
8 engines/toon/toon.cpp
@@ -466,20 +466,24 @@ void ToonEngine::doMagnifierEffect() {
byte tempBuffer[25 * 25];
for (int32 y = -12; y <= 12; y++) {
+ int32 cy = CLIP<int32>(posY + y, 0, TOON_BACKBUFFER_HEIGHT-1);
for (int32 x = -12; x <= 12; x++) {
+ int32 cx = CLIP<int32>(posX + x, 0, TOON_BACKBUFFER_WIDTH-1);
int32 destPitch = surface.pitch;
- uint8 *curRow = (uint8 *)surface.pixels + (posY + y) * destPitch + (posX + x);
+ uint8 *curRow = (uint8 *)surface.pixels + cy * destPitch + cx;
tempBuffer[(y + 12) * 25 + x + 12] = *curRow;
}
}
for (int32 y = -12; y <= 12; y++) {
+ int32 cy = CLIP<int32>(posY + y, 0, TOON_BACKBUFFER_HEIGHT-1);
for (int32 x = -12; x <= 12; x++) {
int32 dist = y * y + x * x;
if (dist > 144)
continue;
+ int32 cx = CLIP<int32>(posX + x, 0, TOON_BACKBUFFER_WIDTH-1);
int32 destPitch = surface.pitch;
- uint8 *curRow = (uint8 *)surface.pixels + (posY + y) * destPitch + (posX + x);
+ uint8 *curRow = (uint8 *)surface.pixels + cy * destPitch + cx;
int32 lerp = (512 + intSqrt[dist] * 256 / 12);
*curRow = tempBuffer[(y * lerp / 1024 + 12) * 25 + x * lerp / 1024 + 12];
}
Please sign in to comment.
Something went wrong with that request. Please try again.