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

IBinaryStream migration.

Browse Source
This commit is contained in:
morkt
2016-10-16 09:22:53 +04:00
parent d0c1d5da01
commit bb18303eb4
251 changed files with 3277 additions and 3630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ArcFormats/FC01/ArcMRG.cs
View File

@@ -114,7 +114,7 @@ namespace GameRes.Formats.FC01
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
var reader = new MrgDecoder (data);
reader.Unpack();
input = new MemoryStream (reader.Data);
input = new BinMemoryStream (reader.Data, entry.Name);
}
else
input = arc.File.CreateStream (entry.Offset, entry.Size);
@@ -124,7 +124,7 @@ namespace GameRes.Formats.FC01
using (var reader = new MrgLzssReader (input, (int)input.Length, (int)packed_entry.UnpackedSize))
{
reader.Unpack();
return new MemoryStream (reader.Data);
return new BinMemoryStream (reader.Data, entry.Name);
}
}
return input;
@@ -240,14 +240,14 @@ namespace GameRes.Formats.FC01
{
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
Decrypt (data, 0, data.Length, mrg_entry.Key, mrg_entry.ArcKey);
input = new MemoryStream (data);
input = new BinMemoryStream (data, entry.Name);
}
else if (mrg_entry.Method >= 2)
{
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
var reader = new MrgDecoder (data);
reader.Unpack();
input = new MemoryStream (reader.Data);
input = new BinMemoryStream (reader.Data, entry.Name);
}
else
input = arc.File.CreateStream (entry.Offset, entry.Size);
@@ -257,7 +257,7 @@ namespace GameRes.Formats.FC01
using (var reader = new MrgLzssReader (input, (int)input.Length, (int)mrg_entry.UnpackedSize))
{
reader.Unpack();
return new MemoryStream (reader.Data);
return new BinMemoryStream (reader.Data, entry.Name);
}
}
return input;

26
ArcFormats/FC01/ImageACD.cs
View File

