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

68
ArcFormats/Will/ImageWIP.cs
View File

@@ -51,36 +51,32 @@ namespace GameRes.Formats.Will
Extensions = new string[] { "wip", "msk", "mos" };
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream file)
{
using (var file = new BinaryReader (stream, Encoding.ASCII, true))
file.Position = 4;
int frames = file.ReadUInt16();
int bpp = file.ReadUInt16();
uint width = file.ReadUInt32();
uint height = file.ReadUInt32();
int x = file.ReadInt32();
int y = file.ReadInt32();
file.ReadInt32(); // 0
uint frame_size = file.ReadUInt32();
if (24 != bpp && 8 != bpp)
{
if (Signature != file.ReadUInt32())
return null;
int frames = file.ReadUInt16();
int bpp = file.ReadUInt16();
uint width = file.ReadUInt32();
uint height = file.ReadUInt32();
int x = file.ReadInt32();
int y = file.ReadInt32();
file.ReadUInt32(); // 0
uint frame_size = file.ReadUInt32();
if (24 != bpp && 8 != bpp)
{
Trace.WriteLine ("unsupported bpp", "WipFormat");
return null;
}
return new WipMetaData
{
Width = width,
Height = height,
OffsetX = x,
OffsetY = y,
BPP = bpp,
FrameCount = frames,
FrameSize = frame_size,
};
Trace.WriteLine ("unsupported bpp", "WipFormat");
return null;
}
return new WipMetaData
{
Width = width,
Height = height,
OffsetX = x,
OffsetY = y,
BPP = bpp,
FrameCount = frames,
FrameSize = frame_size,
};
}
public override void Write (Stream file, ImageData image)
@@ -88,7 +84,7 @@ namespace GameRes.Formats.Will
throw new NotImplementedException ("WipFormat.Write not implemented");
}
public override ImageData Read (Stream file, ImageMetaData info)
public override ImageData Read (IBinaryStream file, ImageMetaData info)
{
var meta = (WipMetaData)info;
if (meta.FrameCount > 1)
@@ -106,7 +102,7 @@ namespace GameRes.Formats.Will
palette[i] = Color.FromRgb (palette_data[i*4], palette_data[i*4+1], palette_data[i*4+2]);
}
}
using (var reader = new Reader (file, meta))
using (var reader = new Reader (file.AsStream, meta))
{
reader.Unpack();
if (24 == meta.BPP)
@@ -134,7 +130,7 @@ namespace GameRes.Formats.Will
}
}
internal class Reader : IDisposable
internal sealed class Reader : IDisposable
{
private BinaryReader m_input;
private uint m_length;
@@ -199,21 +195,13 @@ namespace GameRes.Formats.Will
bool disposed = false;
public void Dispose ()
{
Dispose (true);
GC.SuppressFinalize (this);
}
protected virtual void Dispose (bool disposing)
{
if (!disposed)
{
if (disposing)
m_input.Dispose();
m_input = null;
m_data = null;
m_input.Dispose();
disposed = true;
}
GC.SuppressFinalize (this);
}
#endregion
}