Merge changes If1331d3c,I86fe3847

* changes:
  types.h: centralize use of stddef.h
  vp8io: use size_t for buffer size
This commit is contained in:
James Zern 2012-04-14 13:01:13 -07:00 committed by Gerrit Code Review
commit dceb8b4d9a
10 changed files with 5 additions and 11 deletions

View File

@ -16,8 +16,6 @@
extern "C" { extern "C" {
#endif #endif
#include <stddef.h> // for size_t
#include "../webp/decode_vp8.h" #include "../webp/decode_vp8.h"
#include "../utils/rescaler.h" #include "../utils/rescaler.h"

View File

@ -9,8 +9,6 @@
// //
// Author: Christian Duvivier (cduvivier@google.com) // Author: Christian Duvivier (cduvivier@google.com)
#include <stddef.h> // for NULL
#include "./dsp.h" #include "./dsp.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)

View File

@ -9,6 +9,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include <stdlib.h> // for abs()
#include "./dsp.h" #include "./dsp.h"
#include "../enc/vp8enci.h" #include "../enc/vp8enci.h"

View File

@ -14,7 +14,6 @@
#define WEBP_UTILS_BIT_READER_H_ #define WEBP_UTILS_BIT_READER_H_
#include <assert.h> #include <assert.h>
#include <stddef.h> // For size_t
#ifdef _MSC_VER #ifdef _MSC_VER
#include <stdlib.h> // _byteswap_ulong #include <stdlib.h> // _byteswap_ulong
#endif #endif

View File

@ -11,7 +11,6 @@
#include "./filters.h" #include "./filters.h"
#include <assert.h> #include <assert.h>
#include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -13,7 +13,6 @@
#define WEBP_UTILS_HUFFMAN_H_ #define WEBP_UTILS_HUFFMAN_H_
#include <assert.h> #include <assert.h>
#include <stddef.h>
#include "../webp/types.h" #include "../webp/types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)

View File

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

View File

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

View File

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

View File

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