From 21a3aa56c90db372cac63c0bcac13404d38521bd Mon Sep 17 00:00:00 2001 From: Marqin Date: Sun, 14 Sep 2014 21:26:31 +0200 Subject: [PATCH] fix include paths in webp --- drivers/webp/dec/alpha.c | 2 +- drivers/webp/dec/vp8li.h | 2 +- drivers/webp/dsp/dsp.h | 2 +- drivers/webp/dsp/lossless.h | 4 ++-- drivers/webp/enc/alpha.c | 2 +- drivers/webp/enc/backward_references.h | 4 ++-- drivers/webp/enc/config.c | 2 +- drivers/webp/enc/histogram.h | 4 ++-- drivers/webp/enc/syntax.c | 2 +- drivers/webp/enc/vp8enci.h | 2 +- drivers/webp/enc/vp8l.c | 2 +- drivers/webp/enc/vp8li.h | 4 ++-- drivers/webp/utils/bit_reader.h | 2 +- drivers/webp/utils/bit_writer.h | 2 +- drivers/webp/utils/color_cache.h | 2 +- drivers/webp/utils/filters.h | 2 +- drivers/webp/utils/huffman.c | 2 +- drivers/webp/utils/huffman.h | 2 +- drivers/webp/utils/huffman_encode.c | 2 +- drivers/webp/utils/huffman_encode.h | 2 +- drivers/webp/utils/quant_levels.h | 2 +- drivers/webp/utils/rescaler.h | 2 +- drivers/webp/utils/utils.h | 2 +- 23 files changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/webp/dec/alpha.c b/drivers/webp/dec/alpha.c index 6e65de90302..d1095fa5552 100644 --- a/drivers/webp/dec/alpha.c +++ b/drivers/webp/dec/alpha.c @@ -14,7 +14,7 @@ #include "./vp8li.h" #include "../utils/filters.h" #include "../utils/quant_levels.h" -#include "../webp/format_constants.h" +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/dec/vp8li.h b/drivers/webp/dec/vp8li.h index ee29eb5fafd..5f6cd6a01c6 100644 --- a/drivers/webp/dec/vp8li.h +++ b/drivers/webp/dec/vp8li.h @@ -18,7 +18,7 @@ #include "../utils/bit_reader.h" #include "../utils/color_cache.h" #include "../utils/huffman.h" -#include "../webp/format_constants.h" +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/dsp/dsp.h b/drivers/webp/dsp/dsp.h index 042c98aad24..9ff53174d49 100644 --- a/drivers/webp/dsp/dsp.h +++ b/drivers/webp/dsp/dsp.h @@ -12,7 +12,7 @@ #ifndef WEBP_DSP_DSP_H_ #define WEBP_DSP_DSP_H_ -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/dsp/lossless.h b/drivers/webp/dsp/lossless.h index 992516fcdfc..7c7d5555ed8 100644 --- a/drivers/webp/dsp/lossless.h +++ b/drivers/webp/dsp/lossless.h @@ -13,8 +13,8 @@ #ifndef WEBP_DSP_LOSSLESS_H_ #define WEBP_DSP_LOSSLESS_H_ -#include "../webp/types.h" -#include "../webp/decode.h" +#include "../types.h" +#include "../decode.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/enc/alpha.c b/drivers/webp/enc/alpha.c index 0e519b6c660..e554eb7f307 100644 --- a/drivers/webp/enc/alpha.c +++ b/drivers/webp/enc/alpha.c @@ -15,7 +15,7 @@ #include "./vp8enci.h" #include "../utils/filters.h" #include "../utils/quant_levels.h" -#include "../webp/format_constants.h" +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/enc/backward_references.h b/drivers/webp/enc/backward_references.h index 91c03361ed4..8006a56ba1f 100644 --- a/drivers/webp/enc/backward_references.h +++ b/drivers/webp/enc/backward_references.h @@ -13,8 +13,8 @@ #include #include -#include "../webp/types.h" -#include "../webp/format_constants.h" +#include "../types.h" +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/enc/config.c b/drivers/webp/enc/config.c index 1a26113554f..4136f6c2274 100644 --- a/drivers/webp/enc/config.c +++ b/drivers/webp/enc/config.c @@ -9,7 +9,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "../webp/encode.h" +#include "../encode.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/enc/histogram.h b/drivers/webp/enc/histogram.h index ec573c5c855..5b5de255394 100644 --- a/drivers/webp/enc/histogram.h +++ b/drivers/webp/enc/histogram.h @@ -19,8 +19,8 @@ #include #include "./backward_references.h" -#include "../webp/format_constants.h" -#include "../webp/types.h" +#include "../format_constants.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/enc/syntax.c b/drivers/webp/enc/syntax.c index 7c8c7b1a848..4221436ff98 100644 --- a/drivers/webp/enc/syntax.c +++ b/drivers/webp/enc/syntax.c @@ -11,7 +11,7 @@ #include -#include "../webp/format_constants.h" +#include "../format_constants.h" #include "./vp8enci.h" #if defined(__cplusplus) || defined(c_plusplus) diff --git a/drivers/webp/enc/vp8enci.h b/drivers/webp/enc/vp8enci.h index a77778c0d82..936e1c18ce5 100644 --- a/drivers/webp/enc/vp8enci.h +++ b/drivers/webp/enc/vp8enci.h @@ -13,7 +13,7 @@ #define WEBP_ENC_VP8ENCI_H_ #include // for memcpy() -#include "../webp/encode.h" +#include "../encode.h" #include "../dsp/dsp.h" #include "../utils/bit_writer.h" diff --git a/drivers/webp/enc/vp8l.c b/drivers/webp/enc/vp8l.c index 9c202f8d363..f4eb6e783f9 100644 --- a/drivers/webp/enc/vp8l.c +++ b/drivers/webp/enc/vp8l.c @@ -21,7 +21,7 @@ #include "../utils/bit_writer.h" #include "../utils/huffman_encode.h" #include "../utils/utils.h" -#include "../webp/format_constants.h" +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/enc/vp8li.h b/drivers/webp/enc/vp8li.h index eae90dd61fc..bb111aec334 100644 --- a/drivers/webp/enc/vp8li.h +++ b/drivers/webp/enc/vp8li.h @@ -14,8 +14,8 @@ #include "./histogram.h" #include "../utils/bit_writer.h" -#include "../webp/encode.h" -#include "../webp/format_constants.h" +#include "../encode.h" +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/bit_reader.h b/drivers/webp/utils/bit_reader.h index 36fc13e2da2..d80b4971490 100644 --- a/drivers/webp/utils/bit_reader.h +++ b/drivers/webp/utils/bit_reader.h @@ -18,7 +18,7 @@ #include // _byteswap_ulong #endif #include // For memcpy -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/bit_writer.h b/drivers/webp/utils/bit_writer.h index f7ca08497f6..57f39b11b14 100644 --- a/drivers/webp/utils/bit_writer.h +++ b/drivers/webp/utils/bit_writer.h @@ -12,7 +12,7 @@ #ifndef WEBP_UTILS_BIT_WRITER_H_ #define WEBP_UTILS_BIT_WRITER_H_ -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/color_cache.h b/drivers/webp/utils/color_cache.h index 13be629f36f..da5e2601956 100644 --- a/drivers/webp/utils/color_cache.h +++ b/drivers/webp/utils/color_cache.h @@ -13,7 +13,7 @@ #ifndef WEBP_UTILS_COLOR_CACHE_H_ #define WEBP_UTILS_COLOR_CACHE_H_ -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/filters.h b/drivers/webp/utils/filters.h index c5cdbd6deb8..db886be29a6 100644 --- a/drivers/webp/utils/filters.h +++ b/drivers/webp/utils/filters.h @@ -12,7 +12,7 @@ #ifndef WEBP_UTILS_FILTERS_H_ #define WEBP_UTILS_FILTERS_H_ -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/huffman.c b/drivers/webp/utils/huffman.c index 41529cc9da2..1cc1cfd3550 100644 --- a/drivers/webp/utils/huffman.c +++ b/drivers/webp/utils/huffman.c @@ -13,7 +13,7 @@ #include #include "./huffman.h" #include "../utils/utils.h" -#include "../webp/format_constants.h" +#include "../format_constants.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/huffman.h b/drivers/webp/utils/huffman.h index 70220a67fbe..f16447e6491 100644 --- a/drivers/webp/utils/huffman.h +++ b/drivers/webp/utils/huffman.h @@ -13,7 +13,7 @@ #define WEBP_UTILS_HUFFMAN_H_ #include -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/huffman_encode.c b/drivers/webp/utils/huffman_encode.c index 8ccd291d22a..e172b10a85d 100644 --- a/drivers/webp/utils/huffman_encode.c +++ b/drivers/webp/utils/huffman_encode.c @@ -14,7 +14,7 @@ #include #include "./huffman_encode.h" #include "../utils/utils.h" -#include "../webp/format_constants.h" +#include "../format_constants.h" // ----------------------------------------------------------------------------- // Util function to optimize the symbol map for RLE coding diff --git a/drivers/webp/utils/huffman_encode.h b/drivers/webp/utils/huffman_encode.h index cc3b38d3309..7f4aedc102e 100644 --- a/drivers/webp/utils/huffman_encode.h +++ b/drivers/webp/utils/huffman_encode.h @@ -12,7 +12,7 @@ #ifndef WEBP_UTILS_HUFFMAN_ENCODE_H_ #define WEBP_UTILS_HUFFMAN_ENCODE_H_ -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/quant_levels.h b/drivers/webp/utils/quant_levels.h index 89ccafe40d8..4f165fd2303 100644 --- a/drivers/webp/utils/quant_levels.h +++ b/drivers/webp/utils/quant_levels.h @@ -14,7 +14,7 @@ #include -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff --git a/drivers/webp/utils/rescaler.h b/drivers/webp/utils/rescaler.h index ef93d465f09..9c9133d19b1 100644 --- a/drivers/webp/utils/rescaler.h +++ b/drivers/webp/utils/rescaler.h @@ -16,7 +16,7 @@ extern "C" { #endif -#include "../webp/types.h" +#include "../types.h" // Structure used for on-the-fly rescaling typedef struct { diff --git a/drivers/webp/utils/utils.h b/drivers/webp/utils/utils.h index a034762556f..316ac906120 100644 --- a/drivers/webp/utils/utils.h +++ b/drivers/webp/utils/utils.h @@ -12,7 +12,7 @@ #ifndef WEBP_UTILS_UTILS_H_ #define WEBP_UTILS_UTILS_H_ -#include "../webp/types.h" +#include "../types.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" {