diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /cfb/cfbblt.c | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'cfb/cfbblt.c')
| -rw-r--r-- | cfb/cfbblt.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index aafe44669..5d2e084fd 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -1,7 +1,7 @@ /* * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.12 2001/12/14 19:59:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ /* @@ -118,12 +118,13 @@ Author: Keith Packard #endif void -MROP_NAME(cfbDoBitblt)(pSrc, pDst, alu, prgnDst, pptSrc, planemask) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; - unsigned long planemask; +MROP_NAME(cfbDoBitblt)( + DrawablePtr pSrc, + DrawablePtr pDst, + int alu, + RegionPtr prgnDst, + DDXPointPtr pptSrc, + unsigned long planemask) { CfbBits *psrcBase, *pdstBase; /* start of src and dst bitmaps */ @@ -167,12 +168,8 @@ MROP_NAME(cfbDoBitblt)(pSrc, pDst, alu, prgnDst, pptSrc, planemask) #endif #if MROP == 0 - unsigned char *psrcBaseByte, *pdstBaseByte; - int widthSrcBytes, widthDstBytes; - - cfbGetByteWidthAndPointer (pSrc, widthSrcBytes, psrcBaseByte) - - cfbGetByteWidthAndPointer (pDst, widthDstBytes, pdstBaseByte) + int widthSrcBytes = cfbGetByteWidth(pSrc); + int widthDstBytes = cfbGetByteWidth(pDst); #endif #endif |