gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-03 12:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r14190) -Codechange: use alloc instead of malloc+free when the allocated memory shouldn't be used after the function ended.

Browse Source
This commit is contained in:
rubidium 2008-08-30 09:43:07 +00:00
parent bfcd6e9772
commit e06c21426e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/spriteloader/grf.cpp
View File

@ -30,8 +30,7 @@ bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot,
* In case it is uncompressed, the size is 'num' - 8 (header-size). */
num = (type & 0x02) ? sprite->width * sprite->height : num - 8;
/* XXX -- We should use a pre-located memory segment for this, malloc/free is pretty expensive */
byte *dest_orig = MallocT<byte>(num);
byte *dest_orig = AllocaM(byte, num);
byte *dest = dest_orig;
/* Read the file, which has some kind of compression */
@ -100,6 +99,5 @@ bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot,
for (int i = 0; i < sprite->width * sprite->height; i++)
if (sprite->data[i].m != 0) sprite->data[i].a = 0xFF;
free(dest_orig);
return true;
}