From a6296ecd67a2ca3989628c00dc341a9196133e93 Mon Sep 17 00:00:00 2001 From: John Reiser Date: Sun, 6 Dec 2020 15:22:58 -0800 Subject: [PATCH] Avoid complaint from "gcc -Wsign-conversion" modified: compress_lzma.cpp modified: compress_zlib.cpp --- src/compress_lzma.cpp | 4 ++-- src/compress_zlib.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compress_lzma.cpp b/src/compress_lzma.cpp index 1f100b09..7d8c0ad8 100644 --- a/src/compress_lzma.cpp +++ b/src/compress_lzma.cpp @@ -187,7 +187,7 @@ static int prepare(lzma_compress_result_t *res, { 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) break; 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::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); return 0; diff --git a/src/compress_zlib.cpp b/src/compress_zlib.cpp index 949dedcb..2edc028a 100644 --- a/src/compress_zlib.cpp +++ b/src/compress_zlib.cpp @@ -105,7 +105,7 @@ int upx_zlib_compress ( const upx_bytep src, unsigned src_len, s.avail_out = *dst_len; 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); if (zr != Z_OK) goto error;