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

17
ArcFormats/Vitamin/ImageMFC.cs
View File

@@ -49,17 +49,16 @@ namespace GameRes.Formats.Vitamin
Extensions = new string[] { "mfc" };
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x18];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
var header = stream.ReadHeader (0x18);
if (header[4] != 1 || header[5] != 0 || header[6] != 1 || header[7] != 4)
return null;
int alpha_size = LittleEndian.ToInt32 (header, 12);
using (var sbi = new StreamRegion (stream, alpha_size, true))
int alpha_size = header.ToInt32 (12);
using (var reg = new StreamRegion (stream.AsStream, alpha_size, true))
using (var sbi = new BinaryStream (reg, stream.Name))
{
var info = base.ReadMetaData (sbi) as SbiMetaData;
if (null == info)
@@ -75,15 +74,15 @@ namespace GameRes.Formats.Vitamin
}
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = (MfcMetaData)info;
// XXX implemented like in reference code, width is expected to be even.
var alpha = new byte[info.Width * info.Height / 2];
stream.Position = 0x18;
RleUnpack (stream, meta.AlphaSize - 0x18, alpha);
RleUnpack (stream.AsStream, meta.AlphaSize - 0x18, alpha);
byte[] pixels;
using (var sbi = new StreamRegion (stream, meta.AlphaSize, true))
using (var sbi = new StreamRegion (stream.AsStream, meta.AlphaSize, true))
using (var reader = new SbiReader (sbi, meta.BaseInfo))
{
reader.Unpack();

16
ArcFormats/Vitamin/ImageSBI.cs
View File

@@ -51,11 +51,9 @@ namespace GameRes.Formats.Vitamin
Extensions = new string[] { "cmp" };
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x20];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
var header = stream.ReadHeader (0x20);
if (header[4] != 1 || header[5] != 0)
return null;
int bpp = header[6];
@@ -63,18 +61,18 @@ namespace GameRes.Formats.Vitamin
return null;
return new SbiMetaData
{
Width = LittleEndian.ToUInt16 (header, 7),
Height = LittleEndian.ToUInt16 (header, 9),
Width = header.ToUInt16 (7),
Height = header.ToUInt16 (9),
BPP = bpp,
InputSize = LittleEndian.ToInt32 (header, 0xB),
InputSize = header.ToInt32 (0xB),
IsPacked = 0 != header[0x10],
HasPalette = 8 == bpp && 0 == header[0xF],
};
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
using (var reader = new SbiReader (stream, (SbiMetaData)info))
using (var reader = new SbiReader (stream.AsStream, (SbiMetaData)info))
{
reader.Unpack();
return ImageData.Create (info, reader.Format, reader.Palette, reader.Data, reader.Stride);