aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/ImUtil.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-15 09:58:01 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-16 14:09:07 +0200
commitbad67799229b94ea2ba0174319949766ad1c2fc6 (patch)
tree3a698e5e7544952aefe5cf927a685c76759a8088 /nx-X11/lib/X11/ImUtil.c
parent097562b8bbc04d421e0ab5e1e7a0b705e393c20e (diff)
downloadnx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.tar.gz
nx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.tar.bz2
nx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.zip
old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, WORD64, WORD64ALIGN, MUSTCOPY, UNSIGNEDBITFIELDS definitions).
Diffstat (limited to 'nx-X11/lib/X11/ImUtil.c')
-rw-r--r--nx-X11/lib/X11/ImUtil.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/nx-X11/lib/X11/ImUtil.c b/nx-X11/lib/X11/ImUtil.c
index 9e667bb9c..85f4183f4 100644
--- a/nx-X11/lib/X11/ImUtil.c
+++ b/nx-X11/lib/X11/ImUtil.c
@@ -533,9 +533,7 @@ static unsigned long _XGetPixel (ximage, x, y)
return (pixel & low_bits_table[ximage->depth]);
}
-#ifndef WORD64
static CARD32 const byteorderpixel = MSBFirst << 24;
-#endif
static unsigned long _XGetPixel32 (ximage, x, y)
register XImage *ximage;
@@ -548,11 +546,9 @@ static unsigned long _XGetPixel32 (ximage, x, y)
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)
pixel = ((unsigned long)addr[0] << 24 |
(unsigned long)addr[1] << 16 |
@@ -739,11 +735,9 @@ static int _XPutPixel32 (ximage, x, y, pixel)
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) {
addr[0] = pixel >> 24;
addr[1] = pixel >> 16;
@@ -1002,7 +996,6 @@ _XAddPixel (ximage, value)
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)) {
@@ -1017,7 +1010,6 @@ _XAddPixel (ximage, value)
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; ) {