Reindent and reformat pixman-fastpath.c
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Sun, 12 Jul 2009 23:06:30 +0000 (19:06 -0400)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Mon, 13 Jul 2009 23:55:33 +0000 (19:55 -0400)
pixman/pixman-fast-path.c

index a255080..8b819ca 100644 (file)
@@ -50,7 +50,8 @@ fetch_24 (uint8_t *a)
 }
 
 static force_inline void
-store_24 (uint8_t *a, uint32_t v)
+store_24 (uint8_t *a,
+          uint32_t v)
 {
     if (((unsigned long)a) & 1)
     {
@@ -60,7 +61,7 @@ store_24 (uint8_t *a, uint32_t v)
 #else
        *a = (uint8_t) (v);
        *(uint16_t *)(a + 1) = (uint16_t) (v >> 8);
-#endif 
+#endif
     }
     else
     {
@@ -70,24 +71,26 @@ store_24 (uint8_t *a, uint32_t v)
 #else
        *(uint16_t *)a = (uint16_t)v;
        *(a + 2) = (uint8_t)(v >> 16);
-#endif 
+#endif
     }
 }
 
 static force_inline uint32_t
-over (uint32_t src, uint32_t dest)
+over (uint32_t src,
+      uint32_t dest)
 {
-    uint32_t a = ~src >> 24; 
+    uint32_t a = ~src >> 24;
 
-    UN8x4_MUL_UN8_ADD_UN8x4(dest, a, src);
+    UN8x4_MUL_UN8_ADD_UN8x4 (dest, a, src);
 
     return dest;
 }
 
 static uint32_t
