diff --git a/CMakeLists.txt b/CMakeLists.txt index d4bc4db6..d75c6df7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ endforeach() ### Define the mandatory libraries. # Build the webpdecoder library. add_definitions(-Wall) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ ${WEBP_DEP_INCLUDE_DIRS}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${WEBP_DEP_INCLUDE_DIRS}) add_library(webpdecode OBJECT ${WEBP_DEC_SRCS}) add_library(webpdspdecode OBJECT ${WEBP_DSP_COMMON_SRCS} ${WEBP_DSP_DEC_SRCS}) add_library(webputilsdecode OBJECT ${WEBP_UTILS_COMMON_SRCS} @@ -195,6 +195,10 @@ if(WEBP_BUILD_CWEBP OR WEBP_BUILD_DWEBP OR "imageenc_[^ ]*") add_library(imageenc ${IMAGEENC_SRCS}) target_link_libraries(imageenc webp) + + set_property(TARGET exampleutil imageioutil imagedec imageenc + PROPERTY INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) endif() if(WEBP_BUILD_DWEBP) @@ -205,6 +209,8 @@ if(WEBP_BUILD_DWEBP) add_executable(dwebp ${DWEBP_SRCS}) target_link_libraries(dwebp exampleutil imagedec imageenc webpdecoder) install(TARGETS dwebp RUNTIME DESTINATION bin) + set_property(TARGET dwebp PROPERTY INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) endif() if(WEBP_BUILD_CWEBP) @@ -215,6 +221,8 @@ if(WEBP_BUILD_CWEBP) add_executable(cwebp ${CWEBP_SRCS}) target_link_libraries(cwebp exampleutil imagedec webp) install(TARGETS cwebp RUNTIME DESTINATION bin) + set_property(TARGET cwebp PROPERTY INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) endif() if(WEBP_BUILD_GIF2WEBP AND NOT GIF_FOUND) @@ -241,6 +249,8 @@ if(WEBP_BUILD_GIF2WEBP) target_link_libraries(gif2webp exampleutil imageioutil webp webpmux ${WEBP_DEP_GIF_LIBRARIES}) install(TARGETS gif2webp RUNTIME DESTINATION bin) + set_property(TARGET gif2webp PROPERTY INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) endif() if(WEBP_BUILD_IMG2WEBP) @@ -251,6 +261,8 @@ if(WEBP_BUILD_IMG2WEBP) add_executable(img2webp ${IMG2WEBP_SRCS}) target_link_libraries(img2webp exampleutil imagedec imageioutil webp webpmux) install(TARGETS img2webp RUNTIME DESTINATION bin) + set_property(TARGET img2webp PROPERTY INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) endif() if (WEBP_BUILD_WEBPINFO) @@ -261,6 +273,8 @@ if (WEBP_BUILD_WEBPINFO) add_executable(webpinfo ${WEBPINFO_SRCS}) target_link_libraries(webpinfo exampleutil imageioutil) install(TARGETS webpinfo RUNTIME DESTINATION bin) + set_property(TARGET webpinfo PROPERTY INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src) endif() if(WEBP_BUILD_WEBP_JS) @@ -288,13 +302,11 @@ endif() # Generate the config.h file. configure_file(${CMAKE_CURRENT_LIST_DIR}/cmake/config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/include/webp/config.h) + ${CMAKE_CURRENT_BINARY_DIR}/src/webp/config.h) add_definitions(-DHAVE_CONFIG_H) # The webp folder is included as we reference config.h as # ../webp/config.h or webp/config.h -include_directories(${CMAKE_CURRENT_BINARY_DIR}/include - ${CMAKE_CURRENT_BINARY_DIR}/include/webp -) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) # Install the different headers and libraries. install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h diff --git a/Makefile.vc b/Makefile.vc index c71a6adb..7fb80e8e 100644 --- a/Makefile.vc +++ b/Makefile.vc @@ -29,7 +29,7 @@ PLATFORM_LDFLAGS = /SAFESEH NOLOGO = /nologo CCNODBG = cl.exe $(NOLOGO) /O2 /DNDEBUG CCDEBUG = cl.exe $(NOLOGO) /Od /Gm /Zi /D_DEBUG /RTC1 -CFLAGS = /Isrc $(NOLOGO) /W3 /EHsc /c +CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN LDFLAGS = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE LDFLAGS = $(LDFLAGS) $(PLATFORM_LDFLAGS) diff --git a/build.gradle b/build.gradle index 05765d38..f85c332b 100644 --- a/build.gradle +++ b/build.gradle @@ -88,6 +88,8 @@ model { } else { NEON = "c" } + + cCompiler.args "-I" + file(".").absolutePath } // Link to pthread for shared libraries. withType(SharedLibraryBinarySpec) { diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake index ae9f17e9..5aa1bfda 100644 --- a/cmake/cpu.cmake +++ b/cmake/cpu.cmake @@ -1,4 +1,5 @@ ## Check for SIMD extensions. +include(CMakePushCheckState) function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD) if(NOT ENABLE_SIMD) @@ -7,6 +8,8 @@ function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD) return() endif() unset(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG} CACHE) + cmake_push_check_state() + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}) check_c_source_compiles(" #include \"${CMAKE_CURRENT_LIST_DIR}/../src/dsp/dsp.h\" int main(void) { @@ -17,6 +20,7 @@ function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD) } " WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG} ) + cmake_pop_check_state() if(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG}) set(WEBP_HAVE_${WEBP_SIMD_FLAG} 1 PARENT_SCOPE) else() @@ -54,7 +58,6 @@ endif() list(LENGTH WEBP_SIMD_FLAGS WEBP_SIMD_FLAGS_LENGTH) math(EXPR WEBP_SIMD_FLAGS_RANGE "${WEBP_SIMD_FLAGS_LENGTH} - 1") -include(CMakePushCheckState) foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE}) list(GET WEBP_SIMD_FLAGS ${I_SIMD} WEBP_SIMD_FLAG) diff --git a/extras/Makefile.am b/extras/Makefile.am index 987a2529..57ba477a 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) AM_CPPFLAGS += -I$(top_builddir)/src -I$(top_srcdir)/src noinst_LTLIBRARIES = libwebpextras.la diff --git a/extras/extras.c b/extras/extras.c index 2c013de6..a75dcd1e 100644 --- a/extras/extras.c +++ b/extras/extras.c @@ -10,7 +10,7 @@ // Additional WebP utilities. // -#include "./extras.h" +#include "extras/extras.h" #include "webp/format_constants.h" #include diff --git a/extras/get_disto.c b/extras/get_disto.c index 9091b386..7deb832f 100644 --- a/extras/get_disto.c +++ b/extras/get_disto.c @@ -24,8 +24,8 @@ #include #include "webp/encode.h" -#include "../imageio/image_dec.h" -#include "../imageio/imageio_util.h" +#include "imageio/image_dec.h" +#include "imageio/imageio_util.h" static size_t ReadPicture(const char* const filename, WebPPicture* const pic, int keep_alpha) { diff --git a/extras/quality_estimate.c b/extras/quality_estimate.c index ee7ab5f8..f36783f1 100644 --- a/extras/quality_estimate.c +++ b/extras/quality_estimate.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./extras.h" +#include "extras/extras.h" #include "webp/decode.h" #include diff --git a/extras/vwebp_sdl.c b/extras/vwebp_sdl.c index 700929f0..69171b9a 100644 --- a/extras/vwebp_sdl.c +++ b/extras/vwebp_sdl.c @@ -24,7 +24,7 @@ #include "webp_to_sdl.h" #include "webp/decode.h" -#include "../imageio/imageio_util.h" +#include "imageio/imageio_util.h" #if defined(WEBP_HAVE_JUST_SDL_H) #include diff --git a/extras/webp_quality.c b/extras/webp_quality.c index ff9b1aad..3f6ba202 100644 --- a/extras/webp_quality.c +++ b/extras/webp_quality.c @@ -11,8 +11,8 @@ #include #include -#include "./extras.h" -#include "../imageio/imageio_util.h" +#include "extras/extras.h" +#include "imageio/imageio_util.h" int main(int argc, const char *argv[]) { int c; diff --git a/makefile.unix b/makefile.unix index 5e7761ef..dd546eeb 100644 --- a/makefile.unix +++ b/makefile.unix @@ -113,7 +113,7 @@ endif AR = ar ARFLAGS = r -CPPFLAGS = -Isrc/ -Wall +CPPFLAGS = -I. -Isrc/ -Wall CFLAGS = -O3 -DNDEBUG $(EXTRA_FLAGS) CC = gcc INSTALL = install diff --git a/src/dec/Makefile.am b/src/dec/Makefile.am index 8919c42b..5a48fcf4 100644 --- a/src/dec/Makefile.am +++ b/src/dec/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) noinst_LTLIBRARIES = libwebpdecode.la libwebpdecode_la_SOURCES = diff --git a/src/dec/alpha_dec.c b/src/dec/alpha_dec.c index 83ffd4b6..bce735bf 100644 --- a/src/dec/alpha_dec.c +++ b/src/dec/alpha_dec.c @@ -12,13 +12,13 @@ // Author: Skal (pascal.massimino@gmail.com) #include -#include "./alphai_dec.h" -#include "./vp8i_dec.h" -#include "./vp8li_dec.h" -#include "../dsp/dsp.h" -#include "../utils/quant_levels_dec_utils.h" -#include "../utils/utils.h" -#include "../webp/format_constants.h" +#include "src/dec/alphai_dec.h" +#include "src/dec/vp8i_dec.h" +#include "src/dec/vp8li_dec.h" +#include "src/dsp/dsp.h" +#include "src/utils/quant_levels_dec_utils.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" //------------------------------------------------------------------------------ // ALPHDecoder object. diff --git a/src/dec/alphai_dec.h b/src/dec/alphai_dec.h index 561e8151..9a098f5a 100644 --- a/src/dec/alphai_dec.h +++ b/src/dec/alphai_dec.h @@ -14,8 +14,8 @@ #ifndef WEBP_DEC_ALPHAI_H_ #define WEBP_DEC_ALPHAI_H_ -#include "./webpi_dec.h" -#include "../utils/filters_utils.h" +#include "src/dec/webpi_dec.h" +#include "src/utils/filters_utils.h" #ifdef __cplusplus extern "C" { diff --git a/src/dec/buffer_dec.c b/src/dec/buffer_dec.c index 1b8e45e5..d36a66f9 100644 --- a/src/dec/buffer_dec.c +++ b/src/dec/buffer_dec.c @@ -13,9 +13,9 @@ #include -#include "./vp8i_dec.h" -#include "./webpi_dec.h" -#include "../utils/utils.h" +#include "src/dec/vp8i_dec.h" +#include "src/dec/webpi_dec.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // WebPDecBuffer diff --git a/src/dec/frame_dec.c b/src/dec/frame_dec.c index f91e27f7..bf1e10d9 100644 --- a/src/dec/frame_dec.c +++ b/src/dec/frame_dec.c @@ -12,8 +12,8 @@ // Author: Skal (pascal.massimino@gmail.com) #include -#include "./vp8i_dec.h" -#include "../utils/utils.h" +#include "src/dec/vp8i_dec.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // Main reconstruction function. diff --git a/src/dec/idec_dec.c b/src/dec/idec_dec.c index a0ba5854..a371ed75 100644 --- a/src/dec/idec_dec.c +++ b/src/dec/idec_dec.c @@ -15,10 +15,10 @@ #include #include -#include "./alphai_dec.h" -#include "./webpi_dec.h" -#include "./vp8i_dec.h" -#include "../utils/utils.h" +#include "src/dec/alphai_dec.h" +#include "src/dec/webpi_dec.h" +#include "src/dec/vp8i_dec.h" +#include "src/utils/utils.h" // In append mode, buffer allocations increase as multiples of this value. // Needs to be a power of 2. diff --git a/src/dec/io_dec.c b/src/dec/io_dec.c index 83a9701d..576c12d4 100644 --- a/src/dec/io_dec.c +++ b/src/dec/io_dec.c @@ -13,11 +13,11 @@ #include #include -#include "../dec/vp8i_dec.h" -#include "./webpi_dec.h" -#include "../dsp/dsp.h" -#include "../dsp/yuv.h" -#include "../utils/utils.h" +#include "src/dec/vp8i_dec.h" +#include "src/dec/webpi_dec.h" +#include "src/dsp/dsp.h" +#include "src/dsp/yuv.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // Main YUV<->RGB conversion functions diff --git a/src/dec/quant_dec.c b/src/dec/quant_dec.c index 14e31989..f07212ad 100644 --- a/src/dec/quant_dec.c +++ b/src/dec/quant_dec.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./vp8i_dec.h" +#include "src/dec/vp8i_dec.h" static WEBP_INLINE int clip(int v, int M) { return v < 0 ? 0 : v > M ? M : v; diff --git a/src/dec/tree_dec.c b/src/dec/tree_dec.c index 147b5cf9..ad5880bb 100644 --- a/src/dec/tree_dec.c +++ b/src/dec/tree_dec.c @@ -11,8 +11,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./vp8i_dec.h" -#include "../utils/bit_reader_inl_utils.h" +#include "src/dec/vp8i_dec.h" +#include "src/utils/bit_reader_inl_utils.h" #if !defined(USE_GENERIC_TREE) #if !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__) diff --git a/src/dec/vp8_dec.c b/src/dec/vp8_dec.c index fad8d9cf..6212efd1 100644 --- a/src/dec/vp8_dec.c +++ b/src/dec/vp8_dec.c @@ -13,12 +13,12 @@ #include -#include "./alphai_dec.h" -#include "./vp8i_dec.h" -#include "./vp8li_dec.h" -#include "./webpi_dec.h" -#include "../utils/bit_reader_inl_utils.h" -#include "../utils/utils.h" +#include "src/dec/alphai_dec.h" +#include "src/dec/vp8i_dec.h" +#include "src/dec/vp8li_dec.h" +#include "src/dec/webpi_dec.h" +#include "src/utils/bit_reader_inl_utils.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dec/vp8_dec.h b/src/dec/vp8_dec.h index 6539a70c..db9b34e0 100644 --- a/src/dec/vp8_dec.h +++ b/src/dec/vp8_dec.h @@ -14,7 +14,7 @@ #ifndef WEBP_WEBP_DECODE_VP8_H_ #define WEBP_WEBP_DECODE_VP8_H_ -#include "../webp/decode.h" +#include "src/webp/decode.h" #ifdef __cplusplus extern "C" { diff --git a/src/dec/vp8i_dec.h b/src/dec/vp8i_dec.h index 555853e8..35bf987f 100644 --- a/src/dec/vp8i_dec.h +++ b/src/dec/vp8i_dec.h @@ -15,12 +15,12 @@ #define WEBP_DEC_VP8I_H_ #include // for memcpy() -#include "./common_dec.h" -#include "./vp8li_dec.h" -#include "../utils/bit_reader_utils.h" -#include "../utils/random_utils.h" -#include "../utils/thread_utils.h" -#include "../dsp/dsp.h" +#include "src/dec/common_dec.h" +#include "src/dec/vp8li_dec.h" +#include "src/utils/bit_reader_utils.h" +#include "src/utils/random_utils.h" +#include "src/utils/thread_utils.h" +#include "src/dsp/dsp.h" #ifdef __cplusplus extern "C" { diff --git a/src/dec/vp8l_dec.c b/src/dec/vp8l_dec.c index fe467abd..563e228a 100644 --- a/src/dec/vp8l_dec.c +++ b/src/dec/vp8l_dec.c @@ -14,15 +14,15 @@ #include -#include "./alphai_dec.h" -#include "./vp8li_dec.h" -#include "../dsp/dsp.h" -#include "../dsp/lossless.h" -#include "../dsp/lossless_common.h" -#include "../dsp/yuv.h" -#include "../utils/endian_inl_utils.h" -#include "../utils/huffman_utils.h" -#include "../utils/utils.h" +#include "src/dec/alphai_dec.h" +#include "src/dec/vp8li_dec.h" +#include "src/dsp/dsp.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" +#include "src/dsp/yuv.h" +#include "src/utils/endian_inl_utils.h" +#include "src/utils/huffman_utils.h" +#include "src/utils/utils.h" #define NUM_ARGB_CACHE_ROWS 16 diff --git a/src/dec/vp8li_dec.h b/src/dec/vp8li_dec.h index 097a9d05..f5c8c730 100644 --- a/src/dec/vp8li_dec.h +++ b/src/dec/vp8li_dec.h @@ -16,10 +16,10 @@ #define WEBP_DEC_VP8LI_H_ #include // for memcpy() -#include "./webpi_dec.h" -#include "../utils/bit_reader_utils.h" -#include "../utils/color_cache_utils.h" -#include "../utils/huffman_utils.h" +#include "src/dec/webpi_dec.h" +#include "src/utils/bit_reader_utils.h" +#include "src/utils/color_cache_utils.h" +#include "src/utils/huffman_utils.h" #ifdef __cplusplus extern "C" { diff --git a/src/dec/webp_dec.c b/src/dec/webp_dec.c index a8e9c2c5..f6edaf97 100644 --- a/src/dec/webp_dec.c +++ b/src/dec/webp_dec.c @@ -13,11 +13,11 @@ #include -#include "./vp8i_dec.h" -#include "./vp8li_dec.h" -#include "./webpi_dec.h" -#include "../utils/utils.h" -#include "../webp/mux_types.h" // ALPHA_FLAG +#include "src/dec/vp8i_dec.h" +#include "src/dec/vp8li_dec.h" +#include "src/dec/webpi_dec.h" +#include "src/utils/utils.h" +#include "src/webp/mux_types.h" // ALPHA_FLAG //------------------------------------------------------------------------------ // RIFF layout is: diff --git a/src/dec/webpi_dec.h b/src/dec/webpi_dec.h index 696abc19..42ea9f74 100644 --- a/src/dec/webpi_dec.h +++ b/src/dec/webpi_dec.h @@ -18,8 +18,8 @@ extern "C" { #endif -#include "../utils/rescaler_utils.h" -#include "./vp8_dec.h" +#include "src/utils/rescaler_utils.h" +#include "src/dec/vp8_dec.h" //------------------------------------------------------------------------------ // WebPDecParams: Decoding output parameters. Transient internal object. diff --git a/src/demux/Makefile.am b/src/demux/Makefile.am index c47536bb..6a9e61b3 100644 --- a/src/demux/Makefile.am +++ b/src/demux/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) lib_LTLIBRARIES = libwebpdemux.la libwebpdemux_la_SOURCES = diff --git a/src/demux/anim_decode.c b/src/demux/anim_decode.c index f1cf176e..05dd7073 100644 --- a/src/demux/anim_decode.c +++ b/src/demux/anim_decode.c @@ -11,15 +11,15 @@ // #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif #include #include -#include "../utils/utils.h" -#include "../webp/decode.h" -#include "../webp/demux.h" +#include "src/utils/utils.h" +#include "src/webp/decode.h" +#include "src/webp/demux.h" #define NUM_CHANNELS 4 diff --git a/src/demux/demux.c b/src/demux/demux.c index 567ba3d4..dc75b851 100644 --- a/src/demux/demux.c +++ b/src/demux/demux.c @@ -11,17 +11,17 @@ // #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif #include #include #include -#include "../utils/utils.h" -#include "../webp/decode.h" // WebPGetFeatures -#include "../webp/demux.h" -#include "../webp/format_constants.h" +#include "src/utils/utils.h" +#include "src/webp/decode.h" // WebPGetFeatures +#include "src/webp/demux.h" +#include "src/webp/format_constants.h" #define DMUX_MAJ_VERSION 0 #define DMUX_MIN_VERSION 3 diff --git a/src/dsp/Makefile.am b/src/dsp/Makefile.am index f451d53c..1e57b207 100644 --- a/src/dsp/Makefile.am +++ b/src/dsp/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) noinst_LTLIBRARIES = noinst_LTLIBRARIES += libwebpdsp.la noinst_LTLIBRARIES += libwebpdsp_avx2.la diff --git a/src/dsp/alpha_processing.c b/src/dsp/alpha_processing.c index a85bde17..69604338 100644 --- a/src/dsp/alpha_processing.c +++ b/src/dsp/alpha_processing.c @@ -12,7 +12,7 @@ // Author: Skal (pascal.massimino@gmail.com) #include -#include "./dsp.h" +#include "src/dsp/dsp.h" // Tables can be faster on some platform but incur some extra binary size (~2k). #if !defined(USE_TABLES_FOR_ALPHA_MULT) diff --git a/src/dsp/alpha_processing_mips_dsp_r2.c b/src/dsp/alpha_processing_mips_dsp_r2.c index e812f6fb..e0dc91ba 100644 --- a/src/dsp/alpha_processing_mips_dsp_r2.c +++ b/src/dsp/alpha_processing_mips_dsp_r2.c @@ -12,7 +12,7 @@ // Author(s): Branimir Vasic (branimir.vasic@imgtec.com) // Djordje Pesut (djordje.pesut@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) diff --git a/src/dsp/alpha_processing_neon.c b/src/dsp/alpha_processing_neon.c index 606a401c..9d554217 100644 --- a/src/dsp/alpha_processing_neon.c +++ b/src/dsp/alpha_processing_neon.c @@ -11,11 +11,11 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_NEON) -#include "./neon.h" +#include "src/dsp/neon.h" //------------------------------------------------------------------------------ diff --git a/src/dsp/alpha_processing_sse2.c b/src/dsp/alpha_processing_sse2.c index 8353a64d..71529947 100644 --- a/src/dsp/alpha_processing_sse2.c +++ b/src/dsp/alpha_processing_sse2.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) #include diff --git a/src/dsp/alpha_processing_sse41.c b/src/dsp/alpha_processing_sse41.c index b88eadd4..56040f9c 100644 --- a/src/dsp/alpha_processing_sse41.c +++ b/src/dsp/alpha_processing_sse41.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE41) diff --git a/src/dsp/cost.c b/src/dsp/cost.c index 1cac1298..a732389d 100644 --- a/src/dsp/cost.c +++ b/src/dsp/cost.c @@ -9,8 +9,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" -#include "../enc/cost_enc.h" +#include "src/dsp/dsp.h" +#include "src/enc/cost_enc.h" //------------------------------------------------------------------------------ // Boolean-cost cost table diff --git a/src/dsp/cost_mips32.c b/src/dsp/cost_mips32.c index 9bc40b84..0500f88c 100644 --- a/src/dsp/cost_mips32.c +++ b/src/dsp/cost_mips32.c @@ -9,11 +9,11 @@ // // Author: Djordje Pesut (djordje.pesut@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS32) -#include "../enc/cost_enc.h" +#include "src/enc/cost_enc.h" static int GetResidualCost_MIPS32(int ctx0, const VP8Residual* const res) { int temp0, temp1; diff --git a/src/dsp/cost_mips_dsp_r2.c b/src/dsp/cost_mips_dsp_r2.c index 6c38f946..51248de7 100644 --- a/src/dsp/cost_mips_dsp_r2.c +++ b/src/dsp/cost_mips_dsp_r2.c @@ -9,11 +9,11 @@ // // Author: Djordje Pesut (djordje.pesut@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) -#include "../enc/cost_enc.h" +#include "src/enc/cost_enc.h" static int GetResidualCost_MIPSdspR2(int ctx0, const VP8Residual* const res) { int temp0, temp1; diff --git a/src/dsp/cost_sse2.c b/src/dsp/cost_sse2.c index 83683732..487a0799 100644 --- a/src/dsp/cost_sse2.c +++ b/src/dsp/cost_sse2.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) #include -#include "../enc/cost_enc.h" -#include "../enc/vp8i_enc.h" -#include "../utils/utils.h" +#include "src/enc/cost_enc.h" +#include "src/enc/vp8i_enc.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dsp/cpu.c b/src/dsp/cpu.c index a93bda05..8b40feed 100644 --- a/src/dsp/cpu.c +++ b/src/dsp/cpu.c @@ -11,7 +11,7 @@ // // Author: Christian Duvivier (cduvivier@google.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_HAVE_NEON_RTCD) #include diff --git a/src/dsp/dec.c b/src/dsp/dec.c index 7f74e142..13e852bf 100644 --- a/src/dsp/dec.c +++ b/src/dsp/dec.c @@ -11,9 +11,9 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" -#include "../dec/vp8i_dec.h" -#include "../utils/utils.h" +#include "src/dsp/dsp.h" +#include "src/dec/vp8i_dec.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dsp/dec_clip_tables.c b/src/dsp/dec_clip_tables.c index beb051a3..427b74f7 100644 --- a/src/dsp/dec_clip_tables.c +++ b/src/dsp/dec_clip_tables.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" // define to 0 to have run-time table initialization #if !defined(USE_STATIC_TABLES) diff --git a/src/dsp/dec_mips32.c b/src/dsp/dec_mips32.c index 4e9ef426..e4e70966 100644 --- a/src/dsp/dec_mips32.c +++ b/src/dsp/dec_mips32.c @@ -12,11 +12,11 @@ // Author(s): Djordje Pesut (djordje.pesut@imgtec.com) // Jovan Zelincevic (jovan.zelincevic@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS32) -#include "./mips_macro.h" +#include "src/dsp/mips_macro.h" static const int kC1 = 20091 + (1 << 16); static const int kC2 = 35468; diff --git a/src/dsp/dec_mips_dsp_r2.c b/src/dsp/dec_mips_dsp_r2.c index db5c6572..b0936bc4 100644 --- a/src/dsp/dec_mips_dsp_r2.c +++ b/src/dsp/dec_mips_dsp_r2.c @@ -12,11 +12,11 @@ // Author(s): Djordje Pesut (djordje.pesut@imgtec.com) // Jovan Zelincevic (jovan.zelincevic@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) -#include "./mips_macro.h" +#include "src/dsp/mips_macro.h" static const int kC1 = 20091 + (1 << 16); static const int kC2 = 35468; diff --git a/src/dsp/dec_msa.c b/src/dsp/dec_msa.c index cc1e2850..8090622b 100644 --- a/src/dsp/dec_msa.c +++ b/src/dsp/dec_msa.c @@ -12,11 +12,11 @@ // Author(s): Prashant Patil (prashant.patil@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MSA) -#include "./msa_macro.h" +#include "src/dsp/msa_macro.h" //------------------------------------------------------------------------------ // Transforms diff --git a/src/dsp/dec_neon.c b/src/dsp/dec_neon.c index 34796cf4..474bcf4b 100644 --- a/src/dsp/dec_neon.c +++ b/src/dsp/dec_neon.c @@ -12,12 +12,12 @@ // Authors: Somnath Banerjee (somnath@google.com) // Johann Koenig (johannkoenig@google.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_NEON) -#include "./neon.h" -#include "../dec/vp8i_dec.h" +#include "src/dsp/neon.h" +#include "src/dec/vp8i_dec.h" //------------------------------------------------------------------------------ // NxM Loading functions diff --git a/src/dsp/dec_sse2.c b/src/dsp/dec_sse2.c index c782327a..e7441a87 100644 --- a/src/dsp/dec_sse2.c +++ b/src/dsp/dec_sse2.c @@ -12,7 +12,7 @@ // Author: somnath@google.com (Somnath Banerjee) // cduvivier@google.com (Christian Duvivier) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) @@ -23,9 +23,9 @@ #endif #include -#include "./common_sse2.h" -#include "../dec/vp8i_dec.h" -#include "../utils/utils.h" +#include "src/dsp/common_sse2.h" +#include "src/dec/vp8i_dec.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // Transforms (Paragraph 14.4) diff --git a/src/dsp/dec_sse41.c b/src/dsp/dec_sse41.c index 4e81ec4d..08da4c74 100644 --- a/src/dsp/dec_sse41.c +++ b/src/dsp/dec_sse41.c @@ -11,13 +11,13 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE41) #include -#include "../dec/vp8i_dec.h" -#include "../utils/utils.h" +#include "src/dec/vp8i_dec.h" +#include "src/utils/utils.h" static void HE16(uint8_t* dst) { // horizontal int j; diff --git a/src/dsp/dsp.h b/src/dsp/dsp.h index 224d2200..25efc18f 100644 --- a/src/dsp/dsp.h +++ b/src/dsp/dsp.h @@ -15,10 +15,10 @@ #define WEBP_DSP_DSP_H_ #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/dsp/enc.c b/src/dsp/enc.c index 6399ed88..bf59d5b8 100644 --- a/src/dsp/enc.c +++ b/src/dsp/enc.c @@ -14,8 +14,8 @@ #include #include // for abs() -#include "./dsp.h" -#include "../enc/vp8i_enc.h" +#include "src/dsp/dsp.h" +#include "src/enc/vp8i_enc.h" static WEBP_INLINE uint8_t clip_8b(int v) { return (!(v & ~0xff)) ? v : (v < 0) ? 0 : 255; diff --git a/src/dsp/enc_avx2.c b/src/dsp/enc_avx2.c index 93efb30b..8bc5798f 100644 --- a/src/dsp/enc_avx2.c +++ b/src/dsp/enc_avx2.c @@ -9,7 +9,7 @@ // // AVX2 version of speed-critical encoding functions. -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_AVX2) diff --git a/src/dsp/enc_mips32.c b/src/dsp/enc_mips32.c index ad7d79bb..618f0fc0 100644 --- a/src/dsp/enc_mips32.c +++ b/src/dsp/enc_mips32.c @@ -13,13 +13,13 @@ // Jovan Zelincevic (jovan.zelincevic@imgtec.com) // Slobodan Prijic (slobodan.prijic@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS32) -#include "./mips_macro.h" -#include "../enc/vp8i_enc.h" -#include "../enc/cost_enc.h" +#include "src/dsp/mips_macro.h" +#include "src/enc/vp8i_enc.h" +#include "src/enc/cost_enc.h" static const int kC1 = 20091 + (1 << 16); static const int kC2 = 35468; diff --git a/src/dsp/enc_mips_dsp_r2.c b/src/dsp/enc_mips_dsp_r2.c index 3ee2ecee..9ddd8950 100644 --- a/src/dsp/enc_mips_dsp_r2.c +++ b/src/dsp/enc_mips_dsp_r2.c @@ -12,13 +12,13 @@ // Author(s): Darko Laus (darko.laus@imgtec.com) // Mirko Raus (mirko.raus@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) -#include "./mips_macro.h" -#include "../enc/cost_enc.h" -#include "../enc/vp8i_enc.h" +#include "src/dsp/mips_macro.h" +#include "src/enc/cost_enc.h" +#include "src/enc/vp8i_enc.h" static const int kC1 = 20091 + (1 << 16); static const int kC2 = 35468; diff --git a/src/dsp/enc_msa.c b/src/dsp/enc_msa.c index eb805042..6f85add4 100644 --- a/src/dsp/enc_msa.c +++ b/src/dsp/enc_msa.c @@ -11,13 +11,13 @@ // // Author: Prashant Patil (prashant.patil@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MSA) #include -#include "./msa_macro.h" -#include "../enc/vp8i_enc.h" +#include "src/dsp/msa_macro.h" +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Transforms diff --git a/src/dsp/enc_neon.c b/src/dsp/enc_neon.c index cfc31f47..c23d54fb 100644 --- a/src/dsp/enc_neon.c +++ b/src/dsp/enc_neon.c @@ -11,14 +11,14 @@ // // adapted from libvpx (http://www.webmproject.org/code/) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_NEON) #include -#include "./neon.h" -#include "../enc/vp8i_enc.h" +#include "src/dsp/neon.h" +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Transforms (Paragraph 14.4) diff --git a/src/dsp/enc_sse2.c b/src/dsp/enc_sse2.c index 1d58db18..1c5b836d 100644 --- a/src/dsp/enc_sse2.c +++ b/src/dsp/enc_sse2.c @@ -11,16 +11,16 @@ // // Author: Christian Duvivier (cduvivier@google.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) #include #include // for abs() #include -#include "./common_sse2.h" -#include "../enc/cost_enc.h" -#include "../enc/vp8i_enc.h" +#include "src/dsp/common_sse2.h" +#include "src/enc/cost_enc.h" +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Transforms (Paragraph 14.4) diff --git a/src/dsp/enc_sse41.c b/src/dsp/enc_sse41.c index a3f4b6be..924035a6 100644 --- a/src/dsp/enc_sse41.c +++ b/src/dsp/enc_sse41.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE41) #include #include // for abs() -#include "./common_sse2.h" -#include "../enc/vp8i_enc.h" +#include "src/dsp/common_sse2.h" +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Compute susceptibility based on DCT-coeff histograms. diff --git a/src/dsp/filters.c b/src/dsp/filters.c index 5c8c2a78..7759126f 100644 --- a/src/dsp/filters.c +++ b/src/dsp/filters.c @@ -11,7 +11,7 @@ // // Author: Urvang (urvang@google.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #include #include #include diff --git a/src/dsp/filters_mips_dsp_r2.c b/src/dsp/filters_mips_dsp_r2.c index 865e53bb..9382b128 100644 --- a/src/dsp/filters_mips_dsp_r2.c +++ b/src/dsp/filters_mips_dsp_r2.c @@ -12,11 +12,11 @@ // Author(s): Branimir Vasic (branimir.vasic@imgtec.com) // Djordje Pesut (djordje.pesut@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) -#include "../dsp/dsp.h" +#include "src/dsp/dsp.h" #include #include #include diff --git a/src/dsp/filters_msa.c b/src/dsp/filters_msa.c index 50fb0a60..14c437d1 100644 --- a/src/dsp/filters_msa.c +++ b/src/dsp/filters_msa.c @@ -11,11 +11,11 @@ // // Author: Prashant Patil (prashant.patil@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MSA) -#include "./msa_macro.h" +#include "src/dsp/msa_macro.h" #include diff --git a/src/dsp/filters_neon.c b/src/dsp/filters_neon.c index 6b9c0668..2a4a6f7f 100644 --- a/src/dsp/filters_neon.c +++ b/src/dsp/filters_neon.c @@ -11,12 +11,12 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_NEON) #include -#include "./neon.h" +#include "src/dsp/neon.h" //------------------------------------------------------------------------------ // Helpful macros. diff --git a/src/dsp/filters_sse2.c b/src/dsp/filters_sse2.c index 9c48dfcf..5a188956 100644 --- a/src/dsp/filters_sse2.c +++ b/src/dsp/filters_sse2.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) diff --git a/src/dsp/lossless.c b/src/dsp/lossless.c index a92f4107..000d6566 100644 --- a/src/dsp/lossless.c +++ b/src/dsp/lossless.c @@ -13,14 +13,14 @@ // Jyrki Alakuijala (jyrki@google.com) // Urvang Joshi (urvang@google.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #include #include -#include "../dec/vp8li_dec.h" -#include "../utils/endian_inl_utils.h" -#include "./lossless.h" -#include "./lossless_common.h" +#include "src/dec/vp8li_dec.h" +#include "src/utils/endian_inl_utils.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" #define MAX_DIFF_COST (1e30f) diff --git a/src/dsp/lossless.h b/src/dsp/lossless.h index a7def5fd..a99dbda6 100644 --- a/src/dsp/lossless.h +++ b/src/dsp/lossless.h @@ -15,18 +15,18 @@ #ifndef WEBP_DSP_LOSSLESS_H_ #define WEBP_DSP_LOSSLESS_H_ -#include "../webp/types.h" -#include "../webp/decode.h" +#include "src/webp/types.h" +#include "src/webp/decode.h" -#include "../enc/histogram_enc.h" -#include "../utils/utils.h" +#include "src/enc/histogram_enc.h" +#include "src/utils/utils.h" #ifdef __cplusplus extern "C" { #endif #ifdef WEBP_EXPERIMENTAL_FEATURES -#include "../enc/delta_palettization_enc.h" +#include "src/enc/delta_palettization_enc.h" #endif // WEBP_EXPERIMENTAL_FEATURES //------------------------------------------------------------------------------ diff --git a/src/dsp/lossless_common.h b/src/dsp/lossless_common.h index dd2e4f24..a2648d17 100644 --- a/src/dsp/lossless_common.h +++ b/src/dsp/lossless_common.h @@ -16,9 +16,9 @@ #ifndef WEBP_DSP_LOSSLESS_COMMON_H_ #define WEBP_DSP_LOSSLESS_COMMON_H_ -#include "../webp/types.h" +#include "src/webp/types.h" -#include "../utils/utils.h" +#include "src/utils/utils.h" #ifdef __cplusplus extern "C" { diff --git a/src/dsp/lossless_enc.c b/src/dsp/lossless_enc.c index 18ff860f..b8a6baba 100644 --- a/src/dsp/lossless_enc.c +++ b/src/dsp/lossless_enc.c @@ -13,15 +13,15 @@ // Jyrki Alakuijala (jyrki@google.com) // Urvang Joshi (urvang@google.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #include #include -#include "../dec/vp8li_dec.h" -#include "../utils/endian_inl_utils.h" -#include "./lossless.h" -#include "./lossless_common.h" -#include "./yuv.h" +#include "src/dec/vp8li_dec.h" +#include "src/utils/endian_inl_utils.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" +#include "src/dsp/yuv.h" // lookup table for small values of log2(int) const float kLog2Table[LOG_LOOKUP_IDX_MAX] = { diff --git a/src/dsp/lossless_enc_mips32.c b/src/dsp/lossless_enc_mips32.c index 92ba7b1b..e7b58f4e 100644 --- a/src/dsp/lossless_enc_mips32.c +++ b/src/dsp/lossless_enc_mips32.c @@ -12,9 +12,9 @@ // Author(s): Djordje Pesut (djordje.pesut@imgtec.com) // Jovan Zelincevic (jovan.zelincevic@imgtec.com) -#include "./dsp.h" -#include "./lossless.h" -#include "./lossless_common.h" +#include "src/dsp/dsp.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" #if defined(WEBP_USE_MIPS32) diff --git a/src/dsp/lossless_enc_mips_dsp_r2.c b/src/dsp/lossless_enc_mips_dsp_r2.c index d499875a..5855e6ae 100644 --- a/src/dsp/lossless_enc_mips_dsp_r2.c +++ b/src/dsp/lossless_enc_mips_dsp_r2.c @@ -12,11 +12,11 @@ // Author(s): Djordje Pesut (djordje.pesut@imgtec.com) // Jovan Zelincevic (jovan.zelincevic@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) -#include "./lossless.h" +#include "src/dsp/lossless.h" static void SubtractGreenFromBlueAndRed_MIPSdspR2(uint32_t* argb_data, int num_pixels) { diff --git a/src/dsp/lossless_enc_msa.c b/src/dsp/lossless_enc_msa.c index d5b20581..600dddfb 100644 --- a/src/dsp/lossless_enc_msa.c +++ b/src/dsp/lossless_enc_msa.c @@ -11,12 +11,12 @@ // // Authors: Prashant Patil (Prashant.Patil@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MSA) -#include "./lossless.h" -#include "./msa_macro.h" +#include "src/dsp/lossless.h" +#include "src/dsp/msa_macro.h" #define TRANSFORM_COLOR_8(src0, src1, dst0, dst1, c0, c1, mask0, mask1) do { \ v8i16 g0, g1, t0, t1, t2, t3; \ diff --git a/src/dsp/lossless_enc_neon.c b/src/dsp/lossless_enc_neon.c index 9b2b78e4..84687291 100644 --- a/src/dsp/lossless_enc_neon.c +++ b/src/dsp/lossless_enc_neon.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_NEON) #include -#include "./lossless.h" -#include "./neon.h" +#include "src/dsp/lossless.h" +#include "src/dsp/neon.h" //------------------------------------------------------------------------------ // Subtract-Green Transform diff --git a/src/dsp/lossless_enc_sse2.c b/src/dsp/lossless_enc_sse2.c index 39e5c742..7a4ec42e 100644 --- a/src/dsp/lossless_enc_sse2.c +++ b/src/dsp/lossless_enc_sse2.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) #include #include -#include "./lossless.h" -#include "./common_sse2.h" -#include "./lossless_common.h" +#include "src/dsp/lossless.h" +#include "src/dsp/common_sse2.h" +#include "src/dsp/lossless_common.h" // For sign-extended multiplying constants, pre-shifted by 5: #define CST_5b(X) (((int16_t)((uint16_t)(X) << 8)) >> 5) diff --git a/src/dsp/lossless_enc_sse41.c b/src/dsp/lossless_enc_sse41.c index 87063e32..3526a342 100644 --- a/src/dsp/lossless_enc_sse41.c +++ b/src/dsp/lossless_enc_sse41.c @@ -11,12 +11,12 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE41) #include #include -#include "./lossless.h" +#include "src/dsp/lossless.h" //------------------------------------------------------------------------------ // Subtract-Green Transform diff --git a/src/dsp/lossless_mips_dsp_r2.c b/src/dsp/lossless_mips_dsp_r2.c index 2fc2603f..9888854d 100644 --- a/src/dsp/lossless_mips_dsp_r2.c +++ b/src/dsp/lossless_mips_dsp_r2.c @@ -12,12 +12,12 @@ // Author(s): Djordje Pesut (djordje.pesut@imgtec.com) // Jovan Zelincevic (jovan.zelincevic@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) -#include "./lossless.h" -#include "./lossless_common.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" #define MAP_COLOR_FUNCS(FUNC_NAME, TYPE, GET_INDEX, GET_VALUE) \ static void FUNC_NAME(const TYPE* src, \ diff --git a/src/dsp/lossless_msa.c b/src/dsp/lossless_msa.c index 3dd6c836..9f547207 100644 --- a/src/dsp/lossless_msa.c +++ b/src/dsp/lossless_msa.c @@ -11,12 +11,12 @@ // // Author: Prashant Patil (prashant.patil@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MSA) -#include "./lossless.h" -#include "./msa_macro.h" +#include "src/dsp/lossless.h" +#include "src/dsp/msa_macro.h" //------------------------------------------------------------------------------ // Colorspace conversion functions diff --git a/src/dsp/lossless_neon.c b/src/dsp/lossless_neon.c index deef8105..5feea786 100644 --- a/src/dsp/lossless_neon.c +++ b/src/dsp/lossless_neon.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_NEON) #include -#include "./lossless.h" -#include "./neon.h" +#include "src/dsp/lossless.h" +#include "src/dsp/neon.h" //------------------------------------------------------------------------------ // Colorspace conversion functions diff --git a/src/dsp/lossless_sse2.c b/src/dsp/lossless_sse2.c index e1349599..3770fbc3 100644 --- a/src/dsp/lossless_sse2.c +++ b/src/dsp/lossless_sse2.c @@ -11,13 +11,13 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) -#include "./common_sse2.h" -#include "./lossless.h" -#include "./lossless_common.h" +#include "src/dsp/common_sse2.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" #include #include diff --git a/src/dsp/neon.h b/src/dsp/neon.h index 67554b10..02d69f4c 100644 --- a/src/dsp/neon.h +++ b/src/dsp/neon.h @@ -14,7 +14,7 @@ #include -#include "./dsp.h" +#include "src/dsp/dsp.h" // Right now, some intrinsics functions seem slower, so we disable them // everywhere except newer clang/gcc or aarch64 where the inline assembly is diff --git a/src/dsp/rescaler.c b/src/dsp/rescaler.c index 6886448d..5d567339 100644 --- a/src/dsp/rescaler.c +++ b/src/dsp/rescaler.c @@ -13,8 +13,8 @@ #include -#include "./dsp.h" -#include "../utils/rescaler_utils.h" +#include "src/dsp/dsp.h" +#include "src/utils/rescaler_utils.h" //------------------------------------------------------------------------------ // Implementations of critical functions ImportRow / ExportRow diff --git a/src/dsp/rescaler_mips32.c b/src/dsp/rescaler_mips32.c index 856cee6d..17014fc8 100644 --- a/src/dsp/rescaler_mips32.c +++ b/src/dsp/rescaler_mips32.c @@ -11,12 +11,12 @@ // // Author(s): Djordje Pesut (djordje.pesut@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS32) #include -#include "../utils/rescaler_utils.h" +#include "src/utils/rescaler_utils.h" //------------------------------------------------------------------------------ // Row import diff --git a/src/dsp/rescaler_mips_dsp_r2.c b/src/dsp/rescaler_mips_dsp_r2.c index 7fe96722..3a02f9b0 100644 --- a/src/dsp/rescaler_mips_dsp_r2.c +++ b/src/dsp/rescaler_mips_dsp_r2.c @@ -11,12 +11,12 @@ // // Author(s): Djordje Pesut (djordje.pesut@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) #include -#include "../utils/rescaler_utils.h" +#include "src/utils/rescaler_utils.h" #define ROUNDER (WEBP_RESCALER_ONE >> 1) #define MULT_FIX(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX) diff --git a/src/dsp/rescaler_msa.c b/src/dsp/rescaler_msa.c index 8db96113..b33c6bcb 100644 --- a/src/dsp/rescaler_msa.c +++ b/src/dsp/rescaler_msa.c @@ -11,14 +11,14 @@ // // Author: Prashant Patil (prashant.patil@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MSA) #include -#include "../utils/rescaler_utils.h" -#include "./msa_macro.h" +#include "src/utils/rescaler_utils.h" +#include "src/dsp/msa_macro.h" #define ROUNDER (WEBP_RESCALER_ONE >> 1) #define MULT_FIX(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX) diff --git a/src/dsp/rescaler_neon.c b/src/dsp/rescaler_neon.c index fe048f55..8f31c8fa 100644 --- a/src/dsp/rescaler_neon.c +++ b/src/dsp/rescaler_neon.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_NEON) #include #include -#include "./neon.h" -#include "../utils/rescaler_utils.h" +#include "src/dsp/neon.h" +#include "src/utils/rescaler_utils.h" #define ROUNDER (WEBP_RESCALER_ONE >> 1) #define MULT_FIX_C(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX) diff --git a/src/dsp/rescaler_sse2.c b/src/dsp/rescaler_sse2.c index 57f4c818..92d6e23b 100644 --- a/src/dsp/rescaler_sse2.c +++ b/src/dsp/rescaler_sse2.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) #include #include -#include "../utils/rescaler_utils.h" -#include "../utils/utils.h" +#include "src/utils/rescaler_utils.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // Implementations of critical functions ImportRow / ExportRow diff --git a/src/dsp/ssim.c b/src/dsp/ssim.c index e28cda62..be9b1c26 100644 --- a/src/dsp/ssim.c +++ b/src/dsp/ssim.c @@ -14,7 +14,7 @@ #include #include // for abs() -#include "./dsp.h" +#include "src/dsp/dsp.h" //------------------------------------------------------------------------------ // SSIM / PSNR diff --git a/src/dsp/ssim_sse2.c b/src/dsp/ssim_sse2.c index effd8628..de0f5b0a 100644 --- a/src/dsp/ssim_sse2.c +++ b/src/dsp/ssim_sse2.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) #include #include -#include "./common_sse2.h" +#include "src/dsp/common_sse2.h" // Helper function static WEBP_INLINE void SubtractAndSquare(const __m128i a, const __m128i b, diff --git a/src/dsp/upsampling.c b/src/dsp/upsampling.c index 68e4f388..07dc54a7 100644 --- a/src/dsp/upsampling.c +++ b/src/dsp/upsampling.c @@ -11,8 +11,8 @@ // // Author: somnath@google.com (Somnath Banerjee) -#include "./dsp.h" -#include "./yuv.h" +#include "src/dsp/dsp.h" +#include "src/dsp/yuv.h" #include diff --git a/src/dsp/upsampling_mips_dsp_r2.c b/src/dsp/upsampling_mips_dsp_r2.c index 3e69ee0e..de065d5f 100644 --- a/src/dsp/upsampling_mips_dsp_r2.c +++ b/src/dsp/upsampling_mips_dsp_r2.c @@ -12,12 +12,12 @@ // Author(s): Branimir Vasic (branimir.vasic@imgtec.com) // Djordje Pesut (djordje.pesut@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) #include -#include "./yuv.h" +#include "src/dsp/yuv.h" #define YUV_TO_RGB(Y, U, V, R, G, B) do { \ const int t1 = MultHi(Y, 19077); \ diff --git a/src/dsp/upsampling_msa.c b/src/dsp/upsampling_msa.c index 55f4de0c..5748a6f6 100644 --- a/src/dsp/upsampling_msa.c +++ b/src/dsp/upsampling_msa.c @@ -12,12 +12,12 @@ // Author: Prashant Patil (prashant.patil@imgtec.com) #include -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MSA) -#include "./msa_macro.h" -#include "./yuv.h" +#include "src/dsp/msa_macro.h" +#include "src/dsp/yuv.h" #ifdef FANCY_UPSAMPLING diff --git a/src/dsp/upsampling_neon.c b/src/dsp/upsampling_neon.c index d371a834..27117d2a 100644 --- a/src/dsp/upsampling_neon.c +++ b/src/dsp/upsampling_neon.c @@ -12,15 +12,15 @@ // Author: mans@mansr.com (Mans Rullgard) // Based on SSE code by: somnath@google.com (Somnath Banerjee) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_NEON) #include #include #include -#include "./neon.h" -#include "./yuv.h" +#include "src/dsp/neon.h" +#include "src/dsp/yuv.h" #ifdef FANCY_UPSAMPLING diff --git a/src/dsp/upsampling_sse2.c b/src/dsp/upsampling_sse2.c index 16609f8e..35864c70 100644 --- a/src/dsp/upsampling_sse2.c +++ b/src/dsp/upsampling_sse2.c @@ -11,14 +11,14 @@ // // Author: somnath@google.com (Somnath Banerjee) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) #include #include #include -#include "./yuv.h" +#include "src/dsp/yuv.h" #ifdef FANCY_UPSAMPLING diff --git a/src/dsp/yuv.c b/src/dsp/yuv.c index c68bc8f1..437744cc 100644 --- a/src/dsp/yuv.c +++ b/src/dsp/yuv.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./yuv.h" +#include "src/dsp/yuv.h" #include diff --git a/src/dsp/yuv.h b/src/dsp/yuv.h index 92959bbd..10ea040e 100644 --- a/src/dsp/yuv.h +++ b/src/dsp/yuv.h @@ -35,8 +35,8 @@ #ifndef WEBP_DSP_YUV_H_ #define WEBP_DSP_YUV_H_ -#include "./dsp.h" -#include "../dec/vp8_dec.h" +#include "src/dsp/dsp.h" +#include "src/dec/vp8_dec.h" //------------------------------------------------------------------------------ // YUV -> RGB conversion diff --git a/src/dsp/yuv_mips32.c b/src/dsp/yuv_mips32.c index 9713cbb2..9d0a8878 100644 --- a/src/dsp/yuv_mips32.c +++ b/src/dsp/yuv_mips32.c @@ -12,11 +12,11 @@ // Author(s): Djordje Pesut (djordje.pesut@imgtec.com) // Jovan Zelincevic (jovan.zelincevic@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS32) -#include "./yuv.h" +#include "src/dsp/yuv.h" //------------------------------------------------------------------------------ // simple point-sampling diff --git a/src/dsp/yuv_mips_dsp_r2.c b/src/dsp/yuv_mips_dsp_r2.c index 87a490c3..cc8afcc7 100644 --- a/src/dsp/yuv_mips_dsp_r2.c +++ b/src/dsp/yuv_mips_dsp_r2.c @@ -12,11 +12,11 @@ // Author(s): Branimir Vasic (branimir.vasic@imgtec.com) // Djordje Pesut (djordje.pesut@imgtec.com) -#include "./dsp.h" +#include "src/dsp/dsp.h" #if defined(WEBP_USE_MIPS_DSP_R2) -#include "./yuv.h" +#include "src/dsp/yuv.h" //------------------------------------------------------------------------------ // simple point-sampling diff --git a/src/dsp/yuv_neon.c b/src/dsp/yuv_neon.c index 8917aa06..835311e5 100644 --- a/src/dsp/yuv_neon.c +++ b/src/dsp/yuv_neon.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./yuv.h" +#include "src/dsp/yuv.h" #if defined(WEBP_USE_NEON) #include #include -#include "./neon.h" +#include "src/dsp/neon.h" //----------------------------------------------------------------------------- diff --git a/src/dsp/yuv_sse2.c b/src/dsp/yuv_sse2.c index ccff6940..3c79c691 100644 --- a/src/dsp/yuv_sse2.c +++ b/src/dsp/yuv_sse2.c @@ -11,11 +11,11 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./yuv.h" +#include "src/dsp/yuv.h" #if defined(WEBP_USE_SSE2) -#include "./common_sse2.h" +#include "src/dsp/common_sse2.h" #include #include diff --git a/src/enc/Makefile.am b/src/enc/Makefile.am index 07ea4df2..b1f5e067 100644 --- a/src/enc/Makefile.am +++ b/src/enc/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) noinst_LTLIBRARIES = libwebpencode.la libwebpencode_la_SOURCES = diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c index 1a0ef8a5..6b1a6f4c 100644 --- a/src/enc/alpha_enc.c +++ b/src/enc/alpha_enc.c @@ -14,12 +14,12 @@ #include #include -#include "./vp8i_enc.h" -#include "../dsp/dsp.h" -#include "../utils/filters_utils.h" -#include "../utils/quant_levels_utils.h" -#include "../utils/utils.h" -#include "../webp/format_constants.h" +#include "src/enc/vp8i_enc.h" +#include "src/dsp/dsp.h" +#include "src/utils/filters_utils.h" +#include "src/utils/quant_levels_utils.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" // ----------------------------------------------------------------------------- // Encodes the given alpha data via specified compression method 'method'. @@ -44,7 +44,7 @@ // invalid quality or method, or // memory allocation for the compressed data fails. -#include "../enc/vp8li_enc.h" +#include "src/enc/vp8li_enc.h" static int EncodeLossless(const uint8_t* const data, int width, int height, int effort_level, // in [0..6] range diff --git a/src/enc/analysis_enc.c b/src/enc/analysis_enc.c index dce159b3..08f471f5 100644 --- a/src/enc/analysis_enc.c +++ b/src/enc/analysis_enc.c @@ -15,9 +15,9 @@ #include #include -#include "./vp8i_enc.h" -#include "./cost_enc.h" -#include "../utils/utils.h" +#include "src/enc/vp8i_enc.h" +#include "src/enc/cost_enc.h" +#include "src/utils/utils.h" #define MAX_ITERS_K_MEANS 6 diff --git a/src/enc/backward_references_cost_enc.c b/src/enc/backward_references_cost_enc.c index c84e9ff4..7175496c 100644 --- a/src/enc/backward_references_cost_enc.c +++ b/src/enc/backward_references_cost_enc.c @@ -16,11 +16,11 @@ #include -#include "./backward_references_enc.h" -#include "./histogram_enc.h" -#include "../dsp/lossless_common.h" -#include "../utils/color_cache_utils.h" -#include "../utils/utils.h" +#include "src/enc/backward_references_enc.h" +#include "src/enc/histogram_enc.h" +#include "src/dsp/lossless_common.h" +#include "src/utils/color_cache_utils.h" +#include "src/utils/utils.h" #define VALUES_IN_BYTE 256 diff --git a/src/enc/backward_references_enc.c b/src/enc/backward_references_enc.c index f6b1ceb0..39230188 100644 --- a/src/enc/backward_references_enc.c +++ b/src/enc/backward_references_enc.c @@ -13,13 +13,13 @@ #include #include -#include "./backward_references_enc.h" -#include "./histogram_enc.h" -#include "../dsp/lossless.h" -#include "../dsp/lossless_common.h" -#include "../dsp/dsp.h" -#include "../utils/color_cache_utils.h" -#include "../utils/utils.h" +#include "src/enc/backward_references_enc.h" +#include "src/enc/histogram_enc.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" +#include "src/dsp/dsp.h" +#include "src/utils/color_cache_utils.h" +#include "src/utils/utils.h" #define MIN_BLOCK_SIZE 256 // minimum block size for backward references diff --git a/src/enc/backward_references_enc.h b/src/enc/backward_references_enc.h index a270dc41..36e53a67 100644 --- a/src/enc/backward_references_enc.h +++ b/src/enc/backward_references_enc.h @@ -15,8 +15,8 @@ #include #include -#include "../webp/types.h" -#include "../webp/format_constants.h" +#include "src/webp/types.h" +#include "src/webp/format_constants.h" #ifdef __cplusplus extern "C" { diff --git a/src/enc/config_enc.c b/src/enc/config_enc.c index 4589dc06..9d482897 100644 --- a/src/enc/config_enc.c +++ b/src/enc/config_enc.c @@ -12,10 +12,10 @@ // Author: Skal (pascal.massimino@gmail.com) #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif -#include "../webp/encode.h" +#include "src/webp/encode.h" //------------------------------------------------------------------------------ // WebPConfig diff --git a/src/enc/cost_enc.c b/src/enc/cost_enc.c index c823f5a6..48fd9bc3 100644 --- a/src/enc/cost_enc.c +++ b/src/enc/cost_enc.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./cost_enc.h" +#include "src/enc/cost_enc.h" //------------------------------------------------------------------------------ // Level cost tables diff --git a/src/enc/cost_enc.h b/src/enc/cost_enc.h index 99e4b37a..ab167315 100644 --- a/src/enc/cost_enc.h +++ b/src/enc/cost_enc.h @@ -16,7 +16,7 @@ #include #include -#include "./vp8i_enc.h" +#include "src/enc/vp8i_enc.h" #ifdef __cplusplus extern "C" { diff --git a/src/enc/delta_palettization_enc.c b/src/enc/delta_palettization_enc.c index eaf0f050..a61c8e6c 100644 --- a/src/enc/delta_palettization_enc.c +++ b/src/enc/delta_palettization_enc.c @@ -10,11 +10,11 @@ // Author: Mislav Bradac (mislavm@google.com) // -#include "./delta_palettization_enc.h" +#include "src/enc/delta_palettization_enc.h" #ifdef WEBP_EXPERIMENTAL_FEATURES -#include "../webp/types.h" -#include "../dsp/lossless.h" +#include "src/webp/types.h" +#include "src/dsp/lossless.h" #define MK_COL(r, g, b) (((r) << 16) + ((g) << 8) + (b)) diff --git a/src/enc/delta_palettization_enc.h b/src/enc/delta_palettization_enc.h index 63048ec6..1ec3d2f6 100644 --- a/src/enc/delta_palettization_enc.h +++ b/src/enc/delta_palettization_enc.h @@ -13,8 +13,8 @@ #ifndef WEBP_ENC_DELTA_PALETTIZATION_H_ #define WEBP_ENC_DELTA_PALETTIZATION_H_ -#include "../webp/encode.h" -#include "../enc/vp8li_enc.h" +#include "src/webp/encode.h" +#include "src/enc/vp8li_enc.h" // Replaces enc->argb_[] input by a palettizable approximation of it, // and generates optimal enc->palette_[]. diff --git a/src/enc/filter_enc.c b/src/enc/filter_enc.c index 4bc36727..0b2044ee 100644 --- a/src/enc/filter_enc.c +++ b/src/enc/filter_enc.c @@ -12,8 +12,8 @@ // Author: somnath@google.com (Somnath Banerjee) #include -#include "./vp8i_enc.h" -#include "../dsp/dsp.h" +#include "src/enc/vp8i_enc.h" +#include "src/dsp/dsp.h" // This table gives, for a given sharpness, the filtering strength to be // used (at least) in order to filter a given edge step delta. diff --git a/src/enc/frame_enc.c b/src/enc/frame_enc.c index abef523b..fb8b136a 100644 --- a/src/enc/frame_enc.c +++ b/src/enc/frame_enc.c @@ -14,10 +14,10 @@ #include #include -#include "./cost_enc.h" -#include "./vp8i_enc.h" -#include "../dsp/dsp.h" -#include "../webp/format_constants.h" // RIFF constants +#include "src/enc/cost_enc.h" +#include "src/enc/vp8i_enc.h" +#include "src/dsp/dsp.h" +#include "src/webp/format_constants.h" // RIFF constants #define SEGMENT_VISU 0 #define DEBUG_SEARCH 0 // useful to track search convergence diff --git a/src/enc/histogram_enc.c b/src/enc/histogram_enc.c index c2806332..056a972d 100644 --- a/src/enc/histogram_enc.c +++ b/src/enc/histogram_enc.c @@ -10,16 +10,16 @@ // Author: Jyrki Alakuijala (jyrki@google.com) // #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif #include -#include "./backward_references_enc.h" -#include "./histogram_enc.h" -#include "../dsp/lossless.h" -#include "../dsp/lossless_common.h" -#include "../utils/utils.h" +#include "src/enc/backward_references_enc.h" +#include "src/enc/histogram_enc.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" +#include "src/utils/utils.h" #define MAX_COST 1.e38 diff --git a/src/enc/histogram_enc.h b/src/enc/histogram_enc.h index 00c73f51..510b251d 100644 --- a/src/enc/histogram_enc.h +++ b/src/enc/histogram_enc.h @@ -16,9 +16,9 @@ #include -#include "./backward_references_enc.h" -#include "../webp/format_constants.h" -#include "../webp/types.h" +#include "src/enc/backward_references_enc.h" +#include "src/webp/format_constants.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/enc/iterator_enc.c b/src/enc/iterator_enc.c index e48d30bd..cfacfd24 100644 --- a/src/enc/iterator_enc.c +++ b/src/enc/iterator_enc.c @@ -13,7 +13,7 @@ #include -#include "./vp8i_enc.h" +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // VP8Iterator diff --git a/src/enc/near_lossless_enc.c b/src/enc/near_lossless_enc.c index 1a3ae0ad..cadd14c6 100644 --- a/src/enc/near_lossless_enc.c +++ b/src/enc/near_lossless_enc.c @@ -17,9 +17,9 @@ #include #include -#include "../dsp/lossless_common.h" -#include "../utils/utils.h" -#include "./vp8li_enc.h" +#include "src/dsp/lossless_common.h" +#include "src/utils/utils.h" +#include "src/enc/vp8li_enc.h" #if (WEBP_NEAR_LOSSLESS == 1) diff --git a/src/enc/picture_csp_enc.c b/src/enc/picture_csp_enc.c index 54108572..62be097b 100644 --- a/src/enc/picture_csp_enc.c +++ b/src/enc/picture_csp_enc.c @@ -15,12 +15,12 @@ #include #include -#include "./vp8i_enc.h" -#include "../utils/random_utils.h" -#include "../utils/utils.h" -#include "../dsp/dsp.h" -#include "../dsp/lossless.h" -#include "../dsp/yuv.h" +#include "src/enc/vp8i_enc.h" +#include "src/utils/random_utils.h" +#include "src/utils/utils.h" +#include "src/dsp/dsp.h" +#include "src/dsp/lossless.h" +#include "src/dsp/yuv.h" // Uncomment to disable gamma-compression during RGB->U/V averaging #define USE_GAMMA_COMPRESSION diff --git a/src/enc/picture_enc.c b/src/enc/picture_enc.c index 9f93fad6..1069c59e 100644 --- a/src/enc/picture_enc.c +++ b/src/enc/picture_enc.c @@ -14,9 +14,9 @@ #include #include -#include "./vp8i_enc.h" -#include "../dsp/dsp.h" -#include "../utils/utils.h" +#include "src/enc/vp8i_enc.h" +#include "src/dsp/dsp.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // WebPPicture diff --git a/src/enc/picture_psnr_enc.c b/src/enc/picture_psnr_enc.c index 9c0b2295..de5cc31a 100644 --- a/src/enc/picture_psnr_enc.c +++ b/src/enc/picture_psnr_enc.c @@ -14,8 +14,8 @@ #include #include -#include "./vp8i_enc.h" -#include "../utils/utils.h" +#include "src/enc/vp8i_enc.h" +#include "src/utils/utils.h" typedef double (*AccumulateFunc)(const uint8_t* src, int src_stride, const uint8_t* ref, int ref_stride, diff --git a/src/enc/picture_rescale_enc.c b/src/enc/picture_rescale_enc.c index 0b7181c0..1c0b9875 100644 --- a/src/enc/picture_rescale_enc.c +++ b/src/enc/picture_rescale_enc.c @@ -14,9 +14,9 @@ #include #include -#include "./vp8i_enc.h" -#include "../utils/rescaler_utils.h" -#include "../utils/utils.h" +#include "src/enc/vp8i_enc.h" +#include "src/utils/rescaler_utils.h" +#include "src/utils/utils.h" #define HALVE(x) (((x) + 1) >> 1) diff --git a/src/enc/picture_tools_enc.c b/src/enc/picture_tools_enc.c index 889070d8..6a300910 100644 --- a/src/enc/picture_tools_enc.c +++ b/src/enc/picture_tools_enc.c @@ -13,8 +13,8 @@ #include -#include "./vp8i_enc.h" -#include "../dsp/yuv.h" +#include "src/enc/vp8i_enc.h" +#include "src/dsp/yuv.h" static WEBP_INLINE uint32_t MakeARGB32(int r, int g, int b) { return (0xff000000u | (r << 16) | (g << 8) | b); diff --git a/src/enc/predictor_enc.c b/src/enc/predictor_enc.c index 791991d7..e8051ac8 100644 --- a/src/enc/predictor_enc.c +++ b/src/enc/predictor_enc.c @@ -14,9 +14,9 @@ // Urvang Joshi (urvang@google.com) // Vincent Rabaud (vrabaud@google.com) -#include "../dsp/lossless.h" -#include "../dsp/lossless_common.h" -#include "./vp8li_enc.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" +#include "src/enc/vp8li_enc.h" #define MAX_DIFF_COST (1e30f) diff --git a/src/enc/quant_enc.c b/src/enc/quant_enc.c index 4bf2ba1e..17c29c59 100644 --- a/src/enc/quant_enc.c +++ b/src/enc/quant_enc.c @@ -15,8 +15,8 @@ #include #include // for abs() -#include "./vp8i_enc.h" -#include "./cost_enc.h" +#include "src/enc/vp8i_enc.h" +#include "src/enc/cost_enc.h" #define DO_TRELLIS_I4 1 #define DO_TRELLIS_I16 1 // not a huge gain, but ok at low bitrate. diff --git a/src/enc/syntax_enc.c b/src/enc/syntax_enc.c index 90665bd7..2ae96f49 100644 --- a/src/enc/syntax_enc.c +++ b/src/enc/syntax_enc.c @@ -13,10 +13,10 @@ #include -#include "../utils/utils.h" -#include "../webp/format_constants.h" // RIFF constants -#include "../webp/mux_types.h" // ALPHA_FLAG -#include "./vp8i_enc.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" // RIFF constants +#include "src/webp/mux_types.h" // ALPHA_FLAG +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Helper functions diff --git a/src/enc/token_enc.c b/src/enc/token_enc.c index f9a45cfd..967ed0c7 100644 --- a/src/enc/token_enc.c +++ b/src/enc/token_enc.c @@ -20,9 +20,9 @@ #include #include -#include "./cost_enc.h" -#include "./vp8i_enc.h" -#include "../utils/utils.h" +#include "src/enc/cost_enc.h" +#include "src/enc/vp8i_enc.h" +#include "src/utils/utils.h" #if !defined(DISABLE_TOKEN_BUFFER) diff --git a/src/enc/tree_enc.c b/src/enc/tree_enc.c index 2c40fe7f..64ed2836 100644 --- a/src/enc/tree_enc.c +++ b/src/enc/tree_enc.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./vp8i_enc.h" +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Default probabilities diff --git a/src/enc/vp8i_enc.h b/src/enc/vp8i_enc.h index 018faac7..08ef646c 100644 --- a/src/enc/vp8i_enc.h +++ b/src/enc/vp8i_enc.h @@ -15,12 +15,12 @@ #define WEBP_ENC_VP8ENCI_H_ #include // for memcpy() -#include "../dec/common_dec.h" -#include "../dsp/dsp.h" -#include "../utils/bit_writer_utils.h" -#include "../utils/thread_utils.h" -#include "../utils/utils.h" -#include "../webp/encode.h" +#include "src/dec/common_dec.h" +#include "src/dsp/dsp.h" +#include "src/utils/bit_writer_utils.h" +#include "src/utils/thread_utils.h" +#include "src/utils/utils.h" +#include "src/webp/encode.h" #ifdef __cplusplus extern "C" { diff --git a/src/enc/vp8l_enc.c b/src/enc/vp8l_enc.c index 2e34b92f..4ee2a68d 100644 --- a/src/enc/vp8l_enc.c +++ b/src/enc/vp8l_enc.c @@ -15,18 +15,18 @@ #include #include -#include "./backward_references_enc.h" -#include "./histogram_enc.h" -#include "./vp8i_enc.h" -#include "./vp8li_enc.h" -#include "../dsp/lossless.h" -#include "../dsp/lossless_common.h" -#include "../utils/bit_writer_utils.h" -#include "../utils/huffman_encode_utils.h" -#include "../utils/utils.h" -#include "../webp/format_constants.h" +#include "src/enc/backward_references_enc.h" +#include "src/enc/histogram_enc.h" +#include "src/enc/vp8i_enc.h" +#include "src/enc/vp8li_enc.h" +#include "src/dsp/lossless.h" +#include "src/dsp/lossless_common.h" +#include "src/utils/bit_writer_utils.h" +#include "src/utils/huffman_encode_utils.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" -#include "./delta_palettization_enc.h" +#include "src/enc/delta_palettization_enc.h" #define PALETTE_KEY_RIGHT_SHIFT 22 // Key for 1K buffer. // Maximum number of histogram images (sub-blocks). diff --git a/src/enc/vp8li_enc.h b/src/enc/vp8li_enc.h index 6ebdb51f..96548924 100644 --- a/src/enc/vp8li_enc.h +++ b/src/enc/vp8li_enc.h @@ -15,7 +15,7 @@ #define WEBP_ENC_VP8LI_H_ #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif // Either WEBP_NEAR_LOSSLESS is defined as 0 in config.h when compiling to // disable near-lossless, or it is enabled by default. @@ -23,11 +23,11 @@ #define WEBP_NEAR_LOSSLESS 1 #endif -#include "./backward_references_enc.h" -#include "./histogram_enc.h" -#include "../utils/bit_writer_utils.h" -#include "../webp/encode.h" -#include "../webp/format_constants.h" +#include "src/enc/backward_references_enc.h" +#include "src/enc/histogram_enc.h" +#include "src/utils/bit_writer_utils.h" +#include "src/webp/encode.h" +#include "src/webp/format_constants.h" #ifdef __cplusplus extern "C" { diff --git a/src/enc/webp_enc.c b/src/enc/webp_enc.c index 14c5104b..9003b6ca 100644 --- a/src/enc/webp_enc.c +++ b/src/enc/webp_enc.c @@ -16,10 +16,10 @@ #include #include -#include "./cost_enc.h" -#include "./vp8i_enc.h" -#include "./vp8li_enc.h" -#include "../utils/utils.h" +#include "src/enc/cost_enc.h" +#include "src/enc/vp8i_enc.h" +#include "src/enc/vp8li_enc.h" +#include "src/utils/utils.h" // #define PRINT_MEMORY_INFO diff --git a/src/mux/Makefile.am b/src/mux/Makefile.am index 47b1fbe1..b5e82aff 100644 --- a/src/mux/Makefile.am +++ b/src/mux/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) lib_LTLIBRARIES = libwebpmux.la libwebpmux_la_SOURCES = diff --git a/src/mux/anim_encode.c b/src/mux/anim_encode.c index 33c076bc..7be99068 100644 --- a/src/mux/anim_encode.c +++ b/src/mux/anim_encode.c @@ -16,12 +16,12 @@ #include #include // for abs() -#include "../mux/animi.h" -#include "../utils/utils.h" -#include "../webp/decode.h" -#include "../webp/encode.h" -#include "../webp/format_constants.h" -#include "../webp/mux.h" +#include "src/mux/animi.h" +#include "src/utils/utils.h" +#include "src/webp/decode.h" +#include "src/webp/encode.h" +#include "src/webp/format_constants.h" +#include "src/webp/mux.h" #if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf diff --git a/src/mux/animi.h b/src/mux/animi.h index cecaf1fe..88899532 100644 --- a/src/mux/animi.h +++ b/src/mux/animi.h @@ -14,7 +14,7 @@ #ifndef WEBP_MUX_ANIMI_H_ #define WEBP_MUX_ANIMI_H_ -#include "../webp/mux.h" +#include "src/webp/mux.h" #ifdef __cplusplus extern "C" { diff --git a/src/mux/muxedit.c b/src/mux/muxedit.c index d2c53053..7a027b3c 100644 --- a/src/mux/muxedit.c +++ b/src/mux/muxedit.c @@ -13,8 +13,8 @@ // Vikas (vikasa@google.com) #include -#include "./muxi.h" -#include "../utils/utils.h" +#include "src/mux/muxi.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // Life of a mux object. diff --git a/src/mux/muxi.h b/src/mux/muxi.h index e6606aa5..7aa87967 100644 --- a/src/mux/muxi.h +++ b/src/mux/muxi.h @@ -15,9 +15,9 @@ #define WEBP_MUX_MUXI_H_ #include -#include "../dec/vp8i_dec.h" -#include "../dec/vp8li_dec.h" -#include "../webp/mux.h" +#include "src/dec/vp8i_dec.h" +#include "src/dec/vp8li_dec.h" +#include "src/webp/mux.h" #ifdef __cplusplus extern "C" { diff --git a/src/mux/muxinternal.c b/src/mux/muxinternal.c index 2916e611..1473f100 100644 --- a/src/mux/muxinternal.c +++ b/src/mux/muxinternal.c @@ -13,8 +13,8 @@ // Vikas (vikasa@google.com) #include -#include "./muxi.h" -#include "../utils/utils.h" +#include "src/mux/muxi.h" +#include "src/utils/utils.h" #define UNDEFINED_CHUNK_SIZE ((uint32_t)(-1)) diff --git a/src/mux/muxread.c b/src/mux/muxread.c index 07c27ef9..0b552868 100644 --- a/src/mux/muxread.c +++ b/src/mux/muxread.c @@ -13,8 +13,8 @@ // Vikas (vikasa@google.com) #include -#include "./muxi.h" -#include "../utils/utils.h" +#include "src/mux/muxi.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // Helper method(s). diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index e346c0b4..fbb0fe73 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir) noinst_LTLIBRARIES = libwebputils.la if BUILD_LIBWEBPDECODER diff --git a/src/utils/bit_reader_inl_utils.h b/src/utils/bit_reader_inl_utils.h index fd7fb044..ece06d54 100644 --- a/src/utils/bit_reader_inl_utils.h +++ b/src/utils/bit_reader_inl_utils.h @@ -17,15 +17,15 @@ #define WEBP_UTILS_BIT_READER_INL_H_ #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif #include // for memcpy -#include "../dsp/dsp.h" -#include "./bit_reader_utils.h" -#include "./endian_inl_utils.h" -#include "./utils.h" +#include "src/dsp/dsp.h" +#include "src/utils/bit_reader_utils.h" +#include "src/utils/endian_inl_utils.h" +#include "src/utils/utils.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/bit_reader_utils.c b/src/utils/bit_reader_utils.c index c3157e8f..1500354d 100644 --- a/src/utils/bit_reader_utils.c +++ b/src/utils/bit_reader_utils.c @@ -12,11 +12,11 @@ // Author: Skal (pascal.massimino@gmail.com) #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif -#include "./bit_reader_inl_utils.h" -#include "../utils/utils.h" +#include "src/utils/bit_reader_inl_utils.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // VP8BitReader diff --git a/src/utils/bit_reader_utils.h b/src/utils/bit_reader_utils.h index f67fe98a..65453834 100644 --- a/src/utils/bit_reader_utils.h +++ b/src/utils/bit_reader_utils.h @@ -19,7 +19,7 @@ #ifdef _MSC_VER #include // _byteswap_ulong #endif -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/bit_writer_utils.c b/src/utils/bit_writer_utils.c index d2e632a6..f4f476ce 100644 --- a/src/utils/bit_writer_utils.c +++ b/src/utils/bit_writer_utils.c @@ -16,9 +16,9 @@ #include // for memcpy() #include -#include "./bit_writer_utils.h" -#include "./endian_inl_utils.h" -#include "./utils.h" +#include "src/utils/bit_writer_utils.h" +#include "src/utils/endian_inl_utils.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // VP8BitWriter diff --git a/src/utils/bit_writer_utils.h b/src/utils/bit_writer_utils.h index 05404e54..58e2f687 100644 --- a/src/utils/bit_writer_utils.h +++ b/src/utils/bit_writer_utils.h @@ -14,7 +14,7 @@ #ifndef WEBP_UTILS_BIT_WRITER_H_ #define WEBP_UTILS_BIT_WRITER_H_ -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/color_cache_utils.c b/src/utils/color_cache_utils.c index 0172590c..b09f538e 100644 --- a/src/utils/color_cache_utils.c +++ b/src/utils/color_cache_utils.c @@ -14,8 +14,8 @@ #include #include #include -#include "./color_cache_utils.h" -#include "./utils.h" +#include "src/utils/color_cache_utils.h" +#include "src/utils/utils.h" //------------------------------------------------------------------------------ // VP8LColorCache. diff --git a/src/utils/color_cache_utils.h b/src/utils/color_cache_utils.h index 8d99ece9..29db9437 100644 --- a/src/utils/color_cache_utils.h +++ b/src/utils/color_cache_utils.h @@ -17,7 +17,7 @@ #include -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/endian_inl_utils.h b/src/utils/endian_inl_utils.h index e11260ff..d0858499 100644 --- a/src/utils/endian_inl_utils.h +++ b/src/utils/endian_inl_utils.h @@ -13,11 +13,11 @@ #define WEBP_UTILS_ENDIAN_INL_H_ #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif -#include "../dsp/dsp.h" -#include "../webp/types.h" +#include "src/dsp/dsp.h" +#include "src/webp/types.h" // some endian fix (e.g.: mips-gcc doesn't define __BIG_ENDIAN__) #if !defined(WORDS_BIGENDIAN) && \ diff --git a/src/utils/filters_utils.c b/src/utils/filters_utils.c index 49c1d18a..bbc2c34d 100644 --- a/src/utils/filters_utils.c +++ b/src/utils/filters_utils.c @@ -11,7 +11,7 @@ // // Author: Urvang (urvang@google.com) -#include "./filters_utils.h" +#include "src/utils/filters_utils.h" #include #include diff --git a/src/utils/filters_utils.h b/src/utils/filters_utils.h index 088b132f..67b9b20e 100644 --- a/src/utils/filters_utils.h +++ b/src/utils/filters_utils.h @@ -14,8 +14,8 @@ #ifndef WEBP_UTILS_FILTERS_H_ #define WEBP_UTILS_FILTERS_H_ -#include "../webp/types.h" -#include "../dsp/dsp.h" +#include "src/webp/types.h" +#include "src/dsp/dsp.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/huffman_encode_utils.c b/src/utils/huffman_encode_utils.c index f9504658..6f3b1bbe 100644 --- a/src/utils/huffman_encode_utils.c +++ b/src/utils/huffman_encode_utils.c @@ -14,9 +14,9 @@ #include #include #include -#include "./huffman_encode_utils.h" -#include "./utils.h" -#include "../webp/format_constants.h" +#include "src/utils/huffman_encode_utils.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" // ----------------------------------------------------------------------------- // Util function to optimize the symbol map for RLE coding diff --git a/src/utils/huffman_encode_utils.h b/src/utils/huffman_encode_utils.h index a1571651..fdb1bc5f 100644 --- a/src/utils/huffman_encode_utils.h +++ b/src/utils/huffman_encode_utils.h @@ -14,7 +14,7 @@ #ifndef WEBP_UTILS_HUFFMAN_ENCODE_H_ #define WEBP_UTILS_HUFFMAN_ENCODE_H_ -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/huffman_utils.c b/src/utils/huffman_utils.c index 008b5d74..7a69963c 100644 --- a/src/utils/huffman_utils.c +++ b/src/utils/huffman_utils.c @@ -14,9 +14,9 @@ #include #include #include -#include "./huffman_utils.h" -#include "./utils.h" -#include "../webp/format_constants.h" +#include "src/utils/huffman_utils.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" // Huffman data read via DecodeImageStream is represented in two (red and green) // bytes. diff --git a/src/utils/huffman_utils.h b/src/utils/huffman_utils.h index c6dd6aaa..185ff1a3 100644 --- a/src/utils/huffman_utils.h +++ b/src/utils/huffman_utils.h @@ -15,8 +15,8 @@ #define WEBP_UTILS_HUFFMAN_H_ #include -#include "../webp/format_constants.h" -#include "../webp/types.h" +#include "src/webp/format_constants.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/quant_levels_dec_utils.c b/src/utils/quant_levels_dec_utils.c index 44acaa22..3818a78b 100644 --- a/src/utils/quant_levels_dec_utils.c +++ b/src/utils/quant_levels_dec_utils.c @@ -14,11 +14,11 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./quant_levels_dec_utils.h" +#include "src/utils/quant_levels_dec_utils.h" #include // for memset -#include "./utils.h" +#include "src/utils/utils.h" // #define USE_DITHERING // uncomment to enable ordered dithering (not vital) diff --git a/src/utils/quant_levels_dec_utils.h b/src/utils/quant_levels_dec_utils.h index 59a13495..c397adb0 100644 --- a/src/utils/quant_levels_dec_utils.h +++ b/src/utils/quant_levels_dec_utils.h @@ -14,7 +14,7 @@ #ifndef WEBP_UTILS_QUANT_LEVELS_DEC_H_ #define WEBP_UTILS_QUANT_LEVELS_DEC_H_ -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/quant_levels_utils.c b/src/utils/quant_levels_utils.c index 73174e8a..d65ad3c2 100644 --- a/src/utils/quant_levels_utils.c +++ b/src/utils/quant_levels_utils.c @@ -14,7 +14,7 @@ #include -#include "./quant_levels_utils.h" +#include "src/utils/quant_levels_utils.h" #define NUM_SYMBOLS 256 diff --git a/src/utils/quant_levels_utils.h b/src/utils/quant_levels_utils.h index 1cb5a32c..3609a592 100644 --- a/src/utils/quant_levels_utils.h +++ b/src/utils/quant_levels_utils.h @@ -16,7 +16,7 @@ #include -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/random_utils.c b/src/utils/random_utils.c index 9f1e4154..7edb3fef 100644 --- a/src/utils/random_utils.c +++ b/src/utils/random_utils.c @@ -12,7 +12,7 @@ // Author: Skal (pascal.massimino@gmail.com) #include -#include "./random_utils.h" +#include "src/utils/random_utils.h" //------------------------------------------------------------------------------ diff --git a/src/utils/random_utils.h b/src/utils/random_utils.h index c392a615..5cc66b5c 100644 --- a/src/utils/random_utils.h +++ b/src/utils/random_utils.h @@ -15,7 +15,7 @@ #define WEBP_UTILS_RANDOM_H_ #include -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/rescaler_utils.c b/src/utils/rescaler_utils.c index f1d079da..90e2ea76 100644 --- a/src/utils/rescaler_utils.c +++ b/src/utils/rescaler_utils.c @@ -14,8 +14,8 @@ #include #include #include -#include "../dsp/dsp.h" -#include "./rescaler_utils.h" +#include "src/dsp/dsp.h" +#include "src/utils/rescaler_utils.h" //------------------------------------------------------------------------------ diff --git a/src/utils/rescaler_utils.h b/src/utils/rescaler_utils.h index 98b01a76..dfc4616f 100644 --- a/src/utils/rescaler_utils.h +++ b/src/utils/rescaler_utils.h @@ -18,7 +18,7 @@ extern "C" { #endif -#include "../webp/types.h" +#include "src/webp/types.h" #define WEBP_RESCALER_RFIX 32 // fixed-point precision for multiplies #define WEBP_RESCALER_ONE (1ull << WEBP_RESCALER_RFIX) diff --git a/src/utils/thread_utils.c b/src/utils/thread_utils.c index 1729060c..2ab2d148 100644 --- a/src/utils/thread_utils.c +++ b/src/utils/thread_utils.c @@ -13,8 +13,8 @@ #include #include // for memset() -#include "./thread_utils.h" -#include "./utils.h" +#include "src/utils/thread_utils.h" +#include "src/utils/utils.h" #ifdef WEBP_USE_THREAD diff --git a/src/utils/thread_utils.h b/src/utils/thread_utils.h index b6df4232..fc1b5351 100644 --- a/src/utils/thread_utils.h +++ b/src/utils/thread_utils.h @@ -15,10 +15,10 @@ #define WEBP_UTILS_THREAD_H_ #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif -#include "../webp/types.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/utils/utils.c b/src/utils/utils.c index dfcd3ab2..44d5c14f 100644 --- a/src/utils/utils.c +++ b/src/utils/utils.c @@ -13,11 +13,11 @@ #include #include // for memcpy() -#include "../webp/decode.h" -#include "../webp/encode.h" -#include "../webp/format_constants.h" // for MAX_PALETTE_SIZE -#include "./color_cache_utils.h" -#include "./utils.h" +#include "src/webp/decode.h" +#include "src/webp/encode.h" +#include "src/webp/format_constants.h" // for MAX_PALETTE_SIZE +#include "src/utils/color_cache_utils.h" +#include "src/utils/utils.h" // If PRINT_MEM_INFO is defined, extra info (like total memory used, number of // alloc/free etc) is printed. For debugging/tuning purpose only (it's slow, diff --git a/src/utils/utils.h b/src/utils/utils.h index 1e80d639..029b3e71 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -16,14 +16,14 @@ #define WEBP_UTILS_UTILS_H_ #ifdef HAVE_CONFIG_H -#include "../webp/config.h" +#include "src/webp/config.h" #endif #include #include -#include "../dsp/dsp.h" -#include "../webp/types.h" +#include "src/dsp/dsp.h" +#include "src/webp/types.h" #ifdef __cplusplus extern "C" {