asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Juan Linietsky 2015-12-07 11:50:00 -03:00
parent fe2a9bc746
commit 8bdf2be4a6
39 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/webp/dec/alpha.c
View file

@ -18,7 +18,7 @@
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../utils/quant_levels_dec.h" #include "../utils/quant_levels_dec.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.h" #include "webp/format_constants.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// ALPHDecoder object. // ALPHDecoder object.

2
drivers/webp/dec/decode_vp8.h
View file

@ -14,7 +14,7 @@
#ifndef WEBP_WEBP_DECODE_VP8_H_ #ifndef WEBP_WEBP_DECODE_VP8_H_
#define WEBP_WEBP_DECODE_VP8_H_ #define WEBP_WEBP_DECODE_VP8_H_
#include "../webp/decode.h" #include "webp/decode.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/dec/webp.c
View file

@ -17,7 +17,7 @@
#include "./vp8li.h" #include "./vp8li.h"
#include "./webpi.h" #include "./webpi.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/mux_types.h" // ALPHA_FLAG #include "webp/mux_types.h" // ALPHA_FLAG
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// RIFF layout is: // RIFF layout is:

6
drivers/webp/demux/anim_decode.c
View file

@ -11,15 +11,15 @@
// //
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../webp/config.h" #include "webp/config.h"
#endif #endif
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/decode.h" #include "webp/decode.h"
#include "../webp/demux.h" #include "webp/demux.h"
#define NUM_CHANNELS 4 #define NUM_CHANNELS 4

8
drivers/webp/demux/demux.c
View file

@ -11,7 +11,7 @@
// //
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../webp/config.h" #include "webp/config.h"
#endif #endif
#include <assert.h> #include <assert.h>
@ -19,9 +19,9 @@
#include <string.h> #include <string.h>
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/decode.h" // WebPGetFeatures #include "webp/decode.h" // WebPGetFeatures
#include "../webp/demux.h" #include "webp/demux.h"
#include "../webp/format_constants.h" #include "webp/format_constants.h"
#define DMUX_MAJ_VERSION 0 #define DMUX_MAJ_VERSION 0
#define DMUX_MIN_VERSION 2 #define DMUX_MIN_VERSION 2

4
drivers/webp/dsp/dsp.h
View file

@ -15,10 +15,10 @@
#define WEBP_DSP_DSP_H_ #define WEBP_DSP_DSP_H_
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../webp/config.h" #include "webp/config.h"
#endif #endif
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
drivers/webp/dsp/lossless.h
View file

@ -15,8 +15,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 "webp/types.h"
#include "../webp/decode.h" #include "webp/decode.h"
#include "../enc/histogram.h" #include "../enc/histogram.h"
#include "../utils/utils.h" #include "../utils/utils.h"

2
drivers/webp/enc/alpha.c
View file

@ -19,7 +19,7 @@
#include "../utils/filters.h" #include "../utils/filters.h"
#include "../utils/quant_levels.h" #include "../utils/quant_levels.h"
#include "../utils/utils.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'. // Encodes the given alpha data via specified compression method 'method'.

4
drivers/webp/enc/backward_references.h
View file

@ -15,8 +15,8 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "../webp/types.h" #include "webp/types.h"
#include "../webp/format_constants.h" #include "webp/format_constants.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/enc/config.c
View file

@ -11,7 +11,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "../webp/encode.h" #include "webp/encode.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// WebPConfig // WebPConfig

2
drivers/webp/enc/delta_palettization.c
View file

@ -13,7 +13,7 @@
#include "./delta_palettization.h" #include "./delta_palettization.h"
#ifdef WEBP_EXPERIMENTAL_FEATURES #ifdef WEBP_EXPERIMENTAL_FEATURES
#include "../webp/types.h" #include "webp/types.h"
#include "../dsp/lossless.h" #include "../dsp/lossless.h"
#define MK_COL(r, g, b) (((r) << 16) + ((g) << 8) + (b)) #define MK_COL(r, g, b) (((r) << 16) + ((g) << 8) + (b))

2
drivers/webp/enc/delta_palettization.h
View file

@ -13,7 +13,7 @@
#ifndef WEBP_ENC_DELTA_PALETTIZATION_H_ #ifndef WEBP_ENC_DELTA_PALETTIZATION_H_
#define WEBP_ENC_DELTA_PALETTIZATION_H_ #define WEBP_ENC_DELTA_PALETTIZATION_H_
#include "../webp/encode.h" #include "webp/encode.h"
#include "../enc/vp8li.h" #include "../enc/vp8li.h"
// Replaces enc->argb_[] input by a palettizable approximation of it, // Replaces enc->argb_[] input by a palettizable approximation of it,

2
drivers/webp/enc/frame.c
View file

@ -17,7 +17,7 @@
#include "./cost.h" #include "./cost.h"
#include "./vp8enci.h" #include "./vp8enci.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../webp/format_constants.h" // RIFF constants #include "webp/format_constants.h" // RIFF constants
#define SEGMENT_VISU 0 #define SEGMENT_VISU 0
#define DEBUG_SEARCH 0 // useful to track search convergence #define DEBUG_SEARCH 0 // useful to track search convergence

2
drivers/webp/enc/histogram.c
View file

@ -10,7 +10,7 @@
// Author: Jyrki Alakuijala (jyrki@google.com) // Author: Jyrki Alakuijala (jyrki@google.com)
// //
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../webp/config.h" #include "webp/config.h"
#endif #endif
#include <math.h> #include <math.h>

4
drivers/webp/enc/histogram.h
View file

@ -17,8 +17,8 @@
#include <string.h> #include <string.h>
#include "./backward_references.h" #include "./backward_references.h"
#include "../webp/format_constants.h" #include "webp/format_constants.h"
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
drivers/webp/enc/syntax.c
View file

@ -14,8 +14,8 @@
#include <assert.h> #include <assert.h>
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.h" // RIFF constants #include "webp/format_constants.h" // RIFF constants
#include "../webp/mux_types.h" // ALPHA_FLAG #include "webp/mux_types.h" // ALPHA_FLAG
#include "./vp8enci.h" #include "./vp8enci.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
drivers/webp/enc/vp8enci.h
View file

@ -20,7 +20,7 @@
#include "../utils/bit_writer.h" #include "../utils/bit_writer.h"
#include "../utils/thread.h" #include "../utils/thread.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/encode.h" #include "webp/encode.h"
#ifdef WEBP_EXPERIMENTAL_FEATURES #ifdef WEBP_EXPERIMENTAL_FEATURES
#include "./vp8li.h" #include "./vp8li.h"

2
drivers/webp/enc/vp8l.c
View file

@ -22,7 +22,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 "webp/format_constants.h"
#include "./delta_palettization.h" #include "./delta_palettization.h"

4
drivers/webp/enc/vp8li.h
View file

@ -17,8 +17,8 @@
#include "./backward_references.h" #include "./backward_references.h"
#include "./histogram.h" #include "./histogram.h"
#include "../utils/bit_writer.h" #include "../utils/bit_writer.h"
#include "../webp/encode.h" #include "webp/encode.h"
#include "../webp/format_constants.h" #include "webp/format_constants.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
drivers/webp/mux/anim_encode.c
View file

@ -15,10 +15,10 @@
#include <stdio.h> #include <stdio.h>
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/decode.h" #include "webp/decode.h"
#include "../webp/encode.h" #include "webp/encode.h"
#include "../webp/format_constants.h" #include "webp/format_constants.h"
#include "../webp/mux.h" #include "webp/mux.h"
#if defined(_MSC_VER) && _MSC_VER < 1900 #if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf #define snprintf _snprintf

2
drivers/webp/mux/muxi.h
View file

@ -17,7 +17,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../dec/vp8i.h" #include "../dec/vp8i.h"
#include "../dec/vp8li.h" #include "../dec/vp8li.h"
#include "../webp/mux.h" #include "webp/mux.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/utils/bit_reader.c
View file

@ -12,7 +12,7 @@
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../webp/config.h" #include "webp/config.h"
#endif #endif
#include "./bit_reader_inl.h" #include "./bit_reader_inl.h"

2
drivers/webp/utils/bit_reader.h
View file

@ -19,7 +19,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <stdlib.h> // _byteswap_ulong #include <stdlib.h> // _byteswap_ulong
#endif #endif
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/utils/bit_reader_inl.h
View file

