summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2016-05-13 17:56:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-05-13 17:56:41 +0000
commit98726d538bd046b19b21233d2d51f8eaf7a5efef (patch)
treea278655cfc3632c801ed4db8cb0851db2ade9b71
parent656f9c41260c376a6e34e6fef6d586f8ebeae325 (diff)
parent9a56a5ea1804f8abc9859ef8ff9d7e50326dcb8d (diff)
downloadlibvpx-98726d538bd046b19b21233d2d51f8eaf7a5efef.tar
libvpx-98726d538bd046b19b21233d2d51f8eaf7a5efef.tar.gz
libvpx-98726d538bd046b19b21233d2d51f8eaf7a5efef.tar.bz2
libvpx-98726d538bd046b19b21233d2d51f8eaf7a5efef.zip
Merge "convolve_test: Fix high bit depth IOC runtime errors."
-rw-r--r--test/convolve_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 9c71f239b..73b0edb99 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -231,7 +231,8 @@ void highbd_filter_block2d_8_c(const uint16_t *src_ptr,
* and filter_max_width = 16
*/
uint16_t intermediate_buffer[71 * kMaxDimension];
- const int intermediate_next_stride = 1 - intermediate_height * output_width;
+ const int intermediate_next_stride =
+ 1 - static_cast<int>(intermediate_height * output_width);
// Horizontal pass (src -> transposed intermediate).
{