pixman: Branch 'master'

[Pekka Paalanen]

 pixman/pixman.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 9bc025f7cd6e37f5cc1a2c2799aea6850763a33f
Author: Ben Avison <bavison at riscosopen.org>
Date:   Wed Apr 8 14:20:30 2015 +0100

    pixman.c: Coding style
    
    A few violations of coding style were identified in code copied from here
    into affine-bench.
    
    Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

diff --git a/pixman/pixman.c b/pixman/pixman.c
index 9555cea..a07c577 100644
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -325,18 +325,20 @@ _pixman_compute_composite_region32 (pixman_region32_t * region,
     return TRUE;
 }
 
-typedef struct
+typedef struct box_48_16 box_48_16_t;
+
+struct box_48_16
 {
-    pixman_fixed_48_16_t	x1;
-    pixman_fixed_48_16_t	y1;
-    pixman_fixed_48_16_t	x2;
-    pixman_fixed_48_16_t	y2;
-} box_48_16_t;
+    pixman_fixed_48_16_t        x1;
+    pixman_fixed_48_16_t        y1;
+    pixman_fixed_48_16_t        x2;
+    pixman_fixed_48_16_t        y2;
+};
 
 static pixman_bool_t
-compute_transformed_extents (pixman_transform_t *transform,
+compute_transformed_extents (pixman_transform_t   *transform,
 			     const pixman_box32_t *extents,
-			     box_48_16_t *transformed)
+			     box_48_16_t          *transformed)
 {
     pixman_fixed_48_16_t tx1, ty1, tx2, ty2;
     pixman_fixed_t x1, y1, x2, y2;