mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-15 17:01:51 +00:00
Update miniz to 3616bf804b1e7b9be5e2769b1e4a7d74d575b13c
git-svn-id: https://svn.eduke32.com/eduke32@7097 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
f93e228e2a
commit
3d7a827b3d
2 changed files with 7 additions and 6 deletions
|
@ -96,7 +96,7 @@ typedef enum {
|
||||||
|
|
||||||
/* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */
|
/* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */
|
||||||
/* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */
|
/* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */
|
||||||
tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, mz_uint32 decomp_flags);
|
tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags);
|
||||||
|
|
||||||
/* Internal/private bits follow. */
|
/* Internal/private bits follow. */
|
||||||
enum
|
enum
|
||||||
|
|
|
@ -171,7 +171,7 @@ extern "C" {
|
||||||
} \
|
} \
|
||||||
MZ_MACRO_END
|
MZ_MACRO_END
|
||||||
|
|
||||||
tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, mz_uint32 decomp_flags)
|
tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
|
||||||
{
|
{
|
||||||
static const int s_length_base[31] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 };
|
static const int s_length_base[31] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 };
|
||||||
static const int s_length_extra[31] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 0, 0 };
|
static const int s_length_extra[31] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 0, 0 };
|
||||||
|
@ -540,18 +540,19 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
do
|
while(counter>2)
|
||||||
{
|
{
|
||||||
pOut_buf_cur[0] = pSrc[0];
|
pOut_buf_cur[0] = pSrc[0];
|
||||||
pOut_buf_cur[1] = pSrc[1];
|
pOut_buf_cur[1] = pSrc[1];
|
||||||
pOut_buf_cur[2] = pSrc[2];
|
pOut_buf_cur[2] = pSrc[2];
|
||||||
pOut_buf_cur += 3;
|
pOut_buf_cur += 3;
|
||||||
pSrc += 3;
|
pSrc += 3;
|
||||||
} while ((int)(counter -= 3) > 2);
|
counter -= 3;
|
||||||
if ((int)counter > 0)
|
}
|
||||||
|
if (counter > 0)
|
||||||
{
|
{
|
||||||
pOut_buf_cur[0] = pSrc[0];
|
pOut_buf_cur[0] = pSrc[0];
|
||||||
if ((int)counter > 1)
|
if (counter > 1)
|
||||||
pOut_buf_cur[1] = pSrc[1];
|
pOut_buf_cur[1] = pSrc[1];
|
||||||
pOut_buf_cur += counter;
|
pOut_buf_cur += counter;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue