lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(ReadMetaData): section header is 16 bytes long.

Browse Source
This commit is contained in:
morkt
2016-02-07 09:37:25 +04:00
parent dca410a260
commit 9b4e4a9089
1 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ArcFormats/Entis/ImageERI.cs
View File

@@ -73,6 +73,7 @@ namespace GameRes.Formats.Entis
public enum EriCode public enum EriCode
{ {
ArithmeticCode = 32,
RunlengthGamma = -1, RunlengthGamma = -1,
RunlengthHuffman = -4, RunlengthHuffman = -4,
Nemesis = -16, Nemesis = -16,
@@ -81,9 +82,13 @@ namespace GameRes.Formats.Entis
public enum EriImage public enum EriImage
{ {
RGB = 0x00000001, RGB = 0x00000001,
RGBA = 0x04000001,
Gray = 0x00000002, Gray = 0x00000002,
TypeMask = 0x00FFFFFF, BGR = 0x00000003,
YUV = 0x00000004,
HSB = 0x00000006,
RGBA = 0x04000001,
BGRA = 0x04000003,
TypeMask = 0x0000FFFF,
WithPalette = 0x01000000, WithPalette = 0x01000000,
UseClipping = 0x02000000, UseClipping = 0x02000000,
WithAlpha = 0x04000000, WithAlpha = 0x04000000,
@@ -155,16 +160,15 @@ namespace GameRes.Formats.Entis
EriFileHeader file_header = null; EriFileHeader file_header = null;
EriMetaData info = null; EriMetaData info = null;
string desc = null; string desc = null;
while (header_size > 8) while (header_size > 0x10)
{ {
section = reader.ReadSection(); section = reader.ReadSection();
header_size -= 8; header_size -= 0x10;
if (section.Length <= 0 || section.Length > header_size) if (section.Length <= 0 || section.Length > header_size)
break; break;
if ("FileHdr " == section.Id) if ("FileHdr " == section.Id)
{ {
file_header = new EriFileHeader(); file_header = new EriFileHeader { Version = reader.ReadInt32() };
file_header.Version = reader.ReadInt32();
if (file_header.Version > 0x00020100) if (file_header.Version > 0x00020100)
throw new InvalidFormatException ("Invalid ERI file version"); throw new InvalidFormatException ("Invalid ERI file version");
file_header.ContainedFlag = reader.ReadInt32(); file_header.ContainedFlag = reader.ReadInt32();
@@ -233,7 +237,7 @@ namespace GameRes.Formats.Entis
return ImageData.Create (info, reader.Format, reader.Palette, reader.Data, reader.Stride); return ImageData.Create (info, reader.Format, reader.Palette, reader.Data, reader.Stride);
} }
private Color[] ReadPalette (Stream input, int palette_length) internal Color[] ReadPalette (Stream input, int palette_length)
{ {
var palette_data = new byte[0x400]; var palette_data = new byte[0x400];
if (palette_length > palette_data.Length) if (palette_length > palette_data.Length)
@@ -248,12 +252,12 @@ namespace GameRes.Formats.Entis
return colors; return colors;
} }
private EriReader ReadImageData (Stream stream, EriMetaData meta) internal EriReader ReadImageData (Stream stream, EriMetaData meta)
{ {
stream.Position = meta.StreamPos; stream.Position = meta.StreamPos;
Color[] palette = null;
using (var input = new EriFile (stream)) using (var input = new EriFile (stream))
{ {
Color[] palette = null;
for (;;) // ReadSection throws an exception in case of EOF for (;;) // ReadSection throws an exception in case of EOF
{ {
var section = input.ReadSection(); var section = input.ReadSection();
@@ -268,6 +272,7 @@ namespace GameRes.Formats.Entis
} }
input.BaseStream.Seek (section.Length, SeekOrigin.Current); input.BaseStream.Seek (section.Length, SeekOrigin.Current);
} }
}
var reader = new EriReader (stream, meta, palette); var reader = new EriReader (stream, meta, palette);
reader.DecodeImage(); reader.DecodeImage();
@@ -298,7 +303,6 @@ namespace GameRes.Formats.Entis
} }
return reader; return reader;
} }
}
void AddImageBuffer (EriMetaData dst_info, byte[] dst_img, EriMetaData src_info, byte[] src_img) void AddImageBuffer (EriMetaData dst_info, byte[] dst_img, EriMetaData src_info, byte[] src_img)
{ {