xserver git update 11/6/2010

1 files changed, 112 insertions, 112 deletions

diff --git a/xorg-server/fb/fbfillrect.c b/xorg-server/fb/fbfillrect.c
index 4e4edb3fd..66ed77fa5 100644
--- a/xorg-server/fb/fbfillrect.c
+++ b/xorg-server/fb/fbfillrect.c
@@ -1,112 +1,112 @@
-/*
- * Copyright © 1998 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "fb.h"
-
-void
-fbPolyFillRect(DrawablePtr  pDrawable, 
-	       GCPtr	    pGC, 
-	       int	    nrect,
-	       xRectangle   *prect)
-{
-    RegionPtr	    pClip = fbGetCompositeClip(pGC);
-    register BoxPtr pbox;
-    BoxPtr	    pextent;
-    int		    extentX1, extentX2, extentY1, extentY2;
-    int		    fullX1, fullX2, fullY1, fullY2;
-    int		    partX1, partX2, partY1, partY2;
-    int		    xorg, yorg;
-    int		    n;
-
-    xorg = pDrawable->x;
-    yorg = pDrawable->y;
-    
-    pextent = REGION_EXTENTS(pGC->pScreen, pClip);
-    extentX1 = pextent->x1;
-    extentY1 = pextent->y1;
-    extentX2 = pextent->x2;
-    extentY2 = pextent->y2;
-    while (nrect--)
-    {
-	fullX1 = prect->x + xorg;
-	fullY1 = prect->y + yorg;
-	fullX2 = fullX1 + (int) prect->width;
-	fullY2 = fullY1 + (int) prect->height;
-	prect++;
-	
-	if (fullX1 < extentX1)
-	    fullX1 = extentX1;
-
-	if (fullY1 < extentY1)
-	    fullY1 = extentY1;
-
-	if (fullX2 > extentX2)
-	    fullX2 = extentX2;
-	
-	if (fullY2 > extentY2)
-	    fullY2 = extentY2;
-
-	if ((fullX1 >= fullX2) || (fullY1 >= fullY2))
-	    continue;
-	n = REGION_NUM_RECTS (pClip);
-	if (n == 1)
-	{
-	    fbFill (pDrawable,
-		    pGC,
-		    fullX1, fullY1, fullX2-fullX1, fullY2-fullY1);
-	}
-	else
-	{
-	    pbox = REGION_RECTS(pClip);
-	    /* 
-	     * clip the rectangle to each box in the clip region
-	     * this is logically equivalent to calling Intersect()
-	     */
-	    while(n--)
-	    {
-		partX1 = pbox->x1;
-		if (partX1 < fullX1)
-		    partX1 = fullX1;
-		partY1 = pbox->y1;
-		if (partY1 < fullY1)
-		    partY1 = fullY1;
-		partX2 = pbox->x2;
-		if (partX2 > fullX2)
-		    partX2 = fullX2;
-		partY2 = pbox->y2;
-		if (partY2 > fullY2)
-		    partY2 = fullY2;
-    
-		pbox++;
-		
-		if (partX1 < partX2 && partY1 < partY2)
-		    fbFill (pDrawable, pGC,
-			    partX1, partY1,
-			    partX2 - partX1, partY2 - partY1);
-	    }
-	}
-    }
-}
+/*

+ * Copyright © 1998 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name of Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "fb.h"

+

+void

+fbPolyFillRect(DrawablePtr  pDrawable, 

+	       GCPtr	    pGC, 

+	       int	    nrect,

+	       xRectangle   *prect)

+{

+    RegionPtr	    pClip = fbGetCompositeClip(pGC);

+    register BoxPtr pbox;

+    BoxPtr	    pextent;

+    int		    extentX1, extentX2, extentY1, extentY2;

+    int		    fullX1, fullX2, fullY1, fullY2;

+    int		    partX1, partX2, partY1, partY2;

+    int		    xorg, yorg;

+    int		    n;

+

+    xorg = pDrawable->x;

+    yorg = pDrawable->y;

+    

+    pextent = RegionExtents(pClip);

+    extentX1 = pextent->x1;

+    extentY1 = pextent->y1;

+    extentX2 = pextent->x2;

+    extentY2 = pextent->y2;

+    while (nrect--)

+    {

+	fullX1 = prect->x + xorg;

+	fullY1 = prect->y + yorg;

+	fullX2 = fullX1 + (int) prect->width;

+	fullY2 = fullY1 + (int) prect->height;

+	prect++;

+	

+	if (fullX1 < extentX1)

+	    fullX1 = extentX1;

+

+	if (fullY1 < extentY1)

+	    fullY1 = extentY1;

+

+	if (fullX2 > extentX2)

+	    fullX2 = extentX2;

+	

+	if (fullY2 > extentY2)

+	    fullY2 = extentY2;

+

+	if ((fullX1 >= fullX2) || (fullY1 >= fullY2))

+	    continue;

+	n = RegionNumRects (pClip);

+	if (n == 1)

+	{

+	    fbFill (pDrawable,

+		    pGC,

+		    fullX1, fullY1, fullX2-fullX1, fullY2-fullY1);

+	}

+	else

+	{

+	    pbox = RegionRects(pClip);

+	    /* 

+	     * clip the rectangle to each box in the clip region

+	     * this is logically equivalent to calling Intersect()

+	     */

+	    while(n--)

+	    {

+		partX1 = pbox->x1;

+		if (partX1 < fullX1)

+		    partX1 = fullX1;

+		partY1 = pbox->y1;

+		if (partY1 < fullY1)

+		    partY1 = fullY1;

+		partX2 = pbox->x2;

+		if (partX2 > fullX2)

+		    partX2 = fullX2;

+		partY2 = pbox->y2;

+		if (partY2 > fullY2)

+		    partY2 = fullY2;

+    

+		pbox++;

+		

+		if (partX1 < partX2 && partY1 < partY2)

+		    fbFill (pDrawable, pGC,

+			    partX1, partY1,

+			    partX2 - partX1, partY2 - partY1);

+	    }

+	}

+    }

+}