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

2
ArcFormats/AliceSoft/ArcAFA.cs
View File

@@ -101,7 +101,7 @@ namespace GameRes.Formats.AliceSoft
for (int i = 0; i < prefix.Length; ++i)
prefix[i] ^= AffKey[i & 0xF];
if (data_size <= 0x40)
return new MemoryStream (prefix);
return new BinMemoryStream (prefix, entry.Name);
var rest = arc.File.CreateStream (entry.Offset+0x10+encrypted_length, data_size-encrypted_length);
return new PrefixStream (prefix, rest);
}

12
ArcFormats/AliceSoft/ImageDCF.cs
View File

@@ -137,13 +137,15 @@ namespace GameRes.Formats.AliceSoft
long qnt_pos = m_input.Position;
if (m_input.ReadUInt32() != Qnt.Signature)
throw new InvalidFormatException();
m_input.Seek (-4, SeekOrigin.Current);
var qnt_info = Qnt.ReadMetaData (m_input) as QntMetaData;
QntMetaData qnt_info;
using (var reg = new StreamRegion (m_input.AsStream, qnt_pos, true))
using (var qnt = new BinaryStream (reg, m_input.Name))
qnt_info = Qnt.ReadMetaData (qnt) as QntMetaData;
if (null == qnt_info)
throw new InvalidFormatException();
m_input.Position = qnt_pos + 0x44;
var overlay = new QntFormat.Reader (m_input, qnt_info);
var overlay = new QntFormat.Reader (m_input.AsStream, qnt_info);
overlay.Unpack();
m_overlay_bpp = overlay.BPP;
if (m_mask != null)
@@ -213,13 +215,13 @@ namespace GameRes.Formats.AliceSoft
string dir_name = VFS.GetDirectoryName (m_info.FileName);
string base_name = Path.ChangeExtension (m_info.BaseName, "qnt");
base_name = VFS.CombinePath (dir_name, base_name);
using (var base_file = VFS.OpenSeekableStream (base_name))
using (var base_file = VFS.OpenBinaryStream (base_name))
{
var base_info = Qnt.ReadMetaData (base_file) as QntMetaData;
if (null != base_info && m_info.Width == base_info.Width && m_info.Height == base_info.Height)
{
base_info.FileName = base_name;
var reader = new QntFormat.Reader (base_file, base_info);
var reader = new QntFormat.Reader (base_file.AsStream, base_info);
reader.Unpack();
m_base_bpp = reader.BPP;
m_base = reader.Data;

28
ArcFormats/AliceSoft/ImageQNT.cs
View File

@@ -49,36 +49,34 @@ namespace GameRes.Formats.AliceSoft
throw new System.NotImplementedException ("QntFormat.Write not implemented");
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x44];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
int version = LittleEndian.ToInt32 (header, 4);
var header = stream.ReadHeader (0x44);
int version = header.ToInt32 (4);
if (version <= 0 || version > 2)
return null;
if (0x44 != LittleEndian.ToUInt32 (header, 8))
if (0x44 != header.ToUInt32 (8))
return null;
uint width = LittleEndian.ToUInt32 (header, 0x14);
uint height = LittleEndian.ToUInt32 (header, 0x18);
uint width = header.ToUInt32 (0x14);
uint height = header.ToUInt32 (0x18);
if (0 == width || 0 == height)
return null;
return new QntMetaData
{
Width = width,
Height = height,
OffsetX = LittleEndian.ToInt32 (header, 0x0c),
OffsetY = LittleEndian.ToInt32 (header, 0x10),
BPP = LittleEndian.ToInt32 (header, 0x1c),
RGBSize = LittleEndian.ToUInt32 (header, 0x24),
AlphaSize = LittleEndian.ToUInt32 (header, 0x28),
OffsetX = header.ToInt32 (0x0c),
OffsetY = header.ToInt32 (0x10),
BPP = header.ToInt32 (0x1c),
RGBSize = header.ToUInt32 (0x24),
AlphaSize = header.ToUInt32 (0x28),
};
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
stream.Position = 0x44;
var reader = new Reader (stream, (QntMetaData)info);
var reader = new Reader (stream.AsStream, (QntMetaData)info);
reader.Unpack();
int stride = (int)info.Width * (reader.BPP / 8);
PixelFormat format = 24 == reader.BPP ? PixelFormats.Bgr24 : PixelFormats.Bgra32;