From 235b77e54bab6e2075fa58e83220e89a86d7e588 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Wed, 12 Feb 2014 16:01:52 -0800 Subject: [PATCH] decode_test_driver: Use size_t for size arg to DecodeFrame(). Use size_t for DecodeFrame()'s size arg, and cast only at the vpx_codec_decode() call site. This silences warnings that appear in svc_test.cc when building with vs2013. Change-Id: I2cf39f02a45732c752097f07b0c7ad414b1517d8 --- test/decode_test_driver.cc | 8 +++++--- test/decode_test_driver.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/decode_test_driver.cc b/test/decode_test_driver.cc index 7a93e50c2..e667d1dd0 100644 --- a/test/decode_test_driver.cc +++ b/test/decode_test_driver.cc @@ -15,11 +15,13 @@ namespace libvpx_test { -vpx_codec_err_t Decoder::DecodeFrame(const uint8_t *cxdata, int size) { +vpx_codec_err_t Decoder::DecodeFrame(const uint8_t *cxdata, size_t size) { vpx_codec_err_t res_dec; InitOnce(); - REGISTER_STATE_CHECK(res_dec = vpx_codec_decode(&decoder_, - cxdata, size, NULL, 0)); + REGISTER_STATE_CHECK( + res_dec = vpx_codec_decode(&decoder_, + cxdata, static_cast(size), + NULL, 0)); return res_dec; } diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h index 3e8ff724b..44a0fc03d 100644 --- a/test/decode_test_driver.h +++ b/test/decode_test_driver.h @@ -49,7 +49,7 @@ class Decoder { vpx_codec_destroy(&decoder_); } - vpx_codec_err_t DecodeFrame(const uint8_t *cxdata, int size); + vpx_codec_err_t DecodeFrame(const uint8_t *cxdata, size_t size); DxDataIterator GetDxData() { return DxDataIterator(&decoder_);