Merge pull request #690 from Marqin/master

[BUILD] fix include paths in webp
This commit is contained in:
Juan Linietsky 2014-09-17 09:50:44 -03:00
commit a7b512f2c1
23 changed files with 27 additions and 27 deletions

View file

@ -14,7 +14,7 @@
#include "./vp8li.h" #include "./vp8li.h"
#include "../utils/filters.h" #include "../utils/filters.h"
#include "../utils/quant_levels.h" #include "../utils/quant_levels.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -18,7 +18,7 @@
#include "../utils/bit_reader.h" #include "../utils/bit_reader.h"
#include "../utils/color_cache.h" #include "../utils/color_cache.h"
#include "../utils/huffman.h" #include "../utils/huffman.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -12,7 +12,7 @@
#ifndef WEBP_DSP_DSP_H_ #ifndef WEBP_DSP_DSP_H_
#define WEBP_DSP_DSP_H_ #define WEBP_DSP_DSP_H_
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -13,8 +13,8 @@
#ifndef WEBP_DSP_LOSSLESS_H_ #ifndef WEBP_DSP_LOSSLESS_H_
#define WEBP_DSP_LOSSLESS_H_ #define WEBP_DSP_LOSSLESS_H_
#include "../webp/types.h" #include "../types.h"
#include "../webp/decode.h" #include "../decode.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -15,7 +15,7 @@
#include "./vp8enci.h" #include "./vp8enci.h"
#include "../utils/filters.h" #include "../utils/filters.h"
#include "../utils/quant_levels.h" #include "../utils/quant_levels.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -13,8 +13,8 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "../webp/types.h" #include "../types.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -9,7 +9,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "../webp/encode.h" #include "../encode.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -19,8 +19,8 @@
#include <string.h> #include <string.h>
#include "./backward_references.h" #include "./backward_references.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -11,7 +11,7 @@
#include <assert.h> #include <assert.h>
#include "../webp/format_constants.h" #include "../format_constants.h"
#include "./vp8enci.h" #include "./vp8enci.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)

View file

@ -13,7 +13,7 @@
#define WEBP_ENC_VP8ENCI_H_ #define WEBP_ENC_VP8ENCI_H_
#include <string.h> // for memcpy() #include <string.h> // for memcpy()
#include "../webp/encode.h" #include "../encode.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../utils/bit_writer.h" #include "../utils/bit_writer.h"

View file

@ -21,7 +21,7 @@
#include "../utils/bit_writer.h" #include "../utils/bit_writer.h"
#include "../utils/huffman_encode.h" #include "../utils/huffman_encode.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -14,8 +14,8 @@
#include "./histogram.h" #include "./histogram.h"
#include "../utils/bit_writer.h" #include "../utils/bit_writer.h"
#include "../webp/encode.h" #include "../encode.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -18,7 +18,7 @@
#include <stdlib.h> // _byteswap_ulong #include <stdlib.h> // _byteswap_ulong
#endif #endif
#include <string.h> // For memcpy #include <string.h> // For memcpy
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -12,7 +12,7 @@
#ifndef WEBP_UTILS_BIT_WRITER_H_ #ifndef WEBP_UTILS_BIT_WRITER_H_
#define WEBP_UTILS_BIT_WRITER_H_ #define WEBP_UTILS_BIT_WRITER_H_
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -13,7 +13,7 @@
#ifndef WEBP_UTILS_COLOR_CACHE_H_ #ifndef WEBP_UTILS_COLOR_CACHE_H_
#define WEBP_UTILS_COLOR_CACHE_H_ #define WEBP_UTILS_COLOR_CACHE_H_
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -12,7 +12,7 @@
#ifndef WEBP_UTILS_FILTERS_H_ #ifndef WEBP_UTILS_FILTERS_H_
#define WEBP_UTILS_FILTERS_H_ #define WEBP_UTILS_FILTERS_H_
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -13,7 +13,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "./huffman.h" #include "./huffman.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

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

View file

@ -14,7 +14,7 @@
#include <string.h> #include <string.h>
#include "./huffman_encode.h" #include "./huffman_encode.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.h" #include "../format_constants.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Util function to optimize the symbol map for RLE coding // Util function to optimize the symbol map for RLE coding

View file

@ -12,7 +12,7 @@
#ifndef WEBP_UTILS_HUFFMAN_ENCODE_H_ #ifndef WEBP_UTILS_HUFFMAN_ENCODE_H_
#define WEBP_UTILS_HUFFMAN_ENCODE_H_ #define WEBP_UTILS_HUFFMAN_ENCODE_H_
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -14,7 +14,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {

View file

@ -16,7 +16,7 @@
extern "C" { extern "C" {
#endif #endif
#include "../webp/types.h" #include "../types.h"
// Structure used for on-the-fly rescaling // Structure used for on-the-fly rescaling
typedef struct { typedef struct {

View file

@ -12,7 +12,7 @@
#ifndef WEBP_UTILS_UTILS_H_ #ifndef WEBP_UTILS_UTILS_H_
#define WEBP_UTILS_UTILS_H_ #define WEBP_UTILS_UTILS_H_
#include "../webp/types.h" #include "../types.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {