21 lines
758 B
Diff
21 lines
758 B
Diff
|
diff -u -r -N ../xc.old/programs/Xserver/hw/xfree86/xaa/xaaImage.c ./programs/Xserver/hw/xfree86/xaa/xaaImage.c
|
||
|
|
--- ../xc.old/programs/Xserver/hw/xfree86/xaa/xaaImage.c 2003-10-27 16:30:43.000000000 +0100
|
||
|
|
+++ hw/xfree86/xaa/xaaImage.c 2003-10-27 16:32:18.000000000 +0100
|
||
|
|
@@ -236,12 +236,16 @@
|
||
|
|
(*infoRec->SetupForImageWrite)(pScrn, rop, planemask, trans, bpp, depth);
|
||
|
|
(*infoRec->SubsequentImageWriteRect)(pScrn, x, y, w, h, skipleft);
|
||
|
|
|
||
|
|
+#if 0
|
||
|
|
if(beCareful) {
|
||
|
|
/* in cases with bad alignment we have to be careful not
|
||
|
|
to read beyond the end of the source */
|
||
|
|
if(((x * Bpp) + (dwords << 2)) > srcwidth) h--;
|
||
|
|
else beCareful = FALSE;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
+ if (beCareful)
|
||
|
|
+ h--;
|
||
|
|
|
||
|
|
if(dwords > infoRec->ImageWriteRange) {
|
||
|
|
while(h--) {
|