Avoid complaint from "gcc -Wsign-conversion"
modified: compress_lzma.cpp modified: compress_zlib.cpp
This commit is contained in:
committed by
Markus F.X.J. Oberhumer
parent
bb1df15958
commit
a6296ecd67
@@ -187,7 +187,7 @@ static int prepare(lzma_compress_result_t *res,
|
|||||||
{
|
{
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
unsigned n = 1846 + (768 << (res->lit_context_bits + res->lit_pos_bits));
|
unsigned n = 1846 + (768u << (res->lit_context_bits + res->lit_pos_bits));
|
||||||
if (n <= lcconf->max_num_probs)
|
if (n <= lcconf->max_num_probs)
|
||||||
break;
|
break;
|
||||||
if (res->lit_pos_bits > res->lit_context_bits)
|
if (res->lit_pos_bits > res->lit_context_bits)
|
||||||
@@ -211,7 +211,7 @@ static int prepare(lzma_compress_result_t *res,
|
|||||||
lzma_compress_config_t::dict_size_t::assertValue(res->dict_size);
|
lzma_compress_config_t::dict_size_t::assertValue(res->dict_size);
|
||||||
lzma_compress_config_t::num_fast_bytes_t::assertValue(res->num_fast_bytes);
|
lzma_compress_config_t::num_fast_bytes_t::assertValue(res->num_fast_bytes);
|
||||||
|
|
||||||
res->num_probs = 1846 + (768 << (res->lit_context_bits + res->lit_pos_bits));
|
res->num_probs = 1846 + (768u << (res->lit_context_bits + res->lit_pos_bits));
|
||||||
//printf("\nlzma_compress config: %u %u %u %u %u\n", res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs);
|
//printf("\nlzma_compress config: %u %u %u %u %u\n", res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ int upx_zlib_compress ( const upx_bytep src, unsigned src_len,
|
|||||||
s.avail_out = *dst_len;
|
s.avail_out = *dst_len;
|
||||||
s.total_in = s.total_out = 0;
|
s.total_in = s.total_out = 0;
|
||||||
|
|
||||||
zr = deflateInit2(&s, level, Z_DEFLATED, 0 - (int)window_bits,
|
zr = (int)deflateInit2(&s, level, Z_DEFLATED, 0 - (int)window_bits,
|
||||||
mem_level, strategy);
|
mem_level, strategy);
|
||||||
if (zr != Z_OK)
|
if (zr != Z_OK)
|
||||||
goto error;
|
goto error;
|
||||||
|
|||||||
Reference in New Issue
Block a user