simtactics/niotso
1
0
Fork 0
mirror of https://github.com/simtactics/niotso.git synced 2025-07-04 13:47:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

The iff parsing code now accepts SPR# chunks with a "blank sprite", one that has zero dimensions.

Browse source
This commit is contained in:
Fatbag 2012-05-31 07:38:10 -05:00
parent 31282d91f2
commit ec45a6ce82
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/FileHandler/iff/iff.h
View file

@ -118,6 +118,8 @@ typedef struct IFFSprite_s
uint16_t Width;
uint8_t * IndexData;
uint8_t * BGRA32Data;
uint8_t InvalidDimensions;
} IFFSprite;
typedef struct IFFSpriteList_s

9
Libraries/FileHandler/iff/spr.c
View file

@ -117,11 +117,15 @@ int iff_parse_spr(IFFChunk * ChunkInfo, const uint8_t * Buffer){
if(SpriteSize > b.Size || SpriteSize < 10)
return 0;
}
Sprite->Reserved = read_uint32xe(&b);
Sprite->Height = read_uint16xe(&b);
Sprite->Width = read_uint16xe(&b);
if(Sprite->Reserved != 0 || Sprite->Height == 0 || Sprite->Width == 0 || Sprite->Height > UINT_MAX/Sprite->Width/2)
return 0;
if(Sprite->Reserved != 0 || Sprite->Height == 0 || Sprite->Width == 0 || Sprite->Height > UINT_MAX/Sprite->Width/2){
/* This happens in the third sprite of every SPR# chunk in sprites.iff */
Sprite->InvalidDimensions = 1;
continue;
}
Sprite->IndexData = calloc(Sprite->Height*Sprite->Width, 2);
if(Sprite->IndexData == NULL)
return 0;
@ -229,6 +233,7 @@ int iff_depalette(IFFSprite * Sprite, const IFFPalette * Palette){
uint8_t Index = Sprite->IndexData[2*i + 0];
if(Index >= Palette->ColorCount){
free(Sprite->BGRA32Data);
Sprite->BGRA32Data = NULL;
return 0;
}
Sprite->BGRA32Data[4*i + 0] = Palette->Data[3*Index + 2];