Commit 7ae5954d authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "tokenize: quiet -Warray-bounds warnings"

parents aad7b55b 90de3b01
...@@ -213,6 +213,7 @@ static void tokenize1st_order_b ...@@ -213,6 +213,7 @@ static void tokenize1st_order_b
/* Luma */ /* Luma */
for (block = 0; block < 16; block++, b++) for (block = 0; block < 16; block++, b++)
{ {
const int eob = *b->eob;
tmp1 = vp8_block2above[block]; tmp1 = vp8_block2above[block];
tmp2 = vp8_block2left[block]; tmp2 = vp8_block2left[block];
qcoeff_ptr = b->qcoeff; qcoeff_ptr = b->qcoeff;
...@@ -223,7 +224,7 @@ static void tokenize1st_order_b ...@@ -223,7 +224,7 @@ static void tokenize1st_order_b
c = type ? 0 : 1; c = type ? 0 : 1;
if(c >= *b->eob) if(c >= eob)
{ {
/* c = band for this case */ /* c = band for this case */
t->Token = DCT_EOB_TOKEN; t->Token = DCT_EOB_TOKEN;
...@@ -250,7 +251,8 @@ static void tokenize1st_order_b ...@@ -250,7 +251,8 @@ static void tokenize1st_order_b
t++; t++;
c++; c++;
for (; c < *b->eob; c++) assert(eob <= 16);
for (; c < eob; c++)
{ {
rc = vp8_default_zig_zag1d[c]; rc = vp8_default_zig_zag1d[c];
band = vp8_coef_bands[c]; band = vp8_coef_bands[c];
...@@ -286,6 +288,7 @@ static void tokenize1st_order_b ...@@ -286,6 +288,7 @@ static void tokenize1st_order_b
/* Chroma */ /* Chroma */
for (block = 16; block < 24; block++, b++) for (block = 16; block < 24; block++, b++)
{ {
const int eob = *b->eob;
tmp1 = vp8_block2above[block]; tmp1 = vp8_block2above[block];
tmp2 = vp8_block2left[block]; tmp2 = vp8_block2left[block];
qcoeff_ptr = b->qcoeff; qcoeff_ptr = b->qcoeff;
...@@ -294,7 +297,7 @@ static void tokenize1st_order_b ...@@ -294,7 +297,7 @@ static void tokenize1st_order_b
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l); VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
if(!(*b->eob)) if(!eob)
{ {
/* c = band for this case */ /* c = band for this case */
t->Token = DCT_EOB_TOKEN; t->Token = DCT_EOB_TOKEN;
...@@ -321,7 +324,8 @@ static void tokenize1st_order_b ...@@ -321,7 +324,8 @@ static void tokenize1st_order_b
t++; t++;
c = 1; c = 1;
for (; c < *b->eob; c++) assert(eob <= 16);
for (; c < eob; c++)
{ {
rc = vp8_default_zig_zag1d[c]; rc = vp8_default_zig_zag1d[c];
band = vp8_coef_bands[c]; band = vp8_coef_bands[c];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment