From a76694a1d68626d1eae978521df7a6b21906161a Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 16 Dec 2019 20:42:57 -0800 Subject: [PATCH 1/5] update AUTHORS BUG=webp:441 Change-Id: I844f1e4b5c32219a1e54de0c57a73822f93c7755 --- AUTHORS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 67482c16..32ff2fb6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,6 +2,7 @@ Contributors: - Aidan O'Loan (aidanol at gmail dot com) - Alan Browning (browning at google dot com) - Charles Munger (clm at google dot com) +- Cheng Yi (cyi at google dot com) - Christian Duvivier (cduvivier at google dot com) - Djordje Pesut (djordje dot pesut at imgtec dot com) - Hui Su (huisu at google dot com) @@ -21,6 +22,7 @@ Contributors: - Mislav Bradac (mislavm at google dot com) - Nico Weber (thakis at chromium dot org) - Noel Chromium (noel at chromium dot org) +- Oliver Wolff (oliver dot wolff at qt dot io) - Owen Rodley (orodley at google dot com) - Parag Salasakar (img dot mips1 at gmail dot com) - Pascal Massimino (pascal dot massimino at gmail dot com) From 30f0955160282bc394eddcf4450ba162390e1934 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 16 Dec 2019 20:56:09 -0800 Subject: [PATCH 2/5] bump version to 1.1.0 libwebp{,decoder} - 1.1.0 libwebp libtool - 8.0.1 libwebpdecoder libtool - 4.0.1 mux - 1.1.0 libtool - 3.5.0 demux - 1.1.0 libtool - 2.6.0 (no code change) BUG=webp:441 Change-Id: I458940f407515e0d95d20bbfd670ee29255c12eb --- README | 2 +- README.mux | 2 +- configure.ac | 2 +- extras/extras.c | 4 ++-- src/Makefile.am | 4 ++-- src/dec/vp8i_dec.h | 4 ++-- src/demux/demux.c | 4 ++-- src/demux/libwebpdemux.rc | 8 ++++---- src/enc/vp8i_enc.h | 4 ++-- src/libwebp.rc | 8 ++++---- src/libwebpdecoder.rc | 8 ++++---- src/mux/Makefile.am | 2 +- src/mux/libwebpmux.rc | 8 ++++---- src/mux/muxi.h | 4 ++-- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README b/README index 60da8a28..05927276 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ \__\__/\____/\_____/__/ ____ ___ / _/ / \ \ / _ \/ _/ / \_/ / / \ \ __/ \__ - \____/____/\_____/_____/____/v1.0.3 + \____/____/\_____/_____/____/v1.1.0 Description: ============ diff --git a/README.mux b/README.mux index e7eb5067..22560fe8 100644 --- a/README.mux +++ b/README.mux @@ -1,7 +1,7 @@  __ __ ____ ____ ____ __ __ _ __ __ / \\/ \/ _ \/ _ \/ _ \/ \ \/ \___/_ / _\ \ / __/ _ \ __/ / / (_/ /__ - \__\__/\_____/_____/__/ \__//_/\_____/__/___/v1.0.3 + \__\__/\_____/_____/__/ \__//_/\_____/__/___/v1.1.0 Description: diff --git a/configure.ac b/configure.ac index 501d9335..5481760a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libwebp], [1.0.3], +AC_INIT([libwebp], [1.1.0], [https://bugs.chromium.org/p/webp],, [http://developers.google.com/speed/webp]) AC_CANONICAL_HOST diff --git a/extras/extras.c b/extras/extras.c index 78c9409b..cf867f36 100644 --- a/extras/extras.c +++ b/extras/extras.c @@ -18,8 +18,8 @@ #include #define XTRA_MAJ_VERSION 1 -#define XTRA_MIN_VERSION 0 -#define XTRA_REV_VERSION 3 +#define XTRA_MIN_VERSION 1 +#define XTRA_REV_VERSION 0 //------------------------------------------------------------------------------ diff --git a/src/Makefile.am b/src/Makefile.am index 4cb29997..bcebf739 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 7:5:0 +libwebp_la_LDFLAGS = -no-undefined -version-info 8:0: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 3:5:0 + libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 4:0:1 pkgconfig_DATA += libwebpdecoder.pc endif diff --git a/src/dec/vp8i_dec.h b/src/dec/vp8i_dec.h index 3de8d86f..600a6844 100644 --- a/src/dec/vp8i_dec.h +++ b/src/dec/vp8i_dec.h @@ -31,8 +31,8 @@ extern "C" { // version numbers #define DEC_MAJ_VERSION 1 -#define DEC_MIN_VERSION 0 -#define DEC_REV_VERSION 3 +#define DEC_MIN_VERSION 1 +#define DEC_REV_VERSION 0 // YUV-cache parameters. Cache is 32-bytes wide (= one cacheline). // Constraints are: We need to store one 16x16 block of luma samples (y), diff --git a/src/demux/demux.c b/src/demux/demux.c index ab6433e5..1b3cc2e0 100644 --- a/src/demux/demux.c +++ b/src/demux/demux.c @@ -24,8 +24,8 @@ #include "src/webp/format_constants.h" #define DMUX_MAJ_VERSION 1 -#define DMUX_MIN_VERSION 0 -#define DMUX_REV_VERSION 3 +#define DMUX_MIN_VERSION 1 +#define DMUX_REV_VERSION 0 typedef struct { size_t start_; // start location of the data diff --git a/src/demux/libwebpdemux.rc b/src/demux/libwebpdemux.rc index 2d46b8df..66f26d1a 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,0,3 - PRODUCTVERSION 1,0,0,3 + FILEVERSION 1,0,1,0 + PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpdemux DLL" - VALUE "FileVersion", "1.0.3" + VALUE "FileVersion", "1.1.0" VALUE "InternalName", "libwebpdemux.dll" VALUE "LegalCopyright", "Copyright (C) 2019" VALUE "OriginalFilename", "libwebpdemux.dll" VALUE "ProductName", "WebP Image Demuxer" - VALUE "ProductVersion", "1.0.3" + VALUE "ProductVersion", "1.1.0" END END BLOCK "VarFileInfo" diff --git a/src/enc/vp8i_enc.h b/src/enc/vp8i_enc.h index 57f588b1..fedcaeea 100644 --- a/src/enc/vp8i_enc.h +++ b/src/enc/vp8i_enc.h @@ -31,8 +31,8 @@ extern "C" { // version numbers #define ENC_MAJ_VERSION 1 -#define ENC_MIN_VERSION 0 -#define ENC_REV_VERSION 3 +#define ENC_MIN_VERSION 1 +#define ENC_REV_VERSION 0 enum { MAX_LF_LEVELS = 64, // Maximum loop filter level MAX_VARIABLE_LEVEL = 67, // last (inclusive) level with variable cost diff --git a/src/libwebp.rc b/src/libwebp.rc index a036c9e4..78dccc97 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,0,3 - PRODUCTVERSION 1,0,0,3 + FILEVERSION 1,0,1,0 + PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebp DLL" - VALUE "FileVersion", "1.0.3" + VALUE "FileVersion", "1.1.0" VALUE "InternalName", "libwebp.dll" VALUE "LegalCopyright", "Copyright (C) 2019" VALUE "OriginalFilename", "libwebp.dll" VALUE "ProductName", "WebP Image Codec" - VALUE "ProductVersion", "1.0.3" + VALUE "ProductVersion", "1.1.0" END END BLOCK "VarFileInfo" diff --git a/src/libwebpdecoder.rc b/src/libwebpdecoder.rc index d8b8e431..bf0cffd4 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,0,3 - PRODUCTVERSION 1,0,0,3 + FILEVERSION 1,0,1,0 + PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpdecoder DLL" - VALUE "FileVersion", "1.0.3" + VALUE "FileVersion", "1.1.0" VALUE "InternalName", "libwebpdecoder.dll" VALUE "LegalCopyright", "Copyright (C) 2019" VALUE "OriginalFilename", "libwebpdecoder.dll" VALUE "ProductName", "WebP Image Decoder" - VALUE "ProductVersion", "1.0.3" + VALUE "ProductVersion", "1.1.0" END END BLOCK "VarFileInfo" diff --git a/src/mux/Makefile.am b/src/mux/Makefile.am index d9a0b280..5480296c 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 3:4:0 -lm +libwebpmux_la_LDFLAGS = -no-undefined -version-info 3:5:0 -lm libwebpmuxincludedir = $(includedir)/webp pkgconfig_DATA = libwebpmux.pc diff --git a/src/mux/libwebpmux.rc b/src/mux/libwebpmux.rc index 6725d42a..84503cbc 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,0,3 - PRODUCTVERSION 1,0,0,3 + FILEVERSION 1,0,1,0 + PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpmux DLL" - VALUE "FileVersion", "1.0.3" + VALUE "FileVersion", "1.1.0" VALUE "InternalName", "libwebpmux.dll" VALUE "LegalCopyright", "Copyright (C) 2019" VALUE "OriginalFilename", "libwebpmux.dll" VALUE "ProductName", "WebP Image Muxer" - VALUE "ProductVersion", "1.0.3" + VALUE "ProductVersion", "1.1.0" END END BLOCK "VarFileInfo" diff --git a/src/mux/muxi.h b/src/mux/muxi.h index 7bc0b07e..ad3e1bdb 100644 --- a/src/mux/muxi.h +++ b/src/mux/muxi.h @@ -28,8 +28,8 @@ extern "C" { // Defines and constants. #define MUX_MAJ_VERSION 1 -#define MUX_MIN_VERSION 0 -#define MUX_REV_VERSION 3 +#define MUX_MIN_VERSION 1 +#define MUX_REV_VERSION 0 // Chunk object. typedef struct WebPChunk WebPChunk; From c074c65368f32eae776aadab88c2c5d39af50941 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 16 Dec 2019 22:35:10 -0800 Subject: [PATCH 3/5] update NEWS BUG=webp:441 Change-Id: I8586b004e28b92d8c3c146f681bc9765f8a1f361 --- NEWS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS b/NEWS index 5c0fc8c0..46daa092 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +- 12/18/2019: version 1.1.0 + * API changes: + - libwebp: + WebPMalloc (issue #442) + - extras: + WebPUnmultiplyARGB + * alpha decode fix (issue #439) + * toolchain updates and bug fixes + (chromium: #1026858, #1027136, #1027409, #1028620, #1028716, #995200) + (oss-fuzz: #19430, #19447) + - 7/4/2019: version 1.0.3 This is a binary compatible release. * resize fixes for Nx1 sizes and the addition of non-opaque alpha values for From 7f0064361afc300c53843518bcbe79b4b3670b10 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 20 Dec 2019 08:50:48 -0800 Subject: [PATCH 4/5] Makefile.vc: fix webp_quality.exe link when building a dll based libwebp include the dsp private symbols that WebPUnmultiplyARGB requires Change-Id: I7cf7da0b20d6cf6740219c8562380926a0abd93c (cherry picked from commit cf047e8347314937435aabe643cf2fee0aa4a55b) --- Makefile.vc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.vc b/Makefile.vc index 8a54559a..886f981f 100644 --- a/Makefile.vc +++ b/Makefile.vc @@ -391,7 +391,13 @@ $(DIRBIN)\get_disto.exe: $(IMAGEIO_DEC_OBJS) $(IMAGEIO_UTIL_OBJS) $(DIRBIN)\get_disto.exe: $(LIBWEBPDEMUX) $(LIBWEBP) $(DIRBIN)\webp_quality.exe: $(DIROBJ)\extras\webp_quality.obj $(DIRBIN)\webp_quality.exe: $(IMAGEIO_UTIL_OBJS) -$(DIRBIN)\webp_quality.exe: $(EXTRAS_OBJS) $(LIBWEBP) +$(DIRBIN)\webp_quality.exe: $(EXTRAS_OBJS) +# EXTRA_OBJS requires private symbols from dsp. Explicitly add those when +# building libwebp as a dll. +!IF "$(DLLBUILD)" == "TRUE" +$(DIRBIN)\webp_quality.exe: $(DSP_DEC_OBJS) +!ENDIF +$(DIRBIN)\webp_quality.exe: $(LIBWEBP) $(DIRBIN)\webpinfo.exe: $(DIROBJ)\examples\webpinfo.obj $(DIRBIN)\webpinfo.exe: $(IMAGEIO_DEC_OBJS) $(DIRBIN)\webpinfo.exe: $(EX_UTIL_OBJS) $(IMAGEIO_UTIL_OBJS) From d7844e9762b61c9638c263657bd49e1690184832 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 18 Dec 2019 15:14:16 -0800 Subject: [PATCH 5/5] update ChangeLog BUG=webp:441 Change-Id: Ib401d468c677b9e598ffcec6535a846bf2456a4f --- ChangeLog | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/ChangeLog b/ChangeLog index 10ba5806..0a286fc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +7f006436 Makefile.vc: fix webp_quality.exe link +c074c653 update NEWS +30f09551 bump version to 1.1.0 +a76694a1 update AUTHORS +6e3ef7b3 extras: fix WEBP_SWAP_16BIT_CSP check +47178dbd extras: add WebPUnmultiplyARGB() convenience function +22cbae33 idec_dec: fix 0 offset of NULL pointer +290dd0b4 muxread: fix 0 offset of NULL pointer +0df474ac Merge "lossless_(enc_|)sse2: avoid offsetting a NULL pointer" +c6b75a19 lossless_(enc_|)sse2: avoid offsetting a NULL pointer +295e5e38 fix UBSAN warning +e2575e05 DC8_NEON,aarch64: use vaddv +b0e09e34 dec_neon: Fix build failure under some toolchains +cf0e903c dsp/lossless: Fix non gcc ARM builds +bb7bc40b Remove ubsan errors. +78881b76 CMake: fix GLUT library link +9f750f7a cmake: fix BUILD_SHARED_LIBS build on mac +17850e74 libwebp: Remove char-subscripts warning in pnmdec.c +2fa2552d Merge "Expose WebPMalloc() in addition to WebPFree()" +a4df4aae Expose WebPMalloc() in addition to WebPFree() +853ea3d8 imageio/tiff: Return error before allocating bad tile size +af650c0b Fix a Wxor-used-as-pow false positive +601ef17c libwebp.py: update to swig 3.0.12 +0e48d889 bugfix: last alpha rows were incorrectly decoded +24d2ccb4 webp: Fix imageio ReadPNM() TUPLTYPE +fab8f9cf cosmetics: normalize '*' association +94138e0e update .gitignore +0fe1a89d update ChangeLog (tag: v1.0.3-rc1, tag: v1.0.3) 2ad0916d update NEWS 1287362b bump version to 1.0.3 7b968cc2 update AUTHORS