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/Silky/ImageGRD.cs
View File

@@ -52,12 +52,12 @@ namespace GameRes.Formats.Silky
throw new NotImplementedException ("GrdFormat.Write not implemented");
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
stream.Seek (4, SeekOrigin.Current);
int data_size = stream.ReadByte() | stream.ReadByte() << 8 | stream.ReadByte() << 16 | stream.ReadByte() << 24;
int data_size = stream.ReadInt32();
stream.Seek (4, SeekOrigin.Current);
using (var reader = new Reader (stream, 0x22)) // BMP header
using (var reader = new Reader (stream.AsStream, 0x22)) // BMP header
{
reader.Unpack();
var bmp = reader.Data;
@@ -76,18 +76,15 @@ namespace GameRes.Formats.Silky
}
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = info as GrdMetaData;
if (null == meta)
throw new ArgumentException ("GrdFormat.Read should be supplied with GrdMetaData", "info");
var meta = (GrdMetaData)info;
stream.Position = 12;
using (var reader = new Reader (stream, meta.DataSize))
using (var reader = new Reader (stream.AsStream, meta.DataSize))
{
reader.Unpack();
byte[] pixels = reader.Data;
using (var bmp = new MemoryStream (reader.Data, false))
using (var bmp = new MemoryStream (reader.Data))
{
var decoder = new BmpBitmapDecoder (bmp,
BitmapCreateOptions.None, BitmapCacheOption.OnLoad);