Skip to content
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

Jump to bottom

Use lzham prefixed max int values #30

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

Use lzham prefixed max int values #30

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lzhamcomp/lzham_win32_threading.h
View file
Open in desktop
Expand Up @@ -43,9 +43,9 @@ namespace lzham
}
}

bool wait(uint32 milliseconds = UINT32_MAX)
bool wait(uint32 milliseconds = LZHAM_UINT32_MAX)
{
LZHAM_ASSUME(INFINITE == UINT32_MAX);
LZHAM_ASSUME(INFINITE == LZHAM_UINT32_MAX);

DWORD result = WaitForSingleObject(m_handle, milliseconds);

Expand Down
2 changes: 1 addition & 1 deletion lzhamdecomp/lzham_huffman_codes.cpp
View file
Open in desktop
Expand Up @@ -224,7 +224,7 @@ namespace lzham

sym_freq& sf = state.syms0[num_used_syms];
sf.m_left = (uint16)i;
sf.m_right = UINT16_MAX;
sf.m_right = LZHAM_UINT16_MAX;
sf.m_freq = freq;
num_used_syms++;
}
Expand Down
4 changes: 2 additions & 2 deletions lzhamdecomp/lzham_prefix_coding.cpp
View file
Open in desktop
Expand Up @@ -149,7 +149,7 @@ namespace lzham
{
uint c = pCodesizes[i];

LZHAM_ASSERT(!c || (next_code[c] <= UINT16_MAX));
LZHAM_ASSERT(!c || (next_code[c] <= LZHAM_UINT16_MAX));

pCodes[i] = static_cast<uint16>(next_code[c]++);

Expand Down Expand Up @@ -296,7 +296,7 @@ namespace lzham

LZHAM_ASSERT(t < (1U << table_bits));

LZHAM_ASSERT(pTables->m_lookup[t] == UINT32_MAX);
LZHAM_ASSERT(pTables->m_lookup[t] == LZHAM_UINT32_MAX);

pTables->m_lookup[t] = sym_index | (codesize << 16U);
}
Expand Down
10 changes: 5 additions & 5 deletions lzhamdecomp/lzham_symbol_codec.cpp
View file
Open in desktop
Expand Up @@ -581,7 +581,7 @@ namespace lzham
freq++;
m_sym_freq[sym] = static_cast<uint16>(freq);

LZHAM_ASSERT(freq <= UINT16_MAX);
LZHAM_ASSERT(freq <= LZHAM_UINT16_MAX);

if (--m_symbols_until_update == 0)
{
Expand Down Expand Up @@ -828,7 +828,7 @@ namespace lzham
freq++;
model.m_sym_freq[sym] = static_cast<uint16>(freq);

LZHAM_ASSERT(freq <= UINT16_MAX);
LZHAM_ASSERT(freq <= LZHAM_UINT16_MAX);

if (--model.m_symbols_until_update == 0)
{
Expand Down Expand Up @@ -1265,8 +1265,8 @@ namespace lzham
{
uint32 t = pTables->m_lookup[m_bit_buf >> (cBitBufSize - pTables->m_table_bits)];

LZHAM_ASSERT(t != UINT32_MAX);
sym = t & UINT16_MAX;
LZHAM_ASSERT(t != LZHAM_UINT32_MAX);
sym = t & LZHAM_UINT16_MAX;
len = t >> 16;

LZHAM_ASSERT(model.m_code_sizes[sym] == len);
Expand Down Expand Up @@ -1301,7 +1301,7 @@ namespace lzham
freq++;
model.m_sym_freq[sym] = static_cast<uint16>(freq);

LZHAM_ASSERT(freq <= UINT16_MAX);
LZHAM_ASSERT(freq <= LZHAM_UINT16_MAX);

if (--model.m_symbols_until_update == 0)
{
Expand Down
10 changes: 5 additions & 5 deletions lzhamdecomp/lzham_symbol_codec.h
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ namespace lzham
typedef uint64 bit_cost_t;
const uint32 cBitCostScaleShift = 24;
const uint32 cBitCostScale = (1U << cBitCostScaleShift);
const bit_cost_t cBitCostMax = UINT64_MAX;
const bit_cost_t cBitCostMax = LZHAM_UINT64_MAX;

inline bit_cost_t convert_to_scaled_bitcost(uint bits) { LZHAM_ASSERT(bits <= 255); uint32 scaled_bits = bits << cBitCostScaleShift; return static_cast<bit_cost_t>(scaled_bits); }

Expand Down Expand Up @@ -444,7 +444,7 @@ namespace lzham
if (LZHAM_BUILTIN_EXPECT(k <= pTables->m_table_max_code, 1)) \
{ \
uint32 t = pTables->m_lookup[bit_buf >> (symbol_codec::cBitBufSize - pTables->m_table_bits)]; \
result = t & UINT16_MAX; \
result = t & LZHAM_UINT16_MAX; \
len = t >> 16; \
} \
else \
Expand All @@ -465,7 +465,7 @@ namespace lzham
uint freq = pModel->m_sym_freq[result]; \
freq++; \
pModel->m_sym_freq[result] = static_cast<uint16>(freq); \
LZHAM_ASSERT(freq <= UINT16_MAX); \
LZHAM_ASSERT(freq <= LZHAM_UINT16_MAX); \
if (LZHAM_BUILTIN_EXPECT(--pModel->m_symbols_until_update == 0, 0)) \
{ \
pModel->update_tables(); \
Expand Down Expand Up @@ -501,7 +501,7 @@ namespace lzham
if (LZHAM_BUILTIN_EXPECT(k <= pTables->m_table_max_code, 1)) \
{ \
uint32 t = pTables->m_lookup[bit_buf >> (symbol_codec::cBitBufSize - pTables->m_table_bits)]; \
result = t & UINT16_MAX; \
result = t & LZHAM_UINT16_MAX; \
len = t >> 16; \
} \
else \
Expand All @@ -522,7 +522,7 @@ namespace lzham
uint freq = pModel->m_sym_freq[result]; \
freq++; \
pModel->m_sym_freq[result] = static_cast<uint16>(freq); \
LZHAM_ASSERT(freq <= UINT16_MAX); \
LZHAM_ASSERT(freq <= LZHAM_UINT16_MAX); \
if (LZHAM_BUILTIN_EXPECT(--pModel->m_symbols_until_update == 0, 0)) \
{ \
pModel->update_tables(); \
Expand Down