am 5a504147: (-s ours) DO NOT MERGE Sync libwebp ver 0.2.0
* commit '5a50414796e9a458925c7a13a15055d02406bf43':
DO NOT MERGE Sync libwebp ver 0.2.0
diff --git a/ChangeLog b/ChangeLog
index 1fcff1a..06c8316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,4 +2,5 @@
- 5/11: release version 0.1.2
- 6/11: Added encoder (version 0.1.2) as well
- 7/11: Updated WebP with head change#Ia53f845b
-- 8/12: release version 0.2.0 (head change#I3da2063b
+- 8/12: release version 0.2.0-rc1 (head change#Ia5475247)
+- : Updated WebP with head change#I3da2063b
diff --git a/NEWS b/NEWS
index 9232f5c..9e3fa76 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
- 9/10: initial release version 0.1
-- 8/12: release version 0.2.0 (head change#I3da2063b).
+- 8/12: release version 0.2.0-rc1 (head change#Ia5475247).
diff --git a/README.android b/README.android
index 96dc441..787a8a9 100644
--- a/README.android
+++ b/README.android
@@ -23,7 +23,8 @@
- Fixed the Endian'ness bug for Color-Configs (RGB_565 & ARGB_4444).
The fix is similar to jpeglib handling for JCS_RGB_565 & JCS_RGBA_8888
color configs. Added the code under "ANDROID_WEBP_RGB" flag.
-- Sync-patch with libwebp ver 0.2.0 (head change#I3da2063b).
+- Sync-patch with libwebp ver 0.2.0-rc1 (head change#Ia5475247).
+- Updated WebP with head change#I3da2063b
The Android.mk file creates WebP Decoder and Encoder static libraries which
can be added to any application by Adding to LOCAL_STATIC_LIBRARIES
diff --git a/src/dsp/cpu.c b/src/dsp/cpu.c
index 10e0936..2ee7812 100644
--- a/src/dsp/cpu.c
+++ b/src/dsp/cpu.c
@@ -57,8 +57,8 @@
return 0;
}
VP8CPUInfo VP8GetCPUInfo = x86CPUInfo;
-#elif defined(WEBP_ANDROID_NEON)
-static int AndroidCPUInfo(CPUFeature feature) {
+//#elif defined(WEBP_ANDROID_NEON)
+//static int AndroidCPUInfo(CPUFeature feature) {
// const AndroidCpuFamily cpu_family = android_getCpuFamily();
// const uint64_t cpu_features = android_getCpuFeatures();
// if (feature == kNEON) {
@@ -66,9 +66,8 @@
// 0 != (cpu_features & ANDROID_CPU_ARM_FEATURE_NEON));
// }
// return 0;
- return 1;
-}
-VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo;
+//}
+//VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo;
#elif defined(__ARM_NEON__)
// define a dummy function to enable turning off NEON at runtime by setting
// VP8DecGetCPUInfo = NULL
diff --git a/src/dsp/dsp.h b/src/dsp/dsp.h
index c4061aa..3aad309 100644
--- a/src/dsp/dsp.h
+++ b/src/dsp/dsp.h
@@ -29,9 +29,9 @@
#define WEBP_USE_SSE2
#endif
-#if defined(__ANDROID__) && defined(__ARM_ARCH_7A__) && defined(__ARM_NEON__)
-#define WEBP_ANDROID_NEON // Android targets that might support NEON
-#endif
+//#if defined(__ANDROID__) && defined(__ARM_ARCH_7A__)
+//#define WEBP_ANDROID_NEON // Android targets that might support NEON
+//#endif
#if defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON)
#define WEBP_USE_NEON
