aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-02-21 14:54:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-21 14:54:15 +0000
commit746f1f0853ddbd14ab5da6af35cc1fa560453d1e (patch)
tree1830e028f8c01b29e2fb0105230c8818016ddb1f
parent0cff496ad0f2a3b8302e6c815a50fd7d0628526d (diff)
parent84eb70123e17e1ea3931d30c972ea0450f892695 (diff)
downloadjpeg-746f1f0853ddbd14ab5da6af35cc1fa560453d1e.tar.gz
Merge "AArch64: Correction of definition of UINT32"
-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)