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

4
ArcFormats/YuRis/ArcYPF.cs
View File

@@ -138,7 +138,7 @@ namespace GameRes.Formats.YuRis
{
var packed_entry = entry as PackedEntry;
var ypf = arc as YpfArchive;
Stream input = arc.File.CreateStream (entry.Offset, entry.Size);
Stream input = base.OpenEntry (arc, entry);
if (null != packed_entry && packed_entry.IsPacked)
input = new ZLibStream (input, CompressionMode.Decompress);
uint unpacked_size = null == packed_entry ? entry.Size : packed_entry.UnpackedSize;
@@ -151,7 +151,7 @@ namespace GameRes.Formats.YuRis
input.Read (data, 0, data.Length);
if (Binary.AsciiEqual (data, 0, "YSTB"))
DecryptYstb (data, ypf.ScriptKey);
return new MemoryStream (data);
return new BinMemoryStream (data, entry.Name);
}
}

26
ArcFormats/YuRis/ImageYCG.cs
View File

@@ -48,27 +48,25 @@ namespace GameRes.Formats.YuRis
public override string Description { get { return "YU-RIS compressed image format"; } }
public override uint Signature { get { return 0x474359; } } // 'YCG'
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x38];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
var header = stream.ReadHeader (0x38);
return new YcgMetaData
{
Width = LittleEndian.ToUInt32 (header, 4),
Height = LittleEndian.ToUInt32 (header, 8),
BPP = LittleEndian.ToInt32 (header, 12),
CompressionMethod = LittleEndian.ToInt32 (header, 0x10),
UnpackedSize1 = LittleEndian.ToInt32 (header, 0x20),
CompressedSize1 = LittleEndian.ToInt32 (header, 0x24),
UnpackedSize2 = LittleEndian.ToInt32 (header, 0x30),
CompressedSize2 = LittleEndian.ToInt32 (header, 0x34),
Width = header.ToUInt32 (4),
Height = header.ToUInt32 (8),
BPP = header.ToInt32 (12),
CompressionMethod = header.ToInt32 (0x10),
UnpackedSize1 = header.ToInt32 (0x20),
CompressedSize1 = header.ToInt32 (0x24),
UnpackedSize2 = header.ToInt32 (0x30),
CompressedSize2 = header.ToInt32 (0x34),
};
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var reader = new YcgReader (stream, (YcgMetaData)info);
var reader = new YcgReader (stream.AsStream, (YcgMetaData)info);
reader.Unpack();
return ImageData.Create (info, reader.Format, null, reader.Data);
}