diff options
author | Harish Mahendrakar <hmahendrakar@google.com> | 2023-11-01 00:59:11 +0000 |
---|---|---|
committer | Harish Mahendrakar <hmahendrakar@google.com> | 2023-11-01 00:59:11 +0000 |
commit | f241eb617d452033659fd20702dff54850e5105e (patch) | |
tree | 42979857dbc5513d08e57642f15be26df24fd023 | |
parent | 76086a973df495e44e20db1c4b4d97521c54be90 (diff) | |
parent | ca332209cb5567c9b249c86788cb2dbf8847e760 (diff) | |
download | webp-f241eb617d452033659fd20702dff54850e5105e.tar.gz |
Upgrade webp to v1.3.2
This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update webp
For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
Test: TreeHugger
Change-Id: Idd122587b67858ee400e1295ac7a885f0e71448b
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | extras/extras.c | 2 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/dec/vp8i_dec.h | 2 | ||||
-rw-r--r-- | src/demux/Makefile.am | 2 | ||||
-rw-r--r-- | src/demux/demux.c | 2 | ||||
-rw-r--r-- | src/demux/libwebpdemux.rc | 8 | ||||
-rw-r--r-- | src/enc/vp8i_enc.h | 2 | ||||
-rw-r--r-- | src/libwebp.rc | 8 | ||||
-rw-r--r-- | src/libwebpdecoder.rc | 8 | ||||
-rw-r--r-- | src/mux/Makefile.am | 2 | ||||
-rw-r--r-- | src/mux/libwebpmux.rc | 8 | ||||
-rw-r--r-- | src/mux/muxi.h | 2 |
17 files changed, 42 insertions, 30 deletions
@@ -1,3 +1,7 @@ +1ace578c update NEWS +63234c42 bump version to 1.3.2 +2af26267 Fix OOB write in BuildHuffmanTable. +fd7bb21c update ChangeLog (tag: v1.3.1-rc2, tag: v1.3.1) e1adea50 update NEWS 43393320 enc/*: normalize WebPEncodingSetError() calls 287fdefe enc/*: add missing WebPEncodingSetError() calls @@ -1,3 +1,7 @@ +# This project was upgraded with external_updater. +# Usage: tools/external_updater/updater.sh update webp +# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md + name: "webp" description: "Android fork of the libwebp library." third_party { @@ -5,11 +9,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/webm/libwebp" } - version: "v1.3.1" + version: "v1.3.2" license_type: NOTICE last_upgrade_date { year: 2023 - month: 6 - day: 29 + month: 11 + day: 1 } } @@ -1,3 +1,7 @@ +- 9/13/2023: version 1.3.2 + This is a binary compatible release. + * security fix for lossless decoder (chromium: #1479274, CVE-2023-4863) + - 6/23/2023: version 1.3.1 This is a binary compatible release. * security fixes for lossless encoder (#603, chromium: #1420107, #1455619, @@ -7,7 +7,7 @@ \__\__/\____/\_____/__/ ____ ___ / _/ / \ \ / _ \/ _/ / \_/ / / \ \ __/ \__ - \____/____/\_____/_____/____/v1.3.1 + \____/____/\_____/_____/____/v1.3.2 ``` WebP codec is a library to encode and decode images in WebP format. This package diff --git a/configure.ac b/configure.ac index a999e0c9..2216e4a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libwebp], [1.3.1], +AC_INIT([libwebp], [1.3.2], [https://bugs.chromium.org/p/webp],, [https://developers.google.com/speed/webp]) AC_CANONICAL_HOST diff --git a/extras/extras.c b/extras/extras.c index 3949b9e8..afe5b704 100644 --- a/extras/extras.c +++ b/extras/extras.c @@ -19,7 +19,7 @@ #define XTRA_MAJ_VERSION 1 #define XTRA_MIN_VERSION 3 -#define XTRA_REV_VERSION 1 +#define XTRA_REV_VERSION 2 //------------------------------------------------------------------------------ diff --git a/src/Makefile.am b/src/Makefile.am index 23da9fbd..bc4a320a 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:7:1 +libwebp_la_LDFLAGS = -no-undefined -version-info 8:8: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:7:1 + libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 4:8:1 pkgconfig_DATA += libwebpdecoder.pc endif diff --git a/src/dec/vp8i_dec.h b/src/dec/vp8i_dec.h index 1ae4ff62..7929fd75 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 3 -#define DEC_REV_VERSION 1 +#define DEC_REV_VERSION 2 // 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/Makefile.am b/src/demux/Makefile.am index 42de71d6..2df2db5b 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:13:0 +libwebpdemux_la_LDFLAGS = -no-undefined -version-info 2:14:0 libwebpdemuxincludedir = $(includedir)/webp pkgconfig_DATA = libwebpdemux.pc diff --git a/src/demux/demux.c b/src/demux/demux.c index fd45a250..4b0d3f59 100644 --- a/src/demux/demux.c +++ b/src/demux/demux.c @@ -25,7 +25,7 @@ #define DMUX_MAJ_VERSION 1 #define DMUX_MIN_VERSION 3 -#define DMUX_REV_VERSION 1 +#define DMUX_REV_VERSION 2 typedef struct { size_t start_; // start location of the data diff --git a/src/demux/libwebpdemux.rc b/src/demux/libwebpdemux.rc index 49a45474..b0c9413e 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,3,1 - PRODUCTVERSION 1,0,3,1 + FILEVERSION 1,0,3,2 + PRODUCTVERSION 1,0,3,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpdemux DLL" - VALUE "FileVersion", "1.3.1" + VALUE "FileVersion", "1.3.2" VALUE "InternalName", "libwebpdemux.dll" VALUE "LegalCopyright", "Copyright (C) 2023" VALUE "OriginalFilename", "libwebpdemux.dll" VALUE "ProductName", "WebP Image Demuxer" - VALUE "ProductVersion", "1.3.1" + VALUE "ProductVersion", "1.3.2" END END BLOCK "VarFileInfo" diff --git a/src/enc/vp8i_enc.h b/src/enc/vp8i_enc.h index 19d9a6ed..0864fbf1 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 3 -#define ENC_REV_VERSION 1 +#define ENC_REV_VERSION 2 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 5ce33dbf..4e8e4029 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,3,1 - PRODUCTVERSION 1,0,3,1 + FILEVERSION 1,0,3,2 + PRODUCTVERSION 1,0,3,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebp DLL" - VALUE "FileVersion", "1.3.1" + VALUE "FileVersion", "1.3.2" VALUE "InternalName", "libwebp.dll" VALUE "LegalCopyright", "Copyright (C) 2023" VALUE "OriginalFilename", "libwebp.dll" VALUE "ProductName", "WebP Image Codec" - VALUE "ProductVersion", "1.3.1" + VALUE "ProductVersion", "1.3.2" END END BLOCK "VarFileInfo" diff --git a/src/libwebpdecoder.rc b/src/libwebpdecoder.rc index 1a5a2536..c3f3e4a1 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,3,1 - PRODUCTVERSION 1,0,3,1 + FILEVERSION 1,0,3,2 + PRODUCTVERSION 1,0,3,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpdecoder DLL" - VALUE "FileVersion", "1.3.1" + VALUE "FileVersion", "1.3.2" VALUE "InternalName", "libwebpdecoder.dll" VALUE "LegalCopyright", "Copyright (C) 2023" VALUE "OriginalFilename", "libwebpdecoder.dll" VALUE "ProductName", "WebP Image Decoder" - VALUE "ProductVersion", "1.3.1" + VALUE "ProductVersion", "1.3.2" END END BLOCK "VarFileInfo" diff --git a/src/mux/Makefile.am b/src/mux/Makefile.am index 71ec3aa7..9abd8595 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:12:0 -lm +libwebpmux_la_LDFLAGS = -no-undefined -version-info 3:13:0 -lm libwebpmuxincludedir = $(includedir)/webp pkgconfig_DATA = libwebpmux.pc diff --git a/src/mux/libwebpmux.rc b/src/mux/libwebpmux.rc index 75afcaa8..bca38f6d 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,3,1 - PRODUCTVERSION 1,0,3,1 + FILEVERSION 1,0,3,2 + PRODUCTVERSION 1,0,3,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Google, Inc." VALUE "FileDescription", "libwebpmux DLL" - VALUE "FileVersion", "1.3.1" + VALUE "FileVersion", "1.3.2" VALUE "InternalName", "libwebpmux.dll" VALUE "LegalCopyright", "Copyright (C) 2023" VALUE "OriginalFilename", "libwebpmux.dll" VALUE "ProductName", "WebP Image Muxer" - VALUE "ProductVersion", "1.3.1" + VALUE "ProductVersion", "1.3.2" END END BLOCK "VarFileInfo" diff --git a/src/mux/muxi.h b/src/mux/muxi.h index fc44d6f2..afc59543 100644 --- a/src/mux/muxi.h +++ b/src/mux/muxi.h @@ -29,7 +29,7 @@ extern "C" { #define MUX_MAJ_VERSION 1 #define MUX_MIN_VERSION 3 -#define MUX_REV_VERSION 1 +#define MUX_REV_VERSION 2 // Chunk object. typedef struct WebPChunk WebPChunk; |