From 982ac918afe6a1c02d5cf735d7b6c56443a048cc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 7 Feb 2014 23:28:38 +0100
Subject: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb
 mesa xserver git update 7 Feb 2014

Update to openssl1.0.1f

xserver          commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
libxcb           commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3
xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743
libX11           commit aacf95dacc7c598e7297894580d4d655593813b2
xkbcomp          commit 31b90ee4ffc774e0da540277907fc5540c0b012c
libxtrans        commit 3f0de269abe59353acbd7a5587d68ce0da91db67
fontconfig       commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d
mesa             commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3
---
 xorg-server/glamor/glamor_fillspans.c | 121 ++++++++++++++++------------------
 1 file changed, 58 insertions(+), 63 deletions(-)

(limited to 'xorg-server/glamor/glamor_fillspans.c')

diff --git a/xorg-server/glamor/glamor_fillspans.c b/xorg-server/glamor/glamor_fillspans.c
index 35e881f61..7261d2842 100644
--- a/xorg-server/glamor/glamor_fillspans.c
+++ b/xorg-server/glamor/glamor_fillspans.c
@@ -28,86 +28,81 @@
 
 static Bool
 _glamor_fill_spans(DrawablePtr drawable,
-		  GCPtr gc,
-		  int n, DDXPointPtr points, int *widths, int sorted, Bool fallback)
+                   GCPtr gc,
+                   int n, DDXPointPtr points, int *widths, int sorted,
+                   Bool fallback)
 {
-	DDXPointPtr ppt;
-	int nbox;
-	BoxPtr pbox;
-	int x1, x2, y;
-	RegionPtr pClip = fbGetCompositeClip(gc);
-	Bool ret = FALSE;
+    DDXPointPtr ppt;
+    int nbox;
+    BoxPtr pbox;
+    int x1, x2, y;
+    RegionPtr pClip = fbGetCompositeClip(gc);
+    Bool ret = FALSE;
 
-	if (gc->fillStyle != FillSolid && gc->fillStyle != FillTiled)
-		goto fail;
+    if (gc->fillStyle != FillSolid && gc->fillStyle != FillTiled)
+        goto fail;
 
-	ppt = points;
-	while (n--) {
-		x1 = ppt->x;
-		y = ppt->y;
-		x2 = x1 + (int) *widths;
-		ppt++;
-		widths++;
+    ppt = points;
+    while (n--) {
+        x1 = ppt->x;
+        y = ppt->y;
+        x2 = x1 + (int) *widths;
+        ppt++;
+        widths++;
 
-		nbox = REGION_NUM_RECTS(pClip);
-		pbox = REGION_RECTS(pClip);
-		while (nbox--) {
-			int real_x1 = x1, real_x2 = x2;
+        nbox = REGION_NUM_RECTS(pClip);
+        pbox = REGION_RECTS(pClip);
+        while (nbox--) {
+            int real_x1 = x1, real_x2 = x2;
 
-			if (real_x1 < pbox->x1)
-				real_x1 = pbox->x1;
+            if (real_x1 < pbox->x1)
+                real_x1 = pbox->x1;
 
-			if (real_x2 > pbox->x2)
-				real_x2 = pbox->x2;
+            if (real_x2 > pbox->x2)
+                real_x2 = pbox->x2;
 
-			if (real_x2 > real_x1 && pbox->y1 <= y && pbox->y2 > y) {
-				if (!glamor_fill(drawable, gc, real_x1, y, 
-						 real_x2 - real_x1, 1, fallback))
-					goto fail;
-			}
-			pbox++;
-		}
-	}
-	ret = TRUE;
-	goto done;
+            if (real_x2 > real_x1 && pbox->y1 <= y && pbox->y2 > y) {
+                if (!glamor_fill(drawable, gc, real_x1, y,
+                                 real_x2 - real_x1, 1, fallback))
+                    goto fail;
+            }
+            pbox++;
+        }
+    }
+    ret = TRUE;
+    goto done;
 
-fail:
-	if (!fallback 
-	    && glamor_ddx_fallback_check_pixmap(drawable)
-	    && glamor_ddx_fallback_check_gc(gc)) {
-		goto done;
-	}
-	glamor_fallback("to %p (%c)\n", drawable,
-			glamor_get_drawable_location(drawable));
-	if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
-		if (glamor_prepare_access_gc(gc)) {
-			fbFillSpans(drawable, gc, n, points, widths,
-				    sorted);
-			glamor_finish_access_gc(gc);
-		}
-		glamor_finish_access(drawable, GLAMOR_ACCESS_RW);
-	}
-	ret = TRUE;
+ fail:
+    if (!fallback && glamor_ddx_fallback_check_pixmap(drawable)
+        && glamor_ddx_fallback_check_gc(gc)) {
+        goto done;
+    }
+    glamor_fallback("to %p (%c)\n", drawable,
+                    glamor_get_drawable_location(drawable));
+    if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
+        if (glamor_prepare_access_gc(gc)) {
+            fbFillSpans(drawable, gc, n, points, widths, sorted);
+            glamor_finish_access_gc(gc);
+        }
+        glamor_finish_access(drawable, GLAMOR_ACCESS_RW);
+    }
+    ret = TRUE;
 
-done:
-	return ret;
+ done:
+    return ret;
 }
 
-
 void
 glamor_fill_spans(DrawablePtr drawable,
-		  GCPtr gc,
-		  int n, DDXPointPtr points, int *widths, int sorted)
+                  GCPtr gc, int n, DDXPointPtr points, int *widths, int sorted)
 {
-	_glamor_fill_spans(drawable, gc, n, points, widths, sorted, TRUE);
+    _glamor_fill_spans(drawable, gc, n, points, widths, sorted, TRUE);
 }
 
 Bool
 glamor_fill_spans_nf(DrawablePtr drawable,
-		     GCPtr gc,
-		     int n, DDXPointPtr points, int *widths, int sorted)
+                     GCPtr gc,
+                     int n, DDXPointPtr points, int *widths, int sorted)
 {
-	return _glamor_fill_spans(drawable, gc, n, points, widths, sorted, FALSE);
+    return _glamor_fill_spans(drawable, gc, n, points, widths, sorted, FALSE);
 }
-
-
-- 
cgit v1.2.3