SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge XFree86 4.3.0.1 to -CURRENT

Browse Source
This commit is contained in:
Kaleb Keithley
2003-11-17 19:03:47 +00:00
parent 9508a382f8
commit c57959ad6a
615 changed files with 42990 additions and 101132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mfb/mfbimage.c
View File

@@ -1,3 +1,4 @@
/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.6 2001/12/14 20:00:08 dawes Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -109,14 +110,14 @@ mfbPutImage(dst, pGC, depth, x, y, w, h, leftPad, format, pImage)
if (!pPixmap)
return;
((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->fExpose = FALSE;
pGC->fExpose = FALSE;
if (format != XYBitmap)
(*pGC->ops->CopyArea)((DrawablePtr)pPixmap, dst, pGC, leftPad, 0,
w, h, x, y);
else
(*pGC->ops->CopyPlane)((DrawablePtr)pPixmap, dst, pGC, leftPad, 0,
w, h, x, y, 1);
((mfbPrivGC*)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->fExpose = TRUE;
pGC->fExpose = TRUE;
FreeScratchPixmapHeader(pPixmap);
}
@@ -139,7 +140,6 @@ mfbGetImage( pDrawable, sx, sy, w, h, format, planeMask, pdstLine)
unsigned long planeMask;
char *pdstLine;
{
PixmapPtr pPixmap;
BoxRec box;
DDXPointRec ptSrc;
RegionRec rgnDst;