From fdc549994a5f6eb3ba24fd18d3b1712199ee4755 Mon Sep 17 00:00:00 2001 From: Johann Date: Mon, 1 Jun 2015 10:53:46 -0700 Subject: [PATCH] Cast variance reference output The larger internal variables are required for the intermediates but RoundHighBitDepth brings them down to uint32_t/unsigned int. Fixes type warnings in visual studio. Change-Id: I48d35284d6cbde330ccdc1f46b6215a645d5eb00 --- test/variance_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/variance_test.cc b/test/variance_test.cc index e45d90fae..78657d947 100644 --- a/test/variance_test.cc +++ b/test/variance_test.cc @@ -96,8 +96,8 @@ static unsigned int variance_ref(const uint8_t *src, const uint8_t *ref, } } RoundHighBitDepth(bit_depth, &se, &sse); - *sse_ptr = sse; - return sse - (((int64_t) se * se) >> (l2w + l2h)); + *sse_ptr = (uint32_t) sse; + return (unsigned int) (sse - (((int64_t) se * se) >> (l2w + l2h))); } static unsigned int subpel_variance_ref(const uint8_t *ref, const uint8_t *src, @@ -142,8 +142,8 @@ static unsigned int subpel_variance_ref(const uint8_t *ref, const uint8_t *src, } } RoundHighBitDepth(bit_depth, &se, &sse); - *sse_ptr = sse; - return sse - (((int64_t) se * se) >> (l2w + l2h)); + *sse_ptr = (unsigned int) sse; + return (unsigned int) (sse - (((int64_t) se * se) >> (l2w + l2h))); } typedef unsigned int (*SumOfSquaresFunction)(const int16_t *src); @@ -510,8 +510,8 @@ unsigned int subpel_avg_variance_ref(const uint8_t *ref, } } RoundHighBitDepth(bit_depth, &se, &sse); - *sse_ptr = sse; - return sse - (((int64_t) se * se) >> (l2w + l2h)); + *sse_ptr = (unsigned int) sse; + return (unsigned int) (sse - (((int64_t) se * se) >> (l2w + l2h))); } template