Contents of /trunk/vnc/patches/xc.patch-cfbglblt8.patch
Parent Directory
| 
Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 1738 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 1738 byte(s)
-import
| 1 | --- xc.patch 2004-08-25 11:13:06.749688613 +0000 |
| 2 | +++ xc.patch 2004-08-25 11:13:37.307230320 +0000 |
| 3 | @@ -116,60 +116,6 @@ |
| 4 | ! nlwMiddle >>= 3; \ |
| 5 | while (h--) { \ |
| 6 | srcpix = psrc[srcy]; \ |
| 7 | -*** xc/programs/Xserver/cfb/cfbglblt8.c.orig Fri Dec 14 19:59:23 2001 |
| 8 | ---- xc/programs/Xserver/cfb/cfbglblt8.c Tue Aug 12 10:05:57 2003 |
| 9 | -*************** |
| 10 | -*** 284,288 **** |
| 11 | - register glyphPointer glyphBits; |
| 12 | - register int xoff; |
| 13 | -! #if defined(USE_LEFT_BITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE)) |
| 14 | - register CfbBits *dst; |
| 15 | - #endif |
| 16 | ---- 284,288 ---- |
| 17 | - register glyphPointer glyphBits; |
| 18 | - register int xoff; |
| 19 | -! #if defined(USE_LEFTBITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE)) |
| 20 | - register CfbBits *dst; |
| 21 | - #endif |
| 22 | -*************** |
| 23 | -*** 292,296 **** |
| 24 | - CfbBits *dstLine; |
| 25 | - CfbBits *pdstBase; |
| 26 | -! #ifdef USE_LEFT_BITS |
| 27 | - CARD32 *cTmp; |
| 28 | - #endif |
| 29 | ---- 292,296 ---- |
| 30 | - CfbBits *dstLine; |
| 31 | - CfbBits *pdstBase; |
| 32 | -! #ifdef USE_LEFTBITS |
| 33 | - CARD32 *cTmp; |
| 34 | - #endif |
| 35 | -*************** |
| 36 | -*** 399,403 **** |
| 37 | - } while (--hTmp); |
| 38 | - break; |
| 39 | -! #else /* !USE_LEFT_BITS */ |
| 40 | - { |
| 41 | - int h; |
| 42 | ---- 399,403 ---- |
| 43 | - } while (--hTmp); |
| 44 | - break; |
| 45 | -! #else /* !USE_LEFTBITS */ |
| 46 | - { |
| 47 | - int h; |
| 48 | -*************** |
| 49 | -*** 412,416 **** |
| 50 | - glyphBits = clips; |
| 51 | - /* fall through */ |
| 52 | -! #endif /* USE_LEFT_BITS */ |
| 53 | - case rgnIN: |
| 54 | - #ifdef STIPPLE |
| 55 | ---- 412,416 ---- |
| 56 | - glyphBits = clips; |
| 57 | - /* fall through */ |
| 58 | -! #endif /* USE_LEFTBITS */ |
| 59 | - case rgnIN: |
| 60 | - #ifdef STIPPLE |
| 61 | *** xc/programs/Xserver/cfb/cfbcppl.c.orig Fri Dec 14 19:59:22 2001 |
| 62 | --- xc/programs/Xserver/cfb/cfbcppl.c Sun Apr 18 12:53:36 2004 |
| 63 | *************** |