Commit 7c0c2c22a8ead424a4306aee21edde5b4e8f4e95
2018-02-17T20:10:13
yuv: fixed variable declaration shadowing warnings. Fixes Bugzilla #4062.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/src/video/yuv2rgb/yuv_rgb.c b/src/video/yuv2rgb/yuv_rgb.c
index 072ef5c..dab590e 100644
--- a/src/video/yuv2rgb/yuv_rgb.c
+++ b/src/video/yuv2rgb/yuv_rgb.c
@@ -619,8 +619,8 @@ void rgb24_yuv420_sse(uint32_t width, uint32_t height,
#define SAVE_SI128 _mm_stream_si128
const RGB2YUVParam *const param = &(RGB2YUV[yuv_type]);
- uint32_t x, y;
- for(y=0; y<(height-1); y+=2)
+ uint32_t xpos, ypos;
+ for(ypos=0; ypos<(height-1); ypos+=2)
{
const uint8_t *rgb_ptr1=RGB+y*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,
*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
@@ -655,8 +655,8 @@ void rgb24_yuv420_sseu(uint32_t width, uint32_t height,
#define SAVE_SI128 _mm_storeu_si128
const RGB2YUVParam *const param = &(RGB2YUV[yuv_type]);
- uint32_t x, y;
- for(y=0; y<(height-1); y+=2)
+ uint32_t xpos, ypos;
+ for(ypos=0; ypos<(height-1); ypos+=2)
{
const uint8_t *rgb_ptr1=RGB+y*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,
*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
diff --git a/src/video/yuv2rgb/yuv_rgb_sse_func.h b/src/video/yuv2rgb/yuv_rgb_sse_func.h
index 6872c0d..3a8b45f 100644
--- a/src/video/yuv2rgb/yuv_rgb_sse_func.h
+++ b/src/video/yuv2rgb/yuv_rgb_sse_func.h
@@ -416,8 +416,8 @@ void SSE_FUNCTION_NAME(uint32_t width, uint32_t height,
#endif
if (width >= 32) {
- uint32_t x, y;
- for(y=0; y<(height-(uv_y_sample_interval-1)); y+=uv_y_sample_interval)
+ uint32_t xpos, ypos;
+ for(ypos=0; ypos<(height-(uv_y_sample_interval-1)); ypos+=uv_y_sample_interval)
{
const uint8_t *y_ptr1=Y+y*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,
*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
{
@@ -449,7 +449,7 @@ void SSE_FUNCTION_NAME(uint32_t width, uint32_t height,
}
/* 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,
*u_ptr=U+(y/uv_y_sample_interval)*UV_stride,