@ -17,7 +17,7 @@
#define WEBP_UTILS_BIT_READER_INL_H_ #define WEBP_UTILS_BIT_READER_INL_H_
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../webp/config.h" #include "webp/config.h"
#endif #endif
#ifdef WEBP_FORCE_ALIGNED #ifdef WEBP_FORCE_ALIGNED

2
drivers/webp/utils/bit_writer.h
View file

@ -14,7 +14,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 "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/utils/color_cache.h
View file

@ -15,7 +15,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 "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
drivers/webp/utils/endian_inl.h
View file

@ -13,11 +13,11 @@
#define WEBP_UTILS_ENDIAN_INL_H_ #define WEBP_UTILS_ENDIAN_INL_H_
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../webp/config.h" #include "webp/config.h"
#endif #endif
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../webp/types.h" #include "webp/types.h"
// some endian fix (e.g.: mips-gcc doesn't define __BIG_ENDIAN__) // some endian fix (e.g.: mips-gcc doesn't define __BIG_ENDIAN__)
#if !defined(WORDS_BIGENDIAN) && \ #if !defined(WORDS_BIGENDIAN) && \

2
drivers/webp/utils/filters.h
View file

@ -14,7 +14,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 "webp/types.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#ifdef __cplusplus #ifdef __cplusplus

2
drivers/webp/utils/huffman.c
View file

@ -16,7 +16,7 @@
#include <string.h> #include <string.h>
#include "./huffman.h" #include "./huffman.h"
#include "../utils/utils.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) // Huffman data read via DecodeImageStream is represented in two (red and green)
// bytes. // bytes.

4
drivers/webp/utils/huffman.h
View file

@ -15,8 +15,8 @@
#define WEBP_UTILS_HUFFMAN_H_ #define WEBP_UTILS_HUFFMAN_H_
#include <assert.h> #include <assert.h>
#include "../webp/format_constants.h" #include "webp/format_constants.h"
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/utils/huffman_encode.c
View file

@ -16,7 +16,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 "webp/format_constants.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Util function to optimize the symbol map for RLE coding // Util function to optimize the symbol map for RLE coding

2
drivers/webp/utils/huffman_encode.h
View file

@ -14,7 +14,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 "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/utils/quant_levels.h
View file

@ -16,7 +16,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/utils/quant_levels_dec.h
View file

@ -14,7 +14,7 @@
#ifndef WEBP_UTILS_QUANT_LEVELS_DEC_H_ #ifndef WEBP_UTILS_QUANT_LEVELS_DEC_H_
#define WEBP_UTILS_QUANT_LEVELS_DEC_H_ #define WEBP_UTILS_QUANT_LEVELS_DEC_H_
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/utils/random.h
View file

@ -15,7 +15,7 @@
#define WEBP_UTILS_RANDOM_H_ #define WEBP_UTILS_RANDOM_H_
#include <assert.h> #include <assert.h>
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
drivers/webp/utils/rescaler.h
View file

@ -18,7 +18,7 @@
extern "C" { extern "C" {
#endif #endif
#include "../webp/types.h" #include "webp/types.h"
#define WEBP_RESCALER_RFIX 32 // fixed-point precision for multiplies #define WEBP_RESCALER_RFIX 32 // fixed-point precision for multiplies
#define WEBP_RESCALER_ONE (1ull << WEBP_RESCALER_RFIX) #define WEBP_RESCALER_ONE (1ull << WEBP_RESCALER_RFIX)

4
drivers/webp/utils/thread.h
View file

@ -15,10 +15,10 @@
#define WEBP_UTILS_THREAD_H_ #define WEBP_UTILS_THREAD_H_
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../webp/config.h" #include "webp/config.h"
#endif #endif
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
drivers/webp/utils/utils.c
View file

@ -13,8 +13,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> // for memcpy() #include <string.h> // for memcpy()
#include "../webp/decode.h" #include "webp/decode.h"
#include "../webp/encode.h" #include "webp/encode.h"
#include "./utils.h" #include "./utils.h"
// If PRINT_MEM_INFO is defined, extra info (like total memory used, number of // If PRINT_MEM_INFO is defined, extra info (like total memory used, number of

2
drivers/webp/utils/utils.h
View file

@ -17,7 +17,7 @@
#include <assert.h> #include <assert.h>
#include "../webp/types.h" #include "webp/types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {