[Pixman] 0.30.2 release (Was Re: [PATCH] test: Fix build on MSVC)

Søren Sandmann sandmann at cs.au.dk
Thu Aug 1 05:18:20 PDT 2013


There is now an 0.30 branch, and I'm planning to release 0.30.2 soon. If
anyone knows of something that should go in that isn't in 0.30 already,
let me know, or just cherry-pick it to 0.30 yourself.

Andrea, if you want the MSVC test fix in, you should push it to master
and 0.30 very soon.


Søren


Andrea Canciani <ranma42 at gmail.com> writes:

> The MSVC compiler is very strict about variable declarations after
> statements.
>
> Move all the declarations of each block before any statement in the
> same block to fix multiple instances of:
>
> alpha-loop.c(XX) : error C2275: 'pixman_image_t' : illegal use of this
> type as an expression
> ---
>  test/alpha-loop.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/test/alpha-loop.c b/test/alpha-loop.c
> index eca7615..4d4384d 100644
> --- a/test/alpha-loop.c
> +++ b/test/alpha-loop.c
> @@ -8,6 +8,7 @@
>  int
>  main (int argc, char **argv)
>  {
> +    pixman_image_t *a, *d, *s;
>      uint8_t *alpha;
>      uint32_t *src, *dest;
>  
> @@ -17,9 +18,9 @@ main (int argc, char **argv)
>      src = (uint32_t *)make_random_bytes (WIDTH * HEIGHT * 4);
>      dest = (uint32_t *)make_random_bytes (WIDTH * HEIGHT * 4);
>  
> -    pixman_image_t *a = pixman_image_create_bits (PIXMAN_a8, WIDTH, HEIGHT, (uint32_t *)alpha, WIDTH);
> -    pixman_image_t *d = pixman_image_create_bits (PIXMAN_a8r8g8b8, WIDTH, HEIGHT, dest, WIDTH * 4);
> -    pixman_image_t *s = pixman_image_create_bits (PIXMAN_a2r10g10b10, WIDTH, HEIGHT, src, WIDTH * 4);
> +    a = pixman_image_create_bits (PIXMAN_a8, WIDTH, HEIGHT, (uint32_t *)alpha, WIDTH);
> +    d = pixman_image_create_bits (PIXMAN_a8r8g8b8, WIDTH, HEIGHT, dest, WIDTH * 4);
> +    s = pixman_image_create_bits (PIXMAN_a2r10g10b10, WIDTH, HEIGHT, src, WIDTH * 4);
>  
>      fail_after (5, "Infinite loop detected: 5 seconds without progress\n");


More information about the Pixman mailing list