-Webp include paths are broken, hacked them to work, fixes #2995

2015-12-07 11:50:00 -03:00 · 2015-12-07 11:50:00 -03:00 · 8bdf2be4a6
commit 8bdf2be4a6
parent fe2a9bc746
39 changed files with 57 additions and 57 deletions
--- a/drivers/webp/dec/alpha.c
+++ b/drivers/webp/dec/alpha.c
@ -18,7 +18,7 @@
 #include "../dsp/dsp.h"
 #include "../utils/quant_levels_dec.h"
 #include "../utils/utils.h"
-#include "../webp/format_constants.h"
+#include "webp/format_constants.h"

 //------------------------------------------------------------------------------
 // ALPHDecoder object.
--- a/drivers/webp/dec/decode_vp8.h
+++ b/drivers/webp/dec/decode_vp8.h
@ -14,7 +14,7 @@
 #ifndef WEBP_WEBP_DECODE_VP8_H_
 #define WEBP_WEBP_DECODE_VP8_H_

-#include "../webp/decode.h"
+#include "webp/decode.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/dec/webp.c
+++ b/drivers/webp/dec/webp.c
@ -17,7 +17,7 @@
 #include "./vp8li.h"
 #include "./webpi.h"
 #include "../utils/utils.h"
-#include "../webp/mux_types.h"  // ALPHA_FLAG
+#include "webp/mux_types.h"  // ALPHA_FLAG

 //------------------------------------------------------------------------------
 // RIFF layout is:
--- a/drivers/webp/demux/anim_decode.c
+++ b/drivers/webp/demux/anim_decode.c
@ -11,15 +11,15 @@
 //

 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "webp/config.h"
 #endif

 #include <assert.h>
 #include <string.h>

 #include "../utils/utils.h"
-#include "../webp/decode.h"
-#include "../webp/demux.h"
+#include "webp/decode.h"
+#include "webp/demux.h"

 #define NUM_CHANNELS 4

--- a/drivers/webp/demux/demux.c
+++ b/drivers/webp/demux/demux.c
@ -11,7 +11,7 @@
 //

 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "webp/config.h"
 #endif

 #include <assert.h>
@ -19,9 +19,9 @@
 #include <string.h>

 #include "../utils/utils.h"
-#include "../webp/decode.h"     // WebPGetFeatures
-#include "../webp/demux.h"
-#include "../webp/format_constants.h"
+#include "webp/decode.h"     // WebPGetFeatures
+#include "webp/demux.h"
+#include "webp/format_constants.h"

 #define DMUX_MAJ_VERSION 0
 #define DMUX_MIN_VERSION 2
--- a/drivers/webp/dsp/dsp.h
+++ b/drivers/webp/dsp/dsp.h
@ -15,10 +15,10 @@
 #define WEBP_DSP_DSP_H_

 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "webp/config.h"
 #endif

-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/dsp/lossless.h
+++ b/drivers/webp/dsp/lossless.h
@ -15,8 +15,8 @@
 #ifndef WEBP_DSP_LOSSLESS_H_
 #define WEBP_DSP_LOSSLESS_H_

-#include "../webp/types.h"
-#include "../webp/decode.h"
+#include "webp/types.h"
+#include "webp/decode.h"

 #include "../enc/histogram.h"
 #include "../utils/utils.h"
--- a/drivers/webp/enc/alpha.c
+++ b/drivers/webp/enc/alpha.c
@ -19,7 +19,7 @@
 #include "../utils/filters.h"
 #include "../utils/quant_levels.h"
 #include "../utils/utils.h"
-#include "../webp/format_constants.h"
+#include "webp/format_constants.h"

 // -----------------------------------------------------------------------------
 // Encodes the given alpha data via specified compression method 'method'.
--- a/drivers/webp/enc/backward_references.h
+++ b/drivers/webp/enc/backward_references.h
@ -15,8 +15,8 @@

 #include <assert.h>
 #include <stdlib.h>
-#include "../webp/types.h"
-#include "../webp/format_constants.h"
+#include "webp/types.h"
+#include "webp/format_constants.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/enc/config.c
+++ b/drivers/webp/enc/config.c
@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)

-#include "../webp/encode.h"
+#include "webp/encode.h"

 //------------------------------------------------------------------------------
 // WebPConfig
--- a/drivers/webp/enc/delta_palettization.c
+++ b/drivers/webp/enc/delta_palettization.c
@ -13,7 +13,7 @@
 #include "./delta_palettization.h"

 #ifdef WEBP_EXPERIMENTAL_FEATURES
-#include "../webp/types.h"
+#include "webp/types.h"
 #include "../dsp/lossless.h"

 #define MK_COL(r, g, b) (((r) << 16) + ((g) << 8) + (b))
