diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-04 08:18:40 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-04 08:18:40 +0100 |
| commit | d4d629b77742e60caac3d120ff40e9f386380af2 (patch) | |
| tree | ed3eacb0fdcf29da0a24e03c4330ce8e3bb66718 /libX11/src/ImUtil.c | |
| parent | c74ef795c7282681616decc36a9a81cd1b1b6ec7 (diff) | |
| download | vcxsrv-d4d629b77742e60caac3d120ff40e9f386380af2.tar.gz vcxsrv-d4d629b77742e60caac3d120ff40e9f386380af2.tar.bz2 vcxsrv-d4d629b77742e60caac3d120ff40e9f386380af2.zip | |
fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013
xserver commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6
xkeyboard-config commit fa2f330df22511c3846cb1cb0760551c6e244a81
libX11 commit c23d61d1b84dca3740bf4786978c7908d0065fb9
pixman commit 5feda20fc39407879993ed4a6d861ef7f78d9432
fontconfig commit 612ee2a5c91b8929b2cc5abce4af84d8d7e66bd0
mesa commit e29124717eae4f8d329bb6a9707b802c0ff4bdd9
Diffstat (limited to 'libX11/src/ImUtil.c')
| -rw-r--r-- | libX11/src/ImUtil.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libX11/src/ImUtil.c b/libX11/src/ImUtil.c index 3164d43b7..fa8d464aa 100644 --- a/libX11/src/ImUtil.c +++ b/libX11/src/ImUtil.c @@ -528,9 +528,7 @@ static unsigned long _XGetPixel ( return (pixel & low_bits_table[ximage->depth]); } -#ifndef WORD64 static CARD32 const byteorderpixel = MSBFirst << 24; -#endif static unsigned long _XGetPixel32 ( register XImage *ximage, @@ -543,12 +541,9 @@ static unsigned long _XGetPixel32 ( if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 32)) { addr = &((unsigned char *)ximage->data) [y * ximage->bytes_per_line + (x << 2)]; -#ifndef WORD64 if (*((const char *)&byteorderpixel) == ximage->byte_order) pixel = *((CARD32 *)addr); - else -#endif - if (ximage->byte_order == MSBFirst) + else if (ximage->byte_order == MSBFirst) pixel = ((unsigned long)addr[0] << 24 | (unsigned long)addr[1] << 16 | (unsigned long)addr[2] << 8 | @@ -734,12 +729,9 @@ static int _XPutPixel32 ( if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 32)) { addr = &((unsigned char *)ximage->data) [y * ximage->bytes_per_line + (x << 2)]; -#ifndef WORD64 if (*((const char *)&byteorderpixel) == ximage->byte_order) *((CARD32 *)addr) = pixel; - else -#endif - if (ximage->byte_order == MSBFirst) { + else if (ximage->byte_order == MSBFirst) { addr[0] = pixel >> 24; addr[1] = pixel >> 16; addr[2] = pixel >> 8; @@ -997,7 +989,6 @@ _XAddPixel ( x = ximage->bytes_per_line * ximage->height; while (--x >= 0) *dp++ += value; -#ifndef WORD64 } else if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 16) && (*((const char *)&byteorderpixel) == ximage->byte_order)) { @@ -1012,7 +1003,6 @@ _XAddPixel ( x = (ximage->bytes_per_line >> 2) * ximage->height; while (--x >= 0) *dp++ += value; -#endif } else { for (y = ximage->height; --y >= 0; ) { for (x = ximage->width; --x >= 0; ) { |