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

2
ArcFormats/Cri/ArcCPK.cs
View File

@@ -104,7 +104,7 @@ namespace GameRes.Formats.Cri
}
Array.Reverse (output, (int)prefix_size, unpacked_size);
arc.File.View.Read (entry.Offset+0x10+packed_size, output, 0, prefix_size);
return new MemoryStream (output);
return new BinMemoryStream (output, entry.Name);
}
void DetectFileTypes (ArcView file, List<Entry> dir)

2
ArcFormats/Cri/AudioADX.cs
View File

@@ -43,7 +43,7 @@ namespace GameRes.Formats.Cri
uint signature = file.Signature;
if (0x80 != (signature & 0xFFFF))
return null;
uint header_size = Binary.BigEndian (signature & 0xFFFF0000);
int header_size = (int)Binary.BigEndian (signature & 0xFFFF0000);
if (header_size < 0x10 || header_size >= file.Length)
return null;
var header = file.ReadBytes (header_size);

87
ArcFormats/Cri/ImageBIP.cs
View File

@@ -61,57 +61,52 @@ namespace GameRes.Formats.Cri
throw new NotImplementedException ("BipFormat.Write not implemented");
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream input)
{
using (var input = new BinaryReader (stream, Encoding.ASCII, true))
{
int sig = input.ReadInt32();
if (sig != 5 && sig != 10)
return null;
uint header_end = (uint)sig*4;
uint index_offset = input.ReadUInt32();
int sig = input.ReadInt32();
if (sig != 5 && sig != 10)
return null;
uint header_end = (uint)sig*4;
uint index_offset = input.ReadUInt32();
input.BaseStream.Position = header_end-4;
uint data_offset = input.ReadUInt32() + 8;
if (index_offset >= data_offset || index_offset < header_end)
return null;
input.BaseStream.Position = index_offset;
int tile_count = input.ReadInt16();
int flag = input.ReadInt16();
if (tile_count <= 0 || 0 != flag)
return null;
input.ReadInt32();
uint w = input.ReadUInt16();
uint h = input.ReadUInt16();
if (0 == w || 0 == h)
return null;
var meta = new BipMetaData { Width = w, Height = h, BPP = 32 };
meta.Tiles.Capacity = tile_count;
for (int i = 0; i < tile_count; ++i)
{
input.ReadInt64();
var tile = new BipTile();
tile.Left = input.ReadUInt16();
tile.Top = input.ReadUInt16();
tile.Width = input.ReadUInt16();
tile.Height = input.ReadUInt16();
if (tile.Left + tile.Width > meta.Width)
meta.Width = (uint)(tile.Left + tile.Width);
if (tile.Top + tile.Height > meta.Height)
meta.Height = (uint)(tile.Top + tile.Height);
input.ReadInt64();
tile.Offset = input.ReadUInt32() + data_offset;
meta.Tiles.Add (tile);
}
return meta;
input.Position = header_end-4;
uint data_offset = input.ReadUInt32() + 8;
if (index_offset >= data_offset || index_offset < header_end)
return null;
input.Position = index_offset;
int tile_count = input.ReadInt16();
int flag = input.ReadInt16();
if (tile_count <= 0 || 0 != flag)
return null;
input.ReadInt32();
uint w = input.ReadUInt16();
uint h = input.ReadUInt16();
if (0 == w || 0 == h)
return null;
var meta = new BipMetaData { Width = w, Height = h, BPP = 32 };
meta.Tiles.Capacity = tile_count;
for (int i = 0; i < tile_count; ++i)
{
input.ReadInt64();
var tile = new BipTile();
tile.Left = input.ReadUInt16();
tile.Top = input.ReadUInt16();
tile.Width = input.ReadUInt16();
tile.Height = input.ReadUInt16();
if (tile.Left + tile.Width > meta.Width)
meta.Width = (uint)(tile.Left + tile.Width);
if (tile.Top + tile.Height > meta.Height)
meta.Height = (uint)(tile.Top + tile.Height);
input.ReadInt64();
tile.Offset = input.ReadUInt32() + data_offset;
meta.Tiles.Add (tile);
}
return meta;
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = info as BipMetaData;
if (null == meta)
throw new ArgumentException ("BipFormat.Read should be supplied with BipMetaData", "info");
var meta = (BipMetaData)info;
var header = new byte[0x7c];
var bitmap = new WriteableBitmap ((int)meta.Width, (int)meta.Height,
@@ -127,7 +122,7 @@ namespace GameRes.Formats.Cri
int alpha = LittleEndian.ToInt32 (header, 0x68);
int x = LittleEndian.ToInt32 (header, 0x6c);
int y = LittleEndian.ToInt32 (header, 0x70);
using (var png = new StreamRegion (stream, stream.Position, data_size, true))
using (var png = new StreamRegion (stream.AsStream, stream.Position, data_size, true))
{
var decoder = new PngBitmapDecoder (png,
BitmapCreateOptions.None, BitmapCacheOption.OnLoad);

4
ArcFormats/Cri/ImageSPC.cs
View File

@@ -49,7 +49,7 @@ namespace GameRes.Formats.Cri
return null;
using (var lzss = new LzssStream (stream.AsStream, LzssMode.Decompress, true))
using (var input = new SeekableStream (lzss))
using (var xtx = new BinaryStream (input))
using (var xtx = new BinaryStream (input, stream.Name))
return base.ReadMetaData (xtx);
}
@@ -58,7 +58,7 @@ namespace GameRes.Formats.Cri
stream.Position = 4;
using (var lzss = new LzssStream (stream.AsStream, LzssMode.Decompress, true))
using (var input = new SeekableStream (lzss))
using (var xtx = new BinaryStream (input))
using (var xtx = new BinaryStream (input, stream.Name))
return base.Read (xtx, info);
}