ref: f80d8011a0141a28d8e4a02720483bb6bcb09c6b
parent: f6ac6cf5bdd09969316a6ca480d1a9b53adf41dd
parent: f1de6226176ff90552ebe7473d8a76e388685053
author: Tom Finegan <tomfinegan@google.com>
date: Fri May 27 14:52:04 EDT 2016
Merge "vpx_ports/mem_ops.h: cast the lhs of bitwise shifts of 24."
--- a/vpx_ports/mem_ops.h
+++ b/vpx_ports/mem_ops.h
@@ -89,7 +89,7 @@
unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem;
- val = ((unsigned int)mem[0]) << 24;
+ val = ((unsigned MEM_VALUE_T)mem[0]) << 24;
val |= mem[1] << 16;
val |= mem[2] << 8;
val |= mem[3];
@@ -125,7 +125,7 @@
unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem;
- val = mem[3] << 24;
+ val = ((unsigned MEM_VALUE_T)mem[3]) << 24;
val |= mem[2] << 16;
val |= mem[1] << 8;
val |= mem[0];