Remove all remaining trailing whitespace.

This patch was produced with the following (GNU) sed script:

	sed -i -r -e 's/[ \t]+$//'

run on all *.[ch] files within cairo.

Note that the above script would have also created all the changes
from the previous commits to remove trailing whitespace.

60 files changed, 404 insertions, 404 deletions

diff --git a/doc/tutorial/src/include/cairo-tutorial-gtk.h b/doc/tutorial/src/include/cairo-tutorial-gtk.h
index 8a820f3d..e9445530 100644
--- a/doc/tutorial/src/include/cairo-tutorial-gtk.h
+++ b/doc/tutorial/src/include/cairo-tutorial-gtk.h
@@ -45,13 +45,13 @@ gdk_cairo_create (GdkDrawable *drawable)
     GdkVisual *visual = gdk_drawable_get_visual (drawable);
 
     gdk_drawable_get_size (drawable, &width, &height);
-    if (visual) 
+    if (visual)
 	surface = cairo_xlib_surface_create (GDK_DRAWABLE_XDISPLAY (drawable),
 					     GDK_DRAWABLE_XID (drawable),
 					     GDK_VISUAL_XVISUAL (visual),
 					     width, height);
     else if (gdk_drawable_get_depth (drawable) == 1)
-	surface = cairo_xlib_surface_create_for_bitmap 
+	surface = cairo_xlib_surface_create_for_bitmap
 	    (GDK_PIXMAP_XDISPLAY (drawable),
 	     GDK_PIXMAP_XID (drawable),
 	     GDK_SCREEN_XSCREEN (gdk_drawable_get_screen (drawable)),
@@ -101,7 +101,7 @@ handle_key_press (GtkWidget *widget,
     return FALSE;
 }
 
-int 
+int
 main (int argc, char **argv)
 {
     GtkWidget *window, *drawing_area;
diff --git a/doc/tutorial/src/include/cairo-tutorial-pdf.h b/doc/tutorial/src/include/cairo-tutorial-pdf.h
index c65b7e4a..4c89590a 100644
--- a/doc/tutorial/src/include/cairo-tutorial-pdf.h
+++ b/doc/tutorial/src/include/cairo-tutorial-pdf.h
@@ -35,7 +35,7 @@
 static void
 draw (cairo_t *cr, int width, int height);
 
-int 
+int
 main (int argc, char **argv)
 {
     cairo_surface_t *surface;
diff --git a/doc/tutorial/src/include/cairo-tutorial-png.h b/doc/tutorial/src/include/cairo-tutorial-png.h
index 837dc370..9e15d4c2 100644
--- a/doc/tutorial/src/include/cairo-tutorial-png.h
+++ b/doc/tutorial/src/include/cairo-tutorial-png.h
@@ -34,7 +34,7 @@
 static void
 draw (cairo_t *cr, int width, int height);
 
-int 
+int
 main (int argc, char **argv)
 {
     cairo_surface_t *surface;
diff --git a/pixman/src/fbcompose.c b/pixman/src/fbcompose.c
index f8aa3a3e..8d20039b 100644
--- a/pixman/src/fbcompose.c
+++ b/pixman/src/fbcompose.c
@@ -224,7 +224,7 @@ fbFetch_r5g6b5 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedP
     const CARD16 *end = pixel + width;
     while (pixel < end) {
         CARD32  p = *pixel++;
-        CARD32 r = (((p) << 3) & 0xf8) | 
+        CARD32 r = (((p) << 3) & 0xf8) |
                    (((p) << 5) & 0xfc00) |
                    (((p) << 8) & 0xf80000);
         r |= (r >> 5) & 0x70007;
diff --git a/pixman/src/fbmmx.c b/pixman/src/fbmmx.c
index 8ff9f9f6..4b5e5ddd 100644
--- a/pixman/src/fbmmx.c
+++ b/pixman/src/fbmmx.c
@@ -304,7 +304,7 @@ expand565 (__m64 pixel, int pos)
     __m64 t1, t2;
 
     /* move pixel to low 16 bit and zero the rest */
-    p = shift (shift (p, (3 - pos) * 16), -48); 
+    p = shift (shift (p, (3 - pos) * 16), -48);
 
     t1 = shift (p, 36 - 11);
     t2 = shift (p, 16 - 5);
@@ -753,7 +753,7 @@ mmxCombineAtopC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
         __m64 s = load8888(*src);
         __m64 d = load8888(*dest);
         __m64 da = expand_alpha(d);
-        __m64 sa = expand_alpha(s); 
+        __m64 sa = expand_alpha(s);
         s = pix_multiply(s, a);
         a = pix_multiply(a, sa);
         a = negate(a);
@@ -1214,7 +1214,7 @@ fbCompositeSrc_8888x8x8888mmx (pixman_operator_t	op,
 	}
     }
 
-    _mm_empty(); 
+    _mm_empty();
 }
 
 void
@@ -1349,7 +1349,7 @@ fbCompositeSrc_x888x8x8888mmx (pixman_operator_t	op,
 	}
     }
 
-    _mm_empty(); 
+    _mm_empty();
 }
 
 void
diff --git a/pixman/src/fbpict.c b/pixman/src/fbpict.c
index 2cfbeb88..3c032c11 100644
--- a/pixman/src/fbpict.c
+++ b/pixman/src/fbpict.c
@@ -1907,7 +1907,7 @@ slim_hidden_def(pixman_composite);
 enum CPUFeatures {
     NoFeatures = 0,
     MMX = 0x1,
-    MMX_Extensions = 0x2, 
+    MMX_Extensions = 0x2,
     SSE = 0x6,
     SSE2 = 0x8,
     CMOV = 0x10
@@ -1952,9 +1952,9 @@ static unsigned int detectCPUFeatures(void) {
 	     "pop %%ebx\n"
              "1:\n"
              "mov %%edx, %0\n"
-             : "=r" (result), 
-               "=m" (vendor[0]), 
-               "=m" (vendor[4]), 
+             : "=r" (result),
+               "=m" (vendor[0]),
+               "=m" (vendor[4]),
                "=m" (vendor[8])
              :
              : "%eax", "%ecx", "%edx"
@@ -1974,7 +1974,7 @@ static unsigned int detectCPUFeatures(void) {
         if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
             /* check for AMD MMX extensions */
 
-            unsigned int result;            
+            unsigned int result;
             __asm__("push %%ebx\n"
                     "mov $0x80000000, %%eax\n"
                     "cpuid\n"
diff --git a/pixman/src/icblt.c b/pixman/src/icblt.c
index cbd33c38..4f0c98e3 100644
--- a/pixman/src/icblt.c
+++ b/pixman/src/icblt.c
@@ -45,7 +45,7 @@ fbBlt (FbBits   *srcLine,
        FbStride dstStride,
        int	dstX,
 
-       int	width, 
+       int	width,
        int	height,
 
        int	alu,
@@ -239,7 +239,7 @@ fbBlt (FbBits   *srcLine,
 		    bits1 = *--src;
 		if (endmask)
 		{
-		    bits = FbScrRight(bits1, rightShift); 
+		    bits = FbScrRight(bits1, rightShift);
 		    if (FbScrRight(endmask, leftShift))
 		    {
 			bits1 = *--src;
@@ -253,7 +253,7 @@ fbBlt (FbBits   *srcLine,
 		{
 		    while (n--)
 		    {
-			bits = FbScrRight(bits1, rightShift); 
+			bits = FbScrRight(bits1, rightShift);
 			bits1 = *--src;
 			bits |= FbScrLeft(bits1, leftShift);
 			--dst;
@@ -264,7 +264,7 @@ fbBlt (FbBits   *srcLine,
 		{
 		    while (n--)
 		    {
-			bits = FbScrRight(bits1, rightShift); 
+			bits = FbScrRight(bits1, rightShift);
 			bits1 = *--src;
 			bits |= FbScrLeft(bits1, leftShift);
 			--dst;
@@ -273,7 +273,7 @@ fbBlt (FbBits   *srcLine,
 		}
 		if (startmask)
 		{
-		    bits = FbScrRight(bits1, rightShift); 
+		    bits = FbScrRight(bits1, rightShift);
 		    if (FbScrRight(startmask, leftShift))
 		    {
 			bits1 = *--src;
@@ -289,7 +289,7 @@ fbBlt (FbBits   *srcLine,
 		    bits1 = *src++;
 		if (startmask)
 		{
-		    bits = FbScrLeft(bits1, leftShift); 
+		    bits = FbScrLeft(bits1, leftShift);
 		    bits1 = *src++;
 		    bits |= FbScrRight(bits1, rightShift);
 		    FbDoLeftMaskByteMergeRop (dst, bits, startbyte, startmask);
@@ -300,7 +300,7 @@ fbBlt (FbBits   *srcLine,
 		{
 		    while (n--)
 		    {
-			bits = FbScrLeft(bits1, leftShift); 
+			bits = FbScrLeft(bits1, leftShift);
 			bits1 = *src++;
 			bits |= FbScrRight(bits1, rightShift);
 			*dst = FbDoDestInvarientMergeRop(bits);
@@ -311,7 +311,7 @@ fbBlt (FbBits   *srcLine,
 		{
 		    while (n--)
 		    {
-			bits = FbScrLeft(bits1, leftShift); 
+			bits = FbScrLeft(bits1, leftShift);
 			bits1 = *src++;
 			bits |= FbScrRight(bits1, rightShift);
 			*dst = FbDoMergeRop(bits, *dst);
@@ -320,7 +320,7 @@ fbBlt (FbBits   *srcLine,
 		}
 		if (endmask)
 		{
-		    bits = FbScrLeft(bits1, leftShift); 
+		    bits = FbScrLeft(bits1, leftShift);
 		    if (FbScrLeft(endmask, rightShift))
 		    {
 			bits1 = *src;
@@ -480,7 +480,7 @@ fbBlt24Line (FbBits	    *src,
 		bits1 = *--src;
 	    if (endmask)
 	    {
-		bits = FbScrRight(bits1, rightShift); 
+		bits = FbScrRight(bits1, rightShift);
 		if (FbScrRight(endmask, leftShift))
 		{
 		    bits1 = *--src;
@@ -492,7 +492,7 @@ fbBlt24Line (FbBits	    *src,
 	    }
 	    while (n--)
 	    {
-		bits = FbScrRight(bits1, rightShift); 
+		bits = FbScrRight(bits1, rightShift);
 		bits1 = *--src;
 		bits |= FbScrLeft(bits1, leftShift);
 		--dst;
@@ -501,7 +501,7 @@ fbBlt24Line (FbBits	    *src,
 	    }
 	    if (startmask)
 	    {
-		bits = FbScrRight(bits1, rightShift); 
+		bits = FbScrRight(bits1, rightShift);
 		if (FbScrRight(startmask, leftShift))
 		{
 		    bits1 = *--src;
@@ -517,7 +517,7 @@ fbBlt24Line (FbBits	    *src,
 		bits1 = *src++;
 	    if (startmask)
 	    {
-		bits = FbScrLeft(bits1, leftShift); 
+		bits = FbScrLeft(bits1, leftShift);
 		bits1 = *src++;
 		bits |= FbScrRight(bits1, rightShift);
 		*dst = FbDoMaskMergeRop (bits, *dst, mask & startmask);
@@ -526,7 +526,7 @@ fbBlt24Line (FbBits	    *src,
 	    }
 	    while (n--)
 	    {
-		bits = FbScrLeft(bits1, leftShift); 
+		bits = FbScrLeft(bits1, leftShift);
 		bits1 = *src++;
 		bits |= FbScrRight(bits1, rightShift);
 		*dst = FbDoMaskMergeRop(bits, *dst, mask);
@@ -535,7 +535,7 @@ fbBlt24Line (FbBits	    *src,
 	    }
 	    if (endmask)
 	    {
-		bits = FbScrLeft(bits1, leftShift); 
+		bits = FbScrLeft(bits1, leftShift);
 		if (FbScrLeft(endmask, rightShift))
 		{
 		    bits1 = *src;
@@ -572,7 +572,7 @@ fbBlt24 (FbBits	    *srcLine,
 	 FbStride   dstStride,
 	 int	    dstX,
 
-	 int	    width, 
+	 int	    width,
 	 int	    height,
 
 	 int	    alu,
@@ -880,7 +880,7 @@ fbBltStip (FbStip   *src,
 	   FbStride dstStride,	    /* in FbStip units, not FbBits units */
 	   int	    dstX,
 
-	   int	    width, 
+	   int	    width,
 	   int	    height,
 
 	   int	    alu,
@@ -939,10 +939,10 @@ fbBltStip (FbStip   *src,
     else
 #endif
     {
-	fbBlt ((FbBits *) src, FbStipStrideToBitsStride (srcStride), 
-	       srcX, 
-	       (FbBits *) dst, FbStipStrideToBitsStride (dstStride), 
-	       dstX, 
+	fbBlt ((FbBits *) src, FbStipStrideToBitsStride (srcStride),
+	       srcX,
+	       (FbBits *) dst, FbStipStrideToBitsStride (dstStride),
+	       dstX,
 	       width, height,
 	       alu, pm, bpp, FALSE, FALSE);
     }
diff --git a/pixman/src/icbltone.c b/pixman/src/icbltone.c
index 022d4982..210061ae 100644
--- a/pixman/src/icbltone.c
+++ b/pixman/src/icbltone.c
@@ -111,7 +111,7 @@ static uint8_t const fb8Lane[16] = {
 };
 
 static uint8_t const fb16Lane[16] = {
-    0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 static uint8_t const fb32Lane[16] = {
@@ -209,7 +209,7 @@ fbBltOne (FbStip    *src,
     srcX &= FB_STIP_MASK;
     dstX &= FB_MASK;
 
-    FbMaskBitsBytes(dstX, width, copy, 
+    FbMaskBitsBytes(dstX, width, copy,
 		    startmask, startbyte, nmiddle, endmask, endbyte);
 
     /*
@@ -300,7 +300,7 @@ fbBltOne (FbStip    *src,
 		else
 #endif
 		    mask = fbBits[FbLeftStipBits(bits,pixelsPerDst)];
-#ifndef FBNOPIXADDR		
+#ifndef FBNOPIXADDR
 		if (fbLane)
 		{
 		    fbTransparentSpan (dst, mask & startmask, fgxor, 1);
@@ -407,7 +407,7 @@ fbBltOne (FbStip    *src,
 #endif
 	    {
 		if (mask || !transparent)
-		    FbDoRightMaskByteStippleRRop (dst, mask, 
+		    FbDoRightMaskByteStippleRRop (dst, mask,
 						  fgand, fgxor, bgand, bgxor,
 						  endbyte, endmask);
 	    }
diff --git a/pixman/src/icformat.c b/pixman/src/icformat.c
index 033b65a8..f1332836 100644
--- a/pixman/src/icformat.c
+++ b/pixman/src/icformat.c
@@ -110,7 +110,7 @@ pixman_format_init (pixman_format_t *format, int format_code)
 			     PICT_FORMAT_B(format_code));
 
 	format->redMask = Mask(PICT_FORMAT_R(format_code));
-	format->red = (PICT_FORMAT_G(format_code) + 
+	format->red = (PICT_FORMAT_G(format_code) +
 		       PICT_FORMAT_B(format_code));
 
 	format->greenMask = Mask(PICT_FORMAT_G(format_code));
@@ -129,7 +129,7 @@ pixman_format_init (pixman_format_t *format, int format_code)
 			     PICT_FORMAT_R(format_code));
 
 	format->blueMask = Mask(PICT_FORMAT_B(format_code));
-	format->blue = (PICT_FORMAT_G(format_code) + 
+	format->blue = (PICT_FORMAT_G(format_code) +
 			PICT_FORMAT_R(format_code));
 
 	format->greenMask = Mask(PICT_FORMAT_G(format_code));
diff --git a/pixman/src/icimage.c b/pixman/src/icimage.c
index 5425f653..a9e92898 100644
--- a/pixman/src/icimage.c
+++ b/pixman/src/icimage.c
@@ -613,11 +613,11 @@ FbClipImageSrc (pixman_region16_t	*region,
 	if (image->compositeClipSource &&
 	    image->clientClipType != CT_NONE)
 	{
-	    pixman_region_translate (region, 
+	    pixman_region_translate (region,
 			   dx - image->clipOrigin.x,
 			   dy - image->clipOrigin.y);
 	    pixman_region_intersect (region, image->clientClip, region);
-	    pixman_region_translate (region, 
+	    pixman_region_translate (region,
 			   - (dx - image->clipOrigin.x),
 			   - (dy - image->clipOrigin.y));
 	}
@@ -812,7 +812,7 @@ SetPictureClipRects (PicturePtr	pPicture,
 				 nRect, rects, CT_UNSORTED);
     if (!clientClip)
 	return 1;
-    result =(*ps->ChangePictureClip) (pPicture, CT_REGION, 
+    result =(*ps->ChangePictureClip) (pPicture, CT_REGION,
 				      (void *) clientClip, 0);
     if (result == 0)
     {
diff --git a/pixman/src/icimage.h b/pixman/src/icimage.h
index 0d50e1f5..868ed66e 100644
--- a/pixman/src/icimage.h
+++ b/pixman/src/icimage.h
@@ -35,7 +35,7 @@
 
 /*
 typedef struct _IndexFormat {
-    VisualPtr	    pVisual; 
+    VisualPtr	    pVisual;
     ColormapPtr	    pColormap;
     int		    nvalues;
     xIndexValue	    *pValues;
diff --git a/pixman/src/icint.h b/pixman/src/icint.h
index d45f6328..e7f1de30 100644
--- a/pixman/src/icint.h
+++ b/pixman/src/icint.h
@@ -590,7 +590,7 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
  * icblt.c
  */
 pixman_private void
-fbBlt (pixman_bits_t   *src, 
+fbBlt (pixman_bits_t   *src,
        FbStride	srcStride,
        int	srcX,
 
@@ -598,7 +598,7 @@ fbBlt (pixman_bits_t   *src,
        FbStride dstStride,
        int	dstX,
 
-       int	width, 
+       int	width,
        int	height,
 
        int	alu,
@@ -617,7 +617,7 @@ fbBlt24 (pixman_bits_t	    *srcLine,
 	 FbStride   dstStride,
 	 int	    dstX,
 
-	 int	    width, 
+	 int	    width,
 	 int	    height,
 
 	 int	    alu,
@@ -635,7 +635,7 @@ fbBltStip (FbStip   *src,
 	   FbStride dstStride,	    /* in FbStip units, not FbBits units */
 	   int	    dstX,
 
-	   int	    width, 
+	   int	    width,
 	   int	    height,
 
 	   int	    alu,
diff --git a/pixman/src/icrect.c b/pixman/src/icrect.c
index 959699a3..7027d22f 100644
--- a/pixman/src/icrect.c
+++ b/pixman/src/icrect.c
@@ -123,7 +123,7 @@ pixman_fill_rect_8bpp (pixman_image_t *dst,
 static void
 pixman_fill_rect_32bpp (pixman_image_t *dst,
 			int16_t	        xDst,
-			int16_t	        yDst, 
+			int16_t	        yDst,
 			uint16_t	width,
 			uint16_t	height,
 			pixman_bits_t  *pixel)
@@ -210,11 +210,11 @@ pixman_color_rects (pixman_image_t	 *dst,
     pixman_region_intersect (clip, clip, clipPict->pCompositeClip);
     if (clipPict->alphaMap)
     {
-	pixman_region_translate (clip, 
+	pixman_region_translate (clip,
 				 -clipPict->alphaOrigin.x,
 				 -clipPict->alphaOrigin.y);
 	pixman_region_intersect (clip, clip, clipPict->alphaMap->pCompositeClip);
-	pixman_region_translate (clip, 
+	pixman_region_translate (clip,
 				 clipPict->alphaOrigin.x,
 				 clipPict->alphaOrigin.y);
     }
@@ -248,14 +248,14 @@ pixman_color_rects (pixman_image_t	 *dst,
 	func = pixman_fill_rect_32bpp;
     else if (dst->pixels->bpp == 1)
 	func = pixman_fill_rect_1bpp;
-    else 
+    else
 	func = pixman_fill_rect_general;
 
     for (i = 0; i < n_clipped_rects; i++) {
 	(*func) (dst,
-		 clipped_rects[i].x1, 
-		 clipped_rects[i].y1, 
-		 clipped_rects[i].x2 - clipped_rects[i].x1, 
+		 clipped_rects[i].x1,
+		 clipped_rects[i].y1,
+		 clipped_rects[i].x2 - clipped_rects[i].x1,
 		 clipped_rects[i].y2 - clipped_rects[i].y1,
 		 &pixel);
     }
@@ -350,7 +350,7 @@ pixman_fill_rectangles (pixman_operator_t		op,
 
 	while (nRects--)
 	{
-	    pixman_composite (op, src, NULL, dst, 0, 0, 0, 0, 
+	    pixman_composite (op, src, NULL, dst, 0, 0, 0, 0,
 			 rects->x,
 			 rects->y,
 			 rects->width,
diff --git a/pixman/src/ictransform.c b/pixman/src/ictransform.c
index 6e821610..c7358bfb 100644
--- a/pixman/src/ictransform.c
+++ b/pixman/src/ictransform.c
@@ -40,7 +40,7 @@ pixman_transform_point (pixman_transform_t	*transform,
 	v = 0;
 	for (i = 0; i < 3; i++)
 	{
-	    partial = ((xFixed_48_16) transform->matrix[j][i] * 
+	    partial = ((xFixed_48_16) transform->matrix[j][i] *
 		       (xFixed_48_16) vector->vector[i]);
 	    v += partial >> 16;
 	}
diff --git a/pixman/src/ictrap.c b/pixman/src/ictrap.c
index 68b47506..5a33ab82 100644
--- a/pixman/src/ictrap.c
+++ b/pixman/src/ictrap.c
@@ -46,7 +46,7 @@ FbCreateAlphaPicture (pixman_image_t	*dst,
     }
 
     /* pixman_image_create zeroes out the pixels, so we don't have to */
-    image = pixman_image_create (format, width, height); 
+    image = pixman_image_create (format, width, height);
 
     if (own_format)
 	pixman_format_destroy (format);
@@ -174,7 +174,7 @@ pixman_composite_trapezoids (pixman_operator_t	      op,
     {
 	if (!xTrapezoidValid(traps))
 	    continue;
-	fbRasterizeTrapezoid (image, traps, 
+	fbRasterizeTrapezoid (image, traps,
 			      -bounds.x1, -bounds.y1);
     }
 
diff --git a/pixman/src/ictri.c b/pixman/src/ictri.c
index f6129663..d3d5faa3 100644
--- a/pixman/src/ictri.c
+++ b/pixman/src/ictri.c
@@ -252,7 +252,7 @@ pixman_composite_tri_strip (pixman_operator_t		op,
 	    if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
 		continue;
 	    image = FbCreateAlphaPicture (dst,
-					  format, 
+					  format,
 					  bounds.x2 - bounds.x1,
 					  bounds.y2 - bounds.y1);
 	    if (!image)
@@ -332,7 +332,7 @@ pixman_composite_tri_fan (pixman_operator_t		op,
 	    if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
 		continue;
 	    image = FbCreateAlphaPicture (dst,
-					  format, 
+					  format,
 					  bounds.x2 - bounds.x1,
 					  bounds.y2 - bounds.y1);
 	    if (!image)
diff --git a/pixman/src/pixman-xserver-compat.h b/pixman/src/pixman-xserver-compat.h
index 5113abd5..ee2cca59 100644
--- a/pixman/src/pixman-xserver-compat.h
+++ b/pixman/src/pixman-xserver-compat.h
@@ -69,7 +69,7 @@ typedef pixman_triangle_t	xTriangle;
 */
 #define RENDER 1
 /*
-#define FB_SHIFT IC_SHIFT 
+#define FB_SHIFT IC_SHIFT
 #define FB_MASK IC_MASK
 #define FB_ALLONES IC_ALLONES
 #define FbMaskBits IcMaskBits
diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index 00884e7c..28dc30a1 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -37,13 +37,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c
index 9ecd04a8..a4741615 100644
--- a/pixman/src/pixregion.c
+++ b/pixman/src/pixregion.c
@@ -23,18 +23,18 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 
-Copyright 1987, 1988, 1989 by 
-Digital Equipment Corporation, Maynard, Massachusetts. 
+Copyright 1987, 1988, 1989 by
+Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -451,7 +451,7 @@ pixman_region_copy(pixman_region16_t *dst, pixman_region16_t *src)
 	dst->data->size = src->data->numRects;
     }
     dst->data->numRects = src->data->numRects;
-    memmove((char *)PIXREGION_BOXPTR(dst),(char *)PIXREGION_BOXPTR(src), 
+    memmove((char *)PIXREGION_BOXPTR(dst),(char *)PIXREGION_BOXPTR(src),
 	  dst->data->numRects * sizeof(pixman_box16_t));
     return PIXMAN_REGION_STATUS_SUCCESS;
 }
@@ -1335,7 +1335,7 @@ pixman_region_append(dstrgn, rgn)
 	if (dnumRects == 1)
 	    *new = *PIXREGION_BOXPTR(dstrgn);
 	else
-	    memmove((char *)new,(char *)PIXREGION_BOXPTR(dstrgn), 
+	    memmove((char *)new,(char *)PIXREGION_BOXPTR(dstrgn),
 		  dnumRects * sizeof(pixman_box16_t));
 	new = PIXREGION_BOXPTR(dstrgn);
     }
@@ -1869,9 +1869,9 @@ pixman_region_subtractO (
  */
 pixman_region_status_t
 pixman_region_subtract(regD, regM, regS)
-    pixman_region16_t *	regD;               
+    pixman_region16_t *	regD;
     pixman_region16_t * 	regM;
-    pixman_region16_t *	regS;          
+    pixman_region16_t *	regS;
 {
     int overlap; /* result ignored */
 
@@ -2176,7 +2176,7 @@ pixman_region16_data_copy(pixman_region16_t * dst, pixman_region16_t * src)
 {
     good(dst);
     good(src);
-    if (dst->data) 
+    if (dst->data)
 	return PIXMAN_REGION_STATUS_SUCCESS;
     if (dst == src)
 	return PIXMAN_REGION_STATUS_SUCCESS;
diff --git a/pixman/src/pixregionint.h b/pixman/src/pixregionint.h
index e47c4559..8a902ad4 100644
--- a/pixman/src/pixregionint.h
+++ b/pixman/src/pixregionint.h
@@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/pixman/src/slim_internal.h b/pixman/src/slim_internal.h
index 24b947a3..742059c6 100644
--- a/pixman/src/slim_internal.h
+++ b/pixman/src/slim_internal.h
@@ -30,7 +30,7 @@
 /* This macro marks a symbol as STV_HIDDEN, which prevents it from being
    added to the dynamic symbol table of the shared library.  This prevents
    users of the library from knowingly or unknowingly accessing library
-   internals that may change in future releases.  It also allows the 
+   internals that may change in future releases.  It also allows the
    compiler to generate slightly more efficient code in some cases.
 
    The macro should be placed either immediately before the return type in
diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c
index c94f1784..e4bf30f6 100644
--- a/src/cairo-atsui-font.c
+++ b/src/cairo-atsui-font.c
@@ -370,9 +370,9 @@ _cairo_atsui_font_init_glyph_metrics (cairo_atsui_font_t *font,
 
    extents.x_bearing = metricsH.sideBearing.x;
    extents.y_bearing = metricsV.advance.y;
-   extents.width = 
+   extents.width =
       metricsH.advance.x - metricsH.sideBearing.x - metricsH.otherSideBearing.x;
-   extents.height = 
+   extents.height =
      -metricsV.advance.y - metricsV.sideBearing.y - metricsV.otherSideBearing.y;
    extents.x_advance = metricsH.advance.x;
    extents.y_advance = 0;
@@ -384,7 +384,7 @@ _cairo_atsui_font_init_glyph_metrics (cairo_atsui_font_t *font,
   return CAIRO_STATUS_SUCCESS;
 }
 
-static OSStatus 
+static OSStatus
 _move_to (const Float32Point *point,
 	  void *callback_data)
 {
@@ -398,7 +398,7 @@ _move_to (const Float32Point *point,
     return noErr;
 }
 
-static OSStatus 
+static OSStatus
 _line_to (const Float32Point *point,
 	  void *callback_data)
 {
@@ -441,7 +441,7 @@ _close_path (void *callback_data)
     return noErr;
 }
 
-static cairo_status_t 
+static cairo_status_t
 _cairo_atsui_scaled_font_init_glyph_path (cairo_atsui_font_t *scaled_font,
 					  cairo_scaled_glyph_t *scaled_glyph)
 {
@@ -498,12 +498,12 @@ _cairo_atsui_font_scaled_glyph_init (void			*abstract_font,
     return CAIRO_STATUS_SUCCESS;
 }
 
-static cairo_int_status_t 
+static cairo_int_status_t
 _cairo_atsui_font_text_to_glyphs (void		*abstract_font,
 				  double	 x,
 				  double	 y,
 				  const char	*utf8,
-				  cairo_glyph_t **glyphs, 
+				  cairo_glyph_t **glyphs,
 				  int		*num_glyphs)
 {
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
@@ -549,7 +549,7 @@ _cairo_atsui_font_text_to_glyphs (void		*abstract_font,
 
     free (utf16);
 
-    ATSUDirectReleaseLayoutDataArrayPtr(NULL, 
+    ATSUDirectReleaseLayoutDataArrayPtr(NULL,
 					kATSUDirectDataLayoutRecordATSLayoutRecordCurrent,
 					(void *) &layoutRecords);
     ATSUDisposeTextLayout(textLayout);
@@ -557,7 +557,7 @@ _cairo_atsui_font_text_to_glyphs (void		*abstract_font,
     return CAIRO_STATUS_SUCCESS;
 }
 
-static cairo_int_status_t 
+static cairo_int_status_t
 _cairo_atsui_font_old_show_glyphs (void		       *abstract_font,
 				   cairo_operator_t    	op,
 				   cairo_pattern_t     *pattern,
diff --git a/src/cairo-clip.c b/src/cairo-clip.c
index d14dd2f0..0e3e6faf 100644
--- a/src/cairo-clip.c
+++ b/src/cairo-clip.c
@@ -218,7 +218,7 @@ _cairo_clip_combine_to_surface (cairo_clip_t                  *clip,
 				       NULL,
 				       dst,
 				       extents->x - clip->surface_rect.x,
-				       extents->y - clip->surface_rect.y, 
+				       extents->y - clip->surface_rect.y,
 				       0, 0,
 				       extents->x - dst_x,
 				       extents->y - dst_y,
@@ -312,7 +312,7 @@ _cairo_clip_intersect_region (cairo_clip_t    *clip,
     } else {
 	pixman_region16_t *intersection = pixman_region_create();
 
-	if (pixman_region_intersect (intersection, 
+	if (pixman_region_intersect (intersection,
 				     clip->region, region)
 	    == PIXMAN_REGION_STATUS_SUCCESS) {
 	    pixman_region_destroy (clip->region);
diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index 11bd3f46..46e8cc8f 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -39,7 +39,7 @@
 #include "cairoint.h"
 
 #define DFB_UNSUPPORTED -1
-#define DFB_SUPPORTED 1 
+#define DFB_SUPPORTED 1
 
 /*
 Glyph support not working
@@ -51,7 +51,7 @@ Composite support not working
 #define DFB_COMPOSITE 0
 
 
-#if DFB_SHOW_GLYPHS 
+#if DFB_SHOW_GLYPHS
 static cairo_int_status_t
 _cairo_directfb_surface_show_glyphs (cairo_scaled_font_t    *scaled_font,
                  cairo_operator_t       operator,
@@ -128,7 +128,7 @@ _dfb_set_operator (cairo_operator_t operator,IDirectFBSurface *dest)
     case CAIRO_OPERATOR_ADD:
     	return DFB_UNSUPPORTED;
 	break;
-    case CAIRO_OPERATOR_SATURATE: 
+    case CAIRO_OPERATOR_SATURATE:
     	return DFB_UNSUPPORTED;
 	break;
     default:
@@ -143,15 +143,15 @@ static inline int cairo_to_directfb_format(cairo_format_t format ) {
 				case CAIRO_FORMAT_RGB24:
 						return DSPF_RGB24;
 				case CAIRO_FORMAT_ARGB32:
-						return DSPF_ARGB; 
+						return DSPF_ARGB;
 				case CAIRO_FORMAT_A8:
-						return DSPF_A8; 
+						return DSPF_A8;
 				case CAIRO_FORMAT_A1:
-						return DSPF_A1; 
+						return DSPF_A1;
 				default:
 				{
 						/*assert(0);*/
-						return DSPF_UNKNOWN; 
+						return DSPF_UNKNOWN;
 				}
 		}
 }
@@ -195,7 +195,7 @@ static IDirectFBSurface *cairo_directfb_buffer_surface_create(IDirectFB *dfb,voi
 		IDirectFBSurface      *buffer;
 		DFBSurfaceDescription  dsc;
 
-		dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT; 
+		dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
 		dsc.caps = DSCAPS_NONE;
 		dsc.width       = width;
 		dsc.height      = height;
@@ -244,11 +244,11 @@ _cairo_directfb_surface_get_image (cairo_directfb_surface_t *surface,
 		void *data;
 
 		(void)interest;
-		if( surface->buffer->Lock(surface->buffer,flags,&data,&pitch) != DFB_OK ) 
+		if( surface->buffer->Lock(surface->buffer,flags,&data,&pitch) != DFB_OK )
 		return CAIRO_STATUS_NO_MEMORY;
 
 		/*lock the dest agianst other changes*/
-		if( surface->buffer_image ) { 
+		if( surface->buffer_image ) {
 			if( surface->buffer_data == data ) {
 				cairo_surface_reference(surface->buffer_image);
 			}
@@ -276,7 +276,7 @@ _cairo_directfb_surface_get_image (cairo_directfb_surface_t *surface,
 				surface->format = CAIRO_FORMAT_ARGB32;
 				surface->buffer = cairo_directfb_buffer_surface_create(surface->dfb,NULL,
 											0,DSPF_ARGB,width,height);
-				if( !surface->buffer ) 
+				if( !surface->buffer )
 				return CAIRO_STATUS_NO_MEMORY;
 				/*Have to flip the main surface if its double buffered to blit the buffer*/
 				surface->main_surface->Flip(surface->main_surface,NULL,0);
@@ -288,7 +288,7 @@ _cairo_directfb_surface_get_image (cairo_directfb_surface_t *surface,
 			surface->width=width;
 			surface->height=height;
 
-			if( surface->buffer->Lock(surface->buffer,flags,&data,&pitch) != DFB_OK ) 
+			if( surface->buffer->Lock(surface->buffer,flags,&data,&pitch) != DFB_OK )
 			return CAIRO_STATUS_NO_MEMORY;
 
 			surface->buffer_data = data;
@@ -301,7 +301,7 @@ _cairo_directfb_surface_get_image (cairo_directfb_surface_t *surface,
 			return CAIRO_STATUS_NO_MEMORY;
 			}
 			#if 0
-			if( surface->clip) 
+			if( surface->clip)
 				_cairo_image_surface_set_clip_region (
 					(cairo_image_surface_t *)surface->buffer_image,surface->clip);
 			#endif
@@ -354,7 +354,7 @@ _cairo_directfb_surface_create_similar (void *abstract_src,
 static cairo_status_t
 _cairo_directfb_surface_finish (void *data ) {
 		cairo_directfb_surface_t *surface=(cairo_directfb_surface_t *)data;
-		if( surface->buffer_image ) 
+		if( surface->buffer_image )
 		cairo_surface_destroy (surface->buffer_image);
 		if (surface->clip)
 	    pixman_region_destroy (surface->clip);
@@ -370,7 +370,7 @@ _cairo_directfb_surface_finish (void *data ) {
 #endif
 		surface->main_surface->Release (surface->main_surface);
 		surface->main_surface=NULL;
-		surface->dfb->Release(surface->dfb);	
+		surface->dfb->Release(surface->dfb);
 		surface->dfb=NULL;
 		return CAIRO_STATUS_SUCCESS;
 }
@@ -480,10 +480,10 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
     int itx, ity;
 
 	cairo_directfb_surface_t *surface = abstract_dst;
-	if( _dfb_set_operator(op,surface->buffer) == DFB_UNSUPPORTED ) 
+	if( _dfb_set_operator(op,surface->buffer) == DFB_UNSUPPORTED )
 		return CAIRO_INT_STATUS_UNSUPPORTED;
 
-    if (src_pattern->type == CAIRO_PATTERN_TYPE_SOLID ) { 
+    if (src_pattern->type == CAIRO_PATTERN_TYPE_SOLID ) {
 
     } else if (src_pattern->type != CAIRO_PATTERN_TYPE_SURFACE ||
 			src_pattern->extend != CAIRO_EXTEND_NONE) {
@@ -534,15 +534,15 @@ _cairo_directfb_surface_fill_rectangles (void		         *abstract_surface,
 	}
 
 	buffer->SetColor(buffer,color->red_short >> 8,
-				  color->green_short >> 8, 
-				  color->blue_short >> 8, 
+				  color->green_short >> 8,
+				  color->blue_short >> 8,
 				  color->alpha_short >> 8 );
 	/*Not optimized not sure of the sorting on region*/
 	if( surface->clip ) {
-		DFBRegion region;	
+		DFBRegion region;
     	int n_boxes = pixman_region_num_rects (surface->clip);
     	pixman_box16_t *boxes = pixman_region_rects (surface->clip);
-		for( k = 0; k < n_boxes; k++ ) {  
+		for( k = 0; k < n_boxes; k++ ) {
         	region.x1 = boxes[k].x1;
         	region.y1 = boxes[k].y1;
         	region.x2 = boxes[k].x2;
@@ -581,7 +581,7 @@ _cairo_directfb_surface_set_clip_region (void		*abstract_surface,
 		pixman_region_copy (surface->clip, region);
 	}
 #if 0
-	if( surface->buffer_image ) 
+	if( surface->buffer_image )
 		_cairo_image_surface_set_clip_region (
 			(cairo_image_surface_t *)surface->buffer_image,region);
 #endif
@@ -611,7 +611,7 @@ _cairo_directfb_surface_mark_dirty_rectangle (void * abstract_surface,
 {
 	cairo_directfb_surface_t *surface = abstract_surface;
 	if( surface->main_surface != surface->buffer) {
-		DFBRegion region;	
+		DFBRegion region;
 		region.x1=x;
 		region.y1=y;
 		region.x2=x+width;
@@ -622,11 +622,11 @@ _cairo_directfb_surface_mark_dirty_rectangle (void * abstract_surface,
 	}
 	return CAIRO_STATUS_SUCCESS;
 }
-static cairo_status_t 
+static cairo_status_t
 _cairo_directfb_surface_flush (void  *abstract_surface)
 {
 		cairo_directfb_surface_t *surface = abstract_surface;
-		if( surface->main_surface != surface->buffer) 
+		if( surface->main_surface != surface->buffer)
 		surface->main_surface->Blit(surface->main_surface,surface->buffer,NULL,0,0);
 		return CAIRO_STATUS_SUCCESS;
 }
@@ -662,7 +662,7 @@ _cairo_directfb_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
 
 
 static const cairo_surface_backend_t cairo_directfb_surface_backend = {
-		CAIRO_SURFACE_TYPE_DIRECTFB,    
+		CAIRO_SURFACE_TYPE_DIRECTFB,
 		_cairo_directfb_surface_create_similar,
 		_cairo_directfb_surface_finish,
 		_cairo_directfb_surface_acquire_source_image,
@@ -785,17 +785,17 @@ _cairo_directfb_surface_show_glyphs (cairo_scaled_font_t    *scaled_font,
 
 
 cairo_surface_t *
-cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface *dfbsurface) 
+cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface *dfbsurface)
 {
 		cairo_directfb_surface_t *surface = calloc(1,sizeof(cairo_directfb_surface_t));
-		if( surface == NULL ) 
+		if( surface == NULL )
 		return NULL;
 		/* XXX: The content value here might be totally wrong. */
 		_cairo_surface_init (&surface->base, &cairo_directfb_surface_backend,
 				     CAIRO_CONTENT_COLOR_ALPHA);
 		/*Reference the surface */
-		dfb->AddRef(dfb);	
-		dfbsurface->AddRef(dfbsurface);	
+		dfb->AddRef(dfb);
+		dfbsurface->AddRef(dfbsurface);
 		surface->dfb=dfb;
 		surface->main_surface = dfbsurface;
 		dfbsurface->GetSize(dfbsurface,&surface->width,&surface->height);
diff --git a/src/cairo-directfb.h b/src/cairo-directfb.h
index ff304164..3b8e10d2 100644
--- a/src/cairo-directfb.h
+++ b/src/cairo-directfb.h
@@ -35,7 +35,7 @@
  */
 
 #ifndef CAIRO_DIRECTFB_H
-#define CAIRO_DIRECTFB_H 
+#define CAIRO_DIRECTFB_H
 
 #include <cairo.h>
 
@@ -43,7 +43,7 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t * cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface *surface); 
+cairo_surface_t * cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface *surface);
 
 CAIRO_END_DECLS
 
diff --git a/src/cairo-font-options.c b/src/cairo-font-options.c
index 6764c2cd..e3a5f75c 100644
--- a/src/cairo-font-options.c
+++ b/src/cairo-font-options.c
@@ -129,7 +129,7 @@ cairo_font_options_copy (const cairo_font_options_t *original)
  * Destroys a #cairo_font_options_t object created with with
  * cairo_font_options_create() or cairo_font_options_copy().
  **/
-void 
+void
 cairo_font_options_destroy (cairo_font_options_t *options)
 {
     if (options == (cairo_font_options_t *)&cairo_font_options_nil)
@@ -219,7 +219,7 @@ cairo_font_options_hash (const cairo_font_options_t *options)
 {
     return ((options->antialias) |
 	    (options->subpixel_order << 4) |
-	    (options->hint_style << 8) | 
+	    (options->hint_style << 8) |
 	    (options->hint_metrics << 16));
 }
 
diff --git a/src/cairo-font-subset.c b/src/cairo-font-subset.c
index bb505668..9d7aa405 100644
--- a/src/cairo-font-subset.c
+++ b/src/cairo-font-subset.c
@@ -536,7 +536,7 @@ cairo_pdf_ft_font_write_hmtx_table (cairo_pdf_ft_font_t *font,
 	status = cairo_pdf_ft_font_allocate_write_buffer (font, entry_size,
 							  (unsigned char **) &p);
 	/* XXX: Need to check status here. */
-	FT_Load_Sfnt_Table (font->face, TTAG_hmtx, 
+	FT_Load_Sfnt_Table (font->face, TTAG_hmtx,
 			    font->glyphs[i].parent_index * entry_size,
 			    (FT_Byte *) p, &entry_size);
 	font->base.widths[i] = be16_to_cpu (p[0]);
@@ -663,7 +663,7 @@ cairo_pdf_ft_font_calculate_checksum (cairo_pdf_ft_font_t *font,
     unsigned long checksum;
     char *data;
 
-    checksum = 0; 
+    checksum = 0;
     data = _cairo_array_index (&font->output, 0);
     p = (unsigned long *) (data + start);
     padded_end = (unsigned long *) (data + ((end + 3) & ~3));
diff --git a/src/cairo-font.c b/src/cairo-font.c
index 87f300e2..fb475c30 100644
--- a/src/cairo-font.c
+++ b/src/cairo-font.c
@@ -55,7 +55,7 @@ const cairo_font_face_t _cairo_font_face_nil = {
 };
 
 void
-_cairo_font_face_init (cairo_font_face_t               *font_face, 
+_cairo_font_face_init (cairo_font_face_t               *font_face,
 		       const cairo_font_face_backend_t *backend)
 {
     font_face->status = CAIRO_STATUS_SUCCESS;
@@ -337,8 +337,8 @@ _cairo_toy_font_face_keys_equal (const void *key_a,
  *  cairo_font_face_destroy()
  **/
 cairo_font_face_t *
-_cairo_toy_font_face_create (const char          *family, 
-			     cairo_font_slant_t   slant, 
+_cairo_toy_font_face_create (const char          *family,
+			     cairo_font_slant_t   slant,
 			     cairo_font_weight_t  weight)
 {
     cairo_status_t status;
@@ -427,7 +427,7 @@ static const cairo_font_face_backend_t _cairo_toy_font_face_backend = {
 };
 
 void
-_cairo_unscaled_font_init (cairo_unscaled_font_t               *unscaled_font, 
+_cairo_unscaled_font_init (cairo_unscaled_font_t               *unscaled_font,
 			   const cairo_unscaled_font_backend_t *backend)
 {
     unscaled_font->ref_count = 1;
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 0d03d4e2..24ac1a73 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -434,7 +434,7 @@ UNWIND_UNSCALED_MALLOC:
     free (unscaled);
 UNWIND_FONT_MAP_LOCK:
     _cairo_ft_unscaled_font_map_unlock ();
-UNWIND:    
+UNWIND:
     return NULL;
 }
 
@@ -457,7 +457,7 @@ _cairo_ft_unscaled_font_create_from_face (FT_Face face)
     return unscaled;
 }
 
-static void 
+static void
 _cairo_ft_unscaled_font_destroy (void *abstract_font)
 {
     cairo_ft_unscaled_font_t *unscaled  = abstract_font;
@@ -573,14 +573,14 @@ _compute_transform (cairo_ft_font_transform_t *sf,
      * freetype's transformation.
      */
 
-    _cairo_matrix_compute_scale_factors (&normalized, 
+    _cairo_matrix_compute_scale_factors (&normalized,
 					 &sf->x_scale, &sf->y_scale,
 					 /* XXX */ 1);
 
     if (sf->x_scale != 0 && sf->y_scale != 0) {
 	cairo_matrix_scale (&normalized, 1.0 / sf->x_scale, 1.0 / sf->y_scale);
 
-	_cairo_matrix_get_affine (&normalized, 
+	_cairo_matrix_get_affine (&normalized,
 				  &sf->shape[0][0], &sf->shape[0][1],
 				  &sf->shape[1][0], &sf->shape[1][1],
 				  &tx, &ty);
@@ -1000,7 +1000,7 @@ _render_glyph_outline (FT_Face                    face,
 	    stride = (width * hmul + 3) & -4;
 	}
 
-	bitmap.pitch = stride;   
+	bitmap.pitch = stride;
 	bitmap.width = width * hmul;
 	bitmap.rows = height * vmul;
 	bitmap.buffer = calloc (1, stride * bitmap.rows);
@@ -1232,9 +1232,9 @@ _get_pattern_ft_options (FcPattern *pattern)
     FcMatrix *font_matrix;
     cairo_ft_options_t ft_options;
     int rgba;
-#ifdef FC_HINT_STYLE    
+#ifdef FC_HINT_STYLE
     int hintstyle;
-#endif    
+#endif
     int target_flags = 0;
 
     ft_options.load_flags = 0;
@@ -1271,7 +1271,7 @@ _get_pattern_ft_options (FcPattern *pattern)
 			  FC_HINTING, 0, &hinting) != FcResultMatch)
  	hinting = FcTrue;
 
-#ifdef FC_HINT_STYLE    
+#ifdef FC_HINT_STYLE
     if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
 	hintstyle = FC_HINT_FULL;
 
@@ -1291,7 +1291,7 @@ _get_pattern_ft_options (FcPattern *pattern)
     } else {
 #ifdef FT_LOAD_TARGET_MONO
 	target_flags = FT_LOAD_TARGET_MONO;
-#endif	
+#endif
     }
 #else /* !FC_HINT_STYLE */
     if (!hinting)
@@ -1580,7 +1580,7 @@ _cairo_ft_scaled_font_create_toy (cairo_toy_font_face_t	      *toy_face,
     }
 }
 
-static void 
+static void
 _cairo_ft_scaled_font_fini (void *abstract_font)
 {
     cairo_ft_scaled_font_t *scaled_font = abstract_font;
@@ -1679,7 +1679,7 @@ _cubic_to (FT_Vector *control1, FT_Vector *control2,
     return 0;
 }
 
-static cairo_status_t 
+static cairo_status_t
 _decompose_glyph_outline (FT_Face		  face,
 			  cairo_font_options_t	 *options,
 			  cairo_path_fixed_t	**pathp)
@@ -1740,7 +1740,7 @@ _cairo_ft_scaled_glyph_init (void			*abstract_font,
 	(info & CAIRO_SCALED_GLYPH_INFO_SURFACE) == 0)
 	load_flags |= FT_LOAD_NO_BITMAP;
 
-    error = FT_Load_Glyph (scaled_font->unscaled->face, 
+    error = FT_Load_Glyph (scaled_font->unscaled->face,
 			   _cairo_scaled_glyph_index(scaled_glyph),
 			   load_flags);
 
@@ -1787,7 +1787,7 @@ _cairo_ft_scaled_glyph_init (void			*abstract_font,
 	 */
 
 	if ((scaled_font->base.options.hint_metrics != CAIRO_HINT_METRICS_OFF) &&
-	    (load_flags & FT_LOAD_NO_HINTING)) 
+	    (load_flags & FT_LOAD_NO_HINTING))
 	{
 	    FT_Pos x1, x2;
 	    FT_Pos y1, y2;
@@ -1841,7 +1841,7 @@ _cairo_ft_scaled_glyph_init (void			*abstract_font,
 	    cairo_ft_scaled_font_unlock_face (abstract_font);
 	    return status;
 	}
-	_cairo_scaled_glyph_set_surface (scaled_glyph, 
+	_cairo_scaled_glyph_set_surface (scaled_glyph,
 					 &scaled_font->base,
 					 surface);
     }
@@ -1901,7 +1901,7 @@ _cairo_ft_ucs4_to_index (void	    *abstract_font,
     return index;
 }
 
-static cairo_int_status_t 
+static cairo_int_status_t
 _cairo_ft_show_glyphs (void		       *abstract_font,
 		       cairo_operator_t    	op,
 		       cairo_pattern_t     *pattern,
@@ -2127,7 +2127,7 @@ cairo_ft_font_options_substitute (const cairo_font_options_t *options,
 	    FcPatternAddBool (pattern, FC_HINTING, options->hint_style != CAIRO_HINT_STYLE_NONE);
 	}
 
-#ifdef FC_HINT_STYLE	
+#ifdef FC_HINT_STYLE
 	if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
 	{
 	    int hint_style;
@@ -2147,7 +2147,7 @@ cairo_ft_font_options_substitute (const cairo_font_options_t *options,
 
 	    FcPatternAddInteger (pattern, FC_HINT_STYLE, hint_style);
 	}
-#endif	
+#endif
     }
 }
 
diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index 8095f3b7..fdecf43c 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -88,7 +88,7 @@ _cairo_gstate_create (cairo_surface_t *target)
     status = _cairo_gstate_init (gstate, target);
     if (status) {
 	free (gstate);
-	return NULL;		
+	return NULL;
     }
 
     return gstate;
@@ -111,7 +111,7 @@ _cairo_gstate_init (cairo_gstate_t  *gstate,
     gstate->scaled_font = NULL;
 
     cairo_matrix_init_scale (&gstate->font_matrix,
-			     CAIRO_GSTATE_DEFAULT_FONT_SIZE, 
+			     CAIRO_GSTATE_DEFAULT_FONT_SIZE,
 			     CAIRO_GSTATE_DEFAULT_FONT_SIZE);
 
     _cairo_font_options_init_default (&gstate->font_options);
@@ -1140,9 +1140,9 @@ _cairo_gstate_unset_scaled_font (cairo_gstate_t *gstate)
 }
 
 cairo_status_t
-_cairo_gstate_select_font_face (cairo_gstate_t       *gstate, 
-				const char           *family, 
-				cairo_font_slant_t    slant, 
+_cairo_gstate_select_font_face (cairo_gstate_t       *gstate,
+				const char           *family,
+				cairo_font_slant_t    slant,
 				cairo_font_weight_t   weight)
 {
     cairo_font_face_t *font_face;
@@ -1158,7 +1158,7 @@ _cairo_gstate_select_font_face (cairo_gstate_t       *gstate,
 }
 
 cairo_status_t
-_cairo_gstate_set_font_size (cairo_gstate_t *gstate, 
+_cairo_gstate_set_font_size (cairo_gstate_t *gstate,
 			     double          size)
 {
     _cairo_gstate_unset_scaled_font (gstate);
@@ -1169,7 +1169,7 @@ _cairo_gstate_set_font_size (cairo_gstate_t *gstate,
 }
 
 cairo_status_t
-_cairo_gstate_set_font_matrix (cairo_gstate_t	    *gstate, 
+_cairo_gstate_set_font_matrix (cairo_gstate_t	    *gstate,
 			       const cairo_matrix_t *matrix)
 {
     _cairo_gstate_unset_scaled_font (gstate);
@@ -1341,7 +1341,7 @@ _cairo_gstate_ensure_scaled_font (cairo_gstate_t *gstate)
 }
 
 cairo_status_t
-_cairo_gstate_get_font_extents (cairo_gstate_t *gstate, 
+_cairo_gstate_get_font_extents (cairo_gstate_t *gstate,
 				cairo_font_extents_t *extents)
 {
     cairo_status_t status = _cairo_gstate_ensure_scaled_font (gstate);
@@ -1354,7 +1354,7 @@ _cairo_gstate_get_font_extents (cairo_gstate_t *gstate,
 }
 
 cairo_status_t
-_cairo_gstate_text_to_glyphs (cairo_gstate_t *gstate, 
+_cairo_gstate_text_to_glyphs (cairo_gstate_t *gstate,
 			      const char     *utf8,
 			      double	      x,
 			      double	      y,
@@ -1377,7 +1377,7 @@ _cairo_gstate_text_to_glyphs (cairo_gstate_t *gstate,
 }
 
 cairo_status_t
-_cairo_gstate_set_font_face (cairo_gstate_t    *gstate, 
+_cairo_gstate_set_font_face (cairo_gstate_t    *gstate,
 			     cairo_font_face_t *font_face)
 {
     if (font_face && font_face->status)
@@ -1395,7 +1395,7 @@ _cairo_gstate_set_font_face (cairo_gstate_t    *gstate,
 
 cairo_status_t
 _cairo_gstate_glyph_extents (cairo_gstate_t *gstate,
-			     cairo_glyph_t *glyphs, 
+			     cairo_glyph_t *glyphs,
 			     int num_glyphs,
 			     cairo_text_extents_t *extents)
 {
@@ -1413,8 +1413,8 @@ _cairo_gstate_glyph_extents (cairo_gstate_t *gstate,
 }
 
 cairo_status_t
-_cairo_gstate_show_glyphs (cairo_gstate_t *gstate, 
-			   cairo_glyph_t *glyphs, 
+_cairo_gstate_show_glyphs (cairo_gstate_t *gstate,
+			   cairo_glyph_t *glyphs,
 			   int num_glyphs)
 {
     cairo_status_t status;
@@ -1441,7 +1441,7 @@ _cairo_gstate_show_glyphs (cairo_gstate_t *gstate,
     {
 	transformed_glyphs[i] = glyphs[i];
 	_cairo_gstate_user_to_backend (gstate,
-				       &transformed_glyphs[i].x, 
+				       &transformed_glyphs[i].x,
 				       &transformed_glyphs[i].y);
     }
 
@@ -1462,7 +1462,7 @@ _cairo_gstate_show_glyphs (cairo_gstate_t *gstate,
 
 cairo_status_t
 _cairo_gstate_glyph_path (cairo_gstate_t     *gstate,
-			  cairo_glyph_t	     *glyphs, 
+			  cairo_glyph_t	     *glyphs,
 			  int		      num_glyphs,
 			  cairo_path_fixed_t *path)
 {
@@ -1482,7 +1482,7 @@ _cairo_gstate_glyph_path (cairo_gstate_t     *gstate,
     {
 	transformed_glyphs[i] = glyphs[i];
 	_cairo_gstate_user_to_backend (gstate,
-				       &(transformed_glyphs[i].x), 
+				       &(transformed_glyphs[i].x),
 				       &(transformed_glyphs[i].y));
     }
 
diff --git a/src/cairo-hash.c b/src/cairo-hash.c
index 6b9f3d08..a9909a26 100644
--- a/src/cairo-hash.c
+++ b/src/cairo-hash.c
@@ -264,7 +264,7 @@ _cairo_hash_table_lookup_internal (cairo_hash_table_t *hash_table,
 		    return entry;
 	}
 
-	if (step == 0) { 	    
+	if (step == 0) {
 	    step = key->hash % hash_table->arrangement->rehash;
 	    if (step == 0)
 		step = 1;
@@ -328,7 +328,7 @@ _cairo_hash_table_resize  (cairo_hash_table_t *hash_table)
 
     new_size = tmp.arrangement->size;
     tmp.entries = calloc (new_size, sizeof (cairo_hash_entry_t*));
-    if (tmp.entries == NULL) 
+    if (tmp.entries == NULL)
 	return CAIRO_STATUS_NO_MEMORY;
 
     for (i = 0; i < hash_table->arrangement->size; ++i) {
@@ -424,7 +424,7 @@ _cairo_hash_table_random_entry (cairo_hash_table_t	   *hash_table,
 	    return *entry;
 	}
 
-	if (step == 0) { 	    
+	if (step == 0) {
 	    step = hash % hash_table->arrangement->rehash;
 	    if (step == 0)
 		step = 1;
diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c
index 39b25234..54c421df 100644
--- a/src/cairo-matrix.c
+++ b/src/cairo-matrix.c
@@ -511,7 +511,7 @@ _cairo_matrix_compute_scale_factors (const cairo_matrix_t *matrix,
 	    det = -det;
 	if (major)
 	    minor = det / major;
-	else 
+	else
 	    minor = 0.0;
 	if (x_major)
 	{
@@ -528,7 +528,7 @@ _cairo_matrix_compute_scale_factors (const cairo_matrix_t *matrix,
     return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_bool_t 
+cairo_bool_t
 _cairo_matrix_is_integer_translation(const cairo_matrix_t *m,
 				     int *itx, int *ity)
 {
@@ -566,11 +566,11 @@ _cairo_matrix_is_integer_translation(const cairo_matrix_t *m,
 
   1.  First some notation:
 
-  All capital letters represent vectors in two dimensions.  A prime ' 
+  All capital letters represent vectors in two dimensions.  A prime '
   represents a transformed coordinate.  Matrices are written in underlined
   form, ie _R_.  Lowercase letters represent scalar real values.
 
-  2.  The question has been posed:  What is the maximum expansion factor 
+  2.  The question has been posed:  What is the maximum expansion factor
   achieved by the linear transformation
 
   X' = X _R_
@@ -580,7 +580,7 @@ _cairo_matrix_is_integer_translation(const cairo_matrix_t *m,
   _R_ = [a b]
         [c d]  .
 
-  In other words, what is the maximum radius, MAX[ |X'| ], reached for any 
+  In other words, what is the maximum radius, MAX[ |X'| ], reached for any
   X on the unit circle ( |X| = 1 ) ?
 
 
@@ -600,15 +600,15 @@ _cairo_matrix_is_integer_translation(const cairo_matrix_t *m,
 
        -a*sin(θ)+b*cos(θ) = 0
 
-  From this it follows that 
+  From this it follows that
 
-       tan(θ) = b/a 
+       tan(θ) = b/a
 
-  and hence 
+  and hence
 
        sin(θ) = b/sqrt(a² + b²)
 
-  and 
+  and
 
        cos(θ) = a/sqrt(a² + b²)
 
@@ -625,25 +625,25 @@ _cairo_matrix_is_integer_translation(const cairo_matrix_t *m,
 
        X(θ) = (cos(θ), sin(θ))
 
-  Thus 
+  Thus
 
        X'(θ) = X(θ) * _R_ = (cos(θ), sin(θ)) * [a b]
                                                [c d]
              = (a*cos(θ) + c*sin(θ), b*cos(θ) + d*sin(θ)).
 
-  Define 
+  Define
 
        r(θ) = |X'(θ)|
 
   Thus
 
        r²(θ) = (a*cos(θ) + c*sin(θ))² + (b*cos(θ) + d*sin(θ))²
-             = (a² + b²)*cos²(θ) + (c² + d²)*sin²(θ) 
-                 + 2*(a*c + b*d)*cos(θ)*sin(θ) 
+             = (a² + b²)*cos²(θ) + (c² + d²)*sin²(θ)
+                 + 2*(a*c + b*d)*cos(θ)*sin(θ)
 
   Now apply the double angle formulae (A) to (C) from above:
 
-       r²(θ) = (a² + b² + c² + d²)/2 
+       r²(θ) = (a² + b² + c² + d²)/2
 	     + (a² + b² - c² - d²)*cos(2*θ)/2
   	     + (a*c + b*d)*sin(2*θ)
              = f + g*cos(φ) + h*sin(φ)
diff --git a/src/cairo-meta-surface.c b/src/cairo-meta-surface.c
index 92fd4488..31d16a00 100644
--- a/src/cairo-meta-surface.c
+++ b/src/cairo-meta-surface.c
@@ -233,7 +233,7 @@ _cairo_meta_surface_paint (void			*abstract_surface,
     /* An optimisation that takes care to not replay what was done
      * before surface is cleared. We don't erase recorded commands
      * since we may have earlier snapshots of this surface. */
-    if (op == CAIRO_OPERATOR_CLEAR && !meta->is_clipped) 
+    if (op == CAIRO_OPERATOR_CLEAR && !meta->is_clipped)
 	meta->replay_start_idx = meta->commands.num_elements;
 
     command = malloc (sizeof (cairo_command_paint_t));
@@ -621,7 +621,7 @@ _cairo_meta_surface_replay (cairo_surface_t *surface,
     meta = (cairo_meta_surface_t *) surface;
     status = CAIRO_STATUS_SUCCESS;
 
-    _cairo_clip_init (&clip, target);    
+    _cairo_clip_init (&clip, target);
 
     num_elements = meta->commands.num_elements;
     elements = _cairo_array_index (&meta->commands, 0);
diff --git a/src/cairo-path.c b/src/cairo-path.c
index 5c94ad90..3c8c0b2e 100644
--- a/src/cairo-path.c
+++ b/src/cairo-path.c
@@ -482,7 +482,7 @@ _cairo_path_arg_buf_add_points (cairo_path_arg_buf_t *arg_buf,
 
 #define CAIRO_PATH_OP_MAX_ARGS 3
 
-static int const num_args[] = 
+static int const num_args[] =
 {
     1, /* cairo_path_move_to */
     1, /* cairo_path_op_line_to */
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 1e8015b9..f76f4928 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -113,7 +113,7 @@ _cairo_pattern_set_error (cairo_pattern_t *pattern,
 static void
 _cairo_pattern_init (cairo_pattern_t *pattern, cairo_pattern_type_t type)
 {
-    pattern->type      = type; 
+    pattern->type      = type;
     pattern->ref_count = 1;
     pattern->status    = CAIRO_STATUS_SUCCESS;
 
@@ -1061,7 +1061,7 @@ _cairo_pattern_acquire_surface_for_solid (cairo_solid_pattern_t	     *pattern,
  *
  * Return value: %TRUE if the pattern is an opaque, solid color.
  **/
-cairo_bool_t 
+cairo_bool_t
 _cairo_pattern_is_opaque_solid (const cairo_pattern_t *pattern)
 {
     cairo_solid_pattern_t *solid;
diff --git a/src/cairo-pen.c b/src/cairo-pen.c
index bb4adff1..87de9a41 100644
--- a/src/cairo-pen.c
+++ b/src/cairo-pen.c
@@ -165,7 +165,7 @@ We construct the pen by computing points along the circumference
 using equally spaced angles.
 
 We show that this approximation to the ellipse has maximum error at the
-major axis of the ellipse.  
+major axis of the ellipse.
 
 Set
 
@@ -377,8 +377,8 @@ _cairo_pen_stroke_spline_half (cairo_pen_t *pen,
 	initial_slope.dx = -initial_slope.dx;
 	initial_slope.dy = -initial_slope.dy;
 	final_slope = spline->initial_slope;
-	final_slope.dx = -final_slope.dx; 
-	final_slope.dy = -final_slope.dy; 
+	final_slope.dx = -final_slope.dx;
+	final_slope.dy = -final_slope.dy;
     }
 
     _cairo_pen_find_active_cw_vertex_index (pen, &initial_slope, &active);
diff --git a/src/cairo-polygon.c b/src/cairo-polygon.c
index 59c615da..dc9d3805 100644
--- a/src/cairo-polygon.c
+++ b/src/cairo-polygon.c
@@ -128,7 +128,7 @@ _cairo_polygon_add_edge (cairo_polygon_t *polygon, cairo_point_t *p1, cairo_poin
     return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_status_t 
+cairo_status_t
 _cairo_polygon_move_to (cairo_polygon_t *polygon, cairo_point_t *point)
 {
     if (! polygon->has_current_point)
diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index d291a94b..9d491119 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -290,7 +290,7 @@ _cairo_ps_surface_emit_font_subset (cairo_scaled_font_subset_t	*font_subset,
 				 "\t/Glyphs [\n");
 
     for (i = 0; i < font_subset->num_glyphs; i++) {
-	_cairo_ps_surface_emit_glyph (surface, 
+	_cairo_ps_surface_emit_glyph (surface,
 				      font_subset->scaled_font,
 				      font_subset->glyphs[i], i);
     }
@@ -546,7 +546,7 @@ cairo_ps_surface_set_dpi (cairo_surface_t *surface,
 	return;
     }
 
-    ps_surface->x_dpi = x_dpi;    
+    ps_surface->x_dpi = x_dpi;
     ps_surface->y_dpi = y_dpi;
 }
 
@@ -1434,7 +1434,7 @@ emit_pattern (cairo_ps_surface_t *surface, cairo_pattern_t *pattern)
      * different pattern. */
 
     switch (pattern->type) {
-    case CAIRO_PATTERN_TYPE_SOLID:	
+    case CAIRO_PATTERN_TYPE_SOLID:
 	emit_solid_pattern (surface, (cairo_solid_pattern_t *) pattern);
 	break;
 
@@ -1448,7 +1448,7 @@ emit_pattern (cairo_ps_surface_t *surface, cairo_pattern_t *pattern)
 
     case CAIRO_PATTERN_TYPE_RADIAL:
 	emit_radial_pattern (surface, (cairo_radial_pattern_t *) pattern);
-	break;	    
+	break;
     }
 }
 
diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c
index 269e9b6d..5b55ac3d 100644
--- a/src/cairo-quartz-surface.c
+++ b/src/cairo-quartz-surface.c
@@ -101,7 +101,7 @@ _cairo_quartz_surface_acquire_dest_image(void                    *abstract_surfa
     image_rect->height = y2 - y1;
 
     data = calloc (image_rect->width * image_rect->height * 4, 1);
-    image_surface = cairo_image_surface_create_for_data (data, 
+    image_surface = cairo_image_surface_create_for_data (data,
 							 CAIRO_FORMAT_ARGB32,
 							 image_rect->width,
 							 image_rect->height,
@@ -127,7 +127,7 @@ create_image_from_surface (cairo_image_surface_t *image_surface, void *data)
   height = cairo_image_surface_get_height ((cairo_surface_t *)image_surface);
 
   color_space = CGColorSpaceCreateDeviceRGB();
-  data_provider = CGDataProviderCreateWithData (NULL, data, 
+  data_provider = CGDataProviderCreateWithData (NULL, data,
 						width * height * 4, NULL);
   image = CGImageCreate (width, height,
 			 8, 32,
@@ -227,7 +227,7 @@ static const struct _cairo_surface_backend cairo_quartz_surface_backend = {
 
 
 cairo_surface_t *cairo_quartz_surface_create(CGContextRef context,
-					     int width, 
+					     int width,
 					     int height,
 					     cairo_bool_t y_grows_down)
 {
diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 8d907b00..9be2be28 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -341,7 +341,7 @@ _cairo_scaled_font_subsets_map_glyph (cairo_scaled_font_subsets_t	*subsets,
 
     _cairo_sub_font_init_key (&key, scaled_font);
     if (! _cairo_hash_table_lookup (subsets->sub_fonts, &key.base,
-				    (cairo_hash_entry_t **) &sub_font)) 
+				    (cairo_hash_entry_t **) &sub_font))
     {
 	sub_font = _cairo_sub_font_create (subsets, scaled_font,
 					   subsets->num_sub_fonts++,
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 5893f8f4..06fbe11a 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -318,7 +318,7 @@ _cairo_scaled_font_keys_equal (const void *abstract_key_a, const void *abstract_
  */
 
 cairo_status_t
-_cairo_scaled_font_init (cairo_scaled_font_t               *scaled_font, 
+_cairo_scaled_font_init (cairo_scaled_font_t               *scaled_font,
 			 cairo_font_face_t		   *font_face,
 			 const cairo_matrix_t              *font_matrix,
 			 const cairo_matrix_t              *ctm,
@@ -655,7 +655,7 @@ cairo_scaled_font_text_extents (cairo_scaled_font_t   *scaled_font,
  **/
 void
 cairo_scaled_font_glyph_extents (cairo_scaled_font_t   *scaled_font,
-				 cairo_glyph_t         *glyphs, 
+				 cairo_glyph_t         *glyphs,
 				 int                    num_glyphs,
 				 cairo_text_extents_t  *extents)
 {
@@ -723,8 +723,8 @@ cairo_status_t
 _cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font,
 				   double		x,
 				   double		y,
-				   const char          *utf8, 
-				   cairo_glyph_t      **glyphs, 
+				   const char          *utf8,
+				   cairo_glyph_t      **glyphs,
 				   int 		       *num_glyphs)
 {
     size_t i;
@@ -752,7 +752,7 @@ _cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font,
 	goto FAIL;
     }
 
-    for (i = 0; i < *num_glyphs; i++) {            
+    for (i = 0; i < *num_glyphs; i++) {
         (*glyphs)[i].index = (*scaled_font->backend->
 			      ucs4_to_index) (scaled_font, ucs4[i]);
 	(*glyphs)[i].x = x;
@@ -864,7 +864,7 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t    *scaled_font,
 
     if (scaled_font->backend->show_glyphs != NULL) {
 	status = scaled_font->backend->show_glyphs (scaled_font,
-						    op, pattern, 
+						    op, pattern,
 						    surface,
 						    source_x, source_y,
 						    dest_x, dest_y,
@@ -919,7 +919,7 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t    *scaled_font,
 	}
 
 	/* round glyph locations to the nearest pixel */
-	x = (int) floor (glyphs[i].x + 
+	x = (int) floor (glyphs[i].x +
                          glyph_surface->base.device_x_offset +
                          0.5);
 	y = (int) floor (glyphs[i].y +
@@ -928,14 +928,14 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t    *scaled_font,
 
 	_cairo_pattern_init_for_surface (&glyph_pattern, &glyph_surface->base);
 
-	status = _cairo_surface_composite (CAIRO_OPERATOR_ADD, 
-					   &glyph_pattern.base, 
+	status = _cairo_surface_composite (CAIRO_OPERATOR_ADD,
+					   &glyph_pattern.base,
 					   NULL,
 					   mask,
 					   0, 0,
-					   0, 0, 
-					   x - dest_x, 
-					   y - dest_y, 
+					   0, 0,
+					   x - dest_x,
+					   y - dest_y,
 					   glyph_surface->width,
 					   glyph_surface->height);
 
@@ -951,7 +951,7 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t    *scaled_font,
 
 	status = _cairo_surface_composite (op, pattern, &mask_pattern.base,
 					   surface,
-					   source_x, source_y, 
+					   source_x, source_y,
 					   0,        0,
 					   dest_x,   dest_y,
 					   width,    height);
@@ -1020,7 +1020,7 @@ _scaled_glyph_path_close_path (void *abstract_closure)
 
 cairo_status_t
 _cairo_scaled_font_glyph_path (cairo_scaled_font_t *scaled_font,
-			       const cairo_glyph_t *glyphs, 
+			       const cairo_glyph_t *glyphs,
 			       int		    num_glyphs,
 			       cairo_path_fixed_t  *path)
 {
@@ -1189,8 +1189,8 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
      * Check cache for glyph
      */
     info |= CAIRO_SCALED_GLYPH_INFO_METRICS;
-    if (!_cairo_cache_lookup (scaled_font->glyphs, &key, 
-			      (cairo_cache_entry_t **) &scaled_glyph)) 
+    if (!_cairo_cache_lookup (scaled_font->glyphs, &key,
+			      (cairo_cache_entry_t **) &scaled_glyph))
     {
 	/*
 	 * On miss, create glyph and insert into cache
@@ -1229,7 +1229,7 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
      * already has the requested data and ammend it if not
      */
     need_info = 0;
-    if ((info & CAIRO_SCALED_GLYPH_INFO_SURFACE) != 0 && 
+    if ((info & CAIRO_SCALED_GLYPH_INFO_SURFACE) != 0 &&
 	scaled_glyph->surface == NULL)
 	need_info |= CAIRO_SCALED_GLYPH_INFO_SURFACE;
 
diff --git a/src/cairo-slope.c b/src/cairo-slope.c
index a2edec03..5c4886fd 100644
--- a/src/cairo-slope.c
+++ b/src/cairo-slope.c
@@ -59,7 +59,7 @@ _cairo_slope_compare (cairo_slope_t *a, cairo_slope_t *b)
 {
     cairo_fixed_48_16_t diff;
 
-    diff = ((cairo_fixed_48_16_t) a->dy * (cairo_fixed_48_16_t) b->dx 
+    diff = ((cairo_fixed_48_16_t) a->dy * (cairo_fixed_48_16_t) b->dx
 	    - (cairo_fixed_48_16_t) b->dy * (cairo_fixed_48_16_t) a->dx);
 
     if (diff > 0)
diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c
index 934d3613..3b3dd03d 100644
--- a/src/cairo-surface-fallback.c
+++ b/src/cairo-surface-fallback.c
@@ -237,7 +237,7 @@ _clip_and_composite_combine (cairo_clip_t                  *clip,
      */
     status = _cairo_clip_combine_to_surface (clip, CAIRO_OPERATOR_DEST_IN,
 					     intermediate,
-					     extents->x, extents->y,					     
+					     extents->x, extents->y,
 					     extents);
     if (status)
 	goto CLEANUP_SURFACE;
@@ -878,7 +878,7 @@ _cairo_surface_old_show_glyphs_draw_func (void                          *closure
     if (!src)
 	src = &pattern.base;
 
-    status = _cairo_surface_old_show_glyphs (glyph_info->font, op, src, 
+    status = _cairo_surface_old_show_glyphs (glyph_info->font, op, src,
 					     dst,
 					     extents->x, extents->y,
 					     extents->x - dst_x,
@@ -891,8 +891,8 @@ _cairo_surface_old_show_glyphs_draw_func (void                          *closure
     if (status != CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
-    status = _cairo_scaled_font_show_glyphs (glyph_info->font, 
-					     op, 
+    status = _cairo_scaled_font_show_glyphs (glyph_info->font,
+					     op,
 					     src, dst,
 					     extents->x,         extents->y,
 					     extents->x - dst_x,
@@ -925,8 +925,8 @@ _cairo_surface_fallback_show_glyphs (cairo_surface_t		*surface,
 
     if (_cairo_operator_bounded_by_mask (op)) {
 	status = _cairo_scaled_font_glyph_device_extents (scaled_font,
-							  glyphs, 
-							  num_glyphs, 
+							  glyphs,
+							  num_glyphs,
 							  &glyph_extents);
 	if (status)
 	    return status;
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index 2d3218d4..f2629c4d 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -288,9 +288,9 @@ _cairo_surface_create_similar_solid (cairo_surface_t	 *other,
 	return (cairo_surface_t*) &_cairo_surface_nil;
     }
 
-    status = _cairo_surface_paint (surface, 
-				   color == CAIRO_COLOR_TRANSPARENT ? 
-				   CAIRO_OPERATOR_CLEAR : 
+    status = _cairo_surface_paint (surface,
+				   color == CAIRO_COLOR_TRANSPARENT ?
+				   CAIRO_OPERATOR_CLEAR :
 				   CAIRO_OPERATOR_SOURCE, source);
 
     cairo_pattern_destroy (source);
@@ -1528,7 +1528,7 @@ _cairo_surface_set_clip (cairo_surface_t *surface, cairo_clip_t *clip)
 						 clip->serial);
 
 	if (clip->region)
-	    return _cairo_surface_set_clip_region (surface, 
+	    return _cairo_surface_set_clip_region (surface,
 						   clip->region,
 						   clip->serial);
     }
diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index 720d9369..b2a36fb0 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -58,13 +58,13 @@
 typedef struct cairo_svg_document cairo_svg_document_t;
 typedef struct cairo_svg_surface cairo_svg_surface_t;
 
-static const cairo_svg_version_t _cairo_svg_versions[CAIRO_SVG_VERSION_LAST] = 
+static const cairo_svg_version_t _cairo_svg_versions[CAIRO_SVG_VERSION_LAST] =
 {
     CAIRO_SVG_VERSION_1_1,
     CAIRO_SVG_VERSION_1_2
 };
 
-static const char * _cairo_svg_version_strings[CAIRO_SVG_VERSION_LAST] = 
+static const char * _cairo_svg_version_strings[CAIRO_SVG_VERSION_LAST] =
 {
     "SVG 1.1",
     "SVG 1.2"
@@ -288,13 +288,13 @@ cairo_svg_surface_set_dpi (cairo_surface_t	*abstract_surface,
 
     status = _extract_svg_surface (abstract_surface, &surface);
     if (status) {
-	_cairo_surface_set_error (abstract_surface, 
+	_cairo_surface_set_error (abstract_surface,
 				  CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
 	return;
     }
 
-    surface->document->x_dpi = x_dpi;    
-    surface->document->y_dpi = y_dpi;    
+    surface->document->x_dpi = x_dpi;
+    surface->document->y_dpi = y_dpi;
 }
 
 /**
@@ -320,7 +320,7 @@ cairo_svg_surface_restrict_to_version (cairo_surface_t 		*abstract_surface,
 
     status = _extract_svg_surface (abstract_surface, &surface);
     if (status) {
-	_cairo_surface_set_error (abstract_surface, 
+	_cairo_surface_set_error (abstract_surface,
 				  CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
 	return;
     }
@@ -448,7 +448,7 @@ _cairo_svg_surface_create_for_stream_internal (cairo_output_stream_t	*stream,
 	return (cairo_surface_t *) &_cairo_surface_nil;
     }
 
-    surface = _cairo_svg_surface_create_for_document (document, CAIRO_CONTENT_COLOR_ALPHA, 
+    surface = _cairo_svg_surface_create_for_document (document, CAIRO_CONTENT_COLOR_ALPHA,
 						      width, height);
 
     document->owner = surface;
@@ -613,9 +613,9 @@ _cairo_svg_document_emit_glyph (cairo_svg_document_t	*document,
 					  _cairo_svg_path_close_path,
 					  &info);
 
-    symbol = xmlNewChild (document->xml_node_glyphs, NULL, 
+    symbol = xmlNewChild (document->xml_node_glyphs, NULL,
 			  CC2XML ("symbol"), NULL);
-    snprintf (buffer, sizeof buffer, "glyph%d-%d", 
+    snprintf (buffer, sizeof buffer, "glyph%d-%d",
 	      font_id,
 	      subset_glyph_index);
     xmlSetProp (symbol, CC2XML ("id"), C2XML (buffer));
@@ -724,14 +724,14 @@ emit_alpha_filter (cairo_svg_document_t *document)
 	child = xmlNewChild (node, NULL, CC2XML ("feColorMatrix"), NULL);
 	xmlSetProp (child, CC2XML("type"), CC2XML ("matrix"));
 	xmlSetProp (child, CC2XML("in"), CC2XML ("SourceGraphic"));
-	xmlSetProp (child, CC2XML("values"), CC2XML ("0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0")); 
+	xmlSetProp (child, CC2XML("values"), CC2XML ("0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"));
 	document->alpha_filter = TRUE;
     }
 }
 
 static void
-emit_transform (xmlNodePtr node, 
-		char const *attribute_str, 
+emit_transform (xmlNodePtr node,
+		char const *attribute_str,
 		cairo_matrix_t *matrix)
 {
     xmlBufferPtr matrix_buffer;
@@ -773,7 +773,7 @@ static char const *base64_table =
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 static cairo_status_t
-base64_write_func (void *closure, 
+base64_write_func (void *closure,
 		   const unsigned char *data,
 		   unsigned int length)
 {
@@ -785,7 +785,7 @@ base64_write_func (void *closure,
     src = info->src;
 
     if (info->in_mem + length < 3) {
-	for (i = 0; i < length; i++) { 
+	for (i = 0; i < length; i++) {
 	    src[i + info->in_mem] = *data;
 	    data++;
 	}
@@ -816,7 +816,7 @@ base64_write_func (void *closure,
 	info->in_mem = 0;
     }
 
-    for (i = 0; i < length; i++) { 
+    for (i = 0; i < length; i++) {
 	src[i] = *data;
 	data++;
     }
@@ -844,7 +844,7 @@ _cairo_surface_base64_encode (cairo_surface_t *surface,
 
     xmlBufferCat (info.buffer, CC2XML ("data:image/png;base64,"));
 
-    status = cairo_surface_write_to_png_stream (surface, base64_write_func, 
+    status = cairo_surface_write_to_png_stream (surface, base64_write_func,
 						(void *) &info);
 
     if (status) {
@@ -891,7 +891,7 @@ emit_composite_image_pattern (xmlNodePtr 		 node,
     }
 
     status = _cairo_surface_base64_encode (surface, &image_buffer);
-    if (status) 
+    if (status)
 	goto BAIL;
 
     child = xmlNewChild (node, NULL, CC2XML ("image"), NULL);
@@ -949,11 +949,11 @@ emit_meta_surface (cairo_svg_document_t *document,
 	meta = (cairo_meta_surface_t *) _cairo_surface_snapshot ((cairo_surface_t *)surface);
 	svg_surface = _cairo_svg_surface_create_for_document (document,
 							      meta->content,
-							      meta->width_pixels, 
+							      meta->width_pixels,
 							      meta->height_pixels);
 	paginated_surface = _cairo_paginated_surface_create (svg_surface,
 							     meta->content,
-							     meta->width_pixels, 
+							     meta->width_pixels,
 							     meta->height_pixels,
 							     &cairo_svg_surface_paginated_backend);
 	_cairo_meta_surface_replay ((cairo_surface_t *)meta, paginated_surface);
@@ -963,11 +963,11 @@ emit_meta_surface (cairo_svg_document_t *document,
 	new_snapshot.id = ((cairo_svg_surface_t *) svg_surface)->id;
 	_cairo_array_append (&document->meta_snapshots, &new_snapshot);
 
-	if (meta->content == CAIRO_CONTENT_ALPHA) 
+	if (meta->content == CAIRO_CONTENT_ALPHA)
 	    emit_alpha_filter (document);
-	child = xmlAddChild (document->xml_node_defs, 
+	child = xmlAddChild (document->xml_node_defs,
 			     xmlCopyNode (((cairo_svg_surface_t *) svg_surface)->xml_root_node, 1));
-	if (meta->content == CAIRO_CONTENT_ALPHA) 
+	if (meta->content == CAIRO_CONTENT_ALPHA)
 	    xmlSetProp (child, CC2XML ("filter"), CC2XML("url(#alpha)"));
 
 	id = new_snapshot.id;
@@ -979,10 +979,10 @@ emit_meta_surface (cairo_svg_document_t *document,
 }
 
 static xmlNodePtr
-emit_composite_meta_pattern (xmlNodePtr node, 
+emit_composite_meta_pattern (xmlNodePtr node,
 			     cairo_svg_surface_t	*surface,
 			     cairo_surface_pattern_t	*pattern,
-			     double *width, 
+			     double *width,
 			     double *height,
 			     cairo_bool_t is_pattern)
 {
@@ -1016,7 +1016,7 @@ emit_composite_meta_pattern (xmlNodePtr node,
 }
 
 static xmlNodePtr
-emit_composite_pattern (xmlNodePtr node, 
+emit_composite_pattern (xmlNodePtr node,
 			cairo_svg_surface_t	*surface,
 			cairo_surface_pattern_t *pattern,
 			double *width,
@@ -1024,7 +1024,7 @@ emit_composite_pattern (xmlNodePtr node,
 			int is_pattern)
 {
 
-    if (_cairo_surface_is_meta (pattern->surface)) { 
+    if (_cairo_surface_is_meta (pattern->surface)) {
 	return emit_composite_meta_pattern (node, surface, pattern, width, height, is_pattern);
     }
 
@@ -1033,7 +1033,7 @@ emit_composite_pattern (xmlNodePtr node,
 
 static void
 emit_operator (xmlNodePtr	     node,
-	       cairo_svg_surface_t  *surface, 
+	       cairo_svg_surface_t  *surface,
 	       cairo_operator_t	     op)
 {
     char const *op_str[] = {
@@ -1043,9 +1043,9 @@ emit_operator (xmlNodePtr	     node,
 	"src-out",	"src-atop",
 
 	"dst",		"dst-over",	"dst-in",
-	"dst-out",	"dst-atop",	
+	"dst-out",	"dst-atop",
 
-	"xor", "plus",	
+	"xor", "plus",
 	"color-dodge"	/* FIXME: saturate ? */
     };
 
@@ -1054,9 +1054,9 @@ emit_operator (xmlNodePtr	     node,
 }
 
 static void
-emit_color (cairo_color_t const *color, 
+emit_color (cairo_color_t const *color,
 	    xmlBufferPtr	 style,
-	    char const		*color_str, 
+	    char const		*color_str,
 	    char const		*opacity_str)
 {
     char buffer[CAIRO_SVG_DTOSTR_BUFFER_LEN];
@@ -1082,18 +1082,18 @@ emit_color (cairo_color_t const *color,
 static void
 emit_solid_pattern (cairo_svg_surface_t	    *surface,
 		    cairo_solid_pattern_t   *pattern,
-		    xmlBufferPtr	     style, 
+		    xmlBufferPtr	     style,
 		    int			     is_stroke)
 {
-    emit_color (&pattern->color, 
-		style, is_stroke ? "stroke" : "fill", 
+    emit_color (&pattern->color,
+		style, is_stroke ? "stroke" : "fill",
 		"opacity");
 }
 
 static void
 emit_surface_pattern (cairo_svg_surface_t	*surface,
 		      cairo_surface_pattern_t	*pattern,
-		      xmlBufferPtr		 style, 
+		      xmlBufferPtr		 style,
 		      int			 is_stroke)
 {
     cairo_svg_document_t *document = surface->document;
@@ -1133,9 +1133,9 @@ emit_surface_pattern (cairo_svg_surface_t	*surface,
     xmlSetProp (child, CC2XML ("patternUnits"), CC2XML ("userSpaceOnUse"));
 }
 
-static void 
+static void
 emit_pattern_stops (xmlNodePtr parent,
-		    cairo_gradient_pattern_t const *pattern, 
+		    cairo_gradient_pattern_t const *pattern,
 		    double start_offset)
 {
     xmlNodePtr child;
@@ -1146,7 +1146,7 @@ emit_pattern_stops (xmlNodePtr parent,
 
     for (i = 0; i < pattern->n_stops; i++) {
 	child = xmlNewChild (parent, NULL, CC2XML ("stop"), NULL);
-	_cairo_dtostr (buffer, sizeof buffer, 
+	_cairo_dtostr (buffer, sizeof buffer,
 		       start_offset + (1 - start_offset ) *
 		       _cairo_fixed_to_double (pattern->stops[i].x));
 	xmlSetProp (child, CC2XML ("offset"), C2XML (buffer));
@@ -1169,10 +1169,10 @@ emit_pattern_extend (xmlNodePtr node, cairo_extend_t extend)
 
     switch (extend) {
 	case CAIRO_EXTEND_REPEAT:
-	    value = "repeat"; 
+	    value = "repeat";
 	    break;
 	case CAIRO_EXTEND_REFLECT:
-	    value = "reflect"; 
+	    value = "reflect";
 	    break;
 	case CAIRO_EXTEND_NONE:
 	    break;
@@ -1186,9 +1186,9 @@ emit_pattern_extend (xmlNodePtr node, cairo_extend_t extend)
 }
 
 static void
-emit_linear_pattern (cairo_svg_surface_t    *surface, 
+emit_linear_pattern (cairo_svg_surface_t    *surface,
 		     cairo_linear_pattern_t *pattern,
-		     xmlBufferPtr	     style, 
+		     xmlBufferPtr	     style,
 		     int		     is_stroke)
 {
     cairo_svg_document_t *document = surface->document;
@@ -1239,7 +1239,7 @@ emit_linear_pattern (cairo_svg_surface_t    *surface,
 }
 
 static void
-emit_radial_pattern (cairo_svg_surface_t *surface, 
+emit_radial_pattern (cairo_svg_surface_t *surface,
 		     cairo_radial_pattern_t *pattern,
 		     xmlBufferPtr style, int is_stroke)
 {
@@ -1304,11 +1304,11 @@ emit_radial_pattern (cairo_svg_surface_t *surface,
 }
 
 static void
-emit_pattern (cairo_svg_surface_t *surface, cairo_pattern_t *pattern, 
+emit_pattern (cairo_svg_surface_t *surface, cairo_pattern_t *pattern,
 	      xmlBufferPtr style, int is_stroke)
 {
     switch (pattern->type) {
-    case CAIRO_PATTERN_TYPE_SOLID:	
+    case CAIRO_PATTERN_TYPE_SOLID:
 	emit_solid_pattern (surface, (cairo_solid_pattern_t *) pattern, style, is_stroke);
 	break;
 
@@ -1322,7 +1322,7 @@ emit_pattern (cairo_svg_surface_t *surface, cairo_pattern_t *pattern,
 
     case CAIRO_PATTERN_TYPE_RADIAL:
 	emit_radial_pattern (surface, (cairo_radial_pattern_t *) pattern, style, is_stroke);
-	break;	    
+	break;
     }
 }
 
@@ -1405,11 +1405,11 @@ emit_paint (xmlNodePtr		 node,
     xmlBufferPtr style;
     char buffer[CAIRO_SVG_DTOSTR_BUFFER_LEN];
 
-    if (source->type == CAIRO_PATTERN_TYPE_SURFACE && 
+    if (source->type == CAIRO_PATTERN_TYPE_SURFACE &&
 	source->extend == CAIRO_EXTEND_NONE)
-	return emit_composite_pattern (node, 
+	return emit_composite_pattern (node,
 				       surface,
-				       (cairo_surface_pattern_t *) source, 
+				       (cairo_surface_pattern_t *) source,
 				       NULL, NULL, FALSE);
 
     style = xmlBufferCreate ();
@@ -1438,7 +1438,7 @@ _cairo_svg_surface_paint (void		    *abstract_surface,
 {
     cairo_svg_surface_t *surface = abstract_surface;
 
-    if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE) 
+    if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
 	return _analyze_operation (surface, op, source);
 
     /* XXX: It would be nice to be able to assert this condition
@@ -1567,7 +1567,7 @@ _cairo_svg_surface_stroke (void			*abstract_dst,
     emit_pattern (surface, source, style, 1);
     xmlBufferCat (style, CC2XML ("fill: none; stroke-width: "));
     _cairo_dtostr (buffer, sizeof buffer, stroke_style->line_width);
-    xmlBufferCat (style, C2XML (buffer)); 
+    xmlBufferCat (style, C2XML (buffer));
     xmlBufferCat (style, CC2XML (";"));
 
     switch (stroke_style->line_cap) {
@@ -1585,13 +1585,13 @@ _cairo_svg_surface_stroke (void			*abstract_dst,
     switch (stroke_style->line_join) {
 	    case CAIRO_LINE_JOIN_MITER:
 		    xmlBufferCat (style, CC2XML ("stroke-linejoin: miter;"));
-		    break; 
+		    break;
 	    case CAIRO_LINE_JOIN_ROUND:
 		    xmlBufferCat (style, CC2XML ("stroke-linejoin: round;"));
-		    break; 
+		    break;
 	    case CAIRO_LINE_JOIN_BEVEL:
 		    xmlBufferCat (style, CC2XML ("stroke-linejoin: bevel;"));
-		    break; 
+		    break;
     }
 
     if (stroke_style->num_dashes > 0) {
@@ -1686,9 +1686,9 @@ _cairo_svg_surface_show_glyphs (void			*abstract_surface,
 	}
 
 	glyph_node = xmlNewChild (child, NULL, CC2XML ("use"), NULL);
-	snprintf (buffer, sizeof buffer, "#glyph%d-%d", 
+	snprintf (buffer, sizeof buffer, "#glyph%d-%d",
 		  font_id, subset_glyph_index);
-	xmlSetProp (glyph_node, CC2XML ("xlink:href"), C2XML (buffer)); 
+	xmlSetProp (glyph_node, CC2XML ("xlink:href"), C2XML (buffer));
 	_cairo_dtostr (buffer, sizeof buffer, glyphs[i].x);
 	xmlSetProp (glyph_node, CC2XML ("x"), C2XML (buffer));
 	_cairo_dtostr (buffer, sizeof buffer, glyphs[i].y);
@@ -1707,7 +1707,7 @@ FALLBACK:
 	    return status;
 
     status = _cairo_svg_surface_fill (abstract_surface, op, pattern,
-				      &path, CAIRO_FILL_RULE_WINDING, 0.0, CAIRO_ANTIALIAS_SUBPIXEL); 
+				      &path, CAIRO_FILL_RULE_WINDING, 0.0, CAIRO_ANTIALIAS_SUBPIXEL);
 
     _cairo_path_fixed_fini (&path);
 
@@ -1757,8 +1757,8 @@ _cairo_svg_surface_intersect_clip_path (void			*dst,
 
 	snprintf (buffer, sizeof buffer, "url(#clip%d)", document->clip_id);
 	xmlSetProp (group, CC2XML ("clip-path"), C2XML (buffer));
-	xmlSetProp (group, CC2XML ("clip-rule"), 
-		    fill_rule == CAIRO_FILL_RULE_EVEN_ODD ? 
+	xmlSetProp (group, CC2XML ("clip-rule"),
+		    fill_rule == CAIRO_FILL_RULE_EVEN_ODD ?
 		    CC2XML ("evenodd") : CC2XML ("nonzero"));
 
 	document->clip_id++;
@@ -1853,14 +1853,14 @@ _cairo_svg_document_create (cairo_output_stream_t	*output_stream,
     document->clip_id = 0;
     document->mask_id = 0;
 
-    doc = xmlNewDoc (CC2XML ("1.0")); 
+    doc = xmlNewDoc (CC2XML ("1.0"));
     node = xmlNewNode (NULL, CC2XML ("svg"));
 
     xmlDocSetRootElement (doc, node);
 
     document->xml_doc = doc;
     document->xml_node_main = node;
-    document->xml_node_defs = xmlNewChild (node, NULL, CC2XML ("defs"), NULL); 
+    document->xml_node_defs = xmlNewChild (node, NULL, CC2XML ("defs"), NULL);
 
     xml_buffer = xmlBufferCreate ();
 
@@ -1952,12 +1952,12 @@ _cairo_svg_document_finish (cairo_svg_document_t *document)
 
     _cairo_svg_document_emit_font_subsets (document);
 
-    xmlSetProp (document->xml_node_main, CC2XML ("version"), 
+    xmlSetProp (document->xml_node_main, CC2XML ("version"),
 	CC2XML (_cairo_svg_internal_version_strings [document->svg_version]));
 
     xml_output_buffer = xmlOutputBufferCreateIO ((xmlOutputWriteCallback) _cairo_svg_document_write,
 						 (xmlOutputCloseCallback) NULL,
-						 (void *) document->output_stream, 
+						 (void *) document->output_stream,
 						 NULL);
     xmlSaveFormatFileTo (xml_output_buffer, document->xml_doc, "UTF-8", 1);
 
diff --git a/src/cairo-traps.c b/src/cairo-traps.c
index 93f4eadd..404461cb 100644
--- a/src/cairo-traps.c
+++ b/src/cairo-traps.c
@@ -611,7 +611,7 @@ _compute_x (cairo_line_t *line, cairo_fixed_t y)
 static double
 _compute_inverse_slope (cairo_line_t *l)
 {
-    return (_cairo_fixed_to_double (l->p2.x - l->p1.x) / 
+    return (_cairo_fixed_to_double (l->p2.x - l->p1.x) /
 	    _cairo_fixed_to_double (l->p2.y - l->p1.y));
 }
 
diff --git a/src/cairo-unicode.c b/src/cairo-unicode.c
index cf7c3736..22b0efb4 100644
--- a/src/cairo-unicode.c
+++ b/src/cairo-unicode.c
@@ -143,7 +143,7 @@ _utf8_get_char (const unsigned char *p)
  */
 static uint32_t
 _utf8_get_char_extended (const unsigned char *p,
-			 long		      max_len)  
+			 long		      max_len)
 {
     int i, len;
     uint32_t wc = (unsigned char) *p;
diff --git a/src/cairo-wideint.c b/src/cairo-wideint.c
index b5fd5551..da68f1be 100644
--- a/src/cairo-wideint.c
+++ b/src/cairo-wideint.c
@@ -476,7 +476,7 @@ _cairo_int64x64_128_mul (cairo_int64_t a, cairo_int64_t b)
     s = _cairo_uint64x64_128_mul (_cairo_int64_to_uint64(a),
 				  _cairo_int64_to_uint64(b));
     if (_cairo_int64_negative (a))
-	s.hi = _cairo_uint64_sub (s.hi, 
+	s.hi = _cairo_uint64_sub (s.hi,
 				  _cairo_int64_to_uint64 (b));
     if (_cairo_int64_negative (b))
 	s.hi = _cairo_uint64_sub (s.hi,
diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
index 94163ce7..df5c7589 100644
--- a/src/cairo-win32-font.c
+++ b/src/cairo-win32-font.c
@@ -37,7 +37,7 @@
 #include "cairoint.h"
 #include "cairo-win32-private.h"
 
-#ifndef SPI_GETFONTSMOOTHINGTYPE 
+#ifndef SPI_GETFONTSMOOTHINGTYPE
 #define SPI_GETFONTSMOOTHINGTYPE 0x200a
 #endif
 #ifndef FE_FONTSMOOTHINGCLEARTYPE
@@ -100,10 +100,10 @@ typedef struct {
     cairo_bool_t delete_scaled_hfont;
 } cairo_win32_scaled_font_t;
 
-static cairo_status_t 
+static cairo_status_t
 _cairo_win32_scaled_font_set_metrics (cairo_win32_scaled_font_t *scaled_font);
 
-static cairo_status_t 
+static cairo_status_t
 _cairo_win32_scaled_font_init_glyph_metrics (cairo_win32_scaled_font_t *scaled_font,
 					     cairo_scaled_glyph_t      *scaled_glyph);
 
@@ -228,7 +228,7 @@ _win32_scaled_font_create (LOGFONTW                   *logfont,
 			   cairo_font_face_t	      *font_face,
 			   const cairo_matrix_t       *font_matrix,
 			   const cairo_matrix_t       *ctm,
-			   const cairo_font_options_t *options)			  
+			   const cairo_font_options_t *options)
 {
     cairo_win32_scaled_font_t *f;
     cairo_matrix_t scale;
@@ -510,7 +510,7 @@ _cairo_win32_scaled_font_create_toy (cairo_toy_font_face_t *toy_face,
      * interpretation is locale-specific, but it's not clear what
      * would be a better alternative.
      */
-    logfont.lfCharSet = DEFAULT_CHARSET; 
+    logfont.lfCharSet = DEFAULT_CHARSET;
     logfont.lfOutPrecision = OUT_DEFAULT_PRECIS;
     logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
     logfont.lfQuality = DEFAULT_QUALITY; /* filled in later */
@@ -529,7 +529,7 @@ _cairo_win32_scaled_font_create_toy (cairo_toy_font_face_t *toy_face,
     return CAIRO_STATUS_SUCCESS;
 }
 
-static void 
+static void
 _cairo_win32_scaled_font_fini (void *abstract_font)
 {
     cairo_win32_scaled_font_t *scaled_font = abstract_font;
@@ -544,12 +544,12 @@ _cairo_win32_scaled_font_fini (void *abstract_font)
 	DeleteObject (scaled_font->unscaled_hfont);
 }
 
-static cairo_int_status_t 
+static cairo_int_status_t
 _cairo_win32_scaled_font_text_to_glyphs (void		*abstract_font,
 					 double		x,
 					 double		y,
 					 const char	*utf8,
-					 cairo_glyph_t **glyphs, 
+					 cairo_glyph_t **glyphs,
 					 int		*num_glyphs)
 {
     cairo_win32_scaled_font_t *scaled_font = abstract_font;
@@ -620,7 +620,7 @@ _cairo_win32_scaled_font_text_to_glyphs (void		*abstract_font,
 
 	if (!GetCharacterPlacementW (hdc, utf16, n16,
 				     0,
-				     &gcp_results, 
+				     &gcp_results,
 				     GCP_DIACRITIC | GCP_LIGATE | GCP_GLYPHSHAPE | GCP_REORDER)) {
 	    status = _cairo_win32_print_gdi_error ("_cairo_win32_scaled_font_text_to_glyphs");
 	    goto FAIL2;
@@ -671,7 +671,7 @@ _cairo_win32_scaled_font_text_to_glyphs (void		*abstract_font,
     return status;
 }
 
-static cairo_status_t 
+static cairo_status_t
 _cairo_win32_scaled_font_set_metrics (cairo_win32_scaled_font_t *scaled_font)
 {
     cairo_status_t status;
@@ -726,7 +726,7 @@ _cairo_win32_scaled_font_set_metrics (cairo_win32_scaled_font_t *scaled_font)
     return CAIRO_STATUS_SUCCESS;
 }
 
-static cairo_status_t 
+static cairo_status_t
 _cairo_win32_scaled_font_init_glyph_metrics (cairo_win32_scaled_font_t *scaled_font,
 					     cairo_scaled_glyph_t      *scaled_glyph)
 {
@@ -815,7 +815,7 @@ _cairo_win32_scaled_font_init_glyph_metrics (cairo_win32_scaled_font_t *scaled_f
  * font-space metrics.
  */
 #if 0
-static cairo_status_t 
+static cairo_status_t
 _cairo_win32_scaled_font_glyph_bbox (void		 *abstract_font,
 				     const cairo_glyph_t *glyphs,
 				     int                  num_glyphs,
@@ -1108,7 +1108,7 @@ _cairo_win32_scaled_font_glyph_init (void		       *abstract_font,
     return CAIRO_STATUS_SUCCESS;
 }
 
-static cairo_int_status_t 
+static cairo_int_status_t
 _cairo_win32_scaled_font_show_glyphs (void		       *abstract_font,
 				      cairo_operator_t    	op,
 				      cairo_pattern_t          *pattern,
@@ -1206,7 +1206,7 @@ _cairo_win32_scaled_font_show_glyphs (void		       *abstract_font,
 	 */
 	_cairo_pattern_init_for_surface (&mask, mask_surface);
 
-	status = _cairo_surface_composite (op, pattern, 
+	status = _cairo_surface_composite (op, pattern,
 					   &mask.base,
 					   &surface->base,
 					   source_x, source_y,
@@ -1228,7 +1228,7 @@ _cairo_fixed_from_FIXED (FIXED f)
     return *((cairo_fixed_t *)&f);
 }
 
-static cairo_status_t 
+static cairo_status_t
 _cairo_win32_scaled_font_init_glyph_path (cairo_win32_scaled_font_t *scaled_font,
 					  cairo_scaled_glyph_t      *scaled_glyph)
 {
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index ff14d5bb..8976fee4 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -65,7 +65,7 @@ _cairo_win32_print_gdi_error (const char *context)
     void *lpMsgBuf;
     DWORD last_error = GetLastError ();
 
-    if (!FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+    if (!FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER |
 			 FORMAT_MESSAGE_FROM_SYSTEM,
 			 NULL,
 			 last_error,
@@ -368,7 +368,7 @@ _cairo_win32_surface_get_subimage (cairo_win32_surface_t  *surface,
     cairo_status_t status;
     cairo_content_t content = _cairo_content_from_format (surface->format);
 
-    local = 
+    local =
 	(cairo_win32_surface_t *) _cairo_win32_surface_create_similar (surface,
 								       content,
 								       width,
@@ -376,7 +376,7 @@ _cairo_win32_surface_get_subimage (cairo_win32_surface_t  *surface,
     if (local->base.status)
 	return CAIRO_STATUS_NO_MEMORY;
 
-    if (!BitBlt (local->dc, 
+    if (!BitBlt (local->dc,
 		 0, 0,
 		 width, height,
 		 surface->dc,
@@ -497,7 +497,7 @@ _cairo_win32_surface_acquire_dest_image (void                    *abstract_surfa
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    status = _cairo_win32_surface_get_subimage (abstract_surface, 
+    status = _cairo_win32_surface_get_subimage (abstract_surface,
 						x1, y1, x2 - x1, y2 - y1,
 						&local);
     if (status)
@@ -833,7 +833,7 @@ _cairo_win32_surface_fill_rectangles (void			*abstract_surface,
     switch (categorize_solid_dest_operator (op, color->alpha_short)) {
     case DO_CLEAR:
 	new_color = RGB (0, 0, 0);
-	break;	
+	break;
     case DO_SOURCE:
 	new_color = RGB (color->red_short >> 8, color->green_short >> 8, color->blue_short >> 8);
 	break;
@@ -1014,7 +1014,7 @@ _cairo_win32_surface_show_glyphs (void			*surface,
 
     /* We can only handle operator SOURCE or OVER with the destination
      * having no alpha */
-    if ((op != CAIRO_OPERATOR_SOURCE && op != CAIRO_OPERATOR_OVER) || 
+    if ((op != CAIRO_OPERATOR_SOURCE && op != CAIRO_OPERATOR_OVER) ||
 	(dst->format != CAIRO_FORMAT_RGB24))
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 5d05e242..ed8d4987 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -530,7 +530,7 @@ _get_image_surface (cairo_xcb_surface_t     *surface,
 	image = (cairo_image_surface_t *)
 	    cairo_image_surface_create_for_data (data,
 						 format,
-						 x2 - x1, 
+						 x2 - x1,
 						 y2 - y1,
 						 bytes_per_line);
 	if (image->base.status)
@@ -1026,7 +1026,7 @@ _cairo_xcb_surface_composite_trapezoids (cairo_operator_t	op,
 			     _render_operator (op),
 			     src->picture, dst->picture,
 			     render_format.id,
-			     render_src_x + attributes.x_offset, 
+			     render_src_x + attributes.x_offset,
 			     render_src_y + attributes.y_offset,
 			     num_traps, (XCBRenderTRAP *) traps);
 
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 38bf1bc6..7c613b82 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -53,10 +53,10 @@ typedef struct _cairo_xlib_surface cairo_xlib_surface_t;
 static void
 _cairo_xlib_surface_ensure_gc (cairo_xlib_surface_t *surface);
 
-static void 
+static void
 _cairo_xlib_surface_ensure_src_picture (cairo_xlib_surface_t *surface);
 
-static void 
+static void
 _cairo_xlib_surface_ensure_dst_picture (cairo_xlib_surface_t *surface);
 
 static cairo_bool_t
@@ -215,7 +215,7 @@ _cairo_xlib_surface_create_similar_with_format (void	       *abstract_src,
     Pixmap pix;
     cairo_xlib_surface_t *surface;
     int depth = _CAIRO_FORMAT_DEPTH (format);
-    XRenderPictFormat *xrender_format = _CAIRO_FORMAT_TO_XRENDER_FORMAT (dpy, 
+    XRenderPictFormat *xrender_format = _CAIRO_FORMAT_TO_XRENDER_FORMAT (dpy,
 									 format);
 
     /* As a good first approximation, if the display doesn't have even
@@ -647,7 +647,7 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
 	image = (cairo_image_surface_t*)
 	    cairo_image_surface_create_for_data ((unsigned char *) ximage->data,
 						 format,
-						 ximage->width, 
+						 ximage->width,
 						 ximage->height,
 						 ximage->bytes_per_line);
 	if (image->base.status)
@@ -664,7 +664,7 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
 	image = (cairo_image_surface_t*)
 	    _cairo_image_surface_create_with_masks ((unsigned char *) ximage->data,
 						    &masks,
-						    ximage->width, 
+						    ximage->width,
 						    ximage->height,
 						    ximage->bytes_per_line);
 	if (image->base.status)
@@ -688,8 +688,8 @@ static void
 _cairo_xlib_surface_ensure_src_picture (cairo_xlib_surface_t    *surface)
 {
     if (!surface->src_picture)
-	surface->src_picture = XRenderCreatePicture (surface->dpy, 
-						     surface->drawable, 
+	surface->src_picture = XRenderCreatePicture (surface->dpy,
+						     surface->drawable,
 						     surface->xrender_format,
 						     0, NULL);
 }
@@ -718,8 +718,8 @@ static void
 _cairo_xlib_surface_ensure_dst_picture (cairo_xlib_surface_t    *surface)
 {
     if (!surface->dst_picture) {
-	surface->dst_picture = XRenderCreatePicture (surface->dpy, 
-						     surface->drawable, 
+	surface->dst_picture = XRenderCreatePicture (surface->dpy,
+						     surface->drawable,
 						     surface->xrender_format,
 						     0, NULL);
 	_cairo_xlib_surface_set_picture_clip_rects (surface);
@@ -1148,7 +1148,7 @@ _categorize_composite_operation (cairo_xlib_surface_t *dst,
 		 * make a copy as core drawing can't cross depths and doesn't
 		 * work rightacross visuals of the same depth
 		 */
-		if (_cairo_xlib_surface_same_screen (dst, src) && 
+		if (_cairo_xlib_surface_same_screen (dst, src) &&
 		    !_surfaces_compatible (dst, src))
 		    return DO_UNSUPPORTED;
 	    }
@@ -1629,7 +1629,7 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
 				    _render_operator (op),
 				    src->src_picture, dst->dst_picture,
 				    pict_format,
-				    render_src_x + attributes.x_offset, 
+				    render_src_x + attributes.x_offset,
 				    render_src_y + attributes.y_offset,
 				    (XTrapezoid *) traps, num_traps);
     }
@@ -2207,7 +2207,7 @@ _native_byte_order_lsb (void)
     return *((char *) &x) == 1;
 }
 
-static cairo_status_t 
+static cairo_status_t
 _cairo_xlib_surface_add_glyph (Display *dpy,
 			       cairo_scaled_font_t  *scaled_font,
 			       cairo_scaled_glyph_t *scaled_glyph)
@@ -2220,7 +2220,7 @@ _cairo_xlib_surface_add_glyph (Display *dpy,
     cairo_image_surface_t *glyph_surface = scaled_glyph->surface;
 
     if (scaled_font->surface_private == NULL) {
-	status = _cairo_xlib_surface_font_init (dpy, scaled_font, 
+	status = _cairo_xlib_surface_font_init (dpy, scaled_font,
 						glyph_surface->format);
 	if (status)
 	    return status;
@@ -2403,7 +2403,7 @@ _cairo_xlib_surface_show_glyphs8  (cairo_xlib_surface_t *dst,
 	elts = stack_elts;
 	chars = stack_chars;
     } else {
-	elts = malloc (num_glyphs * sizeof (XGlyphElt8) + 
+	elts = malloc (num_glyphs * sizeof (XGlyphElt8) +
 		       num_glyphs * sizeof (unsigned char));
 	if (elts == NULL)
 	    return CAIRO_STATUS_NO_MEMORY;
@@ -2464,7 +2464,7 @@ _cairo_xlib_surface_show_glyphs16 (cairo_xlib_surface_t *dst,
 	elts = stack_elts;
 	chars = stack_chars;
     } else {
-	elts = malloc (num_glyphs * sizeof (XGlyphElt16) + 
+	elts = malloc (num_glyphs * sizeof (XGlyphElt16) +
 		       num_glyphs * sizeof (unsigned short));
 	if (elts == NULL)
 	    return CAIRO_STATUS_NO_MEMORY;
@@ -2525,7 +2525,7 @@ _cairo_xlib_surface_show_glyphs32 (cairo_xlib_surface_t *dst,
 	elts = stack_elts;
 	chars = stack_chars;
     } else {
-	elts = malloc (num_glyphs * sizeof (XGlyphElt32) + 
+	elts = malloc (num_glyphs * sizeof (XGlyphElt32) +
 		       num_glyphs * sizeof (unsigned int));
 	if (elts == NULL)
 	    return CAIRO_STATUS_NO_MEMORY;
diff --git a/src/cairo.c b/src/cairo.c
index 98308c31..8a8e75ad 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -769,7 +769,7 @@ cairo_set_tolerance (cairo_t *cr, double tolerance)
 void
 cairo_set_antialias (cairo_t *cr, cairo_antialias_t antialias)
 {
-    if (cr->status) 
+    if (cr->status)
 	return;
 
     cr->status = _cairo_gstate_set_antialias (cr->gstate, antialias);
@@ -1460,7 +1460,7 @@ cairo_rel_move_to (cairo_t *cr, double dx, double dy)
 {
     cairo_fixed_t dx_fixed, dy_fixed;
 
-    if (cr->status) 
+    if (cr->status)
 	return;
 
     _cairo_gstate_user_to_device_distance (cr->gstate, &dx, &dy);
@@ -2047,9 +2047,9 @@ cairo_reset_clip (cairo_t *cr)
  * cairo.
  **/
 void
-cairo_select_font_face (cairo_t              *cr, 
-			const char           *family, 
-			cairo_font_slant_t    slant, 
+cairo_select_font_face (cairo_t              *cr,
+			const char           *family,
+			cairo_font_slant_t    slant,
 			cairo_font_weight_t   weight)
 {
     if (cr->status)
@@ -2097,7 +2097,7 @@ cairo_get_font_face (cairo_t *cr)
  * Gets the font extents for the currently selected font.
  **/
 void
-cairo_font_extents (cairo_t              *cr, 
+cairo_font_extents (cairo_t              *cr,
 		    cairo_font_extents_t *extents)
 {
     if (cr->status)
@@ -2124,7 +2124,7 @@ cairo_set_font_face (cairo_t           *cr,
     if (cr->status)
 	return;
 
-    cr->status = _cairo_gstate_set_font_face (cr->gstate, font_face);  
+    cr->status = _cairo_gstate_set_font_face (cr->gstate, font_face);
     if (cr->status)
 	_cairo_set_error (cr, cr->status);
 }
@@ -2253,7 +2253,7 @@ cairo_set_scaled_font (cairo_t                   *cr,
     if (cr->status)
         goto BAIL;
 
-    cr->status = _cairo_gstate_set_font_face (cr->gstate, scaled_font->font_face);  
+    cr->status = _cairo_gstate_set_font_face (cr->gstate, scaled_font->font_face);
     if (cr->status)
         goto BAIL;
 
@@ -2354,7 +2354,7 @@ cairo_text_extents (cairo_t              *cr,
  **/
 void
 cairo_glyph_extents (cairo_t                *cr,
-		     cairo_glyph_t          *glyphs, 
+		     cairo_glyph_t          *glyphs,
 		     int                    num_glyphs,
 		     cairo_text_extents_t   *extents)
 {
diff --git a/src/cairo.h b/src/cairo.h
index 1edc88fe..ecda958b 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -812,7 +812,7 @@ cairo_font_options_create (void);
 cairo_public cairo_font_options_t *
 cairo_font_options_copy (const cairo_font_options_t *original);
 
-cairo_public void 
+cairo_public void
 cairo_font_options_destroy (cairo_font_options_t *options);
 
 cairo_public cairo_status_t
@@ -857,9 +857,9 @@ cairo_font_options_get_hint_metrics (const cairo_font_options_t *options);
    font object inside the the cairo_t. */
 
 cairo_public void
-cairo_select_font_face (cairo_t              *cr, 
-			const char           *family, 
-			cairo_font_slant_t   slant, 
+cairo_select_font_face (cairo_t              *cr,
+			const char           *family,
+			cairo_font_slant_t   slant,
 			cairo_font_weight_t  weight);
 
 cairo_public void
@@ -895,7 +895,7 @@ cairo_public cairo_font_face_t *
 cairo_get_font_face (cairo_t *cr);
 
 cairo_public void
-cairo_font_extents (cairo_t              *cr, 
+cairo_font_extents (cairo_t              *cr,
 		    cairo_font_extents_t *extents);
 
 cairo_public void
@@ -908,7 +908,7 @@ cairo_text_extents (cairo_t              *cr,
 
 cairo_public void
 cairo_glyph_extents (cairo_t               *cr,
-		     cairo_glyph_t         *glyphs, 
+		     cairo_glyph_t         *glyphs,
 		     int                   num_glyphs,
 		     cairo_text_extents_t  *extents);
 
@@ -1011,7 +1011,7 @@ cairo_scaled_font_text_extents (cairo_scaled_font_t  *scaled_font,
 
 cairo_public void
 cairo_scaled_font_glyph_extents (cairo_scaled_font_t   *scaled_font,
-				 cairo_glyph_t         *glyphs, 
+				 cairo_glyph_t         *glyphs,
 				 int                   num_glyphs,
 				 cairo_text_extents_t  *extents);
 
diff --git a/src/cairoint.h b/src/cairoint.h
index 700e418e..0e205b4d 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -143,7 +143,7 @@ CAIRO_BEGIN_DECLS
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
   /* the real initialization must take place in DllMain */
-# define CAIRO_MUTEX_DECLARE(name) extern CRITICAL_SECTION name; 
+# define CAIRO_MUTEX_DECLARE(name) extern CRITICAL_SECTION name;
 # define CAIRO_MUTEX_DECLARE_GLOBAL(name) extern LPCRITICAL_SECTION name;
 # define CAIRO_MUTEX_LOCK(name) EnterCriticalSection (&name)
 # define CAIRO_MUTEX_UNLOCK(name) LeaveCriticalSection (&name)
@@ -153,7 +153,7 @@ CAIRO_BEGIN_DECLS
 cairo_private void _cairo_beos_lock(void*);
 cairo_private void _cairo_beos_unlock(void*);
   /* the real initialization takes place in a global constructor */
-# define CAIRO_MUTEX_DECLARE(name) extern void* name; 
+# define CAIRO_MUTEX_DECLARE(name) extern void* name;
 # define CAIRO_MUTEX_DECLARE_GLOBAL(name) extern void* name;
 # define CAIRO_MUTEX_LOCK(name) _cairo_beos_lock (&name)
 # define CAIRO_MUTEX_UNLOCK(name) _cairo_beos_unlock (&name)
@@ -546,8 +546,8 @@ struct _cairo_scaled_font_backend {
     (*text_to_glyphs) (void                *scaled_font,
 		       double		    x,
 		       double		    y,
-		       const char          *utf8, 
-		       cairo_glyph_t      **glyphs, 
+		       const char          *utf8,
+		       cairo_glyph_t      **glyphs,
 		       int 		   *num_glyphs);
 
     unsigned long
@@ -756,7 +756,7 @@ struct _cairo_surface_backend {
      * resources. If null, render against this surface, using image
      * surfaces as glyphs.
      */
-    cairo_int_status_t 
+    cairo_int_status_t
     (*old_show_glyphs)		(cairo_scaled_font_t	        *font,
 				 cairo_operator_t		 op,
 				 cairo_pattern_t		*pattern,
@@ -1260,13 +1260,13 @@ _cairo_gstate_show_surface (cairo_gstate_t	*gstate,
 			    double		height);
 
 cairo_private cairo_status_t
-_cairo_gstate_select_font_face (cairo_gstate_t *gstate, 
-				const char *family, 
-				cairo_font_slant_t slant, 
+_cairo_gstate_select_font_face (cairo_gstate_t *gstate,
+				const char *family,
+				cairo_font_slant_t slant,
 				cairo_font_weight_t weight);
 
 cairo_private cairo_status_t
-_cairo_gstate_set_font_size (cairo_gstate_t *gstate, 
+_cairo_gstate_set_font_size (cairo_gstate_t *gstate,
 			     double          size);
 
 cairo_private void
@@ -1274,7 +1274,7 @@ _cairo_gstate_get_font_matrix (cairo_gstate_t *gstate,
 			       cairo_matrix_t *matrix);
 
 cairo_private cairo_status_t
-_cairo_gstate_set_font_matrix (cairo_gstate_t	    *gstate, 
+_cairo_gstate_set_font_matrix (cairo_gstate_t	    *gstate,
 			       const cairo_matrix_t *matrix);
 
 cairo_private void
@@ -1282,43 +1282,43 @@ _cairo_gstate_get_font_options (cairo_gstate_t       *gstate,
 				cairo_font_options_t *options);
 
 cairo_private cairo_status_t
-_cairo_gstate_set_font_options (cairo_gstate_t	           *gstate, 
+_cairo_gstate_set_font_options (cairo_gstate_t	           *gstate,
 				const cairo_font_options_t *options);
 
 cairo_private cairo_status_t
-_cairo_gstate_get_font_face (cairo_gstate_t     *gstate, 
+_cairo_gstate_get_font_face (cairo_gstate_t     *gstate,
 			     cairo_font_face_t **font_face);
 
 cairo_private cairo_status_t
-_cairo_gstate_get_font_extents (cairo_gstate_t *gstate, 
+_cairo_gstate_get_font_extents (cairo_gstate_t *gstate,
 				cairo_font_extents_t *extents);
 
 cairo_private cairo_status_t
-_cairo_gstate_set_font_face (cairo_gstate_t    *gstate, 
+_cairo_gstate_set_font_face (cairo_gstate_t    *gstate,
 			     cairo_font_face_t *font_face);
 
 cairo_private cairo_status_t
 _cairo_gstate_text_to_glyphs (cairo_gstate_t *font,
-			      const char     *utf8, 
+			      const char     *utf8,
 			      double	      x,
 			      double	      y,
-			      cairo_glyph_t **glyphs, 
+			      cairo_glyph_t **glyphs,
 			      int	     *num_glyphs);
 
 cairo_private cairo_status_t
 _cairo_gstate_glyph_extents (cairo_gstate_t *gstate,
-			     cairo_glyph_t *glyphs, 
+			     cairo_glyph_t *glyphs,
 			     int num_glyphs,
 			     cairo_text_extents_t *extents);
 
 cairo_private cairo_status_t
-_cairo_gstate_show_glyphs (cairo_gstate_t *gstate, 
-			   cairo_glyph_t *glyphs, 
+_cairo_gstate_show_glyphs (cairo_gstate_t *gstate,
+			   cairo_glyph_t *glyphs,
 			   int num_glyphs);
 
 cairo_private cairo_status_t
-_cairo_gstate_glyph_path (cairo_gstate_t     *gstate, 
-			  cairo_glyph_t	     *glyphs, 
+_cairo_gstate_glyph_path (cairo_gstate_t     *gstate,
+			  cairo_glyph_t	     *glyphs,
 			  int		      num_glyphs,
 			  cairo_path_fixed_t *path);
 
@@ -1384,7 +1384,7 @@ _cairo_toy_font_face_create (const char           *family,
 			     cairo_font_weight_t   weight);
 
 cairo_private void
-_cairo_unscaled_font_init (cairo_unscaled_font_t               *font, 
+_cairo_unscaled_font_init (cairo_unscaled_font_t               *font,
 			   const cairo_unscaled_font_backend_t *backend);
 
 cairo_private cairo_unscaled_font_t *
@@ -1528,7 +1528,7 @@ _cairo_path_fixed_stroke_to_traps (cairo_path_fixed_t	*path,
 /* cairo-scaled-font.c */
 
 cairo_private cairo_status_t
-_cairo_scaled_font_init (cairo_scaled_font_t               *scaled_font, 
+_cairo_scaled_font_init (cairo_scaled_font_t               *scaled_font,
 			 cairo_font_face_t		   *font_face,
 			 const cairo_matrix_t              *font_matrix,
 			 const cairo_matrix_t              *ctm,
@@ -1543,15 +1543,15 @@ cairo_private void
 _cairo_scaled_font_fini (cairo_scaled_font_t *scaled_font);
 
 cairo_private cairo_status_t
-_cairo_scaled_font_font_extents (cairo_scaled_font_t  *scaled_font, 
+_cairo_scaled_font_font_extents (cairo_scaled_font_t  *scaled_font,
 				 cairo_font_extents_t *extents);
 
 cairo_private cairo_status_t
 _cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t	*scaled_font,
 				   double		x,
 				   double		y,
-				   const char           *utf8, 
-				   cairo_glyph_t       **glyphs, 
+				   const char           *utf8,
+				   cairo_glyph_t       **glyphs,
 				   int 		        *num_glyphs);
 
 cairo_private cairo_status_t
@@ -1582,7 +1582,7 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t *scaled_font,
 
 cairo_private cairo_status_t
 _cairo_scaled_font_glyph_path (cairo_scaled_font_t *scaled_font,
-			       const cairo_glyph_t *glyphs, 
+			       const cairo_glyph_t *glyphs,
 			       int                  num_glyphs,
 			       cairo_path_fixed_t  *path);
 
@@ -2116,7 +2116,7 @@ cairo_private void
 _cairo_pattern_transform (cairo_pattern_t      *pattern,
 			  const cairo_matrix_t *ctm_inverse);
 
-cairo_private cairo_bool_t 
+cairo_private cairo_bool_t
 _cairo_pattern_is_opaque_solid (const cairo_pattern_t *pattern);
 
 cairo_bool_t
diff --git a/test/cairo-test-directfb.c b/test/cairo-test-directfb.c
index 13049c5e..c2cf0219 100644
--- a/test/cairo-test-directfb.c
+++ b/test/cairo-test-directfb.c
@@ -39,8 +39,8 @@ static DFBInfo *init(void) {
 	DFBDisplayLayerConfig        layer_config;
 	DFBGraphicsDeviceDescription desc;
 	int err;
-	DFBInfo *info = malloc(sizeof(DFBInfo));	
-	if( !info ) 
+	DFBInfo *info = malloc(sizeof(DFBInfo));
+	if( !info )
 		return NULL;
 
 
@@ -68,7 +68,7 @@ create_directfb_surface (cairo_test_t* test, cairo_format_t format,
 	DFBWindowDescription desc;
 	int err;
 	DFBInfo *info = init();
-	if( !info ) 
+	if( !info )
 		return NULL;
 	*closure = info;
 
@@ -94,7 +94,7 @@ create_directfb_surface (cairo_test_t* test, cairo_format_t format,
 
 cairo_surface_t *
 create_directfb_bitmap_surface (cairo_test_t* test, cairo_format_t format,
-                            void **closure) { 
+                            void **closure) {
 	int  err;
 	DFBInfo *info = init();
 	if( !info ) return NULL;
@@ -102,7 +102,7 @@ create_directfb_bitmap_surface (cairo_test_t* test, cairo_format_t format,
 	info->window= NULL; /* make sure window is null*/
 	DFBSurfaceDescription  desc;
 
-	desc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT; 
+	desc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
 	desc.caps = DSCAPS_NONE;
 	desc.width  = test->width;
 	desc.height = test->height;
@@ -118,10 +118,10 @@ cleanup_directfb (void* closure) {
 	DFBInfo *info = (DFBInfo *)closure;
 	if( info->surface )
 		info->surface->Release( info->surface );
-	if( info->window ) 
+	if( info->window )
 		info->window->Release( info->window );
-	if( info->layer ) 
+	if( info->layer )
 		info->layer->Release( info->layer );
-	if( info->dfb ) 
+	if( info->dfb )
 		info->dfb->Release( info->dfb );
 }
diff --git a/test/cairo-test.c b/test/cairo-test.c
index 09e80121..1072c77f 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -119,7 +119,7 @@ cairo_test_log (const char *fmt, ...)
 void
 xasprintf (char **strp, const char *fmt, ...)
 {
-#ifdef HAVE_VASPRINTF    
+#ifdef HAVE_VASPRINTF
     va_list va;
     int ret;
 
@@ -1143,7 +1143,7 @@ create_ps_surface (cairo_test_t		 *test,
 
     /* Sanitize back to a real cairo_content_t value. */
     if (content == CAIRO_TEST_CONTENT_COLOR_ALPHA_FLATTENED)
-	content = CAIRO_CONTENT_COLOR_ALPHA; 
+	content = CAIRO_CONTENT_COLOR_ALPHA;
 
     *closure = ptc = xmalloc (sizeof (ps_target_closure_t));
 
@@ -1328,7 +1328,7 @@ cleanup_pdf (void *closure)
 static const char *svg_ignored_tests[] = {
     /* rectangle-rounding-error uses CAIRO_ANTIALIAS_NONE,
      * which is not supported */
-    "rectangle-rounding-error",		
+    "rectangle-rounding-error",
     NULL
 };
 
@@ -1353,7 +1353,7 @@ create_svg_surface (cairo_test_t	 *test,
     cairo_surface_t *surface;
 
     for (i = 0; svg_ignored_tests[i] != NULL; i++)
-	if (strcmp (test->name, svg_ignored_tests[i]) == 0)	   
+	if (strcmp (test->name, svg_ignored_tests[i]) == 0)
 	    return NULL;
 
     *closure = ptc = xmalloc (sizeof (svg_target_closure_t));
@@ -1374,7 +1374,7 @@ create_svg_surface (cairo_test_t	 *test,
 
     if (content == CAIRO_CONTENT_COLOR) {
 	ptc->target = surface;
-	surface = cairo_surface_create_similar (ptc->target, 
+	surface = cairo_surface_create_similar (ptc->target,
 						CAIRO_CONTENT_COLOR,
 						width, height);
     } else {
@@ -1606,7 +1606,7 @@ cairo_test_expecting (cairo_test_t *test, cairo_test_draw_function_t draw,
     const char *tname;
     cairo_test_status_t status, ret;
     cairo_test_target_t **targets_to_test;
-    cairo_test_target_t targets[] = 
+    cairo_test_target_t targets[] =
 	{
 	    { "image", CAIRO_SURFACE_TYPE_IMAGE, CAIRO_CONTENT_COLOR_ALPHA,
 	      create_image_surface, cairo_surface_write_to_png, NULL},
@@ -1640,26 +1640,26 @@ cairo_test_expecting (cairo_test_t *test, cairo_test_draw_function_t draw,
 #if CAIRO_CAN_TEST_GLITZ_GLX_SURFACE
 	    { "glitz-glx", CAIRO_SURFACE_TYPE_GLITZ,CAIRO_CONTENT_COLOR_ALPHA,
 		create_cairo_glitz_glx_surface, cairo_surface_write_to_png,
-		cleanup_cairo_glitz_glx }, 
+		cleanup_cairo_glitz_glx },
 	    { "glitz-glx", CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR,
 		create_cairo_glitz_glx_surface, cairo_surface_write_to_png,
-		cleanup_cairo_glitz_glx }, 
+		cleanup_cairo_glitz_glx },
 #endif
 #if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE
 	    { "glitz-agl", CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR_ALPHA,
 		create_cairo_glitz_agl_surface, cairo_surface_write_to_png,
-		cleanup_cairo_glitz_agl }, 
+		cleanup_cairo_glitz_agl },
 	    { "glitz-agl", CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR,
 		create_cairo_glitz_agl_surface, cairo_surface_write_to_png,
-		cleanup_cairo_glitz_agl }, 
+		cleanup_cairo_glitz_agl },
 #endif
 #if CAIRO_CAN_TEST_GLITZ_WGL_SURFACE
 	    { "glitz-wgl", CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR_ALPHA,
 		create_cairo_glitz_wgl_surface, cairo_surface_write_to_png,
-		cleanup_cairo_glitz_wgl }, 
+		cleanup_cairo_glitz_wgl },
 	    { "glitz-wgl", CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR,
 		create_cairo_glitz_wgl_surface, cairo_surface_write_to_png,
-		cleanup_cairo_glitz_wgl }, 
+		cleanup_cairo_glitz_wgl },
 #endif
 #endif /* CAIRO_HAS_GLITZ_SURFACE */
 #if 0 && CAIRO_HAS_QUARTZ_SURFACE
@@ -1830,7 +1830,7 @@ cairo_test_expecting (cairo_test_t *test, cairo_test_draw_function_t draw,
 }
 
 cairo_test_status_t
-cairo_test_expect_failure (cairo_test_t		      *test, 
+cairo_test_expect_failure (cairo_test_t		      *test,
 			   cairo_test_draw_function_t  draw,
 			   const char		      *because)
 {
@@ -1858,7 +1858,7 @@ cairo_test_create_surface_from_png (const char *filename)
     char *srcdir = getenv ("srcdir");
 
     image = cairo_image_surface_create_from_png (filename);
-    if (cairo_surface_status(image)) { 
+    if (cairo_surface_status(image)) {
         /* expect not found when running with srcdir != builddir
          * such as when 'make distcheck' is run
          */
diff --git a/test/cairo-test.h b/test/cairo-test.h
index c5e122d8..d47c47f5 100644
--- a/test/cairo-test.h
+++ b/test/cairo-test.h
@@ -108,7 +108,7 @@ cairo_test (cairo_test_t *test, cairo_test_draw_function_t draw);
  * reason. Any test calling this variant should be listed in the
  * XFAIL_TESTS list in Makefile.am. */
 cairo_test_status_t
-cairo_test_expect_failure (cairo_test_t		      *test, 
+cairo_test_expect_failure (cairo_test_t		      *test,
 			   cairo_test_draw_function_t  draw,
 			   const char		      *reason);
 
diff --git a/test/imagediff.c b/test/imagediff.c
index 90126ed2..d030e76e 100644
--- a/test/imagediff.c
+++ b/test/imagediff.c
@@ -31,7 +31,7 @@
 #include "write-png.h"
 #include "xmalloc.h"
 
-int 
+int
 main (int argc, char *argv[])
 {
     int total_pixels_changed;
diff --git a/test/write-png.c b/test/write-png.c
index 3cb023dc..83ba2b5c 100644
--- a/test/write-png.c
+++ b/test/write-png.c
@@ -76,7 +76,7 @@ write_png_argb32 (unsigned char *buffer, FILE *file,
     png_init_io (png, file);
     png_set_IHDR (png, info,
 		  width, height, 8,
-		  PNG_COLOR_TYPE_RGB_ALPHA, 
+		  PNG_COLOR_TYPE_RGB_ALPHA,
 		  PNG_INTERLACE_NONE,
 		  PNG_COMPRESSION_TYPE_DEFAULT,
 		  PNG_FILTER_TYPE_DEFAULT);