diff options
| author | Siarhei Siamashka <siarhei.siamashka@nokia.com> | 2011-01-10 18:29:33 +0200 |
|---|---|---|
| committer | Siarhei Siamashka <siarhei.siamashka@nokia.com> | 2011-01-16 22:32:33 +0200 |
| commit | 55bbccf84e475b2e3c4536606cd08c946c041fd0 (patch) | |
| tree | 915a80aee1d4db358fa402e61555b396bc1c2584 | |
| parent | ae70b38d40a587e29dc5e0dfe6250693598beca7 (diff) | |
| download | pixman-55bbccf84e475b2e3c4536606cd08c946c041fd0.tar.gz | |
Make 'fast_composite_scaled_nearest_*' less suspicious
Taking address of a variable and then using it as an array looks suspicious
to static code analyzers. So change it into an array with 1 element to make
them happy. Both old and new variants of this code are correct because 'vx'
and 'unit_x' arguments are set to 0 and it means that the called scanline
function can only access a single element of 'zero' buffer.
| -rw-r--r-- | pixman/pixman-fast-path.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pixman/pixman-fast-path.h b/pixman/pixman-fast-path.h index d98cfbf..b829030 100644 --- a/pixman/pixman-fast-path.h +++ b/pixman/pixman-fast-path.h @@ -346,16 +346,16 @@ fast_composite_scaled_nearest ## scale_func_name (pixman_implementation_t *imp, } \ else if (PIXMAN_REPEAT_ ## repeat_mode == PIXMAN_REPEAT_NONE) \ { \ - static src_type_t zero = 0; \ + static src_type_t zero[1] = { 0 }; \ if (y < 0 || y >= src_image->bits.height) \ { \ - scanline_func (dst, &zero, left_pad + width + right_pad, 0, 0, 0); \ + scanline_func (dst, zero, left_pad + width + right_pad, 0, 0, 0); \ continue; \ } \ src = src_first_line + src_stride * y; \ if (left_pad > 0) \ { \ - scanline_func (dst, &zero, left_pad, 0, 0, 0); \ + scanline_func (dst, zero, left_pad, 0, 0, 0); \ } \ if (width > 0) \ { \ @@ -363,7 +363,7 @@ fast_composite_scaled_nearest ## scale_func_name (pixman_implementation_t *imp, } \ if (right_pad > 0) \ { \ - scanline_func (dst + left_pad + width, &zero, right_pad, 0, 0, 0); \ + scanline_func (dst + left_pad + width, zero, right_pad, 0, 0, 0); \ } \ } \ else \ |