From d52b9ee34d6bb8fb7a190fe359d8560cfc2afc91 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Tue, 23 Dec 2025 12:33:21 +0100 Subject: [PATCH] Be consistent with the includes in non-src folders. BUG: 470992419 Change-Id: I55618205da7dcfe17d96a7c3ee69d924a63d1acf --- CMakeLists.txt | 64 ++++++++++++---------------- examples/cwebp.c | 2 +- examples/dwebp.c | 2 +- examples/gif2webp.c | 2 +- examples/img2webp.c | 2 +- examples/vwebp.c | 2 +- examples/webpmux.c | 2 +- extras/extras.c | 6 +-- extras/get_disto.c | 2 +- extras/quality_estimate.c | 4 +- extras/sharpyuv_risk_table.c | 2 +- extras/sharpyuv_risk_table.h | 2 +- extras/webp_quality.c | 4 +- extras/webp_to_sdl.c | 4 +- sharpyuv/sharpyuv.c | 10 ++--- sharpyuv/sharpyuv_dsp.c | 6 +-- sharpyuv/sharpyuv_dsp.h | 4 +- sharpyuv/sharpyuv_gamma.c | 6 +-- sharpyuv/sharpyuv_gamma.h | 4 +- sharpyuv/sharpyuv_sse2.c | 4 +- tests/fuzzer/CMakeLists.txt | 2 + tests/fuzzer/advanced_api_fuzzer.cc | 2 +- tests/fuzzer/animation_api_fuzzer.cc | 6 +-- tests/fuzzer/animdecoder_fuzzer.cc | 6 +-- tests/fuzzer/animencoder_fuzzer.cc | 6 +-- tests/fuzzer/dec_fuzzer.cc | 2 +- tests/fuzzer/enc_dec_fuzzer.cc | 4 +- tests/fuzzer/enc_fuzzer.cc | 6 +-- tests/fuzzer/fuzz_utils.cc | 6 +-- tests/fuzzer/huffman_fuzzer.cc | 2 +- tests/fuzzer/mux_demux_api_fuzzer.cc | 6 +-- tests/fuzzer/simple_api_fuzzer.cc | 4 +- tests/fuzzer/webp_info_fuzzer.cc | 2 +- 33 files changed, 91 insertions(+), 97 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 868dd6c5..1d9d4105 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -349,11 +349,14 @@ endfunction() parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv "WEBP_SHARPYUV_SRCS" "") add_library(sharpyuv ${WEBP_SHARPYUV_SRCS}) -target_link_libraries(sharpyuv ${SHARPYUV_DEP_LIBRARIES}) +target_link_libraries(sharpyuv PRIVATE ${SHARPYUV_DEP_LIBRARIES}) set_version(sharpyuv/Makefile.am sharpyuv sharpyuv) target_include_directories( - sharpyuv PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/src) + sharpyuv + PUBLIC $ + $ + PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/src) set_target_properties( sharpyuv PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv/sharpyuv.h;\ @@ -377,12 +380,12 @@ else() add_compile_options(-Wall) endif() include_directories(${WEBP_DEP_INCLUDE_DIRS}) -add_library(webpdecode OBJECT ${WEBP_DEC_SRCS}) -target_include_directories(webpdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}) add_library(webpdspdecode OBJECT ${WEBP_DSP_COMMON_SRCS} ${WEBP_DSP_DEC_SRCS}) -target_include_directories(webpdspdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(webpdspdecode PUBLIC ${CMAKE_CURRENT_BINARY_DIR} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +add_library(webpdecode OBJECT ${WEBP_DEC_SRCS}) +target_link_libraries(webpdecode PRIVATE webpdspdecode) +target_include_directories(webpdecode PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) add_library(webputilsdecode OBJECT ${WEBP_UTILS_COMMON_SRCS} ${WEBP_UTILS_DEC_SRCS}) target_include_directories(webputilsdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR} @@ -395,11 +398,9 @@ if(XCODE) endif() target_link_libraries(webpdecoder ${WEBP_DEP_LIBRARIES}) target_include_directories( - webpdecoder - PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - INTERFACE - "$" - $) + webpdecoder PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} + INTERFACE $ + $) set_target_properties( webpdecoder PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h;\ @@ -437,9 +438,9 @@ if(XCODE) endif() target_link_libraries(webp ${WEBP_DEP_LIBRARIES}) target_include_directories( - webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - PUBLIC $ - $) + webp PUBLIC $ + $ + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) set_target_properties( webp PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h;\ @@ -565,8 +566,7 @@ if(WEBP_BUILD_CWEBP) parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "CWEBP_SRCS" "cwebp") add_executable(cwebp ${CWEBP_SRCS}) target_link_libraries(cwebp exampleutil imagedec webp) - target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}) + target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -595,8 +595,7 @@ if(WEBP_BUILD_GIF2WEBP) add_executable(gif2webp ${GIF2WEBP_SRCS}) target_link_libraries(gif2webp exampleutil imageioutil webp libwebpmux ${WEBP_DEP_GIF_LIBRARIES}) - target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}) + target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -608,8 +607,7 @@ if(WEBP_BUILD_IMG2WEBP) add_executable(img2webp ${IMG2WEBP_SRCS}) target_link_libraries(img2webp exampleutil imagedec imageioutil webp libwebpmux) - target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}) + target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -648,8 +646,7 @@ if(WEBP_BUILD_WEBPINFO) "webpinfo") add_executable(webpinfo ${WEBPINFO_SRCS}) target_link_libraries(webpinfo exampleutil imageioutil) - target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}/src) + target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) install(TARGETS webpinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -672,30 +669,25 @@ if(WEBP_BUILD_EXTRAS) # libextras add_library(extras STATIC ${WEBP_EXTRAS_SRCS}) - target_include_directories( - extras PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/src) + target_link_libraries(extras PUBLIC webp PRIVATE webpdspdecode) # get_disto add_executable(get_disto ${GET_DISTO_SRCS}) target_link_libraries(get_disto imagedec) - target_include_directories(get_disto PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/src) + target_include_directories(get_disto PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) # webp_quality add_executable(webp_quality ${WEBP_QUALITY_SRCS}) target_link_libraries(webp_quality exampleutil imagedec extras) - target_include_directories(webp_quality PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(webp_quality PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) # vwebp_sdl find_package(SDL2 QUIET) if(WEBP_BUILD_VWEBP AND SDL2_FOUND) add_executable(vwebp_sdl ${VWEBP_SDL_SRCS}) target_link_libraries(vwebp_sdl ${SDL2_LIBRARIES} imageioutil webp) - target_include_directories( - vwebp_sdl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/src ${SDL2_INCLUDE_DIRS}) + target_include_directories(vwebp_sdl PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src + ${SDL2_INCLUDE_DIRS}) set(WEBP_HAVE_SDL 1) target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL) @@ -733,7 +725,7 @@ if(WEBP_BUILD_WEBP_JS) # JavaScript version add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) target_link_libraries(webp_js webpdecoder SDL2) - target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) set(WEBP_HAVE_SDL 1) set_target_properties( webp_js @@ -753,7 +745,7 @@ if(WEBP_BUILD_WEBP_JS) # WASM version add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) target_link_libraries(webp_wasm webpdecoder SDL2) - target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) set_target_properties( webp_wasm PROPERTIES diff --git a/examples/cwebp.c b/examples/cwebp.c index fb1b7552..07cf1452 100644 --- a/examples/cwebp.c +++ b/examples/cwebp.c @@ -21,10 +21,10 @@ #include "webp/config.h" #endif -#include "../examples/example_util.h" #include "../imageio/image_dec.h" #include "../imageio/imageio_util.h" #include "../imageio/webpdec.h" +#include "./example_util.h" #include "./stopwatch.h" #include "./unicode.h" #include "imageio/metadata.h" diff --git a/examples/dwebp.c b/examples/dwebp.c index 239114ce..de184fc2 100644 --- a/examples/dwebp.c +++ b/examples/dwebp.c @@ -20,9 +20,9 @@ #include "webp/config.h" #endif -#include "../examples/example_util.h" #include "../imageio/image_enc.h" #include "../imageio/webpdec.h" +#include "./example_util.h" #include "./stopwatch.h" #include "./unicode.h" #include "webp/decode.h" diff --git a/examples/gif2webp.c b/examples/gif2webp.c index 8e95cb7d..a8406aa4 100644 --- a/examples/gif2webp.c +++ b/examples/gif2webp.c @@ -29,8 +29,8 @@ #include -#include "../examples/example_util.h" #include "../imageio/imageio_util.h" +#include "./example_util.h" #include "./gifdec.h" #include "./unicode.h" #include "./unicode_gif.h" diff --git a/examples/img2webp.c b/examples/img2webp.c index 9072c553..6a714234 100644 --- a/examples/img2webp.c +++ b/examples/img2webp.c @@ -23,9 +23,9 @@ #include "webp/config.h" #endif -#include "../examples/example_util.h" #include "../imageio/image_dec.h" #include "../imageio/imageio_util.h" +#include "./example_util.h" #include "./stopwatch.h" #include "./unicode.h" #include "sharpyuv/sharpyuv.h" diff --git a/examples/vwebp.c b/examples/vwebp.c index afa52472..2bdb4aa0 100644 --- a/examples/vwebp.c +++ b/examples/vwebp.c @@ -38,8 +38,8 @@ #include #endif -#include "../examples/example_util.h" #include "../imageio/imageio_util.h" +#include "./example_util.h" #include "./unicode.h" #include "webp/decode.h" #include "webp/demux.h" diff --git a/examples/webpmux.c b/examples/webpmux.c index 2471206b..8f32914d 100644 --- a/examples/webpmux.c +++ b/examples/webpmux.c @@ -60,8 +60,8 @@ #include #include -#include "../examples/example_util.h" #include "../imageio/imageio_util.h" +#include "./example_util.h" #include "./unicode.h" #include "webp/decode.h" #include "webp/mux.h" diff --git a/extras/extras.c b/extras/extras.c index 73da0110..9a51c053 100644 --- a/extras/extras.c +++ b/extras/extras.c @@ -10,17 +10,17 @@ // Additional WebP utilities. // -#include "extras/extras.h" +#include "./extras.h" #include #include #include -#include "extras/sharpyuv_risk_table.h" +#include "./sharpyuv_risk_table.h" #include "sharpyuv/sharpyuv.h" #include "src/dsp/dsp.h" #include "src/utils/utils.h" -#include "src/webp/encode.h" +#include "webp/encode.h" #include "webp/format_constants.h" #include "webp/types.h" diff --git a/extras/get_disto.c b/extras/get_disto.c index 12786c2c..9d81fc50 100644 --- a/extras/get_disto.c +++ b/extras/get_disto.c @@ -26,8 +26,8 @@ #include "../examples/unicode.h" #include "imageio/image_dec.h" #include "imageio/imageio_util.h" -#include "src/webp/types.h" #include "webp/encode.h" +#include "webp/types.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 973d8000..26051af5 100644 --- a/extras/quality_estimate.c +++ b/extras/quality_estimate.c @@ -14,9 +14,9 @@ #include #include -#include "extras/extras.h" -#include "src/webp/types.h" +#include "./extras.h" #include "webp/decode.h" +#include "webp/types.h" //------------------------------------------------------------------------------ diff --git a/extras/sharpyuv_risk_table.c b/extras/sharpyuv_risk_table.c index ab3e7fdd..8076aa9e 100644 --- a/extras/sharpyuv_risk_table.c +++ b/extras/sharpyuv_risk_table.c @@ -9,7 +9,7 @@ // // Precomputed data for 420 risk estimation. -#include "src/webp/types.h" +#include "webp/types.h" const int kSharpYuvPrecomputedRiskYuvSampling = 7; diff --git a/extras/sharpyuv_risk_table.h b/extras/sharpyuv_risk_table.h index 32f276e3..aaf71b6f 100644 --- a/extras/sharpyuv_risk_table.h +++ b/extras/sharpyuv_risk_table.h @@ -12,7 +12,7 @@ #ifndef WEBP_EXTRAS_SHARPYUV_RISK_TABLE_H_ #define WEBP_EXTRAS_SHARPYUV_RISK_TABLE_H_ -#include "src/webp/types.h" +#include "webp/types.h" extern const int kSharpYuvPrecomputedRiskYuvSampling; // Table of precomputed risk scores when chroma subsampling images with two diff --git a/extras/webp_quality.c b/extras/webp_quality.c index 3a750abc..8d9f34eb 100644 --- a/extras/webp_quality.c +++ b/extras/webp_quality.c @@ -12,9 +12,9 @@ #include #include "../examples/unicode.h" -#include "extras/extras.h" +#include "./extras.h" #include "imageio/imageio_util.h" -#include "src/webp/types.h" +#include "webp/types.h" // Returns EXIT_SUCCESS on success, EXIT_FAILURE on failure. int main(int argc, const char* argv[]) { diff --git a/extras/webp_to_sdl.c b/extras/webp_to_sdl.c index 10e728e3..c1dfca75 100644 --- a/extras/webp_to_sdl.c +++ b/extras/webp_to_sdl.c @@ -12,14 +12,14 @@ // Author: James Zern (jzern@google.com) #ifdef HAVE_CONFIG_H -#include "src/webp/config.h" +#include "webp/config.h" #endif #if defined(WEBP_HAVE_SDL) #include -#include "src/webp/decode.h" +#include "webp/decode.h" #include "webp_to_sdl.h" #if defined(WEBP_HAVE_JUST_SDL_H) diff --git a/sharpyuv/sharpyuv.c b/sharpyuv/sharpyuv.c index 39875101..2f2c9c76 100644 --- a/sharpyuv/sharpyuv.c +++ b/sharpyuv/sharpyuv.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "sharpyuv/sharpyuv.h" +#include "./sharpyuv.h" #include #include @@ -19,10 +19,10 @@ #include #include -#include "sharpyuv/sharpyuv_cpu.h" -#include "sharpyuv/sharpyuv_dsp.h" -#include "sharpyuv/sharpyuv_gamma.h" -#include "src/webp/types.h" +#include "./sharpyuv_cpu.h" +#include "./sharpyuv_dsp.h" +#include "./sharpyuv_gamma.h" +#include "webp/types.h" //------------------------------------------------------------------------------ diff --git a/sharpyuv/sharpyuv_dsp.c b/sharpyuv/sharpyuv_dsp.c index 3d2cf85f..8789a3f8 100644 --- a/sharpyuv/sharpyuv_dsp.c +++ b/sharpyuv/sharpyuv_dsp.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "sharpyuv/sharpyuv_dsp.h" +#include "./sharpyuv_dsp.h" #include #include -#include "sharpyuv/sharpyuv_cpu.h" +#include "./sharpyuv_cpu.h" #include "src/dsp/cpu.h" -#include "src/webp/types.h" +#include "webp/types.h" //----------------------------------------------------------------------------- diff --git a/sharpyuv/sharpyuv_dsp.h b/sharpyuv/sharpyuv_dsp.h index 805fbadb..897ba3b8 100644 --- a/sharpyuv/sharpyuv_dsp.h +++ b/sharpyuv/sharpyuv_dsp.h @@ -12,8 +12,8 @@ #ifndef WEBP_SHARPYUV_SHARPYUV_DSP_H_ #define WEBP_SHARPYUV_SHARPYUV_DSP_H_ -#include "sharpyuv/sharpyuv_cpu.h" -#include "src/webp/types.h" +#include "./sharpyuv_cpu.h" +#include "webp/types.h" extern uint64_t (*SharpYuvUpdateY)(const uint16_t* src, const uint16_t* ref, uint16_t* dst, int len, int bit_depth); diff --git a/sharpyuv/sharpyuv_gamma.c b/sharpyuv/sharpyuv_gamma.c index 06edfd51..cb23a2ec 100644 --- a/sharpyuv/sharpyuv_gamma.c +++ b/sharpyuv/sharpyuv_gamma.c @@ -9,14 +9,14 @@ // // Gamma correction utilities. -#include "sharpyuv/sharpyuv_gamma.h" +#include "./sharpyuv_gamma.h" #include #include #include -#include "sharpyuv/sharpyuv.h" -#include "src/webp/types.h" +#include "./sharpyuv.h" +#include "webp/types.h" // Gamma correction compensates loss of resolution during chroma subsampling. // Size of pre-computed table for converting from gamma to linear. diff --git a/sharpyuv/sharpyuv_gamma.h b/sharpyuv/sharpyuv_gamma.h index b8ba7e98..896ab981 100644 --- a/sharpyuv/sharpyuv_gamma.h +++ b/sharpyuv/sharpyuv_gamma.h @@ -12,8 +12,8 @@ #ifndef WEBP_SHARPYUV_SHARPYUV_GAMMA_H_ #define WEBP_SHARPYUV_SHARPYUV_GAMMA_H_ -#include "sharpyuv/sharpyuv.h" -#include "src/webp/types.h" +#include "./sharpyuv.h" +#include "webp/types.h" #ifdef __cplusplus extern "C" { diff --git a/sharpyuv/sharpyuv_sse2.c b/sharpyuv/sharpyuv_sse2.c index 3f33a4f3..0154ae5d 100644 --- a/sharpyuv/sharpyuv_sse2.c +++ b/sharpyuv/sharpyuv_sse2.c @@ -11,14 +11,14 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "sharpyuv/sharpyuv_dsp.h" +#include "./sharpyuv_dsp.h" #if defined(WEBP_USE_SSE2) #include #include #include "src/dsp/cpu.h" -#include "src/webp/types.h" +#include "webp/types.h" static uint16_t clip_SSE2(int v, int max) { return (v < 0) ? 0 : (v > max) ? max : (uint16_t)v; diff --git a/tests/fuzzer/CMakeLists.txt b/tests/fuzzer/CMakeLists.txt index dde8fc08..8965cf95 100644 --- a/tests/fuzzer/CMakeLists.txt +++ b/tests/fuzzer/CMakeLists.txt @@ -47,6 +47,8 @@ fuzztest_setup_fuzzing_flags() add_library(fuzz_utils fuzz_utils.h fuzz_utils.cc img_alpha.h img_grid.h img_peak.h) target_link_libraries(fuzz_utils PUBLIC webpdecoder) +target_include_directories(fuzz_utils PUBLIC ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR}) link_fuzztest(fuzz_utils) add_webp_fuzztest(advanced_api_fuzzer webpdecode webpdspdecode webputilsdecode) diff --git a/tests/fuzzer/advanced_api_fuzzer.cc b/tests/fuzzer/advanced_api_fuzzer.cc index bf18cd34..8edc87b9 100644 --- a/tests/fuzzer/advanced_api_fuzzer.cc +++ b/tests/fuzzer/advanced_api_fuzzer.cc @@ -23,7 +23,7 @@ #include "./fuzz_utils.h" #include "src/dec/webpi_dec.h" #include "src/utils/rescaler_utils.h" -#include "src/webp/decode.h" +#include "webp/decode.h" namespace { diff --git a/tests/fuzzer/animation_api_fuzzer.cc b/tests/fuzzer/animation_api_fuzzer.cc index f26b2e70..c7363197 100644 --- a/tests/fuzzer/animation_api_fuzzer.cc +++ b/tests/fuzzer/animation_api_fuzzer.cc @@ -19,9 +19,9 @@ #include #include "./fuzz_utils.h" -#include "src/webp/decode.h" -#include "src/webp/demux.h" -#include "src/webp/mux_types.h" +#include "webp/decode.h" +#include "webp/demux.h" +#include "webp/mux_types.h" namespace { diff --git a/tests/fuzzer/animdecoder_fuzzer.cc b/tests/fuzzer/animdecoder_fuzzer.cc index 7a3d1238..a092c710 100644 --- a/tests/fuzzer/animdecoder_fuzzer.cc +++ b/tests/fuzzer/animdecoder_fuzzer.cc @@ -21,9 +21,9 @@ #include "./fuzz_utils.h" #include "./nalloc.h" #include "imageio/imageio_util.h" -#include "src/webp/decode.h" -#include "src/webp/demux.h" -#include "src/webp/mux_types.h" +#include "webp/decode.h" +#include "webp/demux.h" +#include "webp/mux_types.h" namespace { diff --git a/tests/fuzzer/animencoder_fuzzer.cc b/tests/fuzzer/animencoder_fuzzer.cc index 9be0b1dd..407202ee 100644 --- a/tests/fuzzer/animencoder_fuzzer.cc +++ b/tests/fuzzer/animencoder_fuzzer.cc @@ -22,9 +22,9 @@ #include "./fuzz_utils.h" #include "src/dsp/cpu.h" -#include "src/webp/encode.h" -#include "src/webp/mux.h" -#include "src/webp/mux_types.h" +#include "webp/encode.h" +#include "webp/mux.h" +#include "webp/mux_types.h" namespace { diff --git a/tests/fuzzer/dec_fuzzer.cc b/tests/fuzzer/dec_fuzzer.cc index 20427a41..81f9102f 100644 --- a/tests/fuzzer/dec_fuzzer.cc +++ b/tests/fuzzer/dec_fuzzer.cc @@ -21,8 +21,8 @@ #include #include "./nalloc.h" -#include "src/webp/decode.h" #include "tests/fuzzer/fuzz_utils.h" +#include "webp/decode.h" namespace { diff --git a/tests/fuzzer/enc_dec_fuzzer.cc b/tests/fuzzer/enc_dec_fuzzer.cc index 96be377f..3fad65fe 100644 --- a/tests/fuzzer/enc_dec_fuzzer.cc +++ b/tests/fuzzer/enc_dec_fuzzer.cc @@ -24,8 +24,8 @@ #include "./fuzz_utils.h" #include "src/dsp/cpu.h" #include "src/utils/rescaler_utils.h" -#include "src/webp/decode.h" -#include "src/webp/encode.h" +#include "webp/decode.h" +#include "webp/encode.h" namespace { diff --git a/tests/fuzzer/enc_fuzzer.cc b/tests/fuzzer/enc_fuzzer.cc index 3bdbc445..754dac79 100644 --- a/tests/fuzzer/enc_fuzzer.cc +++ b/tests/fuzzer/enc_fuzzer.cc @@ -24,10 +24,10 @@ #include "imageio/image_dec.h" #include "src/dsp/cpu.h" -#include "src/webp/decode.h" -#include "src/webp/encode.h" -#include "src/webp/types.h" #include "tests/fuzzer/fuzz_utils.h" +#include "webp/decode.h" +#include "webp/encode.h" +#include "webp/types.h" namespace { diff --git a/tests/fuzzer/fuzz_utils.cc b/tests/fuzzer/fuzz_utils.cc index 818e7e41..bf91d8b3 100644 --- a/tests/fuzzer/fuzz_utils.cc +++ b/tests/fuzzer/fuzz_utils.cc @@ -30,9 +30,9 @@ #include "./img_grid.h" #include "./img_peak.h" #include "src/dsp/cpu.h" -#include "src/webp/decode.h" -#include "src/webp/encode.h" -#include "src/webp/types.h" +#include "webp/decode.h" +#include "webp/encode.h" +#include "webp/types.h" namespace fuzz_utils { diff --git a/tests/fuzzer/huffman_fuzzer.cc b/tests/fuzzer/huffman_fuzzer.cc index 5b43795d..9abb0e9d 100644 --- a/tests/fuzzer/huffman_fuzzer.cc +++ b/tests/fuzzer/huffman_fuzzer.cc @@ -24,7 +24,7 @@ #include "src/utils/bit_reader_utils.h" #include "src/utils/huffman_utils.h" #include "src/utils/utils.h" -#include "src/webp/format_constants.h" +#include "webp/format_constants.h" namespace { diff --git a/tests/fuzzer/mux_demux_api_fuzzer.cc b/tests/fuzzer/mux_demux_api_fuzzer.cc index 973fd87e..f8ad0e17 100644 --- a/tests/fuzzer/mux_demux_api_fuzzer.cc +++ b/tests/fuzzer/mux_demux_api_fuzzer.cc @@ -19,9 +19,9 @@ #include #include "./fuzz_utils.h" -#include "src/webp/demux.h" -#include "src/webp/mux.h" -#include "src/webp/mux_types.h" +#include "webp/demux.h" +#include "webp/mux.h" +#include "webp/mux_types.h" namespace { diff --git a/tests/fuzzer/simple_api_fuzzer.cc b/tests/fuzzer/simple_api_fuzzer.cc index 48d10536..053510da 100644 --- a/tests/fuzzer/simple_api_fuzzer.cc +++ b/tests/fuzzer/simple_api_fuzzer.cc @@ -20,8 +20,8 @@ #include #include "./fuzz_utils.h" -#include "src/webp/decode.h" -#include "src/webp/types.h" +#include "webp/decode.h" +#include "webp/types.h" namespace { diff --git a/tests/fuzzer/webp_info_fuzzer.cc b/tests/fuzzer/webp_info_fuzzer.cc index 7ced2fe6..c4141c0a 100644 --- a/tests/fuzzer/webp_info_fuzzer.cc +++ b/tests/fuzzer/webp_info_fuzzer.cc @@ -18,8 +18,8 @@ #include #include "./nalloc.h" -#include "src/webp/mux_types.h" #include "tests/fuzzer/fuzz_utils.h" +#include "webp/mux_types.h" // Don't do that at home! #define main exec_main