aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Oakland <marcus.oakland@arm.com>2014-02-06 12:23:38 +0000
committerAshok Bhat <ashok.bhat@arm.com>2014-02-20 14:15:19 +0000
commit84eb70123e17e1ea3931d30c972ea0450f892695 (patch)
tree1830e028f8c01b29e2fb0105230c8818016ddb1f
parent0cff496ad0f2a3b8302e6c815a50fd7d0628526d (diff)
downloadjpeg-84eb70123e17e1ea3931d30c972ea0450f892695.tar.gz
AArch64: Correction of definition of UINT32
In an #ifdef ENABLE_ANDROID_NULL_CONVERT...#endif section of the jccolor.c module UINT32 was defined as unsigned long, which is OK for 32-bit systems but incorrect for __LP64__ systems such as AArch64. The definition of UINT32 has been changed to unsigned int, which is 32-bits on both 32-bit and __LP64__ systems. Change-Id: I5e29db2ea0690ce3623bb54aa1138aa3f772df76 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
-rw-r--r--jccolor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/jccolor.c b/jccolor.c
index 57a76c3..6a8b48f 100644
--- a/jccolor.c
+++ b/jccolor.c
@@ -302,7 +302,7 @@ grayscale_convert (j_compress_ptr cinfo,
#ifdef ENABLE_ANDROID_NULL_CONVERT
-typedef unsigned long UINT32;
+typedef unsigned int UINT32;
#define B0(n) ((n) & 0xFF)
#define B1(n) (((n) >> 8) & 0xFF)