--- a/drivers/webp/enc/delta_palettization.h
+++ b/drivers/webp/enc/delta_palettization.h
@ -13,7 +13,7 @@
 #ifndef WEBP_ENC_DELTA_PALETTIZATION_H_
 #define WEBP_ENC_DELTA_PALETTIZATION_H_

-#include "../webp/encode.h"
+#include "webp/encode.h"
 #include "../enc/vp8li.h"

 // Replaces enc->argb_[] input by a palettizable approximation of it,
--- a/drivers/webp/enc/frame.c
+++ b/drivers/webp/enc/frame.c
@ -17,7 +17,7 @@
 #include "./cost.h"
 #include "./vp8enci.h"
 #include "../dsp/dsp.h"
-#include "../webp/format_constants.h"  // RIFF constants
+#include "webp/format_constants.h"  // RIFF constants

 #define SEGMENT_VISU 0
 #define DEBUG_SEARCH 0    // useful to track search convergence
--- a/drivers/webp/enc/histogram.c
+++ b/drivers/webp/enc/histogram.c
@ -10,7 +10,7 @@
 // Author: Jyrki Alakuijala (jyrki@google.com)
 //
 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "webp/config.h"
 #endif

 #include <math.h>
--- a/drivers/webp/enc/histogram.h
+++ b/drivers/webp/enc/histogram.h
@ -17,8 +17,8 @@
 #include <string.h>

 #include "./backward_references.h"
-#include "../webp/format_constants.h"
-#include "../webp/types.h"
+#include "webp/format_constants.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/enc/syntax.c
+++ b/drivers/webp/enc/syntax.c
@ -14,8 +14,8 @@
 #include <assert.h>

 #include "../utils/utils.h"
-#include "../webp/format_constants.h"  // RIFF constants
-#include "../webp/mux_types.h"         // ALPHA_FLAG
+#include "webp/format_constants.h"  // RIFF constants
+#include "webp/mux_types.h"         // ALPHA_FLAG
 #include "./vp8enci.h"

 //------------------------------------------------------------------------------
--- a/drivers/webp/enc/vp8enci.h
+++ b/drivers/webp/enc/vp8enci.h
@ -20,7 +20,7 @@
 #include "../utils/bit_writer.h"
 #include "../utils/thread.h"
 #include "../utils/utils.h"
-#include "../webp/encode.h"
+#include "webp/encode.h"

 #ifdef WEBP_EXPERIMENTAL_FEATURES
 #include "./vp8li.h"
--- a/drivers/webp/enc/vp8l.c
+++ b/drivers/webp/enc/vp8l.c
@ -22,7 +22,7 @@
 #include "../utils/bit_writer.h"
 #include "../utils/huffman_encode.h"
 #include "../utils/utils.h"
-#include "../webp/format_constants.h"
+#include "webp/format_constants.h"

 #include "./delta_palettization.h"

--- a/drivers/webp/enc/vp8li.h
+++ b/drivers/webp/enc/vp8li.h
@ -17,8 +17,8 @@
 #include "./backward_references.h"
 #include "./histogram.h"
 #include "../utils/bit_writer.h"
-#include "../webp/encode.h"
-#include "../webp/format_constants.h"
+#include "webp/encode.h"
+#include "webp/format_constants.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/mux/anim_encode.c
+++ b/drivers/webp/mux/anim_encode.c
@ -15,10 +15,10 @@
 #include <stdio.h>

 #include "../utils/utils.h"
-#include "../webp/decode.h"
-#include "../webp/encode.h"
-#include "../webp/format_constants.h"
-#include "../webp/mux.h"
+#include "webp/decode.h"
+#include "webp/encode.h"
+#include "webp/format_constants.h"
+#include "webp/mux.h"

 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
--- a/drivers/webp/mux/muxi.h
+++ b/drivers/webp/mux/muxi.h
@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include "../dec/vp8i.h"
 #include "../dec/vp8li.h"
-#include "../webp/mux.h"
+#include "webp/mux.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/bit_reader.c
+++ b/drivers/webp/utils/bit_reader.c
@ -12,7 +12,7 @@
 // Author: Skal (pascal.massimino@gmail.com)

 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "webp/config.h"
 #endif

 #include "./bit_reader_inl.h"
--- a/drivers/webp/utils/bit_reader.h
+++ b/drivers/webp/utils/bit_reader.h
@ -19,7 +19,7 @@
 #ifdef _MSC_VER
 #include <stdlib.h>  // _byteswap_ulong
 #endif
-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/bit_reader_inl.h
+++ b/drivers/webp/utils/bit_reader_inl.h
@ -17,7 +17,7 @@
 #define WEBP_UTILS_BIT_READER_INL_H_

 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "webp/config.h"
 #endif

 #ifdef WEBP_FORCE_ALIGNED
--- a/drivers/webp/utils/bit_writer.h
+++ b/drivers/webp/utils/bit_writer.h
@ -14,7 +14,7 @@
 #ifndef WEBP_UTILS_BIT_WRITER_H_
 #define WEBP_UTILS_BIT_WRITER_H_

-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/color_cache.h
+++ b/drivers/webp/utils/color_cache.h
@ -15,7 +15,7 @@
 #ifndef WEBP_UTILS_COLOR_CACHE_H_
 #define WEBP_UTILS_COLOR_CACHE_H_

-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/endian_inl.h
+++ b/drivers/webp/utils/endian_inl.h
@ -13,11 +13,11 @@
 #define WEBP_UTILS_ENDIAN_INL_H_

 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "webp/config.h"
 #endif

 #include "../dsp/dsp.h"
-#include "../webp/types.h"
+#include "webp/types.h"

 // some endian fix (e.g.: mips-gcc doesn't define __BIG_ENDIAN__)
 #if !defined(WORDS_BIGENDIAN) && \
--- a/drivers/webp/utils/filters.h
+++ b/drivers/webp/utils/filters.h
@ -14,7 +14,7 @@
 #ifndef WEBP_UTILS_FILTERS_H_
 #define WEBP_UTILS_FILTERS_H_

-#include "../webp/types.h"
+#include "webp/types.h"
 #include "../dsp/dsp.h"

 #ifdef __cplusplus
--- a/drivers/webp/utils/huffman.c
+++ b/drivers/webp/utils/huffman.c
@ -16,7 +16,7 @@
 #include <string.h>
 #include "./huffman.h"
 #include "../utils/utils.h"
-#include "../webp/format_constants.h"
+#include "webp/format_constants.h"

 // Huffman data read via DecodeImageStream is represented in two (red and green)
 // bytes.
--- a/drivers/webp/utils/huffman.h
+++ b/drivers/webp/utils/huffman.h
@ -15,8 +15,8 @@
 #define WEBP_UTILS_HUFFMAN_H_

 #include <assert.h>
-#include "../webp/format_constants.h"
-#include "../webp/types.h"
+#include "webp/format_constants.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/huffman_encode.c
+++ b/drivers/webp/utils/huffman_encode.c
@ -16,7 +16,7 @@
 #include <string.h>
 #include "./huffman_encode.h"
 #include "../utils/utils.h"
-#include "../webp/format_constants.h"
+#include "webp/format_constants.h"

 // -----------------------------------------------------------------------------
 // Util function to optimize the symbol map for RLE coding
--- a/drivers/webp/utils/huffman_encode.h
+++ b/drivers/webp/utils/huffman_encode.h
@ -14,7 +14,7 @@
 #ifndef WEBP_UTILS_HUFFMAN_ENCODE_H_
 #define WEBP_UTILS_HUFFMAN_ENCODE_H_

-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/quant_levels.h
+++ b/drivers/webp/utils/quant_levels.h
@ -16,7 +16,7 @@

 #include <stdlib.h>

-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/quant_levels_dec.h
+++ b/drivers/webp/utils/quant_levels_dec.h
@ -14,7 +14,7 @@
 #ifndef WEBP_UTILS_QUANT_LEVELS_DEC_H_
 #define WEBP_UTILS_QUANT_LEVELS_DEC_H_

-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/random.h
+++ b/drivers/webp/utils/random.h
@ -15,7 +15,7 @@
 #define WEBP_UTILS_RANDOM_H_

 #include <assert.h>
-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/rescaler.h
+++ b/drivers/webp/utils/rescaler.h
@ -18,7 +18,7 @@
 extern "C" {
 #endif

-#include "../webp/types.h"
+#include "webp/types.h"

 #define WEBP_RESCALER_RFIX 32   // fixed-point precision for multiplies
 #define WEBP_RESCALER_ONE (1ull << WEBP_RESCALER_RFIX)
--- a/drivers/webp/utils/thread.h
+++ b/drivers/webp/utils/thread.h
@ -15,10 +15,10 @@
 #define WEBP_UTILS_THREAD_H_

 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "webp/config.h"
 #endif

-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/drivers/webp/utils/utils.c
+++ b/drivers/webp/utils/utils.c
@ -13,8 +13,8 @@

 #include <stdlib.h>
 #include <string.h>  // for memcpy()
-#include "../webp/decode.h"
-#include "../webp/encode.h"
+#include "webp/decode.h"
+#include "webp/encode.h"
 #include "./utils.h"

 // If PRINT_MEM_INFO is defined, extra info (like total memory used, number of
--- a/drivers/webp/utils/utils.h
+++ b/drivers/webp/utils/utils.h
@ -17,7 +17,7 @@

 #include <assert.h>

-#include "../webp/types.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {