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

1 files changed, 66 insertions, 69 deletions

diff --git a/xorg-server/glamor/glamor_polyfillrect.c b/xorg-server/glamor/glamor_polyfillrect.c
index 4e1f7b3a9..a25fc4ed5 100644
--- a/xorg-server/glamor/glamor_polyfillrect.c
+++ b/xorg-server/glamor/glamor_polyfillrect.c
@@ -35,93 +35,90 @@
 
 static Bool
 _glamor_poly_fill_rect(DrawablePtr drawable,
-		      GCPtr gc, int nrect, xRectangle * prect, Bool fallback)
+                       GCPtr gc, int nrect, xRectangle *prect, Bool fallback)
 {
-	int fullX1, fullX2, fullY1, fullY2;
-	int xorg, yorg;
-	int n;
-	register BoxPtr pbox;
-	RegionPtr pClip = fbGetCompositeClip(gc);
-	Bool ret = FALSE;
+    int fullX1, fullX2, fullY1, fullY2;
+    int xorg, yorg;
+    int n;
+    register BoxPtr pbox;
+    RegionPtr pClip = fbGetCompositeClip(gc);
+    Bool ret = FALSE;
 
-	xorg = drawable->x;
-	yorg = drawable->y;
+    xorg = drawable->x;
+    yorg = drawable->y;
 
-	while (nrect--) {
-		fullX1 = prect->x + xorg;
-		fullY1 = prect->y + yorg;
-		fullX2 = fullX1 + (int) prect->width;
-		fullY2 = fullY1 + (int) prect->height;
+    while (nrect--) {
+        fullX1 = prect->x + xorg;
+        fullY1 = prect->y + yorg;
+        fullX2 = fullX1 + (int) prect->width;
+        fullY2 = fullY1 + (int) prect->height;
 
-		n = REGION_NUM_RECTS(pClip);
-		pbox = REGION_RECTS(pClip);
-		/*
-		 * clip the rectangle to each box in the clip region
-		 * this is logically equivalent to calling Intersect(),
-		 * but rectangles may overlap each other here.
-		 */
-		while (n--) {
-			int x1 = fullX1;
-			int x2 = fullX2;
-			int y1 = fullY1;
-			int y2 = fullY2;
+        n = REGION_NUM_RECTS(pClip);
+        pbox = REGION_RECTS(pClip);
+        /*
+         * clip the rectangle to each box in the clip region
+         * this is logically equivalent to calling Intersect(),
+         * but rectangles may overlap each other here.
+         */
+        while (n--) {
+            int x1 = fullX1;
+            int x2 = fullX2;
+            int y1 = fullY1;
+            int y2 = fullY2;
 
-			if (pbox->x1 > x1)
-				x1 = pbox->x1;
-			if (pbox->x2 < x2)
-				x2 = pbox->x2;
-			if (pbox->y1 > y1)
-				y1 = pbox->y1;
-			if (pbox->y2 < y2)
-				y2 = pbox->y2;
+            if (pbox->x1 > x1)
+                x1 = pbox->x1;
+            if (pbox->x2 < x2)
+                x2 = pbox->x2;
+            if (pbox->y1 > y1)
+                y1 = pbox->y1;
+            if (pbox->y2 < y2)
+                y2 = pbox->y2;
 
-			pbox++;
-			if (x1 >= x2 || y1 >= y2)
-				continue;
-			if (!glamor_fill(drawable, gc, x1, y1, x2 - x1,
-					 y2 - y1, fallback)) {
-				nrect++;
-				goto fail;
-			}
-		}
-		prect++;
-	}
-	ret = TRUE;
-	goto done;
+            pbox++;
+            if (x1 >= x2 || y1 >= y2)
+                continue;
+            if (!glamor_fill(drawable, gc, x1, y1, x2 - x1, y2 - y1, fallback)) {
+                nrect++;
+                goto fail;
+            }
+        }
+        prect++;
+    }
+    ret = TRUE;
+    goto done;
 
-fail:
+ fail:
 
-	if (!fallback
-	    && glamor_ddx_fallback_check_pixmap(drawable)
-	    && glamor_ddx_fallback_check_gc(gc))
-		goto done;
+    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)) {
-			fbPolyFillRect(drawable, gc, nrect, prect);
-			glamor_finish_access_gc(gc);
-		}
-		glamor_finish_access(drawable, GLAMOR_ACCESS_RW);
-	}
-	ret = TRUE;
+    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)) {
+            fbPolyFillRect(drawable, gc, nrect, prect);
+            glamor_finish_access_gc(gc);
+        }
+        glamor_finish_access(drawable, GLAMOR_ACCESS_RW);
+    }
+    ret = TRUE;
 
-done:
-	return ret;
+ done:
+    return ret;
 }
 
-
 void
 glamor_poly_fill_rect(DrawablePtr drawable,
-		      GCPtr gc, int nrect, xRectangle * prect)
+                      GCPtr gc, int nrect, xRectangle *prect)
 {
-	_glamor_poly_fill_rect(drawable, gc, nrect, prect, TRUE);
+    _glamor_poly_fill_rect(drawable, gc, nrect, prect, TRUE);
 }
 
 Bool
 glamor_poly_fill_rect_nf(DrawablePtr drawable,
-		         GCPtr gc, int nrect, xRectangle * prect)
+                         GCPtr gc, int nrect, xRectangle *prect)
 {
-	return _glamor_poly_fill_rect(drawable, gc, nrect, prect, FALSE);
+    return _glamor_poly_fill_rect(drawable, gc, nrect, prect, FALSE);
 }