dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-28 14:38:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Remove -Wshadow warnings."

Browse Source
This commit is contained in:
pascal massimino 2013-01-28 13:15:54 -08:00 committed by Gerrit Code Review
commit 841a3ba5da
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dsp/upsampling_neon.c
View File

@ -210,7 +210,7 @@ static void FUNC_NAME(const uint8_t *top_y, const uint8_t *bottom_y, \
const uint8_t *top_u, const uint8_t *top_v, \ const uint8_t *top_u, const uint8_t *top_v, \
const uint8_t *cur_u, const uint8_t *cur_v, \ const uint8_t *cur_u, const uint8_t *cur_v, \
uint8_t *top_dst, uint8_t *bottom_dst, int len) { \ uint8_t *top_dst, uint8_t *bottom_dst, int len) { \
int b; \ int block; \
/* 16 byte aligned array to cache reconstructed u and v */ \ /* 16 byte aligned array to cache reconstructed u and v */ \
uint8_t uv_buf[2 * 32 + 15]; \ uint8_t uv_buf[2 * 32 + 15]; \
uint8_t *const r_uv = (uint8_t*)((uintptr_t)(uv_buf + 15) & ~15); \ uint8_t *const r_uv = (uint8_t*)((uintptr_t)(uv_buf + 15) & ~15); \
@ -240,11 +240,11 @@ static void FUNC_NAME(const uint8_t *top_y, const uint8_t *bottom_y, \
VP8YuvTo ## FMT(bottom_y[0], u0, v0, bottom_dst); \ VP8YuvTo ## FMT(bottom_y[0], u0, v0, bottom_dst); \
} \ } \
\ \
for (b = 0; b < num_blocks; ++b) { \ for (block = 0; block < num_blocks; ++block) { \
UPSAMPLE_16PIXELS(top_u, cur_u, r_uv); \ UPSAMPLE_16PIXELS(top_u, cur_u, r_uv); \
UPSAMPLE_16PIXELS(top_v, cur_v, r_uv + 16); \ UPSAMPLE_16PIXELS(top_v, cur_v, r_uv + 16); \
CONVERT2RGB_8(FMT, XSTEP, top_y, bottom_y, r_uv, \ CONVERT2RGB_8(FMT, XSTEP, top_y, bottom_y, r_uv, \
top_dst, bottom_dst, 16 * b + 1, 16); \ top_dst, bottom_dst, 16 * block + 1, 16); \
top_u += 8; \ top_u += 8; \
cur_u += 8; \ cur_u += 8; \
top_v += 8; \ top_v += 8; \