Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-27 15:44:00 +08:00
Code Issues Projects Releases Wiki Activity

(RctFormat): image data reading separated to ReadPixelsData method.

Browse Source
This commit is contained in:
morkt 2015-08-14 21:47:33 +04:00
parent 58dec16f25
commit df5eea6683
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ArcFormats/ImageRCT.cs
View File

@ -120,30 +120,15 @@ namespace GameRes.Formats.Majiro
var meta = info as RctMetaData;
if (null == meta)
throw new ArgumentException ("RctFormat.Read should be supplied with RctMetaData", "info");
byte[] base_image = null;
if (meta.FileName != null && meta.AddSize > 0 && OverlayFrames)
base_image = ReadBaseImage (file, meta);
file.Position = meta.DataOffset + meta.AddSize;
if (meta.IsEncrypted)
file = OpenEncryptedStream (file, meta.DataSize);
try
{
using (var reader = new Reader (file, meta))
{
reader.Unpack();
var pixels = reader.Data;
if (base_image != null)
pixels = CombineImage (base_image, pixels);
return ImageData.Create (meta, PixelFormats.Bgr24, null, pixels, (int)meta.Width*3);
}
}
catch
{
if (meta.IsEncrypted)
Key = null; // probably incorrect encryption scheme caused exception, reset key
throw;
}
var pixels = ReadPixelsData (file, meta);
if (base_image != null)
pixels = CombineImage (base_image, pixels);
return ImageData.Create (meta, PixelFormats.Bgr24, null, pixels, (int)meta.Width*3);
}
byte[] CombineImage (byte[] base_image, byte[] overlay)
@ -160,6 +145,27 @@ namespace GameRes.Formats.Majiro
return overlay;
}
byte[] ReadPixelsData (Stream file, RctMetaData meta)
{
file.Position = meta.DataOffset + meta.AddSize;
if (meta.IsEncrypted)
file = OpenEncryptedStream (file, meta.DataSize);
try
{
using (var reader = new Reader (file, meta))
{
reader.Unpack();
return reader.Data;
}
}
catch
{
if (meta.IsEncrypted)
Key = null; // probably incorrect encryption scheme caused exception, reset key
throw;
}
}
byte[] ReadBaseImage (Stream file, RctMetaData meta)
{
file.Position = meta.DataOffset;
@ -180,15 +186,7 @@ namespace GameRes.Formats.Majiro
&& meta.Width == base_info.Width && meta.Height == base_info.Height)
{
base_info.FileName = name;
base_file.Position = base_info.DataOffset;
Stream input = base_file;
if (base_info.IsEncrypted)
input = OpenEncryptedStream (base_file, base_info.DataSize);
using (var reader = new Reader (input, base_info))
{
reader.Unpack();
return reader.Data;
}
return ReadPixelsData (base_file, base_info);
}
}
}