Skip to content

Update BinaryReaderEx.cs #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update BinaryReaderEx.cs #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions BIS.Core/Stream/BinaryReaderEx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,8 @@ public byte[] ReadCompressed(uint expectedSize, bool forceCompressed = false)
return ReadLZSS(expectedSize);
}

public byte[] ReadLZO(uint expectedSize, bool forceCompressed = false)
public byte[] ReadLZO(uint expectedSize, bool isCompressed = false)
{
bool isCompressed = (expectedSize >= 1024) || forceCompressed;
if (UseCompressionFlag)
{
isCompressed = ReadBoolean();
Expand All @@ -174,23 +173,16 @@ public byte[] ReadLZO(uint expectedSize, bool forceCompressed = false)

public byte[] ReadLZSS(uint expectedSize, bool inPAA = false)
{
if (expectedSize < 1024 && !inPAA) //data is always compressed in PAAs
{
return ReadBytes((int)expectedSize);
}
else
{
// XXX: Needs testing
//var buffer = new byte[expectedSize];
//using (var lzss = new LzssStream(BaseStream, CompressionMode.Decompress, true))
//{
// lzss.Read(buffer, 0, (int)expectedSize);
//}
//Chesksum(inPAA, buffer); //PAAs calculate checksums with signed byte values
byte[] buffer;
LZSS.ReadLZSS(BaseStream, out buffer, expectedSize, inPAA);
return buffer;
}
// XXX: Needs testing
//var buffer = new byte[expectedSize];
//using (var lzss = new LzssStream(BaseStream, CompressionMode.Decompress, true))
//{
// lzss.Read(buffer, 0, (int)expectedSize);
//}
//Chesksum(inPAA, buffer); //PAAs calculate checksums with signed byte values
byte[] buffer;
LZSS.ReadLZSS(BaseStream, out buffer, expectedSize, inPAA);
return buffer;
}

// XXX: Needs testing
Expand Down