@@ -45,20 +45,18 @@ namespace GameRes.Formats.FC01
public override string Description { get { return "F&C Co. image format"; } }
public override uint Signature { get { return 0x20444341; } } // 'ACD'
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x1c];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
int header_size = LittleEndian.ToInt32 (header, 8);
if (!Binary.AsciiEqual (header, 4, "1.00") || header_size < 0x1c)
var header = stream.ReadHeader (0x1c);
int header_size = header.ToInt32 (8);
if (!header.AsciiEqual (4, "1.00") || header_size < 0x1c)
throw new NotSupportedException ("Not supported ACD image version");
int packed_size = LittleEndian.ToInt32 (header, 0x0C);
int unpacked_size = LittleEndian.ToInt32 (header, 0x10);
int packed_size = header.ToInt32 (0x0C);
int unpacked_size = header.ToInt32 (0x10);
return new AcdMetaData
{
Width = LittleEndian.ToUInt32 (header, 0x14),
Height = LittleEndian.ToUInt32 (header, 0x18),
Width = header.ToUInt32 (0x14),
Height = header.ToUInt32 (0x18),
BPP = 24,
DataOffset = header_size,
PackedSize = packed_size,
@@ -66,14 +64,12 @@ namespace GameRes.Formats.FC01
};
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = info as AcdMetaData;
if (null == meta)
throw new ArgumentException ("AcdFormat.Read should be supplied with AcdMetaData", "info");
var meta = (AcdMetaData)info;
stream.Position = meta.DataOffset;
using (var reader = new MrgLzssReader (stream, meta.PackedSize, meta.UnpackedSize))
using (var reader = new MrgLzssReader (stream.AsStream, meta.PackedSize, meta.UnpackedSize))
{
reader.Unpack();
var decoder = new AcdDecoder (reader.Data, meta);

24
ArcFormats/FC01/ImageCLM.cs
View File

@@ -45,20 +45,18 @@ namespace GameRes.Formats.FC01
public override string Description { get { return "F&C Co. image format"; } }
public override uint Signature { get { return 0x204D4C43; } } // 'CLM'
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x40];
if (header.Length != stream.Read (header, 0, header.Length))
var header = stream.ReadHeader (0x40);
if (!header.AsciiEqual (4, "1.00"))
return null;
if (!Binary.AsciiEqual (header, 4, "1.00"))
return null;
uint data_offset = LittleEndian.ToUInt32 (header, 0x10);
uint data_offset = header.ToUInt32 (0x10);
if (data_offset < 0x40)
return null;
uint width = LittleEndian.ToUInt32 (header, 0x1C);
uint height = LittleEndian.ToUInt32 (header, 0x20);
int bpp = LittleEndian.ToInt32 (header, 0x24);
int unpacked_size = LittleEndian.ToInt32 (header, 0x28);
uint width = header.ToUInt32 (0x1C);
uint height = header.ToUInt32 (0x20);
int bpp = header.ToInt32 (0x24);
int unpacked_size = header.ToInt32 (0x28);
return new ClmMetaData
{
Width = width,
@@ -69,7 +67,7 @@ namespace GameRes.Formats.FC01
};
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = (ClmMetaData)info;
stream.Position = meta.DataOffset;
@@ -78,7 +76,7 @@ namespace GameRes.Formats.FC01
if (8 == meta.BPP)
{
format = PixelFormats.Indexed8;
palette = ReadPalette (stream);
palette = ReadPalette (stream.AsStream);
}
else if (24 == meta.BPP)
format = PixelFormats.Bgr24;
@@ -87,7 +85,7 @@ namespace GameRes.Formats.FC01
else
throw new NotSupportedException ("Not supported CLM color depth");
int packed_size = (int)(stream.Length - stream.Position);
using (var reader = new MrgLzssReader (stream, packed_size, meta.UnpackedSize))
using (var reader = new MrgLzssReader (stream.AsStream, packed_size, meta.UnpackedSize))
{
reader.Unpack();
return ImageData.Create (info, format, palette, reader.Data);

24
ArcFormats/FC01/ImageMCG.cs
View File

@@ -67,31 +67,29 @@ namespace GameRes.Formats.FC01
set { KnownKeys = ((McgScheme)value).KnownKeys; }
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
byte[] header = new byte[0x40];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
var header = stream.ReadHeader (0x40);
if (header[5] != '.')
return null;
int version = header[4] * 100 + header[6] * 10 + header[7] - 0x14D0;
if (version != 200 && version != 101)
throw new NotSupportedException ("Not supported MCG format version");
int header_size = LittleEndian.ToInt32 (header, 0x10);
int header_size = header.ToInt32 (0x10);
if (header_size < 0x40)
return null;
int bpp = LittleEndian.ToInt32 (header, 0x24);
int bpp = header.ToInt32 (0x24);
if (24 != bpp)
throw new NotSupportedException ("Not supported MCG image bitdepth");
return new McgMetaData
{
Width = LittleEndian.ToUInt32 (header, 0x1c),
Height = LittleEndian.ToUInt32 (header, 0x20),
OffsetX = LittleEndian.ToInt32 (header, 0x14),
OffsetY = LittleEndian.ToInt32 (header, 0x18),
Width = header.ToUInt32 (0x1c),
Height = header.ToUInt32 (0x20),
OffsetX = header.ToInt32 (0x14),
OffsetY = header.ToInt32 (0x18),
BPP = bpp,
DataOffset = header_size,
PackedSize = LittleEndian.ToInt32 (header, 0x38) - header_size,
PackedSize = header.ToInt32 (0x38) - header_size,
Version = version,
};
}
@@ -99,7 +97,7 @@ namespace GameRes.Formats.FC01
// cache key value so that dialog does not pop up on every file accessed.
byte? LastKey = null;
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = (McgMetaData)info;
byte key = Settings.Default.MCGLastKey;
@@ -113,7 +111,7 @@ namespace GameRes.Formats.FC01
else
key = LastKey.Value;
}
var reader = new McgDecoder (stream, meta, key);
var reader = new McgDecoder (stream.AsStream, meta, key);
reader.Unpack();
if (reader.Key != 0)
LastKey = reader.Key;