Merge "vpx_ports/mem_ops.h: cast the lhs of bitwise shifts of 24."

f80d8011 · Tom Finegan · Gerrit Code Review · f6ac6cf5 · f1de6226 · f80d8011
Commit f80d8011 authored May 27, 2016 by Tom Finegan Committed by Gerrit Code Review May 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

vpx_ports/mem_ops.h vpx_ports/mem_ops.h +2 -2

No files found.
--- a/vpx_ports/mem_ops.h
+++ b/vpx_ports/mem_ops.h
@@ -89,7 +89,7 @@ static unsigned MEM_VALUE_T mem_get_be32(const void *vmem) {
  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 @@ static unsigned MEM_VALUE_T mem_get_le32(const void *vmem) {
  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];