[cairo-commit] libpixman/src fbtrap.c,1.1,1.2

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv16875/src

Modified Files:
	fbtrap.c 
Log Message:

        * src/fbtrap.c: Merge in changes from xserver, (mostly just
        whitespace).


Index: fbtrap.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/fbtrap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbtrap.c	18 Jan 2005 19:54:23 -0000	1.1
+++ fbtrap.c	21 Jan 2005 17:26:44 -0000	1.2
@@ -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 @@
 
 void
 fbRasterizeTrapezoid (PicturePtr    pPicture,
-		      xTrapezoid  *trap,
+		      xTrapezoid    *trap,
 		      int	    x_off,
 		      int	    y_off)
 {
@@ -171,9 +174,9 @@
 		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 @@
 	/*
 	 * Two cases:
 	 *
-	 *		+		+
-	 *	       / \             / \
-	 *	      /   \           /   \
-	 *	     /     +         +     \
+	 *          +               +
+	 *         / \             / \
+	 *        /   \           /   \
+	 *       /     +         +     \
 	 *      /    --           --    \
 	 *     /   --               --   \
 	 *    / ---                   --- \
-	 *	 +--                         --+
+	 *   +--                         --+
 	 */
 	
 	trap.top = top->y;