-in (uint32_t x, uint8_t y)
+in (uint32_t x,
+    uint8_t  y)
 {
-    uint16_t  a = y;
+    uint16_t a = y;
 
     UN8x4_MUL_UN8 (x, a);
 
@@ -101,23 +104,23 @@ in (uint32_t x, uint8_t y)
  */
 static void
 fast_composite_over_x888_8_8888 (pixman_implementation_t *imp,
-                            pixman_op_t      op,
-                            pixman_image_t * src_image,
-                            pixman_image_t * mask_image,
-                            pixman_image_t * dst_image,
-                            int32_t      src_x,
-                            int32_t      src_y,
-                            int32_t      mask_x,
-                            int32_t      mask_y,
-                            int32_t      dest_x,
-                            int32_t      dest_y,
-                            int32_t     width,
-                            int32_t     height)
+                                 pixman_op_t              op,
+                                 pixman_image_t *         src_image,
+                                 pixman_image_t *         mask_image,
+                                 pixman_image_t *         dst_image,
+                                 int32_t                  src_x,
+                                 int32_t                  src_y,
+                                 int32_t                  mask_x,
+                                 int32_t                  mask_y,
+                                 int32_t                  dest_x,
+                                 int32_t                  dest_y,
+                                 int32_t                  width,
+                                 int32_t                  height)
 {
-    uint32_t   *src, *src_line;
+    uint32_t    *src, *src_line;
     uint32_t    *dst, *dst_line;
-    uint8_t    *mask, *mask_line;
-    int                 src_stride, mask_stride, dst_stride;
+    uint8_t     *mask, *mask_line;
+    int src_stride, mask_stride, dst_stride;
     uint8_t m;
     uint32_t s, d;
     uint16_t w;
@@ -159,34 +162,35 @@ fast_composite_over_x888_8_8888 (pixman_implementation_t *imp,
 
 static void
 fast_composite_in_n_8_8 (pixman_implementation_t *imp,
-                             pixman_op_t      op,
-                             pixman_image_t    *src_image,
-                             pixman_image_t    *mask_image,
-                             pixman_image_t    *dest_image,
-                             int32_t      src_x,
-                             int32_t      src_y,
-                             int32_t      mask_x,
-                             int32_t      mask_y,
-                             int32_t      dest_x,
-                             int32_t      dest_y,
-                             int32_t     width,
-                             int32_t     height)
+                         pixman_op_t              op,
+                         pixman_image_t *         src_image,
+                         pixman_image_t *         mask_image,
+                         pixman_image_t *         dest_image,
+                         int32_t                  src_x,
+                         int32_t                  src_y,
+                         int32_t                  mask_x,
+                         int32_t                  mask_y,
+                         int32_t                  dest_x,
+                         int32_t                  dest_y,
+                         int32_t                  width,
+                         int32_t                  height)
 {
-    uint32_t   src, srca;
-    uint8_t    *dst_line, *dst;
-    uint8_t    *mask_line, *mask, m;
-    int        dst_stride, mask_stride;
-    uint16_t   w;
-    uint16_t    t;
+    uint32_t src, srca;
+    uint8_t     *dst_line, *dst;
+    uint8_t     *mask_line, *mask, m;
+    int dst_stride, mask_stride;
+    uint16_t w;
+    uint16_t t;
 
-    src = _pixman_image_get_solid(src_image, dest_image->bits.format);
+    src = _pixman_image_get_solid (src_image, dest_image->bits.format);
 
     srca = src >> 24;
 
     PIXMAN_IMAGE_GET_LINE (dest_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
     PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
 
-    if (srca == 0xff) {
+    if (srca == 0xff)
+    {
        while (height--)
        {
            dst = dst_line;
@@ -204,7 +208,7 @@ fast_composite_in_n_8_8 (pixman_implementation_t *imp,
                }
                else if (m != 0xff)
                {
-                   *dst = MUL_UN8(m, *dst, t);
+                   *dst = MUL_UN8 (m, *dst, t);
                }
                dst++;
            }
@@ -223,14 +227,14 @@ fast_composite_in_n_8_8 (pixman_implementation_t *imp,
            while (w--)
            {
                m = *mask++;
-               m = MUL_UN8(m, srca, t);
+               m = MUL_UN8 (m, srca, t);
                if (m == 0)
                {
                    *dst = 0;
                }
                else if (m != 0xff)
                {
-                   *dst = MUL_UN8(m, *dst, t);
+                   *dst = MUL_UN8 (m, *dst, t);
                }
                dst++;
            }
@@ -238,28 +242,27 @@ fast_composite_in_n_8_8 (pixman_implementation_t *imp,
     }
 }
 
-
 static void
 fast_composite_in_8_8 (pixman_implementation_t *imp,
-                     pixman_op_t      op,
-                     pixman_image_t  *src_image,
-                     pixman_image_t  *mask_image,
-                     pixman_image_t  *dest_image,
-                     int32_t          src_x,
-                     int32_t          src_y,
-                     int32_t          mask_x,
-                     int32_t          mask_y,
-                     int32_t          dest_x,
-                     int32_t          dest_y,
-                     int32_t         width,
-                     int32_t         height)
+                       pixman_op_t              op,
+                       pixman_image_t *         src_image,
+                       pixman_image_t *         mask_image,
+                       pixman_image_t *         dest_image,
+                       int32_t                  src_x,
+                       int32_t                  src_y,
+                       int32_t                  mask_x,
+                       int32_t                  mask_y,
+                       int32_t                  dest_x,
+                       int32_t                  dest_y,
+                       int32_t                  width,
+                       int32_t                  height)
 {
-    uint8_t    *dst_line, *dst;
-    uint8_t    *src_line, *src;
-    int        dst_stride, src_stride;
-    uint16_t   w;
-    uint8_t    s;
-    uint16_t   t;
+    uint8_t     *dst_line, *dst;
+    uint8_t     *src_line, *src;
+    int dst_stride, src_stride;
+    uint16_t w;
+    uint8_t s;
+    uint16_t t;
 
     PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);
     PIXMAN_IMAGE_GET_LINE (dest_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
@@ -281,7 +284,7 @@ fast_composite_in_8_8 (pixman_implementation_t *imp,
            }
            else if (s != 0xff)
            {
-               *dst = MUL_UN8(s, *dst, t);
+               *dst = MUL_UN8 (s, *dst, t);
            }
            dst++;
        }
@@ -290,26 +293,26 @@ fast_composite_in_8_8 (pixman_implementation_t *imp,
 
 static void
 fast_composite_over_n_8_8888 (pixman_implementation_t *imp,
-                              pixman_op_t      op,
-                              pixman_image_t * src_image,
-                              pixman_image_t * mask_image,
-                              pixman_image_t * dst_image,
-                              int32_t      src_x,
-                              int32_t      src_y,
-                              int32_t      mask_x,
-                              int32_t      mask_y,
-                              int32_t      dest_x,
-                              int32_t      dest_y,
-                              int32_t     width,
-                              int32_t     height)
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
 {
-    uint32_t    src, srca;
-    uint32_t   *dst_line, *dst, d;
-    uint8_t    *mask_line, *mask, m;
-    int                 dst_stride, mask_stride;
-    uint16_t    w;
+    uint32_t src, srca;
+    uint32_t    *dst_line, *dst, d;
+    uint8_t     *mask_line, *mask, m;
+    int dst_stride, mask_stride;
+    uint16_t w;
 
-    src = _pixman_image_get_solid(src_image, dst_image->bits.format);
+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
 
     srca = src >> 24;
     if (src == 0)
@@ -348,26 +351,26 @@ fast_composite_over_n_8_8888 (pixman_implementation_t *imp,
 
 static void
 fast_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
-                                  pixman_op_t op,
-                                  pixman_image_t * src_image,
-                                  pixman_image_t * mask_image,
-                                  pixman_image_t * dst_image,
-                                  int32_t      src_x,
-                                  int32_t      src_y,
-                                  int32_t      mask_x,
-                                  int32_t      mask_y,
-                                  int32_t      dest_x,
-                                  int32_t      dest_y,
-                                  int32_t     width,
-                                  int32_t     height)
+                                    pixman_op_t              op,
+                                    pixman_image_t *         src_image,
+                                    pixman_image_t *         mask_image,
+                                    pixman_image_t *         dst_image,
+                                    int32_t                  src_x,
+                                    int32_t                  src_y,
+                                    int32_t                  mask_x,
+                                    int32_t                  mask_y,
+                                    int32_t                  dest_x,
+                                    int32_t                  dest_y,
+                                    int32_t                  width,
+                                    int32_t                  height)
 {
-    uint32_t   src, srca;
-    uint32_t   *dst_line, *dst, d;
-    uint32_t   *mask_line, *mask, ma;
-    int        dst_stride, mask_stride;
-    uint16_t   w;
+    uint32_t src, srca;
+    uint32_t    *dst_line, *dst, d;
+    uint32_t    *mask_line, *mask, ma;
+    int dst_stride, mask_stride;
+    uint16_t w;
 
-    src = _pixman_image_get_solid(src_image, dst_image->bits.format);
+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
 
     srca = src >> 24;
     if (src == 0)
@@ -413,27 +416,27 @@ fast_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
 
 static void
 fast_composite_over_n_8_0888 (pixman_implementation_t *imp,
-                              pixman_op_t op,
-                              pixman_image_t * src_image,
-                              pixman_image_t * mask_image,
-                              pixman_image_t * dst_image,
-                              int32_t      src_x,
-                              int32_t      src_y,
-                              int32_t      mask_x,
-                              int32_t      mask_y,
-                              int32_t      dest_x,
-                              int32_t      dest_y,
-                              int32_t     width,
-                              int32_t     height)
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
 {
-    uint32_t   src, srca;
-    uint8_t    *dst_line, *dst;
-    uint32_t   d;
-    uint8_t    *mask_line, *mask, m;
-    int        dst_stride, mask_stride;
-    uint16_t   w;
+    uint32_t src, srca;
+    uint8_t     *dst_line, *dst;
+    uint32_t d;
+    uint8_t     *mask_line, *mask, m;
+    int dst_stride, mask_stride;
+    uint16_t w;
 
-    src = _pixman_image_get_solid(src_image, dst_image->bits.format);
+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
 
     srca = src >> 24;
     if (src == 0)
@@ -459,15 +462,15 @@ fast_composite_over_n_8_0888 (pixman_implementation_t *imp,
                    d = src;
                else
                {
-                   d = fetch_24(dst);
+                   d = fetch_24 (dst);
                    d = over (src, d);
                }
-               store_24(dst, d);
+               store_24 (dst, d);
            }
            else if (m)
            {
-               d = over (in(src,m), fetch_24(dst));
-               store_24(dst, d);
+               d = over (in (src, m), fetch_24 (dst));
+               store_24 (dst, d);
            }
            dst += 3;
        }
@@ -476,27 +479,27 @@ fast_composite_over_n_8_0888 (pixman_implementation_t *imp,
 
 static void
 fast_composite_over_n_8_0565 (pixman_implementation_t *imp,
-                              pixman_op_t op,
-                                 pixman_image_t * src_image,
-                                 pixman_image_t * mask_image,
-                                 pixman_image_t * dst_image,
-                                 int32_t      src_x,
-                                 int32_t      src_y,
-                                 int32_t      mask_x,
-                                 int32_t      mask_y,
-                                 int32_t      dest_x,
-                                 int32_t      dest_y,
-                                 int32_t     width,
-                                 int32_t     height)
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
 {
-    uint32_t   src, srca;
-    uint16_t   *dst_line, *dst;
-    uint32_t   d;
-    uint8_t    *mask_line, *mask, m;
-    int        dst_stride, mask_stride;
-    uint16_t   w;
+    uint32_t src, srca;
+    uint16_t    *dst_line, *dst;
+    uint32_t d;
+    uint8_t     *mask_line, *mask, m;
+    int dst_stride, mask_stride;
+    uint16_t w;
 
-    src = _pixman_image_get_solid(src_image, dst_image->bits.format);
+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
 
     srca = src >> 24;
     if (src == 0)
@@ -523,15 +526,15 @@ fast_composite_over_n_8_0565 (pixman_implementation_t *imp,
                else
                {
                    d = *dst;
-                   d = over (src, CONVERT_0565_TO_0888(d));
+                   d = over (src, CONVERT_0565_TO_0888 (d));
                }
-               *dst = CONVERT_8888_TO_0565(d);
+               *dst = CONVERT_8888_TO_0565 (d);
            }
            else if (m)
            {
                d = *dst;
-               d = over (in(src,m), CONVERT_0565_TO_0888(d));
-               *dst = CONVERT_8888_TO_0565(d);
+               d = over (in (src, m), CONVERT_0565_TO_0888 (d));
+               *dst = CONVERT_8888_TO_0565 (d);
            }
            dst++;
        }
@@ -540,34 +543,34 @@ fast_composite_over_n_8_0565 (pixman_implementation_t *imp,
 
 static void
 fast_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
-                                  pixman_op_t op,
-                                  pixman_image_t * src_image,
-                                  pixman_image_t * mask_image,
-                                  pixman_image_t * dst_image,
-                                  int32_t      src_x,
-                                  int32_t      src_y,
-                                  int32_t      mask_x,
-                                  int32_t      mask_y,
-                                  int32_t      dest_x,
-                                  int32_t      dest_y,
-                                  int32_t     width,
-                                  int32_t     height)
+                                    pixman_op_t              op,
+                                    pixman_image_t *         src_image,
+                                    pixman_image_t *         mask_image,
+                                    pixman_image_t *         dst_image,
+                                    int32_t                  src_x,
+                                    int32_t                  src_y,
+                                    int32_t                  mask_x,
+                                    int32_t                  mask_y,
+                                    int32_t                  dest_x,
+                                    int32_t                  dest_y,
+                                    int32_t                  width,
+                                    int32_t                  height)
 {
-    uint32_t   src, srca;
-    uint16_t   src16;
-    uint16_t   *dst_line, *dst;
-    uint32_t   d;
-    uint32_t   *mask_line, *mask, ma;
-    int        dst_stride, mask_stride;
-    uint16_t   w;
+    uint32_t src, srca;
+    uint16_t src16;
+    uint16_t    *dst_line, *dst;
+    uint32_t d;
+    uint32_t    *mask_line, *mask, ma;
+    int dst_stride, mask_stride;
+    uint16_t w;
 
-    src = _pixman_image_get_solid(src_image, dst_image->bits.format);
+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
 
     srca = src >> 24;
     if (src == 0)
        return;
 
-    src16 = CONVERT_8888_TO_0565(src);
+    src16 = CONVERT_8888_TO_0565 (src);
 
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
     PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
@@ -592,21 +595,21 @@ fast_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
                else
                {
                    d = *dst;
-                   d = over (src, CONVERT_0565_TO_0888(d));
-                   *dst = CONVERT_8888_TO_0565(d);
+                   d = over (src, CONVERT_0565_TO_0888 (d));
+                   *dst = CONVERT_8888_TO_0565 (d);
                }
            }
            else if (ma)
            {
                d = *dst;
-               d = CONVERT_0565_TO_0888(d);
+               d = CONVERT_0565_TO_0888 (d);
 
                UN8x4_MUL_UN8x4 (src, ma);
                UN8x4_MUL_UN8 (ma, srca);
                ma = ~ma;
                UN8x4_MUL_UN8x4_ADD_UN8x4 (d, ma, src);
-               
-               *dst = CONVERT_8888_TO_0565(d);
+
+               *dst = CONVERT_8888_TO_0565 (d);
            }
            dst++;
        }
@@ -615,24 +618,24 @@ fast_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
 
 static void
 fast_composite_over_8888_8888 (pixman_implementation_t *imp,
-                         pixman_op_t op,
-                        pixman_image_t * src_image,
-                        pixman_image_t * mask_image,
-                        pixman_image_t * dst_image,
-                        int32_t      src_x,
-                        int32_t      src_y,
-                        int32_t      mask_x,
-                        int32_t      mask_y,
-                        int32_t      dest_x,
-                        int32_t      dest_y,
-                        int32_t     width,
-                        int32_t     height)
+                               pixman_op_t              op,
+                               pixman_image_t *         src_image,
+                               pixman_image_t *         mask_image,
+                               pixman_image_t *         dst_image,
+                               int32_t                  src_x,
+                               int32_t                  src_y,
+                               int32_t                  mask_x,
+                               int32_t                  mask_y,
+                               int32_t                  dest_x,
+                               int32_t                  dest_y,
+                               int32_t                  width,
+                               int32_t                  height)
 {
-    uint32_t   *dst_line, *dst;
-    uint32_t   *src_line, *src, s;
-    int        dst_stride, src_stride;
-    uint8_t    a;
-    uint16_t   w;
+    uint32_t    *dst_line, *dst;
+    uint32_t    *src_line, *src, s;
+    int dst_stride, src_stride;
+    uint8_t a;
+    uint16_t w;
 
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
     PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
@@ -660,25 +663,25 @@ fast_composite_over_8888_8888 (pixman_implementation_t *imp,
 
 static void
 fast_composite_src_8888_0888 (pixman_implementation_t *imp,
-                         pixman_op_t op,
-                        pixman_image_t * src_image,
-                        pixman_image_t * mask_image,
-                        pixman_image_t * dst_image,
-                        int32_t      src_x,
-                        int32_t      src_y,
-                        int32_t      mask_x,
-                        int32_t      mask_y,
-                        int32_t      dest_x,
-                        int32_t      dest_y,
-                        int32_t     width,
-                        int32_t     height)
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
 {
-    uint8_t    *dst_line, *dst;
-    uint32_t   d;
-    uint32_t   *src_line, *src, s;
-    uint8_t    a;
-    int        dst_stride, src_stride;
-    uint16_t   w;
+    uint8_t     *dst_line, *dst;
+    uint32_t d;
+    uint32_t    *src_line, *src, s;
+    uint8_t a;
+    int dst_stride, src_stride;
+    uint16_t w;
 
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 3);
     PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
@@ -700,9 +703,9 @@ fast_composite_src_8888_0888 (pixman_implementation_t *imp,
                if (a == 0xff)
                    d = s;
                else
-                   d = over (s, fetch_24(dst));
+                   d = over (s, fetch_24 (dst));
 
-               store_24(dst, d);
+               store_24 (dst, d);
            }
            dst += 3;
        }
@@ -711,25 +714,25 @@ fast_composite_src_8888_0888 (pixman_implementation_t *imp,
 
 static void
 fast_composite_over_8888_0565 (pixman_implementation_t *imp,
-                         pixman_op_t op,
-                        pixman_image_t * src_image,
-                        pixman_image_t * mask_image,
-                        pixman_image_t * dst_image,
-                        int32_t      src_x,
-                        int32_t      src_y,
-                        int32_t      mask_x,
-                        int32_t      mask_y,
-                        int32_t      dest_x,
-                        int32_t      dest_y,
-                        int32_t     width,
-                        int32_t     height)
+                               pixman_op_t              op,
+                               pixman_image_t *         src_image,
+                               pixman_image_t *         mask_image,
+                               pixman_image_t *         dst_image,
+                               int32_t                  src_x,
+                               int32_t                  src_y,
+                               int32_t                  mask_x,
+                               int32_t                  mask_y,
+                               int32_t                  dest_x,
+                               int32_t                  dest_y,
+                               int32_t                  width,
+                               int32_t                  height)
 {
-    uint16_t   *dst_line, *dst;
-    uint32_t   d;
-    uint32_t   *src_line, *src, s;
-    uint8_t    a;
-    int        dst_stride, src_stride;
-    uint16_t   w;
+    uint16_t    *dst_line, *dst;
+    uint32_t d;
+    uint32_t    *src_line, *src, s;
+    uint8_t a;
+    int dst_stride, src_stride;
+    uint16_t w;
 
     PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
@@ -753,9 +756,9 @@ fast_composite_over_8888_0565 (pixman_implementation_t *imp,
                else
                {
                    d = *dst;
-                   d = over (s, CONVERT_0565_TO_0888(d));
+                   d = over (s, CONVERT_0565_TO_0888 (d));
                }
-               *dst = CONVERT_8888_TO_0565(d);
+               *dst = CONVERT_8888_TO_0565 (d);
            }
            dst++;
        }
@@ -764,23 +767,23 @@ fast_composite_over_8888_0565 (pixman_implementation_t *imp,
 
 static void
 fast_composite_src_x888_0565 (pixman_implementation_t *imp,
-                         pixman_op_t op,
-                          pixman_image_t * src_image,
-                          pixman_image_t * mask_image,
-                          pixman_image_t * dst_image,
-                          int32_t      src_x,
-                          int32_t      src_y,
-                          int32_t      mask_x,
-                          int32_t      mask_y,
-                          int32_t      dest_x,
-                          int32_t      dest_y,
-                          int32_t     width,
-                          int32_t     height)
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
 {
-    uint16_t   *dst_line, *dst;
-    uint32_t   *src_line, *src, s;
-    int        dst_stride, src_stride;
-    uint16_t   w;
+    uint16_t    *dst_line, *dst;
+    uint32_t    *src_line, *src, s;
+    int dst_stride, src_stride;
+    uint16_t w;
 
     PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
@@ -796,7 +799,7 @@ fast_composite_src_x888_0565 (pixman_implementation_t *imp,
        while (w--)
        {
            s = *src++;
-           *dst = CONVERT_8888_TO_0565(s);
+           *dst = CONVERT_8888_TO_0565 (s);
            dst++;
        }
     }
@@ -804,25 +807,25 @@ fast_composite_src_x888_0565 (pixman_implementation_t *imp,
 
 static void
 fast_composite_add_8000_8000 (pixman_implementation_t *imp,
-                            pixman_op_t        op,
-                            pixman_image_t * src_image,
-                            pixman_image_t * mask_image,
-                            pixman_image_t * dst_image,
-                            int32_t      src_x,
-                            int32_t      src_y,
-                            int32_t      mask_x,
-                            int32_t      mask_y,
-                            int32_t      dest_x,
-                            int32_t      dest_y,
-                            int32_t     width,
-                            int32_t     height)
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
 {
-    uint8_t    *dst_line, *dst;
-    uint8_t    *src_line, *src;
-    int        dst_stride, src_stride;
-    uint16_t   w;
-    uint8_t    s, d;
-    uint16_t   t;
+    uint8_t     *dst_line, *dst;
+    uint8_t     *src_line, *src;
+    int dst_stride, src_stride;
+    uint16_t w;
+    uint8_t s, d;
+    uint16_t t;
 
     PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
@@ -855,24 +858,24 @@ fast_composite_add_8000_8000 (pixman_implementation_t *imp,
 
 static void
 fast_composite_add_8888_8888 (pixman_implementation_t *imp,
-                            pixman_op_t        op,
-                            pixman_image_t * src_image,
-                            pixman_image_t * mask_image,
-                            pixman_image_t * dst_image,
-                            int32_t      src_x,
-                            int32_t      src_y,
-                            int32_t      mask_x,
-                            int32_t      mask_y,
-                            int32_t      dest_x,
-                            int32_t      dest_y,
-                            int32_t     width,
-                            int32_t     height)
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
 {
-    uint32_t   *dst_line, *dst;
-    uint32_t   *src_line, *src;
-    int        dst_stride, src_stride;
-    uint16_t   w;
-    uint32_t   s, d;
+    uint32_t    *dst_line, *dst;
+    uint32_t    *src_line, *src;
+    int dst_stride, src_stride;
+    uint16_t w;
+    uint32_t s, d;
 
     PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
@@ -894,7 +897,7 @@ fast_composite_add_8888_8888 (pixman_implementation_t *imp,
                {
                    d = *dst;
                    if (d)
-                       UN8x4_ADD_UN8x4(s,d);
+                       UN8x4_ADD_UN8x4 (s, d);
                }
                *dst = s;
            }
@@ -905,25 +908,25 @@ fast_composite_add_8888_8888 (pixman_implementation_t *imp,
 
 static void
 fast_composite_add_8888_8_8 (pixman_implementation_t *imp,
-                           pixman_op_t op,
-                           pixman_image_t * src_image,
-                           pixman_image_t * mask_image,
-                           pixman_image_t * dst_image,
-                           int32_t      src_x,
-                           int32_t      src_y,
-                           int32_t      mask_x,
-                           int32_t      mask_y,
-                           int32_t      dest_x,
-                           int32_t      dest_y,
-                           int32_t     width,
-                           int32_t     height)
+                             pixman_op_t              op,
+                             pixman_image_t *         src_image,
+                             pixman_image_t *         mask_image,
+                             pixman_image_t *         dst_image,
+                             int32_t                  src_x,
+                             int32_t                  src_y,
+                             int32_t                  mask_x,
+                             int32_t                  mask_y,
+                             int32_t                  dest_x,
+                             int32_t                  dest_y,
+                             int32_t                  width,
+                             int32_t                  height)
 {
-    uint8_t    *dst_line, *dst;
-    uint8_t    *mask_line, *mask;
-    int        dst_stride, mask_stride;
-    uint16_t   w;
-    uint32_t   src;
-    uint8_t    sa;
+    uint8_t     *dst_line, *dst;
+    uint8_t     *mask_line, *mask;
+    int dst_stride, mask_stride;
+    uint16_t w;
+    uint32_t src;
+    uint8_t sa;
 
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
     PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
@@ -940,10 +943,10 @@ fast_composite_add_8888_8_8 (pixman_implementation_t *imp,
 
        while (w--)
        {
-           uint16_t    tmp;
-           uint16_t    a;
-           uint32_t    m, d;
-           uint32_t    r;
+           uint16_t tmp;
+           uint16_t a;
+           uint32_t m, d;
+           uint32_t r;
 
            a = *mask++;
            d = *dst;
@@ -962,55 +965,55 @@ fast_composite_add_8888_8_8 (pixman_implementation_t *imp,
 
 static void
 fast_composite_solid_fill (pixman_implementation_t *imp,
-                     pixman_op_t op,
-                     pixman_image_t * src_image,
-                     pixman_image_t * mask_image,
-                     pixman_image_t * dst_image,
-                     int32_t      src_x,
-                     int32_t      src_y,
-                     int32_t      mask_x,
-                     int32_t      mask_y,
-                     int32_t      dest_x,
-                     int32_t      dest_y,
-                     int32_t     width,
-                     int32_t     height)
+                           pixman_op_t              op,
+                           pixman_image_t *         src_image,
+                           pixman_image_t *         mask_image,
+                           pixman_image_t *         dst_image,
+                           int32_t                  src_x,
+                           int32_t                  src_y,
+                           int32_t                  mask_x,
+                           int32_t                  mask_y,
+                           int32_t                  dest_x,
+                           int32_t                  dest_y,
+                           int32_t                  width,
+                           int32_t                  height)
 {
-    uint32_t   src;
+    uint32_t src;
 
-    src = _pixman_image_get_solid(src_image, dst_image->bits.format);
+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
 
     if (dst_image->bits.format == PIXMAN_a8)
        src = src >> 24;
     else if (dst_image->bits.format == PIXMAN_r5g6b5 ||
-            dst_image->bits.format == PIXMAN_b5g6r5)
+             dst_image->bits.format == PIXMAN_b5g6r5)
        src = CONVERT_8888_TO_0565 (src);
 
     pixman_fill (dst_image->bits.bits, dst_image->bits.rowstride,
-                PIXMAN_FORMAT_BPP (dst_image->bits.format),
-                dest_x, dest_y,
-                width, height,
-                src);
+                 PIXMAN_FORMAT_BPP (dst_image->bits.format),
+                 dest_x, dest_y,
+                 width, height,
+                 src);
 }
 
 static void
 fast_composite_src_8888_x888 (pixman_implementation_t *imp,
-                         pixman_op_t op,
-                         pixman_image_t * src_image,
-                         pixman_image_t * mask_image,
-                         pixman_image_t * dst_image,
-                         int32_t      src_x,
-                         int32_t      src_y,
-                         int32_t      mask_x,
-                         int32_t      mask_y,
-                         int32_t      dest_x,
-                         int32_t      dest_y,
-                         int32_t     width,
-                         int32_t     height)
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
 {
-    uint32_t   *dst;
+    uint32_t    *dst;
     uint32_t    *src;
-    int                 dst_stride, src_stride;
-    uint32_t    n_bytes = width * sizeof (uint32_t);
+    int dst_stride, src_stride;
+    uint32_t n_bytes = width * sizeof (uint32_t);
 
     PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src, 1);
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst, 1);
@@ -1040,18 +1043,18 @@ static const pixman_fast_path_t c_fast_paths[] =
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8b8g8r8, PIXMAN_a8b8g8r8, fast_composite_over_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8b8g8r8, PIXMAN_x8b8g8r8, fast_composite_over_n_8888_8888_ca, NEED_COMPONENT_ALPHA },
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8b8g8r8, PIXMAN_b5g6r5,   fast_composite_over_n_8888_0565_ca, NEED_COMPONENT_ALPHA },
-    { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8,      PIXMAN_x8r8g8b8, fast_composite_over_x888_8_8888,       0 },
-    { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8,      PIXMAN_a8r8g8b8, fast_composite_over_x888_8_8888,       0 },
-    { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8,      PIXMAN_x8b8g8r8, fast_composite_over_x888_8_8888,       0 },
-    { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8,      PIXMAN_a8b8g8r8, fast_composite_over_x888_8_8888,       0 },
-    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,     PIXMAN_a8r8g8b8, fast_composite_over_8888_8888,           0 },
-    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,    PIXMAN_x8r8g8b8, fast_composite_over_8888_8888,    0 },
-    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,    PIXMAN_r5g6b5,   fast_composite_over_8888_0565,    0 },
-    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null,    PIXMAN_a8b8g8r8, fast_composite_over_8888_8888,    0 },
-    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null,    PIXMAN_x8b8g8r8, fast_composite_over_8888_8888,    0 },
-    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null,     PIXMAN_b5g6r5,   fast_composite_over_8888_0565,           0 },
-    { PIXMAN_OP_ADD, PIXMAN_a8r8g8b8,  PIXMAN_null,    PIXMAN_a8r8g8b8, fast_composite_add_8888_8888,   0 },
-    { PIXMAN_OP_ADD, PIXMAN_a8b8g8r8,  PIXMAN_null,    PIXMAN_a8b8g8r8, fast_composite_add_8888_8888,   0 },
+    { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8,       PIXMAN_x8r8g8b8, fast_composite_over_x888_8_8888,       0 },
+    { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8,       PIXMAN_a8r8g8b8, fast_composite_over_x888_8_8888,       0 },
+    { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8,       PIXMAN_x8b8g8r8, fast_composite_over_x888_8_8888,       0 },
+    { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8,       PIXMAN_a8b8g8r8, fast_composite_over_x888_8_8888,       0 },
+    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,     PIXMAN_a8r8g8b8, fast_composite_over_8888_8888,    0 },
+    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,     PIXMAN_x8r8g8b8, fast_composite_over_8888_8888,    0 },
+    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,     PIXMAN_r5g6b5,   fast_composite_over_8888_0565,    0 },
+    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null,     PIXMAN_a8b8g8r8, fast_composite_over_8888_8888,    0 },
+    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null,     PIXMAN_x8b8g8r8, fast_composite_over_8888_8888,    0 },
+    { PIXMAN_OP_OVER, PIXMAN_a8b8g8r8, PIXMAN_null,     PIXMAN_b5g6r5,   fast_composite_over_8888_0565,    0 },
+    { PIXMAN_OP_ADD, PIXMAN_a8r8g8b8,  PIXMAN_null,     PIXMAN_a8r8g8b8, fast_composite_add_8888_8888,   0 },
+    { PIXMAN_OP_ADD, PIXMAN_a8b8g8r8,  PIXMAN_null,     PIXMAN_a8b8g8r8, fast_composite_add_8888_8888,   0 },
     { PIXMAN_OP_ADD, PIXMAN_a8,        PIXMAN_null,     PIXMAN_a8,       fast_composite_add_8000_8000,   0 },
     { PIXMAN_OP_ADD, PIXMAN_solid,     PIXMAN_a8,       PIXMAN_a8,       fast_composite_add_8888_8_8,    0 },
     { PIXMAN_OP_SRC, PIXMAN_solid,     PIXMAN_null,     PIXMAN_a8r8g8b8, fast_composite_solid_fill, 0 },
