lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-06-25 05:08:10 +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

37
ArcFormats/EmonEngine/ImageBMP.cs
View File

@@ -54,37 +54,34 @@ namespace GameRes.Formats.EmonEngine
Extensions = new string[] { "bmp" };
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
using (var reader = new ArcView.Reader (stream))
{
reader.ReadInt32();
var info = new EmMetaData();
info.LzssFrameSize = reader.ReadUInt16();
info.LzssInitPos = reader.ReadUInt16();
info.BPP = reader.ReadUInt16() & 0xFF;
info.Width = reader.ReadUInt16();
info.Height = reader.ReadUInt16();
info.Colors = reader.ReadUInt16();
info.Stride = reader.ReadInt32();
info.OffsetX = reader.ReadInt32();
info.OffsetY = reader.ReadInt32();
info.DataOffset = 40;
return info;
}
stream.ReadInt32();
var info = new EmMetaData();
info.LzssFrameSize = stream.ReadUInt16();
info.LzssInitPos = stream.ReadUInt16();
info.BPP = stream.ReadUInt16() & 0xFF;
info.Width = stream.ReadUInt16();
info.Height = stream.ReadUInt16();
info.Colors = stream.ReadUInt16();
info.Stride = stream.ReadInt32();
info.OffsetX = stream.ReadInt32();
info.OffsetY = stream.ReadInt32();
info.DataOffset = 40;
return info;
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = (EmMetaData)info;
stream.Position = meta.DataOffset;
BitmapPalette palette = null;
if (meta.Colors != 0)
palette = ReadPalette (stream, Math.Max (meta.Colors, 3));
palette = ReadPalette (stream.AsStream, Math.Max (meta.Colors, 3));
var pixels = new byte[meta.Stride * (int)info.Height];
if (meta.LzssFrameSize != 0)
{
using (var lzss = new LzssStream (stream, LzssMode.Decompress, true))
using (var lzss = new LzssStream (stream.AsStream, LzssMode.Decompress, true))
{
lzss.Config.FrameSize = meta.LzssFrameSize;
lzss.Config.FrameInitPos = meta.LzssInitPos;