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

(ArcOpener.OpenEntry): use XoredStream instead of manual loop.

Browse Source
This commit is contained in:
morkt 2017-01-18 04:49:38 +04:00
parent edf7ae3389
commit 4edd06e7d9
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ArcFormats/ArcAST.cs
View File

@ -2,7 +2,7 @@
//! \date Tue Apr 21 02:24:20 2015 //! \date Tue Apr 21 02:24:20 2015
//! \brief AST script engine resource archives. //! \brief AST script engine resource archives.
// //
// Copyright (C) 2015-2016 by morkt // Copyright (C) 2015-2017 by morkt
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
@ -113,23 +113,17 @@ namespace GameRes.Formats.AST
public override Stream OpenEntry (ArcFile arc, Entry entry) public override Stream OpenEntry (ArcFile arc, Entry entry)
{ {
var input = arc.File.CreateStream (entry.Offset, entry.Size);
var pent = entry as PackedEntry; var pent = entry as PackedEntry;
if (null == pent || !(arc is AstArchive)) if (null == pent || !(arc is AstArchive))
return arc.File.CreateStream (entry.Offset, entry.Size); return input;
if (!pent.IsPacked) if (!pent.IsPacked)
{ {
arc.File.View.Reserve (entry.Offset, entry.Size); if (0xB8B1AF76 == input.Signature) // PNG signature ^ FF
var sig = arc.File.View.ReadUInt32 (entry.Offset); return new XoredStream (input, 0xFF);
if (0xB8B1AF76 == sig) // PNG signature ^ FF return input;
{
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
for (int i = 0; i < data.Length; ++i)
data[i] ^= 0xff;
return new BinMemoryStream (data, entry.Name);
}
return arc.File.CreateStream (entry.Offset, entry.Size);
} }
using (var input = arc.File.CreateStream (entry.Offset, entry.Size)) using (input)
{ {
var data = UnpackLzss (input, pent.Size, pent.UnpackedSize); var data = UnpackLzss (input, pent.Size, pent.UnpackedSize);
return new BinMemoryStream (data, entry.Name); return new BinMemoryStream (data, entry.Name);