mirror of
https://github.com/webmproject/libwebp.git
synced 2025-02-12 15:02:53 +01:00
Merge changes If1331d3c,I86fe3847
* changes: types.h: centralize use of stddef.h vp8io: use size_t for buffer size
This commit is contained in:
commit
dceb8b4d9a
@ -16,8 +16,6 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <stddef.h> // for size_t
|
||||
|
||||
#include "../webp/decode_vp8.h"
|
||||
#include "../utils/rescaler.h"
|
||||
|
||||
|
@ -9,8 +9,6 @@
|
||||
//
|
||||
// Author: Christian Duvivier (cduvivier@google.com)
|
||||
|
||||
#include <stddef.h> // for NULL
|
||||
|
||||
#include "./dsp.h"
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
|
@ -9,6 +9,7 @@
|
||||
//
|
||||
// Author: Skal (pascal.massimino@gmail.com)
|
||||
|
||||
#include <stdlib.h> // for abs()
|
||||
#include "./dsp.h"
|
||||
#include "../enc/vp8enci.h"
|
||||
|
||||
|
@ -14,7 +14,6 @@
|
||||
#define WEBP_UTILS_BIT_READER_H_
|
||||
|
||||
#include <assert.h>
|
||||
#include <stddef.h> // For size_t
|
||||
#ifdef _MSC_VER
|
||||
#include <stdlib.h> // _byteswap_ulong
|
||||
#endif
|
||||
|
@ -11,7 +11,6 @@
|
||||
|
||||
#include "./filters.h"
|
||||
#include <assert.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
|
@ -13,7 +13,6 @@
|
||||
#define WEBP_UTILS_HUFFMAN_H_
|
||||
|
||||
#include <assert.h>
|
||||
#include <stddef.h>
|
||||
#include "../webp/types.h"
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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__
|
||||
|
Loading…
x
Reference in New Issue
Block a user