Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-02 18:05:36 +08:00
Code Issues Projects Releases Wiki Activity

(GrFormat): handle zero image size field.

Browse Source
This commit is contained in:
morkt 2016-01-06 19:33:42 +04:00
parent 664f7ca415
commit 7e4425cb13
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ArcFormats/Eagls/ImageGR.cs
View File

@ -57,6 +57,8 @@ namespace GameRes.Formats.Eagls
int height = LittleEndian.ToInt32 (bmp, 0x16); int height = LittleEndian.ToInt32 (bmp, 0x16);
int bpp = LittleEndian.ToInt16 (bmp, 0x1c); int bpp = LittleEndian.ToInt16 (bmp, 0x1c);
int image_size = LittleEndian.ToInt32 (bmp, 0x22); int image_size = LittleEndian.ToInt32 (bmp, 0x22);
if (0 == image_size)
image_size = width * height * (bpp / 8);
return new GrMetaData return new GrMetaData
{ {
Width = (uint)width, Width = (uint)width,
@ -69,10 +71,7 @@ namespace GameRes.Formats.Eagls
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (Stream stream, ImageMetaData info)
{ {
var meta = info as GrMetaData; var meta = (GrMetaData)info;
if (null == meta)
throw new ArgumentException ("GrFormat.Read should be supplied with GrMetaData", "info");
using (var reader = new LzssReader (stream, (int)stream.Length, meta.UnpackedSize+2)) using (var reader = new LzssReader (stream, (int)stream.Length, meta.UnpackedSize+2))
{ {
reader.Unpack(); reader.Unpack();