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

IBinaryStream migration - continued.

Browse Source
This commit is contained in:
morkt
2016-10-15 12:21:12 +04:00
parent 503b734645
commit d0c1d5da01
39 changed files with 529 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ArcFormats/KScript/ImageKGP.cs
View File

@@ -45,22 +45,21 @@ namespace GameRes.Formats.KScript
public override string Description { get { return "KScript image format"; } }
public override uint Signature { get { return 0x48505247; } } // 'GRPH'
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;
var header = stream.ReadHeader (0x1C);
byte key = (byte)(header[4] ^ header[5]);
int data_offset = 0x14;
int x = 0, y = 0;
if (0 != header[0xC])
{
data_offset += LittleEndian.ToInt32 (header, 0x10) / 0x10 * 0x18;
x = LittleEndian.ToInt32 (header, 0x14);
y = LittleEndian.ToInt32 (header, 0x18);
data_offset += header.ToInt32 (0x10) / 0x10 * 0x18;
x = header.ToInt32 (0x14);
y = header.ToInt32 (0x18);
}
using (var input = new StreamRegion (stream, data_offset, true))
using (var png = new CryptoStream (input, new XorTransform (key), CryptoStreamMode.Read))
using (var input = new StreamRegion (stream.AsStream, data_offset, true))
using (var crypto = new CryptoStream (input, new XorTransform (key), CryptoStreamMode.Read))
using (var png = new BinaryStream (crypto, stream.Name))
{
var info = Png.ReadMetaData (png);
if (null == info)
@@ -74,16 +73,17 @@ namespace GameRes.Formats.KScript
BPP = info.BPP,
Key = key,
DataOffset = data_offset,
DataLength = LittleEndian.ToInt32 (header, 8),
DataLength = header.ToInt32 (8),
};
}
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = (KgpMetaData)info;
using (var input = new StreamRegion (stream, meta.DataOffset, true))
using (var png = new CryptoStream (input, new XorTransform (meta.Key), CryptoStreamMode.Read))
using (var input = new StreamRegion (stream.AsStream, meta.DataOffset, true))
using (var crypto = new CryptoStream (input, new XorTransform (meta.Key), CryptoStreamMode.Read))
using (var png = new BinaryStream (crypto, stream.Name))
return Png.Read (png, info);
}

17
ArcFormats/KScript/ImageKSL.cs
View File

@@ -43,27 +43,24 @@ namespace GameRes.Formats.KScript
public override string Description { get { return "KScript grayscale image format"; } }
public override uint Signature { get { return 0x4D4C534B; } } // 'KSLM'
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x14];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
var header = stream.ReadHeader (0x14);
return new KslMetaData
{
Width = LittleEndian.ToUInt32 (header, 0xC),
Height = LittleEndian.ToUInt32 (header, 0x10),
Width = header.ToUInt32 (0xC),
Height = header.ToUInt32 (0x10),
BPP = 8,
Key = (byte)(header[4] ^ header[5]),
DataLength = LittleEndian.ToInt32 (header, 8),
DataLength = header.ToInt32 (8),
};
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = (KslMetaData)info;
var pixels = new byte[meta.DataLength];
stream.Position = 0x14;
stream.Read (pixels, 0, pixels.Length);
var pixels = stream.ReadBytes (meta.DataLength);
for (int i = 0; i < pixels.Length; ++i)
pixels[i] ^= meta.Key;
return ImageData.Create (info, PixelFormats.Gray8, null, pixels);