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

11
mfb/mfbline.c
View File

@@ -1,3 +1,4 @@
/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.7 2001/12/14 20:00:09 dawes Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -115,7 +116,9 @@ mfbLineSS (pDrawable, pGC, mode, npt, pptInit)
unsigned int oc2; /* outcode of point 2 */
PixelType *addrlBase; /* pointer to start of drawable */
#ifndef POLYSEGMENT
PixelType *addrl; /* address of destination pixmap */
#endif
int nlwidth; /* width in longwords of destination pixmap */
int xorg, yorg; /* origin of window */
@@ -138,7 +141,7 @@ mfbLineSS (pDrawable, pGC, mode, npt, pptInit)
if (!(pGC->planemask & 1))
return;
cclip = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->pCompositeClip;
cclip = pGC->pCompositeClip;
alu = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop;
pboxInit = REGION_RECTS(cclip);
nboxInit = REGION_NUM_RECTS(cclip);
@@ -505,7 +508,7 @@ mfbLineSD( pDrawable, pGC, mode, npt, pptInit)
unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
int x1, x2, y1, y2;
RegionPtr cclip;
int fgrop, bgrop;
int fgrop = 0, bgrop = 0;
unsigned char *pDash;
int dashOffset;
int numInDashList;
@@ -517,7 +520,7 @@ mfbLineSD( pDrawable, pGC, mode, npt, pptInit)
if (!(pGC->planemask & 1))
return;
cclip = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->pCompositeClip;
cclip = pGC->pCompositeClip;
fgrop = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop;
pboxInit = REGION_RECTS(cclip);
nboxInit = REGION_NUM_RECTS(cclip);
@@ -723,7 +726,7 @@ dontStep: ;
(x2 < pbox->x2) &&
(y2 < pbox->y2))
{
unsigned long _mask;
MfbBits _mask;
int rop;
rop = fgrop;