Merge changes If1331d3c,I86fe3847

* changes:
  types.h: centralize use of stddef.h
  vp8io: use size_t for buffer size

src/webp/decode.h

@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#define WEBP_DECODER_ABI_VERSION 0x0002
+#define WEBP_DECODER_ABI_VERSION 0x0003
 
 // Return the decoder's version number, packed in hexadecimal using 8bits for
 // each of major/minor/revision. E.g: v2.5.7 is 0x020507.

src/webp/decode_vp8.h

@@ -82,7 +82,7 @@ struct VP8Io {
   int fancy_upsampling;
 
   // Input buffer.
-  uint32_t data_size;
+  size_t data_size;
   const uint8_t* data;
 
   // If true, in-loop filtering will not be performed even if present in the

src/webp/encode.h

@@ -12,8 +12,6 @@
 #ifndef WEBP_WEBP_ENCODE_H_
 #define WEBP_WEBP_ENCODE_H_
 
-#include <stdlib.h>
-
 #include "./types.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)

src/webp/types.h

@@ -12,6 +12,8 @@
 #ifndef WEBP_WEBP_TYPES_H_
 #define WEBP_WEBP_TYPES_H_
 
+#include <stddef.h>  // for size_t
+
 #ifndef _MSC_VER
 #include <inttypes.h>
 #ifdef __STRICT_ANSI__