diff --git a/AUTHORS b/AUTHORS index 4cbe9766..6772bcd1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,11 +11,13 @@ Contributors: - Christopher Degawa (ccom at randomderp dot com) - Clement Courbet (courbet at google dot com) - Djordje Pesut (djordje dot pesut at imgtec dot com) +- Frank (1433351828 at qq dot com) - Frank Barchard (fbarchard at google dot com) - Hui Su (huisu at google dot com) - H. Vetinari (h dot vetinari at gmx dot com) - Ilya Kurdyukov (jpegqs at gmail dot com) - Ingvar Stepanyan (rreverser at google dot com) +- Istvan Stefan (Istvan dot Stefan at arm dot com) - James Zern (jzern at google dot com) - Jan Engelhardt (jengelh at medozas dot de) - Jehan (jehan at girinstud dot io) @@ -62,6 +64,7 @@ Contributors: - Vincent Rabaud (vrabaud at google dot com) - Vlad Tsyrklevich (vtsyrklevich at chromium dot org) - Wan-Teh Chang (wtc at google dot com) +- wrv (wrv at utexas dot edu) - Yang Zhang (yang dot zhang at arm dot com) - Yannis Guyon (yguyon at google dot com) - Zhi An Ng (zhin at chromium dot org) diff --git a/ChangeLog b/ChangeLog index e0d920ef..4b07e231 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,141 @@ +c3d85ce4 update NEWS +ad14e811 tests/fuzzer/*: add missing include +74cd026e fuzz_utils.cc: fix build error w/WEBP_REDUCE_SIZE +a027aa93 mux_demux_api_fuzzer.cc: fix -Wshadow warning +25e17c68 update ChangeLog (tag: v1.5.0-rc1) +aa2684fc update NEWS +36923846 bump version to 1.5.0 +ceea8ff6 update AUTHORS +e4f7a9f0 img2webp: add a warning for unused options +1b4c967f Merge "Properly check the data size against the end of the RIFF chunk" into main +9e5ecfaf Properly check the data size against the end of the RIFF chunk +da0d9c7d examples: exit w/failure w/no args +fcff86c7 {gif,img}2webp: sync -m help w/cwebp +b76c4a84 man/img2webp.1: sync -m text w/cwebp.1 & gif2webp.1 +30633519 muxread: fix reading of buffers > riff size +4c85d860 yuv.h: update RGB<->YUV coefficients in comment +0ab789e0 Merge changes I6dfedfd5,I2376e2dc into main +03236450 {ios,xcframework}build.sh: fix compilation w/Xcode 16 +61e2cfda rework AddVectorEq_SSE2 +7bda3deb rework AddVector_SSE2 +2ddaaf0a Fix variable names in SharpYuvComputeConversionMatrix +a3ba6f19 Makefile.vc: fix gif2webp link error +f999d94f gif2webp: add -sharp_yuv/-near_lossless +dfdcb7f9 Merge "lossless.h: fix function declaration mismatches" into main (tag: webp-rfc9649) +78ed6839 fix overread in Intra4Preds_NEON +d516a68e lossless.h: fix function declaration mismatches +87406904 Merge "Improve documentation of SharpYuvConversionMatrix." into main +fdb229ea Merge changes I07a7e36a,Ib29980f7,I2316122d,I2356e314,I32b53dd3, ... into main +0c3cd9cc Improve documentation of SharpYuvConversionMatrix. +169dfbf9 disable Intra4Preds_NEON +2dd5eb98 dsp/yuv*: use WEBP_RESTRICT qualifier +23bbafbe dsp/upsampling*: use WEBP_RESTRICT qualifier +35915b38 dsp/rescaler*: use WEBP_RESTRICT qualifier +a32b436b dsp/lossless*: use WEBP_RESTRICT qualifier +04d4b4f3 dsp/filters*: use WEBP_RESTRICT qualifier +b1cb37e6 dsp/enc*: use WEBP_RESTRICT qualifier +201894ef dsp/dec*: use WEBP_RESTRICT qualifier +02eac8a7 dsp/cost*: use WEBP_RESTRICT qualifier +84b118c9 Merge "webp-container-spec: normalize notes & unknown chunk link" into main +052cf42f webp-container-spec: normalize notes & unknown chunk link +220ee529 Search for best predictor transform bits +78619478 Try to reduce the sampling for the entropy image +14f09ab7 webp-container-spec: reorder chunk size - N text +a78c5356 Remove a useless malloc for entropy image +bc491763 Merge "Refactor predictor finding" into main +34f92238 man/{cwebp,img2webp}.1: rm 'if needed' from -sharp_yuv +367ca938 Refactor predictor finding +a582b53b webp-lossless-bitstream-spec: clarify some text +0fd25d84 Merge "anim_encode.c: fix function ref in comment" into main +f8882913 anim_encode.c: fix function ref in comment +40e4ca60 specs_generation.md: update kramdown command line +57883c78 img2webp: add -exact/-noexact per-frame options +1c8eba97 img2webp,cosmetics: add missing '.' spacers to help +2e81017c Convert predictor_enc.c to fixed point +94de6c7f Merge "Fix fuzztest link errors w/-DBUILD_SHARED_LIBS=1" into main +51d9832a Fix fuzztest link errors w/-DBUILD_SHARED_LIBS=1 +7bcb36b8 Merge "Fix static overflow warning." into main +8e0cc14c Fix static overflow warning. +cea68462 README.md: add security report note +615e5874 Merge "make VP8LPredictor[01]_C() static" into main +233e86b9 Merge changes Ie43dc5ef,I94cd8bab into main +1a29fd2f make VP8LPredictor[01]_C() static +dd9d3770 Do*Filter_*: remove row & num_rows parameters +ab451a49 Do*Filter_C: remove dead 'inverse' code paths +f9a480f7 {TrueMotion,TM16}_NEON: remove zero extension +04834aca Merge changes I25c30a9e,I0a192fc6,I4cf89575 into main +39a602af webp-lossless-bitstream-spec: normalize predictor transform ref +f28c837d Merge "webp-container-spec: align anim pseudocode w/prose" into main +74be8e22 Fix implicit conversion issues +0c01db7c Merge "Increase the transform bits if possible." into main +f2d6dc1e Increase the transform bits if possible. +caa19e5b update link to issue tracker +c9dd9bd4 webp-container-spec: align anim pseudocode w/prose +8a7c8dc6 WASM: Enable VP8L_USE_FAST_LOAD +f0c53cd9 WASM: don't use USE_GENERIC_TREE +eef903d0 WASM: Enable 64-bit BITS caching +6296cc8d iterator_enc: make VP8IteratorReset() static +fbd93896 histogram_enc: make VP8LGetHistogramSize static +cc7ff545 cost_enc: make VP8CalculateLevelCosts[] static +4e2828ba vp8l_dec: make VP8LClear() static +d742b24a Intra16Preds_NEON: fix truemotion saturation +c7bb4cb5 Intra4Preds_NEON: fix truemotion saturation +952a989b Merge "Remove TODO now that log is using fixed point." into main +dde11574 Remove TODO now that log is using fixed point. +a1ca153d Fix hidden myerr in my_error_exit +3bd94202 Merge changes Iff6e47ed,I24c67cd5,Id781e761 into main +d27d246e Merge "Convert VP8LFastSLog2 to fixed point" into main +4838611f Disable msg_code use in fuzzing mode +314a142a Use QuantizeBlock_NEON for VP8EncQuantizeBlockWHT on Arm +3bfb05e3 Add AArch64 Neon implementation of Intra16Preds +baa93808 Add AArch64 Neon implementation of Intra4Preds +41a5e582 Fix errors when compiling code as C++ +fb444b69 Convert VP8LFastSLog2 to fixed point +c1c89f51 Fix WEBP_NODISCARD comment and C++ version +66408c2c Switch the histogram_enc.h API to fixed point +ac1e410d Remove leftover tiff dep +b78d3957 Disable TIFF on fuzztest. +cff21a7d Do not build statically on oss-fuzz. +6853a8e5 Merge "Move more internal fuzzers to public." into main +9bc09db4 Merge "Convert VP8LFastLog2 to fixed point" into main +0a9f1c19 Convert VP8LFastLog2 to fixed point +db0cb9c2 Move more internal fuzzers to public. +ff2b5b15 Merge "advanced_api_fuzzer.cc: use crop dims in OOM check" into main +c4af79d0 Put 0 at the end of a palette and do not store it. +0ec80aef Delete last references to delta palettization +96d79f84 advanced_api_fuzzer.cc: use crop dims in OOM check +c35c7e02 Fix huffman fuzzer to not leak. +f2fe8dec Bump fuzztest dependency. +9ce982fd Fix fuzz tests to work on oss-fuzz +3ba8af1a Do not escape quotes anymore in build.sh +ea0e121b Allow centipede to be used as a fuzzing engine. +27731afd make VP8I4ModeOffsets & VP8MakeIntra4Preds static +ddd6245e oss-fuzz/build.sh: use heredoc for script creation +50074930 oss-fuzz/build.sh,cosmetics: fix indent +20e92f7d Limit the possible fuzz engines. +4f200de5 Switch public fuzz tests to fuzztest. +64186bb3 Add huffman_fuzzer to .gitignore +0905f61c Move build script from oss-fuzz repo to here. +e8678758 Fix link to Javascript documentation +5e5b8f0c Fix SSE2 Transform_AC3 function name +45129ee0 Revert "Check all the rows." +ee26766a Check all the rows. +7ec51c59 Increase the transform bits if possible. +3cd16fd3 Revert "Increase the transform bits if possible." +971a03d8 Increase the transform bits if possible. +1bf198a2 Allow transform_bits to be different during encoding. +1e462ca8 Define MAX_TRANSFORM_BITS according to the specification. +64d1ec23 Use (MIN/NUM)_(TRANSFORM/HUFFMAN)_BITS where appropriate +a90160e1 Refactor histograms in predictors. +a7aa7525 Fix some function declarations +68ff4e1e Merge "jpegdec: add a hint for EOF/READ errors" into main +79e7968a jpegdec: add a hint for EOF/READ errors +d33455cd man/*: s/BUGS/REPORTING BUGS/ +a67ff735 normalize example exit status +edc28909 upsampling_{neon,sse41}: fix int sanitizer warning +3cada4ce ImgIoUtilReadFile: check ftell() return +dc950585 Merge tag 'v1.4.0' +845d5476 update ChangeLog (tag: v1.4.0, origin/1.4.0) 8a6a55bb update NEWS cf7c5a5d provide a way to opt-out/override WEBP_NODISCARD cc34288a update ChangeLog (tag: v1.4.0-rc1) diff --git a/NEWS b/NEWS index 8e40d8ea..7ad3df03 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,25 @@ +- 12/19/2024 version 1.5.0 + This is a binary compatible release. + API changes: + - `cross_color_transform_bits` added to WebPAuxStats + * minor lossless encoder speed and compression improvements + * lossless encoding does not use floats anymore + * additional Arm optimizations for lossy & lossless + general code generation + improvements + * improvements to WASM performance (#643) + * improvements and corrections in webp-container-spec.txt and + webp-lossless-bitstream-spec.txt (#646, #355607636) + * further security related hardening and increased fuzzing coverage w/fuzztest + (oss-fuzz: #382816119, #70112, #70102, #69873, #69825, #69508, #69208) + * miscellaneous warning, bug & build fixes (#499, #562, #381372617, + #381109771, #42340561, #375011696, #372109644, chromium: #334120888) + Tool updates: + * gif2webp: add -sharp_yuv & -near_lossless + * img2webp: add -exact & -noexact + * exit codes normalized; running an example program with no + arguments will output its help and exit with an error (#42340557, + #381372617) + - 4/12/2024: version 1.4.0 This is a binary compatible release. * API changes: diff --git a/README.md b/README.md index c213a2e0..8ae1ab79 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ \__\__/\____/\_____/__/ ____ ___ / _/ / \ \ / _ \/ _/ / \_/ / / \ \ __/ \__ - \____/____/\_____/_____/____/v1.4.0 + \____/____/\_____/_____/____/v1.5.0 ``` WebP codec is a library to encode and decode images in WebP format. This package diff --git a/configure.ac b/configure.ac index 403c832a..1617614f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libwebp], [1.4.0], +AC_INIT([libwebp], [1.5.0], [https://issues.webmproject.org],, [https://developers.google.com/speed/webp]) AC_CANONICAL_HOST diff --git a/extras/extras.c b/extras/extras.c index 3a3d254e..c458c695 100644 --- a/extras/extras.c +++ b/extras/extras.c @@ -24,7 +24,7 @@ #include "webp/types.h" #define XTRA_MAJ_VERSION 1 -#define XTRA_MIN_VERSION 4 +#define XTRA_MIN_VERSION 5 #define XTRA_REV_VERSION 0 //------------------------------------------------------------------------------ diff --git a/sharpyuv/Makefile.am b/sharpyuv/Makefile.am index 1a94d467..bd5b22dc 100644 --- a/sharpyuv/Makefile.am +++ b/sharpyuv/Makefile.am @@ -33,7 +33,7 @@ libsharpyuv_la_SOURCES += sharpyuv_gamma.c sharpyuv_gamma.h libsharpyuv_la_SOURCES += sharpyuv.c sharpyuv.h libsharpyuv_la_CPPFLAGS = $(AM_CPPFLAGS) -libsharpyuv_la_LDFLAGS = -no-undefined -version-info 1:0:1 -lm +libsharpyuv_la_LDFLAGS = -no-undefined -version-info 1:1:1 -lm libsharpyuv_la_LIBADD = libsharpyuv_la_LIBADD += libsharpyuv_sse2.la libsharpyuv_la_LIBADD += libsharpyuv_neon.la diff --git a/sharpyuv/libsharpyuv.rc b/sharpyuv/libsharpyuv.rc index e0027aa4..93fd1b8c 100644 --- a/sharpyuv/libsharpyuv.rc +++ b/sharpyuv/libsharpyuv.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,4,0 - PRODUCTVERSION 0,0,4,0 + FILEVERSION 0,0,4,1 + PRODUCTVERSION 0,0,4,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libsharpyuv DLL" - VALUE "FileVersion", "0.4.0" + VALUE "FileVersion", "0.4.1" VALUE "InternalName", "libsharpyuv.dll" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "libsharpyuv.dll" VALUE "ProductName", "SharpYuv Library" - VALUE "ProductVersion", "0.4.0" + VALUE "ProductVersion", "0.4.1" END END BLOCK "VarFileInfo" diff --git a/sharpyuv/sharpyuv.h b/sharpyuv/sharpyuv.h index e67c2df2..0317fd49 100644 --- a/sharpyuv/sharpyuv.h +++ b/sharpyuv/sharpyuv.h @@ -52,7 +52,7 @@ extern "C" { // SharpYUV API version following the convention from semver.org #define SHARPYUV_VERSION_MAJOR 0 #define SHARPYUV_VERSION_MINOR 4 -#define SHARPYUV_VERSION_PATCH 0 +#define SHARPYUV_VERSION_PATCH 1 // Version as a uint32_t. The major number is the high 8 bits. // The minor number is the middle 8 bits. The patch number is the low 16 bits. #define SHARPYUV_MAKE_VERSION(MAJOR, MINOR, PATCH) \ diff --git a/src/Makefile.am b/src/Makefile.am index 1dafadd1..b4473450 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,7 +36,7 @@ libwebp_la_LIBADD += utils/libwebputils.la # other than the ones listed on the command line, i.e., after linking, it will # not have unresolved symbols. Some platforms (Windows among them) require all # symbols in shared libraries to be resolved at library creation. -libwebp_la_LDFLAGS = -no-undefined -version-info 8:9:1 +libwebp_la_LDFLAGS = -no-undefined -version-info 8:10:1 libwebpincludedir = $(includedir)/webp pkgconfig_DATA = libwebp.pc @@ -48,7 +48,7 @@ if BUILD_LIBWEBPDECODER libwebpdecoder_la_LIBADD += dsp/libwebpdspdecode.la libwebpdecoder_la_LIBADD += utils/libwebputilsdecode.la - libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 4:9:1 + libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 4:10:1 pkgconfig_DATA += libwebpdecoder.pc endif diff --git a/src/dec/vp8i_dec.h b/src/dec/vp8i_dec.h index cb21d475..c07319e9 100644 --- a/src/dec/vp8i_dec.h +++ b/src/dec/vp8i_dec.h @@ -32,7 +32,7 @@ extern "C" { // version numbers #define DEC_MAJ_VERSION 1 -#define DEC_MIN_VERSION 4 +#define DEC_MIN_VERSION 5 #define DEC_REV_VERSION 0 // YUV-cache parameters. Cache is 32-bytes wide (= one cacheline). diff --git a/src/demux/Makefile.am b/src/demux/Makefile.am index 9ecff146..30ecd0e7 100644 --- a/src/demux/Makefile.am +++ b/src/demux/Makefile.am @@ -13,6 +13,6 @@ noinst_HEADERS = noinst_HEADERS += ../webp/format_constants.h libwebpdemux_la_LIBADD = ../libwebp.la -libwebpdemux_la_LDFLAGS = -no-undefined -version-info 2:15:0 +libwebpdemux_la_LDFLAGS = -no-undefined -version-info 2:16:0 libwebpdemuxincludedir = $(includedir)/webp pkgconfig_DATA = libwebpdemux.pc diff --git a/src/demux/demux.c b/src/demux/demux.c index d01c6a74..37d35c6d 100644 --- a/src/demux/demux.c +++ b/src/demux/demux.c @@ -24,7 +24,7 @@ #include "src/webp/format_constants.h" #define DMUX_MAJ_VERSION 1 -#define DMUX_MIN_VERSION 4 +#define DMUX_MIN_VERSION 5 #define DMUX_REV_VERSION 0 typedef struct { diff --git a/src/demux/libwebpdemux.rc b/src/demux/libwebpdemux.rc index bc57c408..f01ad2ac 100644 --- a/src/demux/libwebpdemux.rc +++ b/src/demux/libwebpdemux.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,4,0 - PRODUCTVERSION 1,0,4,0 + FILEVERSION 1,0,5,0 + PRODUCTVERSION 1,0,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpdemux DLL" - VALUE "FileVersion", "1.4.0" + VALUE "FileVersion", "1.5.0" VALUE "InternalName", "libwebpdemux.dll" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "libwebpdemux.dll" VALUE "ProductName", "WebP Image Demuxer" - VALUE "ProductVersion", "1.4.0" + VALUE "ProductVersion", "1.5.0" END END BLOCK "VarFileInfo" diff --git a/src/enc/vp8i_enc.h b/src/enc/vp8i_enc.h index b6d00a7c..9d32bdab 100644 --- a/src/enc/vp8i_enc.h +++ b/src/enc/vp8i_enc.h @@ -32,7 +32,7 @@ extern "C" { // version numbers #define ENC_MAJ_VERSION 1 -#define ENC_MIN_VERSION 4 +#define ENC_MIN_VERSION 5 #define ENC_REV_VERSION 0 enum { MAX_LF_LEVELS = 64, // Maximum loop filter level diff --git a/src/libwebp.rc b/src/libwebp.rc index d51536f5..92fd893a 100644 --- a/src/libwebp.rc +++ b/src/libwebp.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,4,0 - PRODUCTVERSION 1,0,4,0 + FILEVERSION 1,0,5,0 + PRODUCTVERSION 1,0,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebp DLL" - VALUE "FileVersion", "1.4.0" + VALUE "FileVersion", "1.5.0" VALUE "InternalName", "libwebp.dll" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "libwebp.dll" VALUE "ProductName", "WebP Image Codec" - VALUE "ProductVersion", "1.4.0" + VALUE "ProductVersion", "1.5.0" END END BLOCK "VarFileInfo" diff --git a/src/libwebpdecoder.rc b/src/libwebpdecoder.rc index 3891488c..8e6e4c71 100644 --- a/src/libwebpdecoder.rc +++ b/src/libwebpdecoder.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,4,0 - PRODUCTVERSION 1,0,4,0 + FILEVERSION 1,0,5,0 + PRODUCTVERSION 1,0,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpdecoder DLL" - VALUE "FileVersion", "1.4.0" + VALUE "FileVersion", "1.5.0" VALUE "InternalName", "libwebpdecoder.dll" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "libwebpdecoder.dll" VALUE "ProductName", "WebP Image Decoder" - VALUE "ProductVersion", "1.4.0" + VALUE "ProductVersion", "1.5.0" END END BLOCK "VarFileInfo" diff --git a/src/mux/Makefile.am b/src/mux/Makefile.am index 18bc90e9..0512b649 100644 --- a/src/mux/Makefile.am +++ b/src/mux/Makefile.am @@ -17,6 +17,6 @@ noinst_HEADERS = noinst_HEADERS += ../webp/format_constants.h libwebpmux_la_LIBADD = ../libwebp.la -libwebpmux_la_LDFLAGS = -no-undefined -version-info 4:0:1 -lm +libwebpmux_la_LDFLAGS = -no-undefined -version-info 4:1:1 -lm libwebpmuxincludedir = $(includedir)/webp pkgconfig_DATA = libwebpmux.pc diff --git a/src/mux/libwebpmux.rc b/src/mux/libwebpmux.rc index 1b20fac1..60be5efc 100644 --- a/src/mux/libwebpmux.rc +++ b/src/mux/libwebpmux.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,4,0 - PRODUCTVERSION 1,0,4,0 + FILEVERSION 1,0,5,0 + PRODUCTVERSION 1,0,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpmux DLL" - VALUE "FileVersion", "1.4.0" + VALUE "FileVersion", "1.5.0" VALUE "InternalName", "libwebpmux.dll" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "libwebpmux.dll" VALUE "ProductName", "WebP Image Muxer" - VALUE "ProductVersion", "1.4.0" + VALUE "ProductVersion", "1.5.0" END END BLOCK "VarFileInfo" diff --git a/src/mux/muxi.h b/src/mux/muxi.h index 74ae3fac..3c542f93 100644 --- a/src/mux/muxi.h +++ b/src/mux/muxi.h @@ -28,7 +28,7 @@ extern "C" { // Defines and constants. #define MUX_MAJ_VERSION 1 -#define MUX_MIN_VERSION 4 +#define MUX_MIN_VERSION 5 #define MUX_REV_VERSION 0 // Chunk object. diff --git a/tests/fuzzer/fuzz_utils.cc b/tests/fuzzer/fuzz_utils.cc index 72fd2fee..f0941b08 100644 --- a/tests/fuzzer/fuzz_utils.cc +++ b/tests/fuzzer/fuzz_utils.cc @@ -76,9 +76,8 @@ int CropOrScale(WebPPicture* const pic, const CropOrScaleParams& params) { } } #else // defined(WEBP_REDUCE_SIZE) - (void)data; - (void)size; - (void)bit_pos; + (void)pic; + (void)params; #endif // !defined(WEBP_REDUCE_SIZE) return 1; } diff --git a/tests/fuzzer/imageio_fuzzer.cc b/tests/fuzzer/imageio_fuzzer.cc index 0e2b5beb..600c78a2 100644 --- a/tests/fuzzer/imageio_fuzzer.cc +++ b/tests/fuzzer/imageio_fuzzer.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include "imageio/image_dec.h" #include "imageio/metadata.h" diff --git a/tests/fuzzer/mux_demux_api_fuzzer.cc b/tests/fuzzer/mux_demux_api_fuzzer.cc index 4d853518..9d7307dd 100644 --- a/tests/fuzzer/mux_demux_api_fuzzer.cc +++ b/tests/fuzzer/mux_demux_api_fuzzer.cc @@ -24,7 +24,7 @@ namespace { -void MuxDemuxApiTest(std::string_view data_in, bool mux) { +void MuxDemuxApiTest(std::string_view data_in, bool use_mux_api) { const size_t size = data_in.size(); WebPData webp_data; WebPDataInit(&webp_data); @@ -34,7 +34,7 @@ void MuxDemuxApiTest(std::string_view data_in, bool mux) { // Extracted chunks and frames are not processed or decoded, // which is already covered extensively by the other fuzz targets. - if (mux) { + if (use_mux_api) { // Mux API WebPMux* mux = WebPMuxCreate(&webp_data, size & 2); if (!mux) return; diff --git a/tests/fuzzer/webp_info_fuzzer.cc b/tests/fuzzer/webp_info_fuzzer.cc index 6316f7b0..3b1c7f2e 100644 --- a/tests/fuzzer/webp_info_fuzzer.cc +++ b/tests/fuzzer/webp_info_fuzzer.cc @@ -15,6 +15,7 @@ //////////////////////////////////////////////////////////////////////////////// #include +#include #include "src/webp/mux_types.h" #include "tests/fuzzer/fuzz_utils.h"