Merge pull request #11 from pandamicro/master

Add webp

Author: pandamicro

android/Android.mk

@@ -55,20 +55,20 @@ LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libtiff.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 #======================================
-#include $(CLEAR_VARS)
-#
-#LOCAL_MODULE := cocos_webp_static
-#LOCAL_MODULE_FILENAME := webp
-#LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
-#
-#LOCAL_WHOLE_STATIC_LIBRARIES := cpufeatures
-#
-#ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-#    LOCAL_CFLAGS := -DHAVE_NEON=1
-#endif
-#
-#include $(PREBUILT_STATIC_LIBRARY)
-#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cocos_webp_static
+LOCAL_MODULE_FILENAME := webp
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
+
+LOCAL_WHOLE_STATIC_LIBRARIES := cpufeatures
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+   LOCAL_CFLAGS := -DHAVE_NEON=1
+endif
+
+include $(PREBUILT_STATIC_LIBRARY)
+
 #======================================
 include $(CLEAR_VARS)
 

android/arm64-v8a/include/webp/decode.h

@@ -0,0 +1,52 @@
+// Copyright 2010 Google Inc. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the COPYING file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS. All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+// -----------------------------------------------------------------------------
+//
+//  Common types
+//
+// Author: Skal ([email protected])
+
+#ifndef WEBP_WEBP_TYPES_H_
+#define WEBP_WEBP_TYPES_H_
+
+#include <stddef.h>  // for size_t
+
+#ifndef _MSC_VER
+#include <inttypes.h>
+#if defined(__cplusplus) || !defined(__STRICT_ANSI__) || \
+    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+#define WEBP_INLINE inline
+#else
+#define WEBP_INLINE
+#endif
+#else
+typedef signed   char int8_t;
+typedef unsigned char uint8_t;
+typedef signed   short int16_t;
+typedef unsigned short uint16_t;
+typedef signed   int int32_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long int uint64_t;
+typedef long long int int64_t;
+#define WEBP_INLINE __forceinline
+#endif  /* _MSC_VER */
+
+#ifndef WEBP_EXTERN
+// This explicitly marks library functions and allows for changing the
+// signature for e.g., Windows DLL builds.
+# if defined(__GNUC__) && __GNUC__ >= 4
+#  define WEBP_EXTERN(type) extern __attribute__ ((visibility ("default"))) type
+# else
+#  define WEBP_EXTERN(type) extern type
+# endif  /* __GNUC__ >= 4 */
+#endif  /* WEBP_EXTERN */
+
+// Macro to check ABI compatibility (same major revision number)
+#define WEBP_ABI_IS_INCOMPATIBLE(a, b) (((a) >> 8) != ((b) >> 8))
+
+#endif  /* WEBP_WEBP_TYPES_H_ */