diff options
| author | Vikas Arora <vikasa@google.com> | 2015-01-28 14:08:58 -0800 |
|---|---|---|
| committer | Vikas Arora <vikasa@google.com> | 2015-01-28 19:09:40 -0800 |
| commit | 8c098653157979e397d3954fc2ea0ee43bae6ab2 (patch) | |
| tree | ac8c9cf17c8f9f8e582c859c2d469816385bf8de /src/dsp/cpu.c | |
| parent | b47abadef58b12e6d28cbe462c801a64f9ce8ef5 (diff) | |
| download | webp-8c098653157979e397d3954fc2ea0ee43bae6ab2.tar.gz | |
Sync-patch with libwebp ver 0.4.2
Sync-patch with libwebp ver 0.4.2 (change#I32a22786f)
Also cherry-picked one-line fix for Alpha-decode bug (ref: 'src < src_end')
Verfied the build on volantis/flounder (N9), razor/flo (N7), hammerhead (N5) and nakasi
(N7-old) and verified that the corrupted image rendered correctly on
Razor and Volantis devices.
Change-Id: I1d013d5b8d2236957c85c2cd2cdfa083733b5215
Diffstat (limited to 'src/dsp/cpu.c')
| -rw-r--r-- | src/dsp/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dsp/cpu.c b/src/dsp/cpu.c index 581b5e30..70ba2ab0 100644 --- a/src/dsp/cpu.c +++ b/src/dsp/cpu.c @@ -57,7 +57,7 @@ static WEBP_INLINE uint64_t xgetbv(void) { } #elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 160040219 // >= VS2010 SP1 #define xgetbv() _xgetbv(0) -#elif defined(_M_IX86) +#elif defined(_MSC_VER) && defined(_M_IX86) static WEBP_INLINE uint64_t xgetbv(void) { uint32_t eax_, edx_; __asm { |