Fix handling of Xv images with width that is not a multiple of 8

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f9de97326..0e2592d6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09  David Reveman  <davidr@novell.com>
+
+	* hw/xgl/xglxv.c (xglXvPutImage): Stride should be padded to a
+	multiple of 8.
+
 2006-05-05  David Reveman  <davidr@novell.com>
 
 	* hw/xgl/glx/xglx.c (xglxKbdCtrl): No need to go through more than
diff --git a/hw/xgl/xglxv.c b/hw/xgl/xglxv.c
index faef674c4..e9191bcfb 100644
--- a/hw/xgl/xglxv.c
+++ b/hw/xgl/xglxv.c
@@ -339,7 +339,7 @@ xglXvPutImage (ClientPtr     client,
 				    srcWidth, srcHeight,
 				    depth, bpp, -1, (pointer) data);
 
-    XGL_GET_PIXMAP_PRIV (pPortPriv->pPixmap)->stride = -srcWidth;
+    XGL_GET_PIXMAP_PRIV (pPortPriv->pPixmap)->stride = -((srcWidth + 7) & ~7);
 
     pPortPriv->pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;