@@ -1069,72 +1072,76 @@ static const pixman_fast_path_t c_fast_paths[] =
     { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8,  PIXMAN_null,     PIXMAN_b5g6r5,   fast_composite_src_x888_0565, 0 },
     { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8,  PIXMAN_null,     PIXMAN_b5g6r5,   fast_composite_src_x888_0565, 0 },
     { PIXMAN_OP_IN,  PIXMAN_a8,        PIXMAN_null,     PIXMAN_a8,       fast_composite_in_8_8,   0 },
-    { PIXMAN_OP_IN,  PIXMAN_solid,     PIXMAN_a8,      PIXMAN_a8,       fast_composite_in_n_8_8, 0 },
+    { PIXMAN_OP_IN,  PIXMAN_solid,     PIXMAN_a8,       PIXMAN_a8,       fast_composite_in_n_8_8, 0 },
     { PIXMAN_OP_NONE },
 };
 
 static void
 fast_composite_src_scale_nearest (pixman_implementation_t *imp,
-                           pixman_op_t     op,
-                           pixman_image_t *src_image,
-                           pixman_image_t *mask_image,
-                           pixman_image_t *dst_image,
-                           int32_t         src_x,
-                           int32_t         src_y,
-                           int32_t         mask_x,
-                           int32_t         mask_y,
-                           int32_t         dest_x,
-                           int32_t         dest_y,
-                           int32_t        width,
-                           int32_t        height)
+                                  pixman_op_t              op,
+                                  pixman_image_t *         src_image,
+                                  pixman_image_t *         mask_image,
+                                  pixman_image_t *         dst_image,
+                                  int32_t                  src_x,
+                                  int32_t                  src_y,
+                                  int32_t                  mask_x,
+                                  int32_t                  mask_y,
+                                  int32_t                  dest_x,
+                                  int32_t                  dest_y,
+                                  int32_t                  width,
+                                  int32_t                  height)
 {
     uint32_t       *dst;
     uint32_t       *src;
-    int             dst_stride, src_stride;
-    int             i, j;
+    int dst_stride, src_stride;
+    int i, j;
     pixman_vector_t v;
-    
+
     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst, 1);
     /* pass in 0 instead of src_x and src_y because src_x and src_y need to be
      * transformed from destination space to source space */
     PIXMAN_IMAGE_GET_LINE (src_image, 0, 0, uint32_t, src_stride, src, 1);
