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

use IBinaryStream interface instead of BinaryReader where appropriate.

Browse Source
This commit is contained in:
morkt
2016-10-16 18:29:54 +04:00
parent 3a1bae1a19
commit df01ce1893
23 changed files with 195 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ArcFormats/FC01/ArcMCA.cs
View File

@@ -99,7 +99,7 @@ namespace GameRes.Formats.FC01
MrgOpener.Decrypt (data, 0, data.Length, mca.Key);
if (method > 0)
{
using (var input = new MemoryStream (data))
using (var input = new BinMemoryStream (data))
using (var lzss = new MrgLzssReader (input, data.Length, unpacked_size))
{
lzss.Unpack();

26
ArcFormats/FC01/ArcMRG.cs
View File

@@ -106,7 +106,7 @@ namespace GameRes.Formats.FC01
var packed_entry = entry as MrgEntry;
if (null == packed_entry || !packed_entry.IsPacked || packed_entry.Method > 3)
return arc.File.CreateStream (entry.Offset, entry.Size);
Stream input;
IBinaryStream input;
if (packed_entry.Method >= 2)
{
if (entry.Size < 0x108)
@@ -127,7 +127,7 @@ namespace GameRes.Formats.FC01
return new BinMemoryStream (reader.Data, entry.Name);
}
}
return input;
return input.AsStream;
}
static public void Decrypt (byte[] data, int index, int length, int key)
@@ -235,7 +235,7 @@ namespace GameRes.Formats.FC01
var mrg_entry = entry as Mrg2Entry;
if (null == mrg_entry || mrg_entry.Method > 3)
return arc.File.CreateStream (entry.Offset, entry.Size);
Stream input;
IBinaryStream input;
if (0 == mrg_entry.Method)
{
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
@@ -260,7 +260,7 @@ namespace GameRes.Formats.FC01
return new BinMemoryStream (reader.Data, entry.Name);
}
}
return input;
return input.AsStream;
}
void Decrypt (byte[] data, int index, int length, uint checksum, uint key)
@@ -298,15 +298,15 @@ namespace GameRes.Formats.FC01
/// </summary>
internal sealed class MrgLzssReader : IDisposable
{
BinaryReader m_input;
IBinaryStream m_input;
byte[] m_output;
int m_size;
public byte[] Data { get { return m_output; } }
public MrgLzssReader (Stream input, int input_length, int output_length)
public MrgLzssReader (IBinaryStream input, int input_length, int output_length)
{
m_input = new ArcView.Reader (input);
m_input = input;
m_output = new byte[output_length];
m_size = input_length;
}
@@ -320,7 +320,7 @@ namespace GameRes.Formats.FC01
int remaining = m_size;
while (remaining > 0)
{
int ctl = m_input.ReadByte();
int ctl = m_input.ReadUInt8();
--remaining;
for (int bit = 1; remaining > 0 && bit != 0x100; bit <<= 1)
{
@@ -328,7 +328,7 @@ namespace GameRes.Formats.FC01
return;
if (0 != (ctl & bit))
{
byte b = m_input.ReadByte();
byte b = m_input.ReadUInt8();
--remaining;
frame[frame_pos++] = b;
frame_pos &= frame_mask;
@@ -357,16 +357,8 @@ namespace GameRes.Formats.FC01
}
#region IDisposable Members
bool disposed = false;
public void Dispose ()
{
if (!disposed)
{
m_input.Dispose();
disposed = true;
}
GC.SuppressFinalize (this);
}
#endregion
}

2
ArcFormats/FC01/ImageACD.cs
View File

@@ -69,7 +69,7 @@ namespace GameRes.Formats.FC01
var meta = (AcdMetaData)info;
stream.Position = meta.DataOffset;
using (var reader = new MrgLzssReader (stream.AsStream, meta.PackedSize, meta.UnpackedSize))
using (var reader = new MrgLzssReader (stream, meta.PackedSize, meta.UnpackedSize))
{
reader.Unpack();
var decoder = new AcdDecoder (reader.Data, meta);

2
ArcFormats/FC01/ImageCLM.cs
View File

@@ -85,7 +85,7 @@ namespace GameRes.Formats.FC01
else
throw new NotSupportedException ("Not supported CLM color depth");
int packed_size = (int)(stream.Length - stream.Position);
using (var reader = new MrgLzssReader (stream.AsStream, packed_size, meta.UnpackedSize))
using (var reader = new MrgLzssReader (stream, packed_size, meta.UnpackedSize))
{
reader.Unpack();
return ImageData.Create (info, format, palette, reader.Data);

4
ArcFormats/FC01/ImageMCG.cs
View File

@@ -197,7 +197,7 @@ namespace GameRes.Formats.FC01
{
var copy = m_input.Clone() as byte[];
MrgOpener.Decrypt (copy, 0, copy.Length-1, (byte)key);
using (var input = new MemoryStream (copy))
using (var input = new BinMemoryStream (copy))
using (var lzss = new MrgLzssReader (input, m_input.Length, Stride * m_height))
{
lzss.Unpack();
@@ -211,7 +211,7 @@ namespace GameRes.Formats.FC01
}
}
#endif
using (var input = new MemoryStream (m_input))
using (var input = new BinMemoryStream (m_input))
using (var lzss = new MrgLzssReader (input, m_input.Length, Stride * m_height))
{
lzss.Unpack();