Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10095) -Fix: avoid reading outside the buffer because of scaling problems

Browse Source
This commit is contained in:
truelight 2007-06-11 12:51:27 +00:00
parent 52fa0751b2
commit 37ee35df07
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blitter/8bpp_optimized.cpp
View File

@ -134,6 +134,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite)
uint pixels = 0; uint pixels = 0;
uint last_color = 0; uint last_color = 0;
uint count_index = 0; uint count_index = 0;
uint rx = 0;
src = &sprite->data[ScaleByZoom(y, (ZoomLevel)i) * sprite->width]; src = &sprite->data[ScaleByZoom(y, (ZoomLevel)i) * sprite->width];
for (int x = 0; x < UnScaleByZoom(sprite->width, (ZoomLevel)i); x++) { for (int x = 0; x < UnScaleByZoom(sprite->width, (ZoomLevel)i); x++) {
@ -144,6 +145,9 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite)
for (int j = 0; j < ScaleByZoom(1, (ZoomLevel)i); j++) { for (int j = 0; j < ScaleByZoom(1, (ZoomLevel)i); j++) {
if (src->m != 0) { color = src->m; count++; } if (src->m != 0) { color = src->m; count++; }
src++; src++;
rx++;
/* Because of the scaling it might happen we read outside the buffer. Avoid that. */
if (rx == sprite->width) break;
} }
/* If more than 12.5% of the pixels are non-transparent, make thisone non-transparent too */ /* If more than 12.5% of the pixels are non-transparent, make thisone non-transparent too */
if (count < ScaleByZoom(1, (ZoomLevel)i) / 8) color = 0; if (count < ScaleByZoom(1, (ZoomLevel)i) / 8) color = 0;