-    
+
     /* reference point is the center of the pixel */
-    v.vector[0] = pixman_int_to_fixed(src_x) + pixman_fixed_1 / 2;
-    v.vector[1] = pixman_int_to_fixed(src_y) + pixman_fixed_1 / 2;
+    v.vector[0] = pixman_int_to_fixed (src_x) + pixman_fixed_1 / 2;
+    v.vector[1] = pixman_int_to_fixed (src_y) + pixman_fixed_1 / 2;
     v.vector[2] = pixman_fixed_1;
-    
+
     if (!pixman_transform_point_3d (src_image->common.transform, &v))
-        return;
-    
+       return;
+
     /* Round down to closest integer, ensuring that 0.5 rounds to 0, not 1 */
     v.vector[0] -= pixman_fixed_e;
     v.vector[1] -= pixman_fixed_e;
-    
-    for (j = 0; j < height; j++) {
-        pixman_fixed_t vx = v.vector[0];
-        pixman_fixed_t vy = v.vector[1];
-        for (i = 0; i < width; ++i) {
-            pixman_bool_t inside_bounds;
-            uint32_t result;
-            int x, y;
-            x = vx >> 16;
-            y = vy >> 16;
-           
-            /* apply the repeat function */
-            switch (src_image->common.repeat) {
+
+    for (j = 0; j < height; j++)
+    {
+       pixman_fixed_t vx = v.vector[0];
+       pixman_fixed_t vy = v.vector[1];
+
+       for (i = 0; i < width; ++i)
+       {
+           pixman_bool_t inside_bounds;
+           uint32_t result;
+           int x, y;
+           x = vx >> 16;
+           y = vy >> 16;
+
+           /* apply the repeat function */
+           switch (src_image->common.repeat)
+           {
            case PIXMAN_REPEAT_NORMAL:
                x = MOD (x, src_image->bits.width);
                y = MOD (y, src_image->bits.height);
                inside_bounds = TRUE;
                break;
-               
+
            case PIXMAN_REPEAT_PAD:
-               x = CLIP (x, 0, src_image->bits.width-1);
-               y = CLIP (y, 0, src_image->bits.height-1);
+               x = CLIP (x, 0, src_image->bits.width - 1);
+               y = CLIP (y, 0, src_image->bits.height - 1);
                inside_bounds = TRUE;
                break;
-               
+
            case PIXMAN_REPEAT_REFLECT:
                x = MOD (x, src_image->bits.width * 2);
                if (x >= src_image->bits.width)
@@ -1144,46 +1151,57 @@ fast_composite_src_scale_nearest (pixman_implementation_t *imp,
                    y = src_image->bits.height * 2 - y - 1;
                inside_bounds = TRUE;
                break;
-               
+
            case PIXMAN_REPEAT_NONE:
            default:
-               inside_bounds = (x >= 0 && x < src_image->bits.width && y >= 0 && y < src_image->bits.height);
+               inside_bounds =
+                   (x >= 0                             &&
+                    x < src_image->bits.width          &&
+                    y >= 0                             &&
+                    y < src_image->bits.height);
                break;
-            }
-           
-            if (inside_bounds) {
-                //XXX: we should move this multiplication out of the loop
-                result = *(src + y * src_stride + x);
-            } else {
-                result = 0;
-            }
+           }
+
+           if (inside_bounds)
+           {
+               /* XXX: we should move this multiplication out of the loop */
+               result = *(src + y * src_stride + x);
+           }
+           else
+           {
+               result = 0;
+           }
            *(dst + i) = result;
-           
-            /* adjust the x location by a unit vector in the x direction:
-             * this is equivalent to transforming x+1 of the destination point to source space */
-            vx += src_image->common.transform->matrix[0][0];
-        }
-        /* adjust the y location by a unit vector in the y direction
-         * this is equivalent to transforming y+1 of the destination point to source space */
-        v.vector[1] += src_image->common.transform->matrix[1][1];
-        dst += dst_stride;
+
+           /* adjust the x location by a unit vector in the x direction:
+            * this is equivalent to transforming x+1 of the destination
+            * point to source space
+            */
+           vx += src_image->common.transform->matrix[0][0];
+       }
+       /* adjust the y location by a unit vector in the y direction
+        * this is equivalent to transforming y+1 of the destination point
+        * to source space
+        */
+       v.vector[1] += src_image->common.transform->matrix[1][1];
+       dst += dst_stride;
     }
 }
 
 static void
 fast_path_composite (pixman_implementation_t *imp,
-                    pixman_op_t     op,
-                    pixman_image_t *src,
-                    pixman_image_t *mask,
-                    pixman_image_t *dest,
-                    int32_t         src_x,
-                    int32_t         src_y,
-                    int32_t         mask_x,
-                    int32_t         mask_y,
-                    int32_t         dest_x,
-                    int32_t         dest_y,
-                    int32_t        width,
-                    int32_t        height)
+                     pixman_op_t              op,
+                     pixman_image_t *         src,
+                     pixman_image_t *         mask,
+                     pixman_image_t *         dest,
+                     int32_t                  src_x,
+                     int32_t                  src_y,
+                     int32_t                  mask_x,
+                     int32_t                  mask_y,
+                     int32_t                  dest_x,
+                     int32_t                  dest_y,
+                     int32_t                  width,
+                     int32_t                  height)
 {
     if (src->type == BITS
         && src->common.transform
@@ -1191,55 +1209,55 @@ fast_path_composite (pixman_implementation_t *imp,
         && op == PIXMAN_OP_SRC
         && !src->common.alpha_map && !dest->common.alpha_map
         && (src->common.filter == PIXMAN_FILTER_NEAREST)
-        && PIXMAN_FORMAT_BPP(dest->bits.format) == 32
+        && PIXMAN_FORMAT_BPP (dest->bits.format) == 32
         && src->bits.format == dest->bits.format
         && !src->common.read_func && !src->common.write_func
         && !dest->common.read_func && !dest->common.write_func)
     {
-        /* ensure that the transform matrix only has a scale */
-        if (src->common.transform->matrix[0][1] == 0 &&
-            src->common.transform->matrix[1][0] == 0 &&
-            src->common.transform->matrix[2][0] == 0 &&
-            src->common.transform->matrix[2][1] == 0 &&
-            src->common.transform->matrix[2][2] == pixman_fixed_1)
+       /* ensure that the transform matrix only has a scale */
+       if (src->common.transform->matrix[0][1] == 0 &&
+           src->common.transform->matrix[1][0] == 0 &&
+           src->common.transform->matrix[2][0] == 0 &&
+           src->common.transform->matrix[2][1] == 0 &&
+           src->common.transform->matrix[2][2] == pixman_fixed_1)
        {
            _pixman_walk_composite_region (imp, op,
-                                          src, mask, dest,
-                                          src_x, src_y,
-                                          mask_x, mask_y,
-                                          dest_x, dest_y,
-                                          width, height,
-                                          fast_composite_src_scale_nearest);
+                                          src, mask, dest,
+                                          src_x, src_y,
+                                          mask_x, mask_y,
+                                          dest_x, dest_y,
+                                          width, height,
+                                          fast_composite_src_scale_nearest);
            return;
        }
     }
 
     if (_pixman_run_fast_path (c_fast_paths, imp,
-                              op, src, mask, dest,
-                              src_x, src_y,
-                              mask_x, mask_y,
-                              dest_x, dest_y,
-                              width, height))
+                               op, src, mask, dest,
+                               src_x, src_y,
+                               mask_x, mask_y,
+                               dest_x, dest_y,
+                               width, height))
     {
        return;
     }
 
     _pixman_implementation_composite (imp->delegate, op,
-                                     src, mask, dest,
-                                     src_x, src_y,
-                                     mask_x, mask_y,
-                                     dest_x, dest_y,
-                                     width, height);
+                                      src, mask, dest,
+                                      src_x, src_y,
+                                      mask_x, mask_y,
+                                      dest_x, dest_y,
+                                      width, height);
 }
 
 static void
