commit 6efba480e27a17bd50b3f137a5055e45dd287ada
author James Zern <jzern@google.com> Thu Apr 20 20:53:49 2017 -0700
committer James Zern <jzern@google.com> Fri Apr 21 21:56:58 2017 -0700
tree cc2a334972517a96a4c02970267d79c79edc3ed1
parent c1d54a43461caa55db73b8b8394ea3cf612c742a

get_tile_buffers: normalize size types

quiets -Wshorten-64-to-32 warnings

BUG=aomedia:445

Change-Id: Ieae58e09804e8707393a3813529f3c6316eef888

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 8d14095..a89aba2 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3248,12 +3248,11 @@
   const int tile_rows = cm->tile_rows;
   int tc = 0;
   int first_tile_in_tg = 0;
-  int hdr_offset;
   struct aom_read_bit_buffer rb_tg_hdr;
   uint8_t clear_data[MAX_AV1_HEADER_SIZE];
   const int num_tiles = tile_rows * tile_cols;
   const int num_bits = OD_ILOG(num_tiles) - 1;
-  const int hdr_size = pbi->uncomp_hdr_size + pbi->first_partition_size;
+  const size_t hdr_size = pbi->uncomp_hdr_size + pbi->first_partition_size;
   const int tg_size_bit_offset = pbi->tg_size_bit_offset;
 #if CONFIG_DEPENDENT_HORZTILES
   int tile_group_start_col = 0;
@@ -3264,7 +3263,7 @@
     for (c = 0; c < tile_cols; ++c, ++tc) {
       TileBufferDec *const buf = &tile_buffers[r][c];
       const int is_last = (r == tile_rows - 1) && (c == tile_cols - 1);
-      hdr_offset = (tc && tc == first_tile_in_tg) ? hdr_size : 0;
+      const size_t hdr_offset = (tc && tc == first_tile_in_tg) ? hdr_size : 0;
 
       buf->col = c;
       if (hdr_offset) {