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

(LsbBitStream): support up to 32 bit sequences.

Browse Source
This commit is contained in:
morkt 2018-09-13 20:51:30 +04:00
parent a775bfe557
commit 652037f878
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ArcFormats/BitStream.cs
View File

@ -117,19 +117,40 @@ namespace GameRes.Formats
public int GetBits (int count) public int GetBits (int count)
{ {
Debug.Assert (count <= 24, "LsbBitStream does not support sequences longer than 24 bits"); Debug.Assert (count <= 32, "LsbBitStream does not support sequences longer than 32 bits");
while (m_cached_bits < count) int value;
if (m_cached_bits >= count)
{ {
int b = m_input.ReadByte(); int mask = (1 << count) - 1;
if (-1 == b) value = m_bits & mask;
return -1; m_bits = (int)((uint)m_bits >> count);
m_bits |= b << m_cached_bits; m_cached_bits -= count;
m_cached_bits += 8; }
else
{
value = m_bits & ((1 << m_cached_bits) - 1);
count -= m_cached_bits;
int shift = m_cached_bits;
m_cached_bits = 0;
while (count >= 8)
{
int b = m_input.ReadByte();
if (-1 == b)
return -1;
value |= b << shift;
shift += 8;
count -= 8;
}
if (count > 0)
{
int b = m_input.ReadByte();
if (-1 == b)
return -1;
value |= (b & ((1 << count) - 1)) << shift;
m_bits = b >> count;
m_cached_bits = 8 - count;
}
} }
int mask = (1 << count) - 1;
int value = m_bits & mask;
m_bits = (int)((uint)m_bits >> count);
m_cached_bits -= count;
return value; return value;
} }