encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

yuv: fixed variable declaration shadowing warnings. 

Fixes Bugzilla #4062.
This commit is contained in:
Ryan C. Gordon 2018-02-17 20:10:13 -05:00
parent 97494f5374
commit 7c0c2c22a8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video/yuv2rgb/yuv_rgb.c
View File

@ -619,8 +619,8 @@ void rgb24_yuv420_sse(uint32_t width, uint32_t height,
#define SAVE_SI128 _mm_stream_si128 #define SAVE_SI128 _mm_stream_si128
const RGB2YUVParam *const param = &(RGB2YUV[yuv_type]); const RGB2YUVParam *const param = &(RGB2YUV[yuv_type]);
uint32_t x, y; uint32_t xpos, ypos;
for(y=0; y<(height-1); y+=2) for(ypos=0; ypos<(height-1); ypos+=2)
{ {
const uint8_t *rgb_ptr1=RGB+y*RGB_stride, const uint8_t *rgb_ptr1=RGB+y*RGB_stride,
*rgb_ptr2=RGB+(y+1)*RGB_stride; *rgb_ptr2=RGB+(y+1)*RGB_stride;
@ -630,7 +630,7 @@ void rgb24_yuv420_sse(uint32_t width, uint32_t height,
*u_ptr=U+(y/2)*UV_stride, *u_ptr=U+(y/2)*UV_stride,
*v_ptr=V+(y/2)*UV_stride; *v_ptr=V+(y/2)*UV_stride;
for(x=0; x<(width-31); x+=32) for(xpos=0; xpos<(width-31); xpos+=32)
{ {
RGB2YUV_32 RGB2YUV_32
@ -655,8 +655,8 @@ void rgb24_yuv420_sseu(uint32_t width, uint32_t height,
#define SAVE_SI128 _mm_storeu_si128 #define SAVE_SI128 _mm_storeu_si128
const RGB2YUVParam *const param = &(RGB2YUV[yuv_type]); const RGB2YUVParam *const param = &(RGB2YUV[yuv_type]);
uint32_t x, y; uint32_t xpos, ypos;
for(y=0; y<(height-1); y+=2) for(ypos=0; ypos<(height-1); ypos+=2)
{ {
const uint8_t *rgb_ptr1=RGB+y*RGB_stride, const uint8_t *rgb_ptr1=RGB+y*RGB_stride,
*rgb_ptr2=RGB+(y+1)*RGB_stride; *rgb_ptr2=RGB+(y+1)*RGB_stride;
@ -666,7 +666,7 @@ void rgb24_yuv420_sseu(uint32_t width, uint32_t height,
*u_ptr=U+(y/2)*UV_stride, *u_ptr=U+(y/2)*UV_stride,
*v_ptr=V+(y/2)*UV_stride; *v_ptr=V+(y/2)*UV_stride;
for(x=0; x<(width-31); x+=32) for(xpos=0; xpos<(width-31); xpos+=32)
{ {
RGB2YUV_32 RGB2YUV_32

8
src/video/yuv2rgb/yuv_rgb_sse_func.h
View File

@ -416,8 +416,8 @@ void SSE_FUNCTION_NAME(uint32_t width, uint32_t height,
#endif #endif
if (width >= 32) { if (width >= 32) {
uint32_t x, y; uint32_t xpos, ypos;
for(y=0; y<(height-(uv_y_sample_interval-1)); y+=uv_y_sample_interval) for(ypos=0; ypos<(height-(uv_y_sample_interval-1)); ypos+=uv_y_sample_interval)
{ {
const uint8_t *y_ptr1=Y+y*Y_stride, const uint8_t *y_ptr1=Y+y*Y_stride,
*y_ptr2=Y+(y+1)*Y_stride, *y_ptr2=Y+(y+1)*Y_stride,
@ -427,7 +427,7 @@ void SSE_FUNCTION_NAME(uint32_t width, uint32_t height,
uint8_t *rgb_ptr1=RGB+y*RGB_stride, uint8_t *rgb_ptr1=RGB+y*RGB_stride,
*rgb_ptr2=RGB+(y+1)*RGB_stride; *rgb_ptr2=RGB+(y+1)*RGB_stride;
for(x=0; x<(width-31); x+=32) for(xpos=0; xpos<(width-31); xpos+=32)
{ {
YUV2RGB_32 YUV2RGB_32
{ {
@ -449,7 +449,7 @@ void SSE_FUNCTION_NAME(uint32_t width, uint32_t height,
} }
/* Catch the last line, if needed */ /* Catch the last line, if needed */
if (uv_y_sample_interval == 2 && y == (height-1)) if (uv_y_sample_interval == 2 && ypos == (height-1))
{ {
const uint8_t *y_ptr=Y+y*Y_stride, const uint8_t *y_ptr=Y+y*Y_stride,
*u_ptr=U+(y/uv_y_sample_interval)*UV_stride, *u_ptr=U+(y/uv_y_sample_interval)*UV_stride,