From c64e2ccd06edfc9b148ca620d218f84c7bb93378 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Fri, 21 Jan 2005 09:26:44 +0000
Subject: [PATCH] Merge in changes from xserver, (mostly just whitespace).

---
 pixman/ChangeLog    |  5 +++++
 pixman/src/fbtrap.c | 21 ++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index 5c148878d..af7a4ec38 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-21  Carl Worth  <cworth@cworth.org>
+
+	* src/fbtrap.c: Merge in changes from xserver, (mostly just
+	whitespace).
+
 2005-01-18  Carl Worth  <cworth@cworth.org>
 
 	* src/fbedge.c:
diff --git a/pixman/src/fbtrap.c b/pixman/src/fbtrap.c
index 36aab7b06..b5adcf161 100644
--- a/pixman/src/fbtrap.c
+++ b/pixman/src/fbtrap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fbtrap.c,v 1.1 2005-01-18 19:54:23 cworth Exp $
+ * $Id: fbtrap.c,v 1.2 2005-01-21 17:26:44 cworth Exp $
  *
  * Copyright © 2004 Keith Packard
  *
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 
 #ifdef RENDER
@@ -95,7 +98,7 @@ fbAddTraps (PicturePtr	pPicture,
 
 void
 fbRasterizeTrapezoid (PicturePtr    pPicture,
-		      xTrapezoid  *trap,
+		      xTrapezoid    *trap,
 		      int	    x_off,
 		      int	    y_off)
 {
@@ -171,9 +174,9 @@ fbAddTriangles (PicturePtr  pPicture,
 		INT16	    x_off,
 		INT16	    y_off,
 		int	    ntri,
-		xTriangle *tris)
+		xTriangle   *tris)
 {
-    xPointFixed	  *top, *left, *right, *tmp;
+    xPointFixed	    *top, *left, *right, *tmp;
     xTrapezoid	    trap;
 
     for (; ntri; ntri--, tris++)
@@ -194,14 +197,14 @@ fbAddTriangles (PicturePtr  pPicture,
 	/*
 	 * Two cases:
 	 *
-	 *		+		+
-	 *	       / \             / \
-	 *	      /   \           /   \
-	 *	     /     +         +     \
+	 *          +               +
+	 *         / \             / \
+	 *        /   \           /   \
+	 *       /     +         +     \
 	 *      /    --           --    \
 	 *     /   --               --   \
 	 *    / ---                   --- \
-	 *	 +--                         --+
+	 *   +--                         --+
 	 */
 	
 	trap.top = top->y;