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/cfbpntwin.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/cfbpntwin.c')
| -rw-r--r-- | cfb/cfbpntwin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index d21544b37..c77d01961 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7 2002/09/16 18:05:31 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ #include "X.h" @@ -226,7 +226,6 @@ cfbFillBoxSolid (pDrawable, nBox, pBox, pixel) CfbBits *pdstBase; int widthDst; register int h; - register CfbBits rrop_xor; register CfbBits *pdst; int nmiddle; int w; @@ -238,13 +237,16 @@ cfbFillBoxSolid (pDrawable, nBox, pBox, pixel) piQxelArray[1] = ((pixel&0xFFFF00)>>8) | ((pixel&0xFFFF)<<16); piQxelArray[2] = ((pixel&0xFFFFFF)<<8) | ((pixel&0xFF0000)>>16); #else + register CfbBits rrop_xor; register CfbBits leftMask, rightMask; register int m; #endif cfbGetLongWidthAndPointer(pDrawable, widthDst, pdstBase); +#if PSZ != 24 rrop_xor = PFILL(pixel); +#endif for (; nBox; nBox--, pBox++) { pdst = pdstBase + pBox->y1 * widthDst; |