summaryrefslogtreecommitdiff
path: root/hw/xfree86/xf4bpp/ppcWinFS.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
commitadc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch)
tree23eb7becc5360b2cbe16aa8d45529880067f3989 /hw/xfree86/xf4bpp/ppcWinFS.c
parent90f1536dd315cd265bfc7ef35058761a65a01734 (diff)
downloadxserver-adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39.tar.gz
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'hw/xfree86/xf4bpp/ppcWinFS.c')
-rw-r--r--hw/xfree86/xf4bpp/ppcWinFS.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c
index 29d466f00..fc38cdcfe 100644
--- a/hw/xfree86/xf4bpp/ppcWinFS.c
+++ b/hw/xfree86/xf4bpp/ppcWinFS.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.3 1999/06/06 08:49:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.4 2003/11/03 05:11:57 tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
@@ -98,16 +98,16 @@ xf4bppSolidWindowFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted )
return ;
n = nInit * miFindMaxBand( pGC->pCompositeClip ) ;
- if ( !( pwidth = (int *) ALLOCATE_LOCAL( n * sizeof( int ) ) ) )
+ if ( !( pwidthFree = (int *) ALLOCATE_LOCAL( n * sizeof( int ) ) ) )
return ;
- pwidthFree = pwidth ;
+ pwidth = pwidthFree ;
- if ( !( ppt = (DDXPointRec *)
+ if ( !( pptFree = (DDXPointRec *)
ALLOCATE_LOCAL( n * sizeof( DDXPointRec ) ) ) ) {
DEALLOCATE_LOCAL( pwidth ) ;
return ;
}
- pptFree = ppt ;
+ ppt = pptFree ;
n = miClipSpans( pGC->pCompositeClip, pptInit, pwidthInit, nInit,
ppt, pwidth, fSorted ) ;
@@ -164,8 +164,8 @@ int fSorted ;
if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
return ;
- SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
- ppt, pwidthFree, pptFree, fSorted ) ;
+ SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+ pptFree, pwidth, ppt, fSorted ) ;
pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.planemask ;
fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.fgPixel ;
@@ -216,8 +216,8 @@ int fSorted ;
if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
return ;
- SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
- ppt, pwidthFree, pptFree, fSorted ) ;
+ SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+ pptFree, pwidth, ppt, fSorted ) ;
pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.planemask ;
fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.fgPixel ;
@@ -261,8 +261,8 @@ int fSorted ;
if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr )->colorRrop.alu ) == GXnoop )
return ;
- SETSPANPTRS( nInit, n, pwidthInit, pwidth, pptInit,
- ppt, pwidthFree, pptFree, fSorted ) ;
+ SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
+ pptFree, pwidth, ppt, fSorted ) ;
xSrc = pGC->patOrg.x + pDrawable->x ;
ySrc = pGC->patOrg.y + pDrawable->y ;