commit 0cff496ad0f2a3b8302e6c815a50fd7d0628526d
author Colin Cross <ccross@android.com> Thu Feb 06 02:21:19 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 06 02:21:19 2014 +0000
tree 048092e9c508e94601ae03845b94c4ce29e2b049
parent b16da2189f013e44ba5b44b843f784110fa0ffe6
parent 0da7ab65c6faaf7c8c39edf3612206703997334b

Merge "jpeg: fix compiling for 64-bit"

jmorecfg.h

diff --git a/jmorecfg.h b/jmorecfg.h
index 71cb393..66116db 100644
--- a/jmorecfg.h
+++ b/jmorecfg.h
@@ -22,7 +22,7 @@
 #ifdef ANDROID_RGB
 #define PACK_SHORT_565(r,g,b)  ((((r)<<8)&0xf800)|(((g)<<3)&0x7E0)|((b)>>3))
 #define PACK_TWO_PIXELS(l,r)   ((r<<16) | l)
-#define PACK_NEED_ALIGNMENT(ptr) (((int)(ptr))&3)
+#define PACK_NEED_ALIGNMENT(ptr) (((uintptr_t)(ptr))&3)
 #define WRITE_TWO_PIXELS(addr, pixels) do {     \
          ((INT16*)(addr))[0] = (pixels);        \
          ((INT16*)(addr))[1] = (pixels)>>16;    \