xserver/fb fbgc.c,1.14,1.15

David Reveman xserver-commit at pdx.freedesktop.org
Thu Mar 10 15:25:30 PST 2005


Committed by: davidr

Update of /cvs/xserver/xserver/fb
In directory gabe:/tmp/cvs-serv28941/fb

Modified Files:
	fbgc.c 
Log Message:
Make fbPadPixmap work with negative stride

Index: fbgc.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbgc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- fbgc.c	2 Mar 2005 15:30:03 -0000	1.14
+++ fbgc.c	10 Mar 2005 23:25:28 -0000	1.15
@@ -99,9 +99,13 @@
     FbBits  mask;
     int	    height;
     int	    w;
+    int	    stride;
+    int	    bpp;
+    int	    xOff, yOff;
 
+    fbGetDrawable (&pPixmap->drawable, bits, stride, bpp, xOff, yOff);
+    
     width = pPixmap->drawable.width * pPixmap->drawable.bitsPerPixel;
-    bits = pPixmap->devPrivate.ptr;
     height = pPixmap->drawable.height;
     mask = FbBitsMask (0, width);
     while (height--)
@@ -113,7 +117,8 @@
 	    b = b | FbScrRight(b, w);
 	    w <<= 1;
 	}
-	*bits++ = b;
+	*bits = b;
+	bits += stride;
     }
 }
 



More information about the xserver-commit mailing list