diff --git a/BurnOutSharp/External/libmspack/Compression/CompressionStream.cs b/BurnOutSharp/External/libmspack/Compression/CompressionStream.cs index fad21319..a6ede2ec 100644 --- a/BurnOutSharp/External/libmspack/Compression/CompressionStream.cs +++ b/BurnOutSharp/External/libmspack/Compression/CompressionStream.cs @@ -16,8 +16,14 @@ namespace LibMSPackSharp.Compression { public abstract class CompressionStream : BaseDecompressState { + /// + /// Number of bits in a character + /// private const int CHAR_BIT = 8; + /// + /// Bit width of a UInt32 bit buffer + /// public const int BITBUF_WIDTH = 4 * CHAR_BIT; #region I/O buffering @@ -28,11 +34,11 @@ namespace LibMSPackSharp.Compression public int InputPointer { get; set; } - public int InputLength { get; set; } + public int InputEnd { get; set; } public int OutputPointer { get; set; } - public int OutputLength { get; set; } + public int OutputEnd { get; set; } public uint BitBuffer { get; set; } @@ -41,7 +47,7 @@ namespace LibMSPackSharp.Compression /// /// Have we reached the end of input? /// - public int InputEnd { get; set; } + public int EndOfInput { get; set; } #endregion @@ -125,7 +131,7 @@ namespace LibMSPackSharp.Compression // so fake 2 more bytes at the end of input if (read == 0) { - if (InputEnd != 0) + if (EndOfInput != 0) { Console.WriteLine("Out of input bytes"); return Error = Error.MSPACK_ERR_READ; @@ -134,13 +140,13 @@ namespace LibMSPackSharp.Compression { read = 2; InputBuffer[0] = InputBuffer[1] = 0; - InputEnd = 1; + EndOfInput = 1; } } // Update i_ptr and i_end InputPointer = 0; - InputLength = read; + InputEnd = read; return Error = Error.MSPACK_ERR_OK; } diff --git a/BurnOutSharp/External/libmspack/Compression/LZHKWAJ.cs b/BurnOutSharp/External/libmspack/Compression/LZHKWAJ.cs index b4c87fa3..3245dc44 100644 --- a/BurnOutSharp/External/libmspack/Compression/LZHKWAJ.cs +++ b/BurnOutSharp/External/libmspack/Compression/LZHKWAJ.cs @@ -54,16 +54,16 @@ namespace LibMSPackSharp.Compression //INIT_BITS { lzh.InputPointer = 0; - lzh.InputLength = 0; + lzh.InputEnd = 0; lzh.BitBuffer = 0; lzh.BitsLeft = 0; - lzh.InputEnd = 0; + lzh.EndOfInput = 0; } //RESTORE_BITS { i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; bit_buffer = lzh.BitBuffer; bits_left = lzh.BitsLeft; } @@ -92,7 +92,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -113,7 +113,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } } @@ -125,7 +125,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzh.InputPointer = i_ptr; - lzh.InputLength = i_end; + lzh.InputEnd = i_end; lzh.BitBuffer = bit_buffer; lzh.BitsLeft = bits_left; } @@ -137,7 +137,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; bit_buffer = lzh.BitBuffer; bits_left = lzh.BitsLeft; } @@ -151,7 +151,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzh.InputPointer = i_ptr; - lzh.InputLength = i_end; + lzh.InputEnd = i_end; lzh.BitBuffer = bit_buffer; lzh.BitsLeft = bits_left; } @@ -163,7 +163,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; bit_buffer = lzh.BitBuffer; bits_left = lzh.BitsLeft; } @@ -177,7 +177,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzh.InputPointer = i_ptr; - lzh.InputLength = i_end; + lzh.InputEnd = i_end; lzh.BitBuffer = bit_buffer; lzh.BitsLeft = bits_left; } @@ -189,7 +189,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; bit_buffer = lzh.BitBuffer; bits_left = lzh.BitsLeft; } @@ -203,7 +203,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzh.InputPointer = i_ptr; - lzh.InputLength = i_end; + lzh.InputEnd = i_end; lzh.BitBuffer = bit_buffer; lzh.BitsLeft = bits_left; } @@ -215,7 +215,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; bit_buffer = lzh.BitBuffer; bits_left = lzh.BitsLeft; } @@ -229,7 +229,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzh.InputPointer = i_ptr; - lzh.InputLength = i_end; + lzh.InputEnd = i_end; lzh.BitBuffer = bit_buffer; lzh.BitsLeft = bits_left; } @@ -241,7 +241,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; bit_buffer = lzh.BitBuffer; bits_left = lzh.BitsLeft; } @@ -250,7 +250,7 @@ namespace LibMSPackSharp.Compression return Error.MSPACK_ERR_DATAFORMAT; } - while (lzh.InputEnd == 0) + while (lzh.EndOfInput == 0) { if (lit_run != 0) { @@ -270,7 +270,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -308,7 +308,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } } @@ -330,7 +330,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -368,7 +368,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } } @@ -394,7 +394,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -432,7 +432,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -454,7 +454,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -475,7 +475,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -514,7 +514,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -552,7 +552,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -576,7 +576,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -614,7 +614,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -646,7 +646,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; bit_buffer = lzh.BitBuffer; bits_left = lzh.BitsLeft; } @@ -680,7 +680,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -701,7 +701,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -724,7 +724,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -745,7 +745,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -771,7 +771,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -792,7 +792,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -818,7 +818,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -839,7 +839,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -867,7 +867,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -888,7 +888,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -911,7 +911,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -932,7 +932,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -954,7 +954,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -975,7 +975,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } } @@ -1008,7 +1008,7 @@ namespace LibMSPackSharp.Compression return err; i_ptr = lzh.InputPointer; - i_end = lzh.InputLength; + i_end = lzh.InputEnd; } //INJECT_BITS(lzh.InputBuffer[i_ptr++], 8) @@ -1029,7 +1029,7 @@ namespace LibMSPackSharp.Compression } } - if (lzh.InputEnd != 0 && bits_left < lzh.InputEnd) + if (lzh.EndOfInput != 0 && bits_left < lzh.EndOfInput) return Error.MSPACK_ERR_OK; } @@ -1042,7 +1042,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzh.InputPointer = i_ptr; - lzh.InputLength = i_end; + lzh.InputEnd = i_end; lzh.BitBuffer = bit_buffer; lzh.BitsLeft = bits_left; } @@ -1053,9 +1053,9 @@ namespace LibMSPackSharp.Compression private static Error ReadInput(LZHKWAJStream lzh) { int read; - if (lzh.InputEnd != 0) + if (lzh.EndOfInput != 0) { - lzh.InputEnd += 8; + lzh.EndOfInput += 8; lzh.InputBuffer[0] = 0; read = 1; } @@ -1067,7 +1067,7 @@ namespace LibMSPackSharp.Compression if (read == 0) { - lzh.InputLength = 8; + lzh.InputEnd = 8; lzh.InputBuffer[0] = 0; read = 1; } @@ -1075,7 +1075,7 @@ namespace LibMSPackSharp.Compression // Update InputPointer and InputLength lzh.InputPointer = 0; - lzh.InputLength = read; + lzh.InputEnd = read; return Error.MSPACK_ERR_OK; } } diff --git a/BurnOutSharp/External/libmspack/Compression/LZX.cs b/BurnOutSharp/External/libmspack/Compression/LZX.cs index 9bb464a6..a20c25ec 100644 --- a/BurnOutSharp/External/libmspack/Compression/LZX.cs +++ b/BurnOutSharp/External/libmspack/Compression/LZX.cs @@ -326,7 +326,7 @@ namespace LibMSPackSharp.Compression // e8_buf OutputPointer = 0, - OutputLength = 0, + OutputEnd = 0, }; ResetState(lzx); @@ -334,10 +334,10 @@ namespace LibMSPackSharp.Compression //INIT_BITS { lzx.InputPointer = 0; - lzx.InputLength = 0; + lzx.InputEnd = 0; lzx.BitBuffer = 0; lzx.BitsLeft = 0; - lzx.InputEnd = 0; + lzx.EndOfInput = 0; } return lzx; @@ -464,7 +464,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; // Flush out any stored-up bytes before we begin - i = lzx.OutputLength - lzx.OutputPointer; + i = lzx.OutputEnd - lzx.OutputPointer; if (i > out_bytes) i = (int)out_bytes; @@ -486,7 +486,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; bit_buffer = lzx.BitBuffer; bits_left = lzx.BitsLeft; } @@ -539,7 +539,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -553,7 +553,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -600,7 +600,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -625,7 +625,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -639,7 +639,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -686,7 +686,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -700,7 +700,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -742,7 +742,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -756,7 +756,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -796,7 +796,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -810,7 +810,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -855,7 +855,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -869,7 +869,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -909,7 +909,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -923,7 +923,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -973,7 +973,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -987,7 +987,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1030,7 +1030,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzx.InputPointer = i_ptr; - lzx.InputLength = i_end; + lzx.InputEnd = i_end; lzx.BitBuffer = bit_buffer; lzx.BitsLeft = bits_left; } @@ -1041,7 +1041,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; bit_buffer = lzx.BitBuffer; bits_left = lzx.BitsLeft; } @@ -1052,7 +1052,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzx.InputPointer = i_ptr; - lzx.InputLength = i_end; + lzx.InputEnd = i_end; lzx.BitBuffer = bit_buffer; lzx.BitsLeft = bits_left; } @@ -1063,7 +1063,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; bit_buffer = lzx.BitBuffer; bits_left = lzx.BitsLeft; } @@ -1089,7 +1089,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzx.InputPointer = i_ptr; - lzx.InputLength = i_end; + lzx.InputEnd = i_end; lzx.BitBuffer = bit_buffer; lzx.BitsLeft = bits_left; } @@ -1100,7 +1100,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; bit_buffer = lzx.BitBuffer; bits_left = lzx.BitsLeft; } @@ -1135,7 +1135,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzx.InputPointer = i_ptr; - lzx.InputLength = i_end; + lzx.InputEnd = i_end; lzx.BitBuffer = bit_buffer; lzx.BitsLeft = bits_left; } @@ -1146,7 +1146,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; bit_buffer = lzx.BitBuffer; bits_left = lzx.BitsLeft; } @@ -1157,7 +1157,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzx.InputPointer = i_ptr; - lzx.InputLength = i_end; + lzx.InputEnd = i_end; lzx.BitBuffer = bit_buffer; lzx.BitsLeft = bits_left; } @@ -1168,7 +1168,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; bit_buffer = lzx.BitBuffer; bits_left = lzx.BitsLeft; } @@ -1194,7 +1194,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzx.InputPointer = i_ptr; - lzx.InputLength = i_end; + lzx.InputEnd = i_end; lzx.BitBuffer = bit_buffer; lzx.BitsLeft = bits_left; } @@ -1205,7 +1205,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; bit_buffer = lzx.BitBuffer; bits_left = lzx.BitsLeft; } @@ -1253,7 +1253,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1267,7 +1267,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1296,7 +1296,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1348,7 +1348,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1362,7 +1362,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1440,7 +1440,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1454,7 +1454,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1546,7 +1546,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1560,7 +1560,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1615,7 +1615,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1629,7 +1629,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1671,7 +1671,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1685,7 +1685,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1748,7 +1748,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1762,7 +1762,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1825,7 +1825,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1839,7 +1839,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1899,7 +1899,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1913,7 +1913,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1953,7 +1953,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -1967,7 +1967,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2017,7 +2017,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2031,7 +2031,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2083,7 +2083,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2097,7 +2097,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2149,7 +2149,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2163,7 +2163,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2269,7 +2269,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } } @@ -2328,7 +2328,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2342,7 +2342,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2368,9 +2368,9 @@ namespace LibMSPackSharp.Compression } // Check that we've used all of the previous frame first - if (lzx.OutputPointer != lzx.OutputLength) + if (lzx.OutputPointer != lzx.OutputEnd) { - Console.WriteLine($"{lzx.OutputLength - lzx.OutputPointer} avail bytes, new {frame_size} frame"); + Console.WriteLine($"{lzx.OutputEnd - lzx.OutputPointer} avail bytes, new {frame_size} frame"); return lzx.Error = Error.MSPACK_ERR_DECRUNCH; } @@ -2409,7 +2409,7 @@ namespace LibMSPackSharp.Compression curpos += 5; } - lzx.OutputLength = (int)(lzx.OutputPointer + frame_size); + lzx.OutputEnd = (int)(lzx.OutputPointer + frame_size); // Write a frame i = (int)((out_bytes < frame_size) ? out_bytes : frame_size); @@ -2419,7 +2419,7 @@ namespace LibMSPackSharp.Compression else { lzx.OutputPointer = (int)lzx.FramePosition; - lzx.OutputLength = (int)(lzx.OutputPointer + frame_size); + lzx.OutputEnd = (int)(lzx.OutputPointer + frame_size); // Write a frame i = (int)((out_bytes < frame_size) ? out_bytes : frame_size); @@ -2454,7 +2454,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzx.InputPointer = i_ptr; - lzx.InputLength = i_end; + lzx.InputEnd = i_end; lzx.BitBuffer = bit_buffer; lzx.BitsLeft = bits_left; } @@ -2481,7 +2481,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; bit_buffer = lzx.BitBuffer; bits_left = lzx.BitsLeft; } @@ -2505,7 +2505,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2519,7 +2519,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2573,7 +2573,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2587,7 +2587,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2647,7 +2647,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2661,7 +2661,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2711,7 +2711,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2725,7 +2725,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2775,7 +2775,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2789,7 +2789,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2831,7 +2831,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2845,7 +2845,7 @@ namespace LibMSPackSharp.Compression return lzx.Error; i_ptr = lzx.InputPointer; - i_end = lzx.InputLength; + i_end = lzx.InputEnd; } } @@ -2910,7 +2910,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { lzx.InputPointer = i_ptr; - lzx.InputLength = i_end; + lzx.InputEnd = i_end; lzx.BitBuffer = bit_buffer; lzx.BitsLeft = bits_left; } diff --git a/BurnOutSharp/External/libmspack/Compression/MSZIP.cs b/BurnOutSharp/External/libmspack/Compression/MSZIP.cs index f6a160c0..1e3a4b7f 100644 --- a/BurnOutSharp/External/libmspack/Compression/MSZIP.cs +++ b/BurnOutSharp/External/libmspack/Compression/MSZIP.cs @@ -116,15 +116,15 @@ namespace LibMSPackSharp.Compression InputFileHandle = input, OutputFileHandle = output, InputBufferSize = (uint)input_buffer_size, - InputEnd = 0, + EndOfInput = 0, Error = Error.MSPACK_ERR_OK, RepairMode = repair_mode, FlushWindow = FlushWindow, InputPointer = 0, - InputLength = 0, + InputEnd = 0, OutputPointer = 0, - OutputLength = 0, + OutputEnd = 0, BitBuffer = 0, BitsLeft = 0, }; @@ -170,7 +170,7 @@ namespace LibMSPackSharp.Compression return zip.Error; // Flush out any stored-up bytes before we begin - i = zip.OutputLength - zip.OutputPointer; + i = zip.OutputEnd - zip.OutputPointer; if (i > out_bytes) i = (int)out_bytes; @@ -193,7 +193,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; bit_buffer = zip.BitBuffer; bits_left = zip.BitsLeft; } @@ -228,7 +228,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -265,7 +265,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { zip.InputPointer = i_ptr; - zip.InputLength = i_end; + zip.InputEnd = i_end; zip.BitBuffer = bit_buffer; zip.BitsLeft = bits_left; } @@ -294,7 +294,7 @@ namespace LibMSPackSharp.Compression } zip.OutputPointer = 0; - zip.OutputLength = zip.BytesOutput; + zip.OutputEnd = zip.BytesOutput; // Write a frame i = (out_bytes < zip.BytesOutput) ? (int)out_bytes : zip.BytesOutput; @@ -338,7 +338,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; bit_buffer = zip.BitBuffer; bits_left = zip.BitsLeft; } @@ -368,7 +368,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -406,7 +406,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -451,7 +451,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -492,7 +492,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -524,7 +524,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { zip.InputPointer = i_ptr; - zip.InputLength = i_end; + zip.InputEnd = i_end; zip.BitBuffer = bit_buffer; zip.BitsLeft = bits_left; } @@ -560,7 +560,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; bit_buffer = zip.BitBuffer; bits_left = zip.BitsLeft; } @@ -583,7 +583,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -623,7 +623,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -663,7 +663,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -710,7 +710,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -761,7 +761,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -807,7 +807,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -850,7 +850,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -893,7 +893,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -954,7 +954,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { zip.InputPointer = i_ptr; - zip.InputLength = i_end; + zip.InputEnd = i_end; zip.BitBuffer = bit_buffer; zip.BitsLeft = bits_left; } @@ -979,7 +979,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; bit_buffer = zip.BitBuffer; bits_left = zip.BitsLeft; } @@ -1004,7 +1004,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -1044,7 +1044,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -1108,7 +1108,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -1134,7 +1134,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -1204,7 +1204,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { zip.InputPointer = i_ptr; - zip.InputLength = i_end; + zip.InputEnd = i_end; zip.BitBuffer = bit_buffer; zip.BitsLeft = bits_left; } @@ -1215,7 +1215,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; bit_buffer = zip.BitBuffer; bits_left = zip.BitsLeft; } @@ -1248,7 +1248,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -1329,7 +1329,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -1369,7 +1369,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -1427,7 +1427,7 @@ namespace LibMSPackSharp.Compression return zip.Error; i_ptr = zip.InputPointer; - i_end = zip.InputLength; + i_end = zip.InputEnd; } } @@ -1536,7 +1536,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { zip.InputPointer = i_ptr; - zip.InputLength = i_end; + zip.InputEnd = i_end; zip.BitBuffer = bit_buffer; zip.BitsLeft = bits_left; } diff --git a/BurnOutSharp/External/libmspack/Compression/QTM.cs b/BurnOutSharp/External/libmspack/Compression/QTM.cs index 288347bf..36808b9f 100644 --- a/BurnOutSharp/External/libmspack/Compression/QTM.cs +++ b/BurnOutSharp/External/libmspack/Compression/QTM.cs @@ -127,10 +127,10 @@ namespace LibMSPackSharp.Compression Error = Error.MSPACK_ERR_OK, InputPointer = 0, - InputLength = 0, - OutputPointer = 0, - OutputLength = 0, InputEnd = 0, + OutputPointer = 0, + OutputEnd = 0, + EndOfInput = 0, BitsLeft = 0, BitBuffer = 0, }; @@ -197,7 +197,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; // Flush out any stored-up bytes before we begin - i = qtm.OutputLength - qtm.OutputPointer; + i = qtm.OutputEnd - qtm.OutputPointer; if (i > out_bytes) i = (int)out_bytes; @@ -218,7 +218,7 @@ namespace LibMSPackSharp.Compression //RESTORE_BITS { i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; bit_buffer = qtm.BitBuffer; bits_left = qtm.BitsLeft; } @@ -231,7 +231,7 @@ namespace LibMSPackSharp.Compression C = qtm.Current; // While we do not have enough decoded bytes in reserve - while ((qtm.OutputLength - qtm.OutputPointer) < out_bytes) + while ((qtm.OutputEnd - qtm.OutputPointer) < out_bytes) { // Read header if necessary. Initialises H, L and C if (qtm.HeaderRead != 0) @@ -255,7 +255,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -269,7 +269,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -298,7 +298,7 @@ namespace LibMSPackSharp.Compression // Decode more, up to the number of bytes needed, the frame boundary, // or the window boundary, whichever comes first - frame_end = (uint)(window_posn + (out_bytes - (qtm.OutputLength - qtm.OutputPointer))); + frame_end = (uint)(window_posn + (out_bytes - (qtm.OutputEnd - qtm.OutputPointer))); if ((window_posn + frame_todo) < frame_end) frame_end = window_posn + frame_todo; if (frame_end > qtm.WindowSize) @@ -366,7 +366,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -380,7 +380,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -489,7 +489,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -503,7 +503,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -598,7 +598,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -612,7 +612,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -655,7 +655,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -669,7 +669,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -762,7 +762,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -776,7 +776,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -819,7 +819,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -833,7 +833,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -926,7 +926,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -940,7 +940,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -983,7 +983,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -997,7 +997,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -1086,7 +1086,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -1100,7 +1100,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -1143,7 +1143,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -1157,7 +1157,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -1228,7 +1228,7 @@ namespace LibMSPackSharp.Compression out_bytes -= i; qtm.OutputPointer = 0; - qtm.OutputLength = 0; + qtm.OutputEnd = 0; // Copy second part of match, after window wrap rundest = 0; @@ -1290,7 +1290,7 @@ namespace LibMSPackSharp.Compression } } - qtm.OutputLength = (int)window_posn; + qtm.OutputEnd = (int)window_posn; // If we subtracted too much from frame_todo, it will // wrap around past zero and go above its max value @@ -1334,7 +1334,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -1348,7 +1348,7 @@ namespace LibMSPackSharp.Compression return qtm.Error; i_ptr = qtm.InputPointer; - i_end = qtm.InputLength; + i_end = qtm.InputEnd; } } @@ -1382,7 +1382,7 @@ namespace LibMSPackSharp.Compression if (window_posn == qtm.WindowSize) { // Flush all currently stored data - i = (qtm.OutputLength - qtm.OutputPointer); + i = (qtm.OutputEnd - qtm.OutputPointer); // Break out if we have more than enough to finish this request if (i >= out_bytes) @@ -1393,7 +1393,7 @@ namespace LibMSPackSharp.Compression out_bytes -= i; qtm.OutputPointer = 0; - qtm.OutputLength = 0; + qtm.OutputEnd = 0; window_posn = 0; } @@ -1414,7 +1414,7 @@ namespace LibMSPackSharp.Compression //STORE_BITS { qtm.InputPointer = i_ptr; - qtm.InputLength = i_end; + qtm.InputEnd = i_end; qtm.BitBuffer = bit_buffer; qtm.BitsLeft = bits_left; }