-pixman_fill8 (uint32_t  *bits,
-             int       stride,
-             int       x,
-             int       y,
-             int       width,
-             int       height,
-             uint32_t  xor)
+pixman_fill8 (uint32_t *bits,
+              int       stride,
+              int       x,
+              int       y,
+              int       width,
+              int       height,
+              uint32_t xor)
 {
     int byte_stride = stride * (int) sizeof (uint32_t);
     uint8_t *dst = (uint8_t *) bits;
@@ -1259,14 +1277,15 @@ pixman_fill8 (uint32_t  *bits,
 
 static void
 pixman_fill16 (uint32_t *bits,
-              int       stride,
-              int       x,
-              int       y,
-              int       width,
-              int       height,
-              uint32_t  xor)
+               int       stride,
+               int       x,
+               int       y,
+               int       width,
+               int       height,
+               uint32_t xor)
 {
-    int short_stride = (stride * (int) sizeof (uint32_t)) / (int) sizeof (uint16_t);
+    int short_stride =
+       (stride * (int)sizeof (uint32_t)) / (int)sizeof (uint16_t);
     uint16_t *dst = (uint16_t *)bits;
     uint16_t v = xor & 0xffff;
     int i;
@@ -1284,12 +1303,12 @@ pixman_fill16 (uint32_t *bits,
 
 static void
 pixman_fill32 (uint32_t *bits,
-              int       stride,
-              int       x,
-              int       y,
-              int       width,
-              int       height,
-              uint32_t  xor)
+               int       stride,
+               int       x,
+               int       y,
+               int       width,
+               int       height,
+               uint32_t  xor)
 {
     int i;
 
@@ -1306,35 +1325,35 @@ pixman_fill32 (uint32_t *bits,
 
 static pixman_bool_t
 fast_path_fill (pixman_implementation_t *imp,
-               uint32_t *bits,
-               int stride,
-               int bpp,
-               int x,
-               int y,
-               int width,
-               int height,
-               uint32_t xor)
+                uint32_t *               bits,
+                int                      stride,
+                int                      bpp,
+                int                      x,
+                int                      y,
+                int                      width,
+                int                      height,
+                uint32_t                xor)
 {
     switch (bpp)
     {
     case 8:
        pixman_fill8 (bits, stride, x, y, width, height, xor);
        break;
-       
+
     case 16:
        pixman_fill16 (bits, stride, x, y, width, height, xor);
        break;
-       
+
     case 32:
        pixman_fill32 (bits, stride, x, y, width, height, xor);
        break;
-       
+
     default:
        return _pixman_implementation_fill (
            imp->delegate, bits, stride, bpp, x, y, width, height, xor);
        break;
     }
-    
+
     return TRUE;
 }
 
@@ -1346,6 +1365,7 @@ _pixman_implementation_create_fast_path (void)
 
     imp->composite = fast_path_composite;
     imp->fill = fast_path_fill;
-    
+
     return imp;
 }
+