summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMathis Rosenhauer <rosenhauer@dkrz.de>2014-08-01 13:51:04 +0200
committerMathis Rosenhauer <rosenhauer@dkrz.de>2014-08-01 15:16:51 +0200
commit6f2ffa1769746b622c4860d2491b0f7ff3407259 (patch)
tree73e8a136791ab6eef469cca33ae6ee1eaf5ccc1f /tests
parent8e055aaa334e5d41828932bc898e0cb42870b6af (diff)
downloadlibaec-6f2ffa1769746b622c4860d2491b0f7ff3407259.tar.gz
libaec-6f2ffa1769746b622c4860d2491b0f7ff3407259.tar.bz2
libaec-6f2ffa1769746b622c4860d2491b0f7ff3407259.zip
More explicit casting to shup up VS.
Diffstat (limited to 'tests')
-rw-r--r--tests/check_aec.c18
-rw-r--r--tests/check_aec.h2
-rw-r--r--tests/check_buffer_sizes.c6
-rw-r--r--tests/check_code_options.c2
4 files changed, 16 insertions, 12 deletions
diff --git a/tests/check_aec.c b/tests/check_aec.c
index e59da41..9896bc6 100644
--- a/tests/check_aec.c
+++ b/tests/check_aec.c
@@ -3,20 +3,20 @@
#include <string.h>
#include "check_aec.h"
-static void out_lsb(unsigned char *dest, unsigned int val, int size)
+static void out_lsb(unsigned char *dest, unsigned long long int val, int size)
{
int i;
for (i = 0; i < size; i++)
- dest[i] = val >> (8 * i);
+ dest[i] = (unsigned char)(val >> (8 * i));
}
-static void out_msb(unsigned char *dest, unsigned int val, int size)
+static void out_msb(unsigned char *dest, unsigned long long int val, int size)
{
int i;
for (i = 0; i < size; i++)
- dest[i] = val >> (8 * (size - 1 - i));
+ dest[i] = (unsigned char)(val >> (8 * (size - 1 - i)));
}
int update_state(struct test_state *state)
@@ -46,7 +46,7 @@ int update_state(struct test_state *state)
state->out = out_lsb;
if (strm->flags & AEC_DATA_SIGNED) {
- state->xmin = -(1ULL << (strm->bits_per_sample - 1));
+ state->xmin = -(1LL << (strm->bits_per_sample - 1));
state->xmax = (1ULL << (strm->bits_per_sample - 1)) - 1;
} else {
state->xmin = 0;
@@ -58,8 +58,9 @@ int update_state(struct test_state *state)
int encode_decode_small(struct test_state *state)
{
- int status, i, compressed_size;
- int n_in, avail_in, avail_out, total_out;
+ int status, i;
+ size_t compressed_size;
+ size_t n_in, avail_in, avail_out, total_out;
struct aec_stream *strm = state->strm;
status = aec_encode_init(strm);
@@ -200,7 +201,8 @@ int encode_decode_small(struct test_state *state)
int encode_decode_large(struct test_state *state)
{
- int status, i, to;
+ int status, i;
+ size_t to;
struct aec_stream *strm = state->strm;
strm->avail_in = state->ibuf_len;
diff --git a/tests/check_aec.h b/tests/check_aec.h
index f184686..d5fdb99 100644
--- a/tests/check_aec.h
+++ b/tests/check_aec.h
@@ -14,7 +14,7 @@ struct test_state {
size_t cbuf_len;
long long int xmax;
long long int xmin;
- void (*out)(unsigned char *dest, unsigned int val, int size);
+ void (*out)(unsigned char *dest, unsigned long long int val, int size);
struct aec_stream *strm;
};
diff --git a/tests/check_buffer_sizes.c b/tests/check_buffer_sizes.c
index c9ca88b..da9bf1e 100644
--- a/tests/check_buffer_sizes.c
+++ b/tests/check_buffer_sizes.c
@@ -11,7 +11,8 @@ int check_block_sizes(struct test_state *state)
for (bs = 8; bs <= 64; bs *= 2) {
state->strm->block_size = bs;
- state->strm->rsi = state->buf_len / (bs * state->bytes_per_sample);
+ state->strm->rsi = (int)(state->buf_len
+ / (bs * state->bytes_per_sample));
status = encode_decode_large(state);
if (status)
@@ -28,7 +29,8 @@ int check_block_sizes_short(struct test_state *state)
tmp = state->ibuf_len;
for (bs = 8; bs <= 64; bs *= 2) {
state->strm->block_size = bs;
- state->strm->rsi = state->buf_len / (bs * state->bytes_per_sample);
+ state->strm->rsi = (int)(state->buf_len
+ / (bs * state->bytes_per_sample));
state->ibuf_len = state->buf_len - 2 * bs + 4;
status = encode_decode_large(state);
if (status)
diff --git a/tests/check_code_options.c b/tests/check_code_options.c
index 0ec6006..7117c7d 100644
--- a/tests/check_code_options.c
+++ b/tests/check_code_options.c
@@ -12,7 +12,7 @@ int check_block_sizes(struct test_state *state, int id, int id_len)
for (bs = 8; bs <= 64; bs *= 2) {
state->strm->block_size = bs;
- max_rsi = state->buf_len / (bs * state->bytes_per_sample);
+ max_rsi = (int)(state->buf_len / (bs * state->bytes_per_sample));
if (max_rsi > 4096)
max_rsi = 4096;