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

diff --git a/xorg-server/glamor/glamor_getimage.c b/xorg-server/glamor/glamor_getimage.c
index 5df576c45..5609e707f 100644
--- a/xorg-server/glamor/glamor_getimage.c
+++ b/xorg-server/glamor/glamor_getimage.c
@@ -28,74 +28,71 @@
 
 #include "glamor_priv.h"
 
-
 static Bool
 _glamor_get_image(DrawablePtr drawable, int x, int y, int w, int h,
-		  unsigned int format, unsigned long planeMask, char *d,
-		  Bool fallback)
+                  unsigned int format, unsigned long planeMask, char *d,
+                  Bool fallback)
 {
-	PixmapPtr pixmap, sub_pixmap;
-	struct glamor_pixmap_private *pixmap_priv;
-	int x_off, y_off;
-	int stride;
-	void *data;
-
-	pixmap = glamor_get_drawable_pixmap(drawable);
-	glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off);
+    PixmapPtr pixmap, sub_pixmap;
+    struct glamor_pixmap_private *pixmap_priv;
+    int x_off, y_off;
+    int stride;
+    void *data;
 
-	if (format != ZPixmap)
-		goto fall_back;
-	pixmap = glamor_get_drawable_pixmap(drawable);
-	glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off);
+    pixmap = glamor_get_drawable_pixmap(drawable);
+    glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off);
 
-	if (!glamor_set_planemask(pixmap, planeMask)) {
-		glamor_fallback
-		    ("Failedto set planemask  in glamor_solid.\n");
-		goto fall_back;
-	}
-	pixmap_priv = glamor_get_pixmap_private(pixmap);
+    if (format != ZPixmap)
+        goto fall_back;
+    pixmap = glamor_get_drawable_pixmap(drawable);
+    glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off);
 
+    if (!glamor_set_planemask(pixmap, planeMask)) {
+        glamor_fallback("Failedto set planemask  in glamor_solid.\n");
+        goto fall_back;
+    }
+    pixmap_priv = glamor_get_pixmap_private(pixmap);
 
-	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
-		goto fall_back;
-	stride = PixmapBytePad(w, drawable->depth);
+    if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
+        goto fall_back;
+    stride = PixmapBytePad(w, drawable->depth);
 
-	x += drawable->x + x_off;
-	y += drawable->y + y_off;
+    x += drawable->x + x_off;
+    y += drawable->y + y_off;
 
-	data = glamor_download_sub_pixmap_to_cpu(pixmap, x, y, w, h, stride,
-						 d, 0, GLAMOR_ACCESS_RO);
-	if (data != NULL) {
-		assert(data == d);
-		return TRUE;
-	}
-fall_back:
-	sub_pixmap = glamor_get_sub_pixmap(pixmap, x + x_off + drawable->x,
-					   y + y_off + drawable->y, w, h,
-					   GLAMOR_ACCESS_RO);
-	if (sub_pixmap) {
-		fbGetImage(&sub_pixmap->drawable, 0, 0, w, h, format, planeMask, d);
-		glamor_put_sub_pixmap(sub_pixmap, pixmap,
-				      x + x_off + drawable->x,
-				      y + y_off + drawable->y,
-				      w, h, GLAMOR_ACCESS_RO);
-	} else
-		miGetImage(drawable, x, y, w, h, format, planeMask, d);
+    data = glamor_download_sub_pixmap_to_cpu(pixmap, x, y, w, h, stride,
+                                             d, 0, GLAMOR_ACCESS_RO);
+    if (data != NULL) {
+        assert(data == d);
+        return TRUE;
+    }
+ fall_back:
+    sub_pixmap = glamor_get_sub_pixmap(pixmap, x + x_off + drawable->x,
+                                       y + y_off + drawable->y, w, h,
+                                       GLAMOR_ACCESS_RO);
+    if (sub_pixmap) {
+        fbGetImage(&sub_pixmap->drawable, 0, 0, w, h, format, planeMask, d);
+        glamor_put_sub_pixmap(sub_pixmap, pixmap,
+                              x + x_off + drawable->x,
+                              y + y_off + drawable->y, w, h, GLAMOR_ACCESS_RO);
+    }
+    else
+        miGetImage(drawable, x, y, w, h, format, planeMask, d);
 
-	return TRUE;
+    return TRUE;
 }
 
 void
 glamor_get_image(DrawablePtr pDrawable, int x, int y, int w, int h,
-		 unsigned int format, unsigned long planeMask, char *d)
+                 unsigned int format, unsigned long planeMask, char *d)
 {
-	_glamor_get_image(pDrawable, x, y, w, h, format, planeMask, d, TRUE);
+    _glamor_get_image(pDrawable, x, y, w, h, format, planeMask, d, TRUE);
 }
 
 Bool
 glamor_get_image_nf(DrawablePtr pDrawable, int x, int y, int w, int h,
-		    unsigned int format, unsigned long planeMask, char *d)
+                    unsigned int format, unsigned long planeMask, char *d)
 {
-	return _glamor_get_image(pDrawable, x, y, w, 
-				 h, format, planeMask, d, FALSE);
+    return _glamor_get_image(pDrawable, x, y, w,
+                             h, format, planeMask, d, FALSE);
 }