aaru-dps/AaruBenchmark
1
0
Fork 0
mirror of https://github.com/aaru-dps/AaruBenchmark.git synced 2025-12-16 19:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

General refactor and cleanup.

Browse Source
This commit is contained in:
Natalia Portillo
2024-04-30 04:30:11 +01:00
parent 886bd83e85
commit fa6f1b2e46
34 changed files with 2153 additions and 2226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Aaru6.Compression/TeleDiskLzh.cs
View File

@@ -145,8 +145,7 @@ public class TeleDiskLzh
_tdctl.Bufcnt = 0;
StartHuff();
for(i = 0; i < N - F; i++)
_textBuf[i] = 0x20;
for(i = 0; i < N - F; i++) _textBuf[i] = 0x20;
_tdctl.R = N - F;
_inStream = dataStream;
@@ -172,8 +171,7 @@ public class TeleDiskLzh
{
if(_tdctl.Bufcnt == 0)
{
if((c = DecodeChar()) < 0)
return count; // fatal error
if((c = DecodeChar()) < 0) return count; // fatal error
if(c < 256)
{
@@ -186,8 +184,7 @@ public class TeleDiskLzh
{
short pos;
if((pos = DecodePosition()) < 0)
return count; // fatal error
if((pos = DecodePosition()) < 0) return count; // fatal error
_tdctl.Bufpos = (ushort)(_tdctl.R - pos - 1 & N - 1);
_tdctl.Bufcnt = (ushort)(c - 255 + THRESHOLD);
@@ -197,8 +194,7 @@ public class TeleDiskLzh
else
{
// still chars from last string
while(_tdctl.Bufndx < _tdctl.Bufcnt &&
count < len)
while(_tdctl.Bufndx < _tdctl.Bufcnt && count < len)
{
c = _textBuf[_tdctl.Bufpos + _tdctl.Bufndx & N - 1];
buf[count] = (byte)c;
@@ -209,8 +205,7 @@ public class TeleDiskLzh
}
// reset bufcnt after copy string from text_buf[]
if(_tdctl.Bufndx >= _tdctl.Bufcnt)
_tdctl.Bufndx = _tdctl.Bufcnt = 0;
if(_tdctl.Bufndx >= _tdctl.Bufcnt) _tdctl.Bufndx = _tdctl.Bufcnt = 0;
}
}
@@ -219,8 +214,7 @@ public class TeleDiskLzh
long DataRead(out byte[] buf, long size)
{
if(size > _inStream.Length - _inStream.Position)
size = _inStream.Length - _inStream.Position;
if(size > _inStream.Length - _inStream.Position) size = _inStream.Length - _inStream.Position;
buf = new byte[size];
_inStream.Read(buf, 0, (int)size);
@@ -235,8 +229,7 @@ public class TeleDiskLzh
_tdctl.Ibufndx = 0;
_tdctl.Ibufcnt = (ushort)DataRead(out _tdctl.Inbuf, BUFSZ);
if(_tdctl.Ibufcnt <= 0)
return -1;
if(_tdctl.Ibufcnt <= 0) return -1;
}
while(_getlen <= 8)
@@ -251,8 +244,7 @@ public class TeleDiskLzh
int GetBit() /* get one bit */
{
if(NextWord() < 0)
return -1;
if(NextWord() < 0) return -1;
var i = (short)_getbuf;
_getbuf <<= 1;
@@ -263,8 +255,7 @@ public class TeleDiskLzh
int GetByte() /* get a byte */
{
if(NextWord() != 0)
return -1;
if(NextWord() != 0) return -1;
ushort i = _getbuf;
_getbuf <<= 8;
@@ -353,8 +344,7 @@ public class TeleDiskLzh
void Update(int c)
{
if(_freq[ROOT] == MAX_FREQ)
Reconst();
if(_freq[ROOT] == MAX_FREQ) Reconst();
c = _prnt[c + T];
@@ -365,8 +355,7 @@ public class TeleDiskLzh
/* swap nodes to keep the tree freq-ordered */
int l;
if(k <= _freq[l = c + 1])
continue;
if(k <= _freq[l = c + 1]) continue;
while(k > _freq[++l]) {}
@@ -377,16 +366,14 @@ public class TeleDiskLzh
int i = _son[c];
_prnt[i] = (short)l;
if(i < T)
_prnt[i + 1] = (short)l;
if(i < T) _prnt[i + 1] = (short)l;
int j = _son[l];
_son[l] = (short)i;
_prnt[j] = (short)c;
if(j < T)
_prnt[j + 1] = (short)c;
if(j < T) _prnt[j + 1] = (short)c;
_son[c] = (short)j;
@@ -407,8 +394,7 @@ public class TeleDiskLzh
{
int ret;
if((ret = GetBit()) < 0)
return -1;
if((ret = GetBit()) < 0) return -1;
c += (ushort)ret;
c = (ushort)_son[c];
@@ -425,8 +411,7 @@ public class TeleDiskLzh
short bit;
/* decode upper 6 bits from given table */
if((bit = (short)GetByte()) < 0)
return -1;
if((bit = (short)GetByte()) < 0) return -1;
var i = (ushort)bit;
var c = (ushort)(_dCode[i] << 6);
@@ -437,8 +422,7 @@ public class TeleDiskLzh
while(j-- > 0)
{
if((bit = (short)GetBit()) < 0)
return -1;
if((bit = (short)GetBit()) < 0) return -1;
i = (ushort)((i << 1) + bit);
}