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, 44 insertions, 47 deletions

diff --git a/xorg-server/glamor/glamor_getspans.c b/xorg-server/glamor/glamor_getspans.c
index 6d6c8e9a4..ff58725d6 100644
--- a/xorg-server/glamor/glamor_getspans.c
+++ b/xorg-server/glamor/glamor_getspans.c
@@ -28,68 +28,65 @@
 
 #include "glamor_priv.h"
 
-static Bool 
+static Bool
 _glamor_get_spans(DrawablePtr drawable,
-		  int wmax,
-		  DDXPointPtr points, int *widths, int count, char *dst,
-		  Bool fallback)
+                  int wmax,
+                  DDXPointPtr points, int *widths, int count, char *dst,
+                  Bool fallback)
 {
-	PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
-	glamor_pixmap_private *pixmap_priv =
-	    glamor_get_pixmap_private(pixmap);
-	int i;
-	uint8_t *readpixels_dst = (uint8_t *) dst;
-	void *data;
-	int x_off, y_off;
-	Bool ret = FALSE;
+    PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
+    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
+    int i;
+    uint8_t *readpixels_dst = (uint8_t *) dst;
+    void *data;
+    int x_off, y_off;
+    Bool ret = FALSE;
 
-	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
-		goto fail;
+    if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
+        goto fail;
 
-	glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off);
-	for (i = 0; i < count; i++) {
-		data = glamor_download_sub_pixmap_to_cpu(pixmap, points[i].x + x_off,
-							 points[i].y + y_off, widths[i], 1,
-							 PixmapBytePad(widths[i], drawable->depth),
-							 readpixels_dst, 0, GLAMOR_ACCESS_RO);
-		assert(data == readpixels_dst);
-		readpixels_dst += PixmapBytePad(widths[i], drawable->depth);
-	}
+    glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off);
+    for (i = 0; i < count; i++) {
+        data = glamor_download_sub_pixmap_to_cpu(pixmap, points[i].x + x_off,
+                                                 points[i].y + y_off, widths[i],
+                                                 1, PixmapBytePad(widths[i],
+                                                                  drawable->
+                                                                  depth),
+                                                 readpixels_dst, 0,
+                                                 GLAMOR_ACCESS_RO);
+        (void)data;
+        assert(data == readpixels_dst);
+        readpixels_dst += PixmapBytePad(widths[i], drawable->depth);
+    }
 
-	ret = TRUE;
-	goto done;
-fail:
+    ret = TRUE;
+    goto done;
+ fail:
 
-	if (!fallback
-	    && glamor_ddx_fallback_check_pixmap(drawable))
-		goto done;
+    if (!fallback && glamor_ddx_fallback_check_pixmap(drawable))
+        goto done;
 
-	ret = TRUE;
-	if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RO)) {
-		fbGetSpans(drawable, wmax, points, widths, count, dst);
-		glamor_finish_access(drawable, GLAMOR_ACCESS_RO);
-	}
-done:
-	return ret;
+    ret = TRUE;
+    if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RO)) {
+        fbGetSpans(drawable, wmax, points, widths, count, dst);
+        glamor_finish_access(drawable, GLAMOR_ACCESS_RO);
+    }
+ done:
+    return ret;
 }
 
 void
 glamor_get_spans(DrawablePtr drawable,
-		 int wmax,
-		 DDXPointPtr points, int *widths, int count, char *dst)
+                 int wmax,
+                 DDXPointPtr points, int *widths, int count, char *dst)
 {
-	_glamor_get_spans(drawable, wmax, points, 
-			  widths, count, dst, TRUE);
+    _glamor_get_spans(drawable, wmax, points, widths, count, dst, TRUE);
 }
 
 Bool
 glamor_get_spans_nf(DrawablePtr drawable,
-		    int wmax,
-		    DDXPointPtr points, int *widths, int count, char *dst)
+                    int wmax,
+                    DDXPointPtr points, int *widths, int count, char *dst)
 {
-	return _glamor_get_spans(drawable, wmax, points, 
-				 widths, count, dst, FALSE);
+    return _glamor_get_spans(drawable, wmax, points, widths, count, dst, FALSE);
 }
-
-
-