diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 14:14:08 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 14:14:08 +0000 |
| commit | 56888f9877ad37ee62a8d751d3e448fd57d4e48a (patch) | |
| tree | e053325b0fbad50834d1fe37d518161ba8daeb6b /third_party | |
| parent | 982735c278476e99b504feaa775fa7b3c0fd8fa8 (diff) | |
| download | chromium_src-56888f9877ad37ee62a8d751d3e448fd57d4e48a.zip chromium_src-56888f9877ad37ee62a8d751d3e448fd57d4e48a.tar.gz chromium_src-56888f9877ad37ee62a8d751d3e448fd57d4e48a.tar.bz2 | |
fix cast warning in webp for Visual C by using stddef and uintptr_t
BUG=none
TEST=devenv -build Release chrome.sln -project libwebp
Review URL: http://codereview.chromium.org/4165010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libwebp/frame.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/libwebp/frame.c b/third_party/libwebp/frame.c index 2386db2..1e1aadc 100644 --- a/third_party/libwebp/frame.c +++ b/third_party/libwebp/frame.c @@ -9,6 +9,7 @@ // // Author: Skal (pascal.massimino@gmail.com) +#include <stddef.h> #include <stdlib.h> #include "vp8i.h" @@ -64,7 +65,7 @@ int VP8InitFrame(VP8Decoder* const dec, VP8Io* io) { dec->mb_info_ = ((VP8MB*)mem) + 1; mem += info_size; - mem = (uint8_t*)((uint64_t)(mem + ALIGN_MASK) & ~ALIGN_MASK); + mem = (uint8_t*)((uintptr_t)(mem + ALIGN_MASK) & ~ALIGN_MASK); assert((yuv_size & ALIGN_MASK) == 0); dec->yuv_b_ = (uint8_t*)mem; mem += yuv_size; |