From 5795eaee9455031dead3dff50d1ab2d06c5f9915 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 16 Jun 2010 12:29:54 +0200 Subject: Do runtime endianness test instead of relying on unreliable preprocessor macros. --- draw/imageunpack.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'draw') diff --git a/draw/imageunpack.c b/draw/imageunpack.c index 6e4e7f85..536e43d1 100644 --- a/draw/imageunpack.c +++ b/draw/imageunpack.c @@ -31,6 +31,12 @@ static void decodetile(fz_pixmap *pix, int skip, float *decode) justinvert &= min[i] == 255 && max[i] == 0 && sub[i] == -255; } + unsigned mask; + if (fz_isbigendian()) + mask = 0x00ff00ff; + else + mask = 0xff00ff00; + if (!needed) return; @@ -51,11 +57,7 @@ static void decodetile(fz_pixmap *pix, int skip, float *decode) wh = wh - 2 * hwh; while(hwh--) { unsigned in = *wp; -#if BYTE_ORDER == LITTLE_ENDIAN - unsigned out = in ^ 0xff00ff00; -#else - unsigned out = in ^ 0x00ff00ff; -#endif + unsigned out = in ^ mask; *wp++ = out; } p = (byte *)wp; -- cgit v1.2.3