Commit: c968b0e5b33d9d63c5806cd652dfb1c38ef0a90c - Fs-scripts (git)

Commit MetaInfo

• Revision: c968b0e5b33d9d63c5806cd652dfb1c38ef0a90c (tree)
• Zeit: 2024-04-18 20:54:25
• Autor: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

update libwebp patch

Ändern Zusammenfassung

• modified: Patches/6.2/2023-09-22-CVE-2023-4863-qtimageformats-6.2.patch

Diff

--- a/Patches/6.2/2023-09-22-CVE-2023-4863-qtimageformats-6.2.patch
+++ b/Patches/6.2/2023-09-22-CVE-2023-4863-qtimageformats-6.2.patch
@@ -1,21 +1,7 @@
 diff -rNuZ a/src/3rdparty/libwebp/AUTHORS b/src/3rdparty/libwebp/AUTHORS
---- a/src/3rdparty/libwebp/AUTHORS	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/AUTHORS	2023-09-14 06:11:07.000000000 +0800
-@@ -11,11 +11,13 @@
- - Djordje Pesut (djordje dot pesut at imgtec 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)
- - James Zern (jzern at google dot com)
- - Jan Engelhardt (jengelh at medozas dot de)
- - Jehan (jehan at girinstud dot io)
-+- Jeremy Maitin-Shepard (jbms at google dot com)
- - Johann Koenig (johann dot koenig at duck dot com)
- - Jovan Zelincevic (jovan dot zelincevic at imgtec dot com)
- - Jyrki Alakuijala (jyrki at google dot com)
-@@ -30,6 +32,7 @@
+--- a/src/3rdparty/libwebp/AUTHORS	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/AUTHORS	2024-03-17 19:08:13.312591300 +0800
+@@ -32,6 +32,7 @@
  - Mislav Bradac (mislavm at google dot com)
  - Nico Weber (thakis at chromium dot org)
  - Noel Chromium (noel at chromium dot org)
@@ -23,7 +9,7 @@ diff -rNuZ a/src/3rdparty/libwebp/AUTHORS b/src/3rdparty/libwebp/AUTHORS
  - 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)
-@@ -45,6 +48,7 @@
+@@ -47,6 +48,7 @@
  - Somnath Banerjee (somnath dot banerjee at gmail dot com)
  - Sriraman Tallam (tmsriram at google dot com)
  - Tamar Levy (tamar dot levy at intel dot com)
@@ -32,9 +18,9 @@ diff -rNuZ a/src/3rdparty/libwebp/AUTHORS b/src/3rdparty/libwebp/AUTHORS
  - Urvang Joshi (urvang at google dot com)
  - Vikas Arora (vikasa at google dot com)
 diff -rNuZ a/src/3rdparty/libwebp/ChangeLog b/src/3rdparty/libwebp/ChangeLog
---- a/src/3rdparty/libwebp/ChangeLog	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/ChangeLog	2023-09-14 06:11:07.000000000 +0800
-@@ -1,8 +1,228 @@
+--- a/src/3rdparty/libwebp/ChangeLog	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/ChangeLog	2024-03-17 19:08:13.312591300 +0800
+@@ -1,3 +1,82 @@
 +1ace578c update NEWS
 +63234c42 bump version to 1.3.2
 +2af26267 Fix OOB write in BuildHuffmanTable.
@@ -114,159 +100,22 @@ diff -rNuZ a/src/3rdparty/libwebp/ChangeLog b/src/3rdparty/libwebp/ChangeLog
 +d9a505ff CMakeLists.txt: allow CMAKE_INSTALL_RPATH to be set empty
 +bdf33d03 Merge tag 'v1.3.0'
 +b5577769 update ChangeLog (tag: v1.3.0-rc1, tag: v1.3.0)
-+0ba77244 update NEWS
-+e763eb1e bump version to 1.3.0
-+2a8686fc update AUTHORS
-+106a57c1 Merge "*/Android.mk: add a check for NDK_ROOT" into main
-+c5e841c4 Merge "extras: WebpToSDL -> WebPToSDL" into main
-+dbc30715 Merge "xcframeworkbuild.sh: bump MACOSX_CATALYST_MIN_VERSION" into main
-+6fc1a9f9 */Android.mk: add a check for NDK_ROOT
-+d3e151fc doc/api.md,webp_js/README.md: Webp -> WebP
-+ed92a626 extras: WebpToSDL -> WebPToSDL
-+6eb0189b xcframeworkbuild.sh: bump MACOSX_CATALYST_MIN_VERSION
-+1d58575b CMake: align .pc variables with autoconf
-+e5fe2cfc webp-lossless-bitstream-spec,cosmetics: reflow paragraphs
-+0ceeeab9 webp-lossless-bitstream-spec: add amendment note
-+607611cd Merge "webp-container-spec: normalize section title case" into main
-+f853685e lossless: SUBTRACT_GREEN -> SUBTRACT_GREEN_TRANSFORM
-+786497e4 webp-lossless-bitstream-spec: fix inv color txfm description
-+c6ac672d webp-lossless-bitstream-spec: fix num_code_lengths check
-+b5700efb webp-lossless-bitstream-spec,cosmetics: grammar/capitalization
-+d8ed8c11 webp-container-spec: normalize section title case
-+52ec0b8f Merge changes Ie975dbb5,Ifc8c93af,I6ca7c5d6,I2e8d66f5,I152477b8 into main
-+5097ef62 webp-container-spec,cosmetics: grammar/capitalization
-+e3ba2b1f webp-lossless-bitstream-spec,cosmetics: reflow abstract
-+1e8e3ded webp-lossless-bitstream-spec: reword abstract re alpha
-+017cb6fa webp-container-spec,cosmetics: normalize range syntax
-+f6a4684b webp-lossless-bitstream-spec,cosmetics: normalize range syntax
-+54ebd5a3 webp-lossless-bitstream-spec: limit dist map lut to 69 cols
-+44741f9c webp-lossless-bitstream-spec: fix dist mapping example
-+fad0ece7 pnmdec.c: use snprintf instead of sprintf
-+3f73e8f7 sharpyuv: add SharpYuvGetVersion()
-+ce2f2d66 SharpYuvConvert: fix a race on SharpYuvGetCPUInfo
-+a458e308 sharpyuv_dsp.h: restore sharpyuv_cpu.h include
-+9ba800a7 Merge changes Id72fbf3b,Ic59d23a2 into main
-+979c0ebb sharpyuv: add SharpYuvGetCPUInfo
-+8bab09a4 Merge "*.pc.in: rename lib_prefix to webp_libname_prefix" into main
-+769387c5 cpu.c,cosmetics: fix a typo
-+a02978c2 sharpyuv/Makefile.am+cmake: add missing -lm
-+28aedcb9 *.pc.in: rename lib_prefix to webp_libname_prefix
-+c42e6d5a configure.ac: export an empty lib_prefix variable
-+dfc843aa Merge "*.pc.in: add lib prefix to lib names w/MSVC" into main
-+2498209b *.pc.in: add lib prefix to lib names w/MSVC
-+ac252b61 Merge "analysis_enc.c: fix a dead store warning" into main
-[phone] analysis_enc.c: fix a dead store warning
-+d34f9b99 Merge "webp-lossless-bitstream-spec: convert BNF to ABNF" into main
-+dc05b4db Merge changes I96bc063c,I45880467,If9e18e5a,I6ee938e4,I0a410b28, ... into main
-+83270c7f webp-container-spec: add prose for rendering process
-+73b19b64 webp-container-spec: note reserved fields MUST be ignored
-+57101d3f webp-lossless-bitstream-spec: improve 'small' color table stmt
-+dfd32e45 webp-container-spec: remove redundant sentence
-+8a6185dd doc/webp-*: fix some punctuation, grammar
-[phone] webp-lossless-bitstream-spec: convert BNF to ABNF
-+d992bb08 cmake: rename cpufeatures target to cpufeatures-webp
-+3ed2b275 webp-container-spec: clarify background color note
-+951c292d webp-container-spec: come too late -> out of order
-+902dd787 webp-container-spec: prefer hex literals
-+a8f6b5ee webp-container-spec: change SHOULD to MUST w/ANIM chunk
-+1dc59435 webp-container-spec: add unknown fields MUST be ignored
-+280a810f webp-container-spec: make padding byte=0 a MUST
-+41f0bf68 webp-container-spec: update note on trailing data
-+6bdd36db webp-container-spec: clarify Chunk Size is in bytes
-+87e36c48 Merge "webp_js/README.md,cosmetics: reflow some lines" into main
-+5b01f321 Merge "Update Windows makefile to build libsharpyuv library." into main
-+19b1a71c webp_js/README.md,cosmetics: reflow some lines
-+780db756 Update Windows makefile to build libsharpyuv library.
-+e407d4b3 CMakeLists.txt: replace GLUT_glut_LIBRARY w/GLUT::GLUT
-+abf73d62 Merge "WebPConfig.cmake.in: add find_dependency(Threads)" into main
-+25807fb4 Merge "cmake: restore compatibility with cmake < 3.12" into main
-+5dbc4bfa WebPConfig.cmake.in: add find_dependency(Threads)
-+b2a175dd Merge "Update wasm instructions." into main
-+cb90f76b Update wasm instructions.
-+02d15258 cmake: restore compatibility with cmake < 3.12
-+5ba046e2 CMake: add_definitions -> add_compile_options
-+e68765af dsp,neon: use vaddv in a few more places
-+e8f83de2 Set libsharpyuv include dir to 'webp' subdirectory.
-+15a91ab1 cmake,cosmetics: apply cmake-format
-+0dd49d1a CMakeLists.txt: set @ONLY in configure_file() calls
-+62b1bfe8 Merge changes I2877e7bb,I777cad70,I15af7d1a,I686e6740,If10538a9, ... into main
-+95c8fe5f Merge changes Iecea3603,I9dc228ab into main
-+e7c805cf picture_csp_enc.c: remove SafeInitSharpYuv
-+6af8845a sharpyuv: prefer webp/types.h
-+639619ce cmake: fix dll exports
-+782ed48c sharpyuv,SharpYuvInit: add mutex protection when available
-+cad0d5ad sharyuv_{neon,sse2}.c: merge WEBP_USE_* sections
-+ef70ee06 add a few missing <stddef.h> includes for NULL
-+f0f9eda4 sharpyuv.h: remove <inttypes.h>
-+9b902cba Merge "picture_csp_enc.c,CheckNonOpaque: rm unneeded local" into main
-+9c1d457c cmake/cpu.cmake: remove unused variable
-+9ac25bcb CMakeLists.txt,win32: match naming convention used by nmake
-+76c353ba picture_csp_enc.c,CheckNonOpaque: rm unneeded local
-+5000de54 Merge "cwebp: fix WebPPictureHasTransparency call" into main
-+e1729309 Merge "WebPPictureHasTransparency: add missing pointer check" into main
-+00ff988a vp8l_enc,AddSingleSubGreen: clear int sanitizer warnings
-+e2fecc22 dsp/lossless_enc.c: clear int sanitizer warnings
-+129cf9e9 dsp/lossless.c: clear int sanitizer warnings
-+ad7d1753 dsp/lossless_enc.c: clear int sanitizer warnings
-+5037220e VP8LSubtractGreenFromBlueAndRed_C: clear int sanitizer warnings
-+2ee786c7 upsampling_sse2.c: clear int sanitizer warnings
-+4cc157d4 ParseOptionalChunks: clear int sanitizer warning
-+892cf033 BuildHuffmanTable: clear int sanitizer warning
-+3a9a4d45 VP8GetSigned: clear int sanitizer warnings
-+704a3d0a dsp/lossless.c: quiet int sanitizer warnings
-+1a6c109c WebPPictureHasTransparency: add missing pointer check
-+c626e7d5 cwebp: fix WebPPictureHasTransparency call
-+866e349c Merge tag 'v1.2.4'
-+c170df38 Merge "Create libsharpyuv.a in makefile.unix." into main
-+9d7ff74a Create libsharpyuv.a in makefile.unix.
+ 0ba77244 update NEWS
+ e763eb1e bump version to 1.3.0
+ 2a8686fc update AUTHORS
+@@ -103,7 +182,7 @@
+ 866e349c Merge tag 'v1.2.4'
+ c170df38 Merge "Create libsharpyuv.a in makefile.unix." into main
+ 9d7ff74a Create libsharpyuv.a in makefile.unix.
+-0d1f1254 update ChangeLog (tag: v1.2.4, origin/1.2.4)
 +0d1f1254 update ChangeLog (tag: v1.2.4)
-+fcbc2d78 Merge "doc/*.txt: restrict code to 69 columns" into main
-+4ad0e189 Merge "webp-container-spec.txt: normalize fourcc spelling" into main
+ fcbc2d78 Merge "doc/*.txt: restrict code to 69 columns" into main
+ 4ad0e189 Merge "webp-container-spec.txt: normalize fourcc spelling" into main
  980d2488 update NEWS
- 9fde8127 bump version to 1.2.4
-+7a0a9935 doc/*.txt: restrict code to 69 columns
-+c040a615 webp-container-spec.txt: normalize fourcc spelling
-+aff1c546 dsp,x86: normalize types w/_mm_cvtsi128_si32 calls
-+ab540ae0 dsp,x86: normalize types w/_mm_cvtsi32_si128 calls
-+8980362e dsp,x86: normalize types w/_mm_set* calls (2)
- e626925c lossless: fix crunch mode w/WEBP_REDUCE_SIZE
-[phone] dsp,x86: normalize types w/_mm_set* calls
-+8a4576ce webp-container-spec.txt: replace &amp; with &
-+db870881 Merge "webp-container-spec.txt: make reserved 0 values a MUST" into main
-+01d7d378 webp-lossless-bitstream-spec: number all sections
-+337cf69f webp-lossless-bitstream-spec: mv Nomenclature after Intro
-+79be856e Merge changes I7111d1f7,I872cd62c into main
-+5b87983a webp-container-spec.txt: make reserved 0 values a MUST
-+bd939123 Merge changes I7a25b1a6,I51b2c2a0,I87d0cbcf,I6ec60af6,I0a3fe9dc into main
-+04764b56 libwebp.pc: add libsharpyuv to requires
-+7deee810 libsharpyuv: add pkg-config file
-+1a64a7e6 webp-container-spec.txt: clarify some SHOULDs
-+bec2c88a webp-container-spec.txt: move ChunkHeader to terminology
-+c9359332 webp-container-spec.txt: clarify 'VP8 '/'XMP ' fourccs
-+70fe3063 webp-container-spec.txt: rightsize table entries
-+ddbf3f3f webp-container-spec.txt: update 'key words' text
-+c151e95b utils.h,WEBP_ALIGN: make bitmask unsigned
-+748e92bb add WebPInt32ToMem
-+3fe15b67 Merge "Build libsharpyuv as a full installable library." into main
-+4f402f34 add WebPMemToInt32
-+a3b68c19 Build libsharpyuv as a full installable library.
-+b4994eaa CMake: set rpath for shared objects
-+94cd7117 Merge "CMake: fix dylib versioning" into main
-+e91451b6 Fix the lossless specs a bit more.
-+231bdfb7 CMake: fix dylib versioning
- bfad7ab5 CMakeLists.txt: correct libwebpmux name in WebPConfig.cmake
- c2e3fd30 Revert "cmake: fix webpmux lib name for cmake linking"
-+7366f7f3 Merge "lossless: fix crunch mode w/WEBP_REDUCE_SIZE" into main
-+84163d9d lossless: fix crunch mode w/WEBP_REDUCE_SIZE
-+d01c1eb3 webp-lossless-bitstream-spec,cosmetics: normalize capitalization
-+8813ca8e Merge tag 'v1.2.3'
- 3c4a0fbf update ChangeLog (tag: v1.2.3)
- 56a480e8 dsp/cpu.h: add missing extern "C"
- 62b45bdd update ChangeLog (tag: v1.2.3-rc1)
 diff -rNuZ a/src/3rdparty/libwebp/NEWS b/src/3rdparty/libwebp/NEWS
---- a/src/3rdparty/libwebp/NEWS	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/NEWS	2023-09-14 06:11:07.000000000 +0800
-@@ -1,3 +1,30 @@
+--- a/src/3rdparty/libwebp/NEWS	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/NEWS	2024-03-17 19:08:13.322351600 +0800
+@@ -1,3 +1,22 @@
 +- 9/13/2023: version 1.3.2
 +  This is a binary compatible release.
 +  * security fix for lossless decoder (chromium: #1479274, CVE-2023-4863)
@@ -286,20 +135,12 @@ diff -rNuZ a/src/3rdparty/libwebp/NEWS b/src/3rdparty/libwebp/NEWS
 +  * CMake fixes (#592, #610, #612)
 +  * further updates to the container and lossless bitstream docs (#581, #611)
 +
-+- 12/16/2022: version 1.3.0
-+  This is a binary compatible release.
-+  * add libsharpyuv, which exposes -sharp_yuv/config.use_sharp_yuv
-+    functionality to other libraries; libwebp now depends on this library
-+  * major updates to the container and lossless bitstream docs (#448, #546,
-+    #551)
-+  * miscellaneous warning, bug & build fixes (#576, #583, #584)
-+
- - 8/4/2022: version 1.2.4
+ - 12/16/2022: version 1.3.0
    This is a binary compatible release.
-   * restore CMake libwebpmux target name for compatibility with 1.2.2 (#575)
+   * add libsharpyuv, which exposes -sharp_yuv/config.use_sharp_yuv
 diff -rNuZ a/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch b/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch
---- a/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch	2024-03-17 17:51:53.649178500 +0800
+--- a/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch	2024-03-17 19:08:13.322351600 +0800
 @@ -1,17 +1,15 @@
 -diff --git a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/cpu.h
 -index 57a40d8..8cf3e92 100644
@@ -343,19 +184,19 @@ diff -rNuZ a/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-n
   #define WEBP_USE_NEON
   #define WEBP_USE_INTRINSICS
 diff -rNuZ a/src/3rdparty/libwebp/qt_attribution.json b/src/3rdparty/libwebp/qt_attribution.json
---- a/src/3rdparty/libwebp/qt_attribution.json	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/qt_attribution.json	2024-03-17 17:44:39.084175500 +0800
+--- a/src/3rdparty/libwebp/qt_attribution.json	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/qt_attribution.json	2024-03-17 19:08:13.322351600 +0800
 @@ -6,7 +6,7 @@
  
      "Description": "WebP is a new image format that provides lossless and lossy compression for images on the web.",
      "Homepage": "https://developers.google.com/speed/webp/",
--    "Version": "1.2.4",
+-    "Version": "1.3.0",
 +    "Version": "1.3.2",
      "License": "BSD 3-clause \"New\" or \"Revised\" License",
      "LicenseId": "BSD-3-Clause",
      "LicenseFile": "COPYING",
 diff -rNuZ a/src/3rdparty/libwebp/README b/src/3rdparty/libwebp/README
---- a/src/3rdparty/libwebp/README	2023-11-01 02:38:38.000000000 +0800
+--- a/src/3rdparty/libwebp/README	2024-03-27 03:34:35.000000000 +0800
 +++ b/src/3rdparty/libwebp/README	1970-01-01 08:00:00.000000000 +0800
 @@ -1,795 +0,0 @@
 -          __   __  ____  ____  ____
@@ -1155,7 +996,7 @@ diff -rNuZ a/src/3rdparty/libwebp/README b/src/3rdparty/libwebp/README
 -Web: https://groups.google.com/a/webmproject.org/group/webp-discuss
 diff -rNuZ a/src/3rdparty/libwebp/README.md b/src/3rdparty/libwebp/README.md
 --- a/src/3rdparty/libwebp/README.md	1970-01-01 08:00:00.000000000 +0800
-+++ b/src/3rdparty/libwebp/README.md	2023-09-14 06:11:07.000000000 +0800
++++ b/src/3rdparty/libwebp/README.md	2024-03-17 19:08:13.328221700 +0800
 @@ -0,0 +1,53 @@
 +# WebP Codec
 +
@@ -1211,265 +1052,32 @@ diff -rNuZ a/src/3rdparty/libwebp/README.md b/src/3rdparty/libwebp/README.md
 +
 +Web: https://groups.google.com/a/webmproject.org/group/webp-discuss
 diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv.c b/src/3rdparty/libwebp/sharpyuv/sharpyuv.c
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv.c	2023-09-14 06:11:07.000000000 +0800
-@@ -15,16 +15,22 @@
- 
- #include <assert.h>
- #include <limits.h>
--#include <math.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- 
- #include "src/webp/types.h"
--#include "src/dsp/cpu.h"
-+#include "sharpyuv/sharpyuv_cpu.h"
- #include "sharpyuv/sharpyuv_dsp.h"
- #include "sharpyuv/sharpyuv_gamma.h"
- 
- //------------------------------------------------------------------------------
-+
-+int SharpYuvGetVersion(void) {
-+  return SHARPYUV_VERSION;
-+}
-+
-+//------------------------------------------------------------------------------
- // Sharp RGB->YUV conversion
- 
- static const int kNumIterations = 4;
-@@ -414,24 +420,46 @@
- }
- #undef SAFE_ALLOC
- 
-+#if defined(WEBP_USE_THREAD) && !defined(_WIN32)
-+#include <pthread.h>  // NOLINT
-+
-+#define LOCK_ACCESS \
-+    static pthread_mutex_t sharpyuv_lock = PTHREAD_MUTEX_INITIALIZER; \
-+    if (pthread_mutex_lock(&sharpyuv_lock)) return
-+#define UNLOCK_ACCESS_AND_RETURN                  \
-+    do {                                          \
-+      (void)pthread_mutex_unlock(&sharpyuv_lock); \
-+      return;                                     \
-+    } while (0)
-+#else  // !(defined(WEBP_USE_THREAD) && !defined(_WIN32))
-+#define LOCK_ACCESS do {} while (0)
-+#define UNLOCK_ACCESS_AND_RETURN return
-+#endif  // defined(WEBP_USE_THREAD) && !defined(_WIN32)
-+
- // Hidden exported init function.
--// By default SharpYuvConvert calls it with NULL. If needed, users can declare
--// it as extern and call it with a VP8CPUInfo function.
--extern void SharpYuvInit(VP8CPUInfo cpu_info_func);
-+// By default SharpYuvConvert calls it with SharpYuvGetCPUInfo. If needed,
-+// users can declare it as extern and call it with an alternate VP8CPUInfo
-+// function.
+--- a/src/3rdparty/libwebp/sharpyuv/sharpyuv.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv.c	2024-03-17 19:08:13.328221700 +0800
+@@ -440,6 +440,7 @@
+ // By default SharpYuvConvert calls it with SharpYuvGetCPUInfo. If needed,
+ // users can declare it as extern and call it with an alternate VP8CPUInfo
+ // function.
 +extern VP8CPUInfo SharpYuvGetCPUInfo;
-+SHARPYUV_EXTERN void SharpYuvInit(VP8CPUInfo cpu_info_func);
+ SHARPYUV_EXTERN void SharpYuvInit(VP8CPUInfo cpu_info_func);
  void SharpYuvInit(VP8CPUInfo cpu_info_func) {
    static volatile VP8CPUInfo sharpyuv_last_cpuinfo_used =
-       (VP8CPUInfo)&sharpyuv_last_cpuinfo_used;
--  const int initialized =
--      (sharpyuv_last_cpuinfo_used != (VP8CPUInfo)&sharpyuv_last_cpuinfo_used);
--  if (cpu_info_func == NULL && initialized) return;
--  if (sharpyuv_last_cpuinfo_used == cpu_info_func) return;
--
--  SharpYuvInitDsp(cpu_info_func);
--  if (!initialized) {
--    SharpYuvInitGammaTables();
-+  LOCK_ACCESS;
-+  // Only update SharpYuvGetCPUInfo when called from external code to avoid a
-+  // race on reading the value in SharpYuvConvert().
-+  if (cpu_info_func != (VP8CPUInfo)&SharpYuvGetCPUInfo) {
-+    SharpYuvGetCPUInfo = cpu_info_func;
-   }
-+  if (sharpyuv_last_cpuinfo_used == SharpYuvGetCPUInfo) {
-+    UNLOCK_ACCESS_AND_RETURN;
-+  }
-+
-+  SharpYuvInitDsp();
-+  SharpYuvInitGammaTables();
- 
--  sharpyuv_last_cpuinfo_used = cpu_info_func;
-+  sharpyuv_last_cpuinfo_used = SharpYuvGetCPUInfo;
-+  UNLOCK_ACCESS_AND_RETURN;
- }
- 
- int SharpYuvConvert(const void* r_ptr, const void* g_ptr,
-@@ -467,7 +495,8 @@
-     // Stride should be even for uint16_t buffers.
-     return 0;
-   }
--  SharpYuvInit(NULL);
-+  // The address of the function pointer is used to avoid a read race.
-+  SharpYuvInit((VP8CPUInfo)&SharpYuvGetCPUInfo);
- 
-   // Add scaling factor to go from rgb_bit_depth to yuv_bit_depth, to the
-   // rgb->yuv conversion matrix.
 diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv.h b/src/3rdparty/libwebp/sharpyuv/sharpyuv.h
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv.h	2023-09-14 06:11:07.000000000 +0800
-@@ -12,16 +12,32 @@
- #ifndef WEBP_SHARPYUV_SHARPYUV_H_
- #define WEBP_SHARPYUV_SHARPYUV_H_
- 
--#include <inttypes.h>
--
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
-+#ifndef SHARPYUV_EXTERN
-+#ifdef WEBP_EXTERN
-+#define SHARPYUV_EXTERN WEBP_EXTERN
-+#else
-+// This explicitly marks library functions and allows for changing the
-+// signature for e.g., Windows DLL builds.
-+#if defined(__GNUC__) && __GNUC__ >= 4
-+#define SHARPYUV_EXTERN extern __attribute__((visibility("default")))
-+#else
-+#if defined(_MSC_VER) && defined(WEBP_DLL)
-+#define SHARPYUV_EXTERN __declspec(dllexport)
-+#else
-+#define SHARPYUV_EXTERN extern
-+#endif /* _MSC_VER && WEBP_DLL */
-+#endif /* __GNUC__ >= 4 */
-+#endif /* WEBP_EXTERN */
-+#endif /* SHARPYUV_EXTERN */
-+
+--- a/src/3rdparty/libwebp/sharpyuv/sharpyuv.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv.h	2024-03-17 19:08:13.328221700 +0800
+@@ -37,7 +37,7 @@
  // SharpYUV API version following the convention from semver.org
  #define SHARPYUV_VERSION_MAJOR 0
--#define SHARPYUV_VERSION_MINOR 1
+ #define SHARPYUV_VERSION_MINOR 2
 -#define SHARPYUV_VERSION_PATCH 0
-+#define SHARPYUV_VERSION_MINOR 2
 +#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) \
-@@ -30,6 +46,10 @@
-   SHARPYUV_MAKE_VERSION(SHARPYUV_VERSION_MAJOR, SHARPYUV_VERSION_MINOR, \
-                         SHARPYUV_VERSION_PATCH)
- 
-+// Returns the library's version number, packed in hexadecimal. See
-+// SHARPYUV_VERSION.
-+SHARPYUV_EXTERN int SharpYuvGetVersion(void);
-+
- // RGB to YUV conversion matrix, in 16 bit fixed point.
- // y = rgb_to_y[0] * r + rgb_to_y[1] * g + rgb_to_y[2] * b + rgb_to_y[3]
- // u = rgb_to_u[0] * r + rgb_to_u[1] * g + rgb_to_u[2] * b + rgb_to_u[3]
-@@ -65,11 +85,13 @@
- //     adjacent pixels on the y, u and v channels. If yuv_bit_depth > 8, they
- //     should be multiples of 2.
- // width, height: width and height of the image in pixels
--int SharpYuvConvert(const void* r_ptr, const void* g_ptr, const void* b_ptr,
--                    int rgb_step, int rgb_stride, int rgb_bit_depth,
--                    void* y_ptr, int y_stride, void* u_ptr, int u_stride,
--                    void* v_ptr, int v_stride, int yuv_bit_depth, int width,
--                    int height, const SharpYuvConversionMatrix* yuv_matrix);
-+SHARPYUV_EXTERN int SharpYuvConvert(const void* r_ptr, const void* g_ptr,
-+                                    const void* b_ptr, int rgb_step,
-+                                    int rgb_stride, int rgb_bit_depth,
-+                                    void* y_ptr, int y_stride, void* u_ptr,
-+                                    int u_stride, void* v_ptr, int v_stride,
-+                                    int yuv_bit_depth, int width, int height,
-+                                    const SharpYuvConversionMatrix* yuv_matrix);
- 
- // TODO(b/194336375): Add YUV444 to YUV420 conversion. Maybe also add 422
- // support (it's rarely used in practice, especially for images).
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_cpu.c b/src/3rdparty/libwebp/sharpyuv/sharpyuv_cpu.c
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_cpu.c	1970-01-01 08:00:00.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_cpu.c	2023-09-14 06:11:07.000000000 +0800
-@@ -0,0 +1,14 @@
-+// Copyright 2022 Google Inc. All Rights Reserved.
-+//
-+// Use of this source code is governed by a BSD-style license
-+// that can be found in the COPYING file in the root of the source
-+// tree. An additional intellectual property rights grant can be found
-+// in the file PATENTS. All contributing project authors may
-+// be found in the AUTHORS file in the root of the source tree.
-+// -----------------------------------------------------------------------------
-+//
-+#include "sharpyuv/sharpyuv_cpu.h"
-+
-+// Include src/dsp/cpu.c to create SharpYuvGetCPUInfo from VP8GetCPUInfo. The
-+// function pointer is renamed in sharpyuv_cpu.h.
-+#include "src/dsp/cpu.c"
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_cpu.h b/src/3rdparty/libwebp/sharpyuv/sharpyuv_cpu.h
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_cpu.h	1970-01-01 08:00:00.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_cpu.h	2023-09-14 06:11:07.000000000 +0800
-@@ -0,0 +1,22 @@
-+// Copyright 2022 Google Inc. All Rights Reserved.
-+//
-+// Use of this source code is governed by a BSD-style license
-+// that can be found in the COPYING file in the root of the source
-+// tree. An additional intellectual property rights grant can be found
-+// in the file PATENTS. All contributing project authors may
-+// be found in the AUTHORS file in the root of the source tree.
-+// -----------------------------------------------------------------------------
-+//
-+#ifndef WEBP_SHARPYUV_SHARPYUV_CPU_H_
-+#define WEBP_SHARPYUV_SHARPYUV_CPU_H_
-+
-+#include "sharpyuv/sharpyuv.h"
-+
-+// Avoid exporting SharpYuvGetCPUInfo in shared object / DLL builds.
-+// SharpYuvInit() replaces the use of the function pointer.
-+#undef WEBP_EXTERN
-+#define WEBP_EXTERN extern
-+#define VP8GetCPUInfo SharpYuvGetCPUInfo
-+#include "src/dsp/cpu.h"
-+
-+#endif  // WEBP_SHARPYUV_SHARPYUV_CPU_H_
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_csp.c b/src/3rdparty/libwebp/sharpyuv/sharpyuv_csp.c
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_csp.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_csp.c	2023-09-14 06:11:07.000000000 +0800
-@@ -13,7 +13,7 @@
- 
- #include <assert.h>
- #include <math.h>
--#include <string.h>
-+#include <stddef.h>
- 
- static int ToFixed16(float f) { return (int)floor(f * (1 << 16) + 0.5f); }
- 
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_csp.h b/src/3rdparty/libwebp/sharpyuv/sharpyuv_csp.h
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_csp.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_csp.h	2023-09-14 06:11:07.000000000 +0800
-@@ -35,8 +35,9 @@
- } SharpYuvColorSpace;
- 
- // Fills in 'matrix' for the given YUVColorSpace.
--void SharpYuvComputeConversionMatrix(const SharpYuvColorSpace* yuv_color_space,
--                                     SharpYuvConversionMatrix* matrix);
-+SHARPYUV_EXTERN void SharpYuvComputeConversionMatrix(
-+    const SharpYuvColorSpace* yuv_color_space,
-+    SharpYuvConversionMatrix* matrix);
- 
- // Enums for precomputed conversion matrices.
- typedef enum {
-@@ -49,7 +50,7 @@
- } SharpYuvMatrixType;
- 
- // Returns a pointer to a matrix for one of the predefined colorspaces.
--const SharpYuvConversionMatrix* SharpYuvGetConversionMatrix(
-+SHARPYUV_EXTERN const SharpYuvConversionMatrix* SharpYuvGetConversionMatrix(
-     SharpYuvMatrixType matrix_type);
- 
- #ifdef __cplusplus
 diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c b/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c	2023-09-14 06:11:07.000000000 +0800
-@@ -16,7 +16,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
--#include "src/dsp/cpu.h"
-+#include "sharpyuv/sharpyuv_cpu.h"
- 
- //-----------------------------------------------------------------------------
- 
-@@ -72,26 +72,28 @@
+--- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c	2024-03-17 19:08:13.332225200 +0800
+@@ -72,6 +72,7 @@
                            const uint16_t* best_y, uint16_t* out,
                            int bit_depth);
  
@@ -1477,140 +1085,9 @@ diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c b/src/3rdparty/libwebp
  extern void InitSharpYuvSSE2(void);
  extern void InitSharpYuvNEON(void);
  
--void SharpYuvInitDsp(VP8CPUInfo cpu_info_func) {
--  (void)cpu_info_func;
--
-+void SharpYuvInitDsp(void) {
- #if !WEBP_NEON_OMIT_C_CODE
-   SharpYuvUpdateY = SharpYuvUpdateY_C;
-   SharpYuvUpdateRGB = SharpYuvUpdateRGB_C;
-   SharpYuvFilterRow = SharpYuvFilterRow_C;
- #endif
- 
-+  if (SharpYuvGetCPUInfo != NULL) {
- #if defined(WEBP_HAVE_SSE2)
--  if (cpu_info_func == NULL || cpu_info_func(kSSE2)) {
--    InitSharpYuvSSE2();
--  }
-+    if (SharpYuvGetCPUInfo(kSSE2)) {
-+      InitSharpYuvSSE2();
-+    }
- #endif  // WEBP_HAVE_SSE2
-+  }
- 
- #if defined(WEBP_HAVE_NEON)
--  if (WEBP_NEON_OMIT_C_CODE || cpu_info_func == NULL || cpu_info_func(kNEON)) {
-+  if (WEBP_NEON_OMIT_C_CODE ||
-+      (SharpYuvGetCPUInfo != NULL && SharpYuvGetCPUInfo(kNEON))) {
-     InitSharpYuvNEON();
-   }
- #endif  // WEBP_HAVE_NEON
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.h b/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.h
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_dsp.h	2023-09-14 06:11:07.000000000 +0800
-@@ -12,9 +12,8 @@
- #ifndef WEBP_SHARPYUV_SHARPYUV_DSP_H_
- #define WEBP_SHARPYUV_SHARPYUV_DSP_H_
- 
--#include <stdint.h>
--
--#include "src/dsp/cpu.h"
-+#include "sharpyuv/sharpyuv_cpu.h"
-+#include "src/webp/types.h"
- 
- extern uint64_t (*SharpYuvUpdateY)(const uint16_t* src, const uint16_t* ref,
-                                    uint16_t* dst, int len, int bit_depth);
-@@ -24,6 +23,6 @@
-                                  const uint16_t* best_y, uint16_t* out,
-                                  int bit_depth);
- 
--void SharpYuvInitDsp(VP8CPUInfo cpu_info_func);
-+void SharpYuvInitDsp(void);
- 
- #endif  // WEBP_SHARPYUV_SHARPYUV_DSP_H_
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_gamma.c b/src/3rdparty/libwebp/sharpyuv/sharpyuv_gamma.c
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_gamma.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_gamma.c	2023-09-14 06:11:07.000000000 +0800
-@@ -13,7 +13,6 @@
- 
- #include <assert.h>
- #include <math.h>
--#include <stdint.h>
- 
- #include "src/webp/types.h"
- 
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_gamma.h b/src/3rdparty/libwebp/sharpyuv/sharpyuv_gamma.h
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_gamma.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_gamma.h	2023-09-14 06:11:07.000000000 +0800
-@@ -12,7 +12,7 @@
- #ifndef WEBP_SHARPYUV_SHARPYUV_GAMMA_H_
- #define WEBP_SHARPYUV_SHARPYUV_GAMMA_H_
- 
--#include <stdint.h>
-+#include "src/webp/types.h"
- 
- #ifdef __cplusplus
- extern "C" {
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_neon.c b/src/3rdparty/libwebp/sharpyuv/sharpyuv_neon.c
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_neon.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_neon.c	2023-09-14 06:11:07.000000000 +0800
-@@ -17,11 +17,6 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <arm_neon.h>
--#endif
--
--extern void InitSharpYuvNEON(void);
--
--#if defined(WEBP_USE_NEON)
- 
- static uint16_t clip_NEON(int v, int max) {
-   return (v < 0) ? 0 : (v > max) ? max : (uint16_t)v;
-@@ -169,6 +164,8 @@
- 
- //------------------------------------------------------------------------------
- 
-+extern void InitSharpYuvNEON(void);
-+
- WEBP_TSAN_IGNORE_FUNCTION void InitSharpYuvNEON(void) {
-   SharpYuvUpdateY = SharpYuvUpdateY_NEON;
-   SharpYuvUpdateRGB = SharpYuvUpdateRGB_NEON;
-@@ -177,6 +174,8 @@
- 
- #else  // !WEBP_USE_NEON
- 
-+extern void InitSharpYuvNEON(void);
-+
- void InitSharpYuvNEON(void) {}
- 
- #endif  // WEBP_USE_NEON
-diff -rNuZ a/src/3rdparty/libwebp/sharpyuv/sharpyuv_sse2.c b/src/3rdparty/libwebp/sharpyuv/sharpyuv_sse2.c
---- a/src/3rdparty/libwebp/sharpyuv/sharpyuv_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/sharpyuv/sharpyuv_sse2.c	2023-09-14 06:11:07.000000000 +0800
-@@ -16,11 +16,6 @@
- #if defined(WEBP_USE_SSE2)
- #include <stdlib.h>
- #include <emmintrin.h>
--#endif
--
--extern void InitSharpYuvSSE2(void);
--
--#if defined(WEBP_USE_SSE2)
- 
- static uint16_t clip_SSE2(int v, int max) {
-   return (v < 0) ? 0 : (v > max) ? max : (uint16_t)v;
-@@ -199,6 +194,8 @@
- }
- #else  // !WEBP_USE_SSE2
- 
-+extern void InitSharpYuvSSE2(void);
-+
- void InitSharpYuvSSE2(void) {}
- 
- #endif  // WEBP_USE_SSE2
 diff -rNuZ a/src/3rdparty/libwebp/src/dec/tree_dec.c b/src/3rdparty/libwebp/src/dec/tree_dec.c
---- a/src/3rdparty/libwebp/src/dec/tree_dec.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dec/tree_dec.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dec/tree_dec.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dec/tree_dec.c	2024-03-17 19:08:13.332225200 +0800
 @@ -12,10 +12,11 @@
  // Author: Skal ([e-mail])
  
@@ -1625,8 +1102,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dec/tree_dec.c b/src/3rdparty/libwebp/src/
  #define USE_GENERIC_TREE 1   // ALTERNATE_CODE
  #else
 diff -rNuZ a/src/3rdparty/libwebp/src/dec/vp8_dec.c b/src/3rdparty/libwebp/src/dec/vp8_dec.c
---- a/src/3rdparty/libwebp/src/dec/vp8_dec.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dec/vp8_dec.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dec/vp8_dec.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dec/vp8_dec.c	2024-03-17 19:08:13.342361800 +0800
 @@ -494,6 +494,8 @@
    return 16;
  }
@@ -1637,22 +1114,20 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dec/vp8_dec.c b/src/3rdparty/libwebp/src/d
    if (VP8GetCPUInfo != NULL && VP8GetCPUInfo(kSlowSSSE3)) {
      GetCoeffs = GetCoeffsAlt;
 diff -rNuZ a/src/3rdparty/libwebp/src/dec/vp8i_dec.h b/src/3rdparty/libwebp/src/dec/vp8i_dec.h
---- a/src/3rdparty/libwebp/src/dec/vp8i_dec.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dec/vp8i_dec.h	2023-09-14 06:11:07.000000000 +0800
-@@ -31,8 +31,8 @@
- 
+--- a/src/3rdparty/libwebp/src/dec/vp8i_dec.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dec/vp8i_dec.h	2024-03-17 19:08:13.343872800 +0800
+@@ -32,7 +32,7 @@
  // version numbers
  #define DEC_MAJ_VERSION 1
--#define DEC_MIN_VERSION 2
--#define DEC_REV_VERSION 4
-+#define DEC_MIN_VERSION 3
+ #define DEC_MIN_VERSION 3
+-#define DEC_REV_VERSION 0
 +#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 -rNuZ a/src/3rdparty/libwebp/src/dec/vp8l_dec.c b/src/3rdparty/libwebp/src/dec/vp8l_dec.c
---- a/src/3rdparty/libwebp/src/dec/vp8l_dec.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dec/vp8l_dec.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dec/vp8l_dec.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dec/vp8l_dec.c	2024-03-17 19:08:13.343872800 +0800
 @@ -253,11 +253,11 @@
    int symbol;
    int max_symbol;
@@ -1779,15 +1254,6 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dec/vp8l_dec.c b/src/3rdparty/libwebp/src/
      VP8LHtreeGroupsFree(htree_groups);
    }
    return ok;
-@@ -1336,7 +1340,7 @@
-        ok = ok && ExpandColorMap(num_colors, transform);
-       break;
-     }
--    case SUBTRACT_GREEN:
-+    case SUBTRACT_GREEN_TRANSFORM:
-       break;
-     default:
-       assert(0);    // can't happen
 @@ -1358,7 +1362,7 @@
    assert(hdr != NULL);
  
@@ -1807,8 +1273,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dec/vp8l_dec.c b/src/3rdparty/libwebp/src/
    assert(dec->hdr_.num_htree_groups_ > 0);
  
 diff -rNuZ a/src/3rdparty/libwebp/src/dec/vp8li_dec.h b/src/3rdparty/libwebp/src/dec/vp8li_dec.h
---- a/src/3rdparty/libwebp/src/dec/vp8li_dec.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dec/vp8li_dec.h	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dec/vp8li_dec.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dec/vp8li_dec.h	2024-03-17 19:08:13.343872800 +0800
 @@ -51,7 +51,7 @@
    uint32_t*       huffman_image_;
    int             num_htree_groups_;
@@ -1819,17 +1285,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dec/vp8li_dec.h b/src/3rdparty/libwebp/src
  
  typedef struct VP8LDecoder VP8LDecoder;
 diff -rNuZ a/src/3rdparty/libwebp/src/dec/webp_dec.c b/src/3rdparty/libwebp/src/dec/webp_dec.c
---- a/src/3rdparty/libwebp/src/dec/webp_dec.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dec/webp_dec.c	2023-09-14 06:11:07.000000000 +0800
-@@ -179,7 +179,7 @@
-       return VP8_STATUS_BITSTREAM_ERROR;          // Not a valid chunk size.
-     }
-     // For odd-sized chunk-payload, there's one byte padding at the end.
--    disk_chunk_size = (CHUNK_HEADER_SIZE + chunk_size + 1) & ~1;
-+    disk_chunk_size = (CHUNK_HEADER_SIZE + chunk_size + 1) & ~1u;
-     total_size += disk_chunk_size;
- 
-     // Check that total bytes skipped so far does not exceed riff_size.
+--- a/src/3rdparty/libwebp/src/dec/webp_dec.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dec/webp_dec.c	2024-03-17 19:08:13.343872800 +0800
 @@ -658,19 +658,26 @@
  uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size,
                         int* width, int* height, uint8_t** u, uint8_t** v,
@@ -1870,22 +1327,20 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dec/webp_dec.c b/src/3rdparty/libwebp/src/
  
  static void DefaultFeatures(WebPBitstreamFeatures* const features) {
 diff -rNuZ a/src/3rdparty/libwebp/src/demux/demux.c b/src/3rdparty/libwebp/src/demux/demux.c
---- a/src/3rdparty/libwebp/src/demux/demux.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/demux/demux.c	2023-09-14 06:11:07.000000000 +0800
-@@ -24,8 +24,8 @@
- #include "src/webp/format_constants.h"
+--- a/src/3rdparty/libwebp/src/demux/demux.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/demux/demux.c	2024-03-17 19:08:13.343872800 +0800
+@@ -25,7 +25,7 @@
  
  #define DMUX_MAJ_VERSION 1
--#define DMUX_MIN_VERSION 2
--#define DMUX_REV_VERSION 4
-+#define DMUX_MIN_VERSION 3
+ #define DMUX_MIN_VERSION 3
+-#define DMUX_REV_VERSION 0
 +#define DMUX_REV_VERSION 2
  
  typedef struct {
    size_t start_;        // start location of the data
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/alpha_processing.c b/src/3rdparty/libwebp/src/dsp/alpha_processing.c
---- a/src/3rdparty/libwebp/src/dsp/alpha_processing.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/alpha_processing.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/alpha_processing.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/alpha_processing.c	2024-03-17 19:08:13.343872800 +0800
 @@ -425,6 +425,7 @@
  //------------------------------------------------------------------------------
  // Init function
@@ -1894,64 +1349,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/alpha_processing.c b/src/3rdparty/libw
  extern void WebPInitAlphaProcessingMIPSdspR2(void);
  extern void WebPInitAlphaProcessingSSE2(void);
  extern void WebPInitAlphaProcessingSSE41(void);
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/alpha_processing_sse2.c b/src/3rdparty/libwebp/src/dsp/alpha_processing_sse2.c
---- a/src/3rdparty/libwebp/src/dsp/alpha_processing_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/alpha_processing_sse2.c	2023-09-14 06:11:07.000000000 +0800
-@@ -26,8 +26,8 @@
-   uint32_t alpha_and = 0xff;
-   int i, j;
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i rgb_mask = _mm_set1_epi32(0xffffff00u);  // to preserve RGB
--  const __m128i all_0xff = _mm_set_epi32(0, 0, ~0u, ~0u);
-+  const __m128i rgb_mask = _mm_set1_epi32((int)0xffffff00);  // to preserve RGB
-+  const __m128i all_0xff = _mm_set_epi32(0, 0, ~0, ~0);
-   __m128i all_alphas = all_0xff;
- 
-   // We must be able to access 3 extra bytes after the last written byte
-@@ -106,8 +106,8 @@
-   // value is not 0xff if any of the alpha[] is not equal to 0xff.
-   uint32_t alpha_and = 0xff;
-   int i, j;
--  const __m128i a_mask = _mm_set1_epi32(0xffu);  // to preserve alpha
--  const __m128i all_0xff = _mm_set_epi32(0, 0, ~0u, ~0u);
-+  const __m128i a_mask = _mm_set1_epi32(0xff);  // to preserve alpha
-+  const __m128i all_0xff = _mm_set_epi32(0, 0, ~0, ~0);
-   __m128i all_alphas = all_0xff;
- 
-   // We must be able to access 3 extra bytes after the last written byte
-@@ -178,7 +178,7 @@
- static void ApplyAlphaMultiply_SSE2(uint8_t* rgba, int alpha_first,
-                                     int w, int h, int stride) {
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i kMult = _mm_set1_epi16(0x8081u);
-+  const __m128i kMult = _mm_set1_epi16((short)0x8081);
-   const __m128i kMask = _mm_set_epi16(0, 0xff, 0xff, 0, 0, 0xff, 0xff, 0);
-   const int kSpan = 4;
-   while (h-- > 0) {
-@@ -267,7 +267,7 @@
- }
- 
- static void AlphaReplace_SSE2(uint32_t* src, int length, uint32_t color) {
--  const __m128i m_color = _mm_set1_epi32(color);
-+  const __m128i m_color = _mm_set1_epi32((int)color);
-   const __m128i zero = _mm_setzero_si128();
-   int i = 0;
-   for (; i + 8 <= length; i += 8) {
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/alpha_processing_sse41.c b/src/3rdparty/libwebp/src/dsp/alpha_processing_sse41.c
---- a/src/3rdparty/libwebp/src/dsp/alpha_processing_sse41.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/alpha_processing_sse41.c	2023-09-14 06:11:07.000000000 +0800
-@@ -26,7 +26,7 @@
-   // value is not 0xff if any of the alpha[] is not equal to 0xff.
-   uint32_t alpha_and = 0xff;
-   int i, j;
--  const __m128i all_0xff = _mm_set1_epi32(~0u);
-+  const __m128i all_0xff = _mm_set1_epi32(~0);
-   __m128i all_alphas = all_0xff;
- 
-   // We must be able to access 3 extra bytes after the last written byte
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cost.c b/src/3rdparty/libwebp/src/dsp/cost.c
---- a/src/3rdparty/libwebp/src/dsp/cost.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/cost.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/cost.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/cost.c	2024-03-17 19:08:13.352376100 +0800
 @@ -374,6 +374,7 @@
  VP8GetResidualCostFunc VP8GetResidualCost;
  VP8SetResidualCoeffsFunc VP8SetResidualCoeffs;
@@ -1961,8 +1361,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cost.c b/src/3rdparty/libwebp/src/dsp/
  extern void VP8EncDspCostInitMIPSdspR2(void);
  extern void VP8EncDspCostInitSSE2(void);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cost_neon.c b/src/3rdparty/libwebp/src/dsp/cost_neon.c
---- a/src/3rdparty/libwebp/src/dsp/cost_neon.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/cost_neon.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/cost_neon.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/cost_neon.c	2024-03-17 19:08:13.352376100 +0800
 @@ -29,7 +29,7 @@
    const uint8x16_t eob = vcombine_u8(vqmovn_u16(eob_0), vqmovn_u16(eob_1));
    const uint8x16_t masked = vandq_u8(eob, vld1q_u8(position));
@@ -1982,8 +1382,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cost_neon.c b/src/3rdparty/libwebp/src
    res->coeffs = coeffs;
  }
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.c b/src/3rdparty/libwebp/src/dsp/cpu.c
---- a/src/3rdparty/libwebp/src/dsp/cpu.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/cpu.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/cpu.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/cpu.c	2024-03-17 19:08:13.352376100 +0800
 @@ -173,6 +173,7 @@
    }
    return 0;
@@ -2000,7 +1400,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.c b/src/3rdparty/libwebp/src/dsp/c
  VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo;
  #elif defined(EMSCRIPTEN) // also needs to be before generic NEON test
  // Use compile flags as an indicator of SIMD support instead of a runtime check.
-@@ -208,11 +210,12 @@
+@@ -208,6 +210,7 @@
    }
    return 0;
  }
@@ -2008,12 +1408,6 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.c b/src/3rdparty/libwebp/src/dsp/c
  VP8CPUInfo VP8GetCPUInfo = wasmCPUInfo;
  #elif defined(WEBP_HAVE_NEON)
  // In most cases this function doesn't check for NEON support (it's assumed by
- // the configuration), but enables turning off NEON at runtime, for testing
--// purposes, by setting VP8DecGetCPUInfo = NULL.
-+// purposes, by setting VP8GetCPUInfo = NULL.
- static int armCPUInfo(CPUFeature feature) {
-   if (feature != kNEON) return 0;
- #if defined(__linux__) && defined(WEBP_HAVE_NEON_RTCD)
 @@ -236,6 +239,7 @@
    return 1;
  #endif
@@ -2033,18 +1427,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.c b/src/3rdparty/libwebp/src/dsp/c
  VP8CPUInfo VP8GetCPUInfo = NULL;
  #endif
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/cpu.h
---- a/src/3rdparty/libwebp/src/dsp/cpu.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/cpu.h	2024-03-17 17:50:33.634580700 +0800
-@@ -14,6 +14,8 @@
- #ifndef WEBP_DSP_CPU_H_
- #define WEBP_DSP_CPU_H_
- 
-+#include <stddef.h>
-+
- #include <qglobal.h>
- 
- #ifdef HAVE_CONFIG_H
-@@ -43,6 +45,9 @@
+--- a/src/3rdparty/libwebp/src/dsp/cpu.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/cpu.h	2024-03-17 19:08:13.352376100 +0800
+@@ -45,6 +45,9 @@
  #define __has_builtin(x) 0
  #endif
  
@@ -2054,7 +1439,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/c
  #if !defined(HAVE_CONFIG_H)
  #if defined(_MSC_VER) && _MSC_VER > 1310 && \
      (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__)
-@@ -80,6 +85,9 @@
+@@ -82,6 +85,9 @@
  #undef WEBP_MSC_SSE41
  #undef WEBP_MSC_SSE2
  
@@ -2064,7 +1449,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/c
  // The intrinsics currently cause compiler errors with arm-nacl-gcc and the
  // inline assembly would need to be modified for use with Native Client.
  #if ((defined(__ARM_NEON__) || defined(__aarch64__)) &&       \
-@@ -98,17 +106,27 @@
+@@ -100,17 +106,27 @@
  // inclusion of arm64_neon.h; Visual Studio 2019 includes this file in
  // arm_neon.h. Compile errors were seen with Visual Studio 2019 16.4 with
  // vtbl4_u8(); a fix was made in 16.6.
@@ -2094,7 +1479,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/c
  #if defined(__mips__) && !defined(__mips64) && defined(__mips_isa_rev) && \
      (__mips_isa_rev >= 1) && (__mips_isa_rev < 6)
  #define WEBP_USE_MIPS32
-@@ -124,6 +142,8 @@
+@@ -126,6 +142,8 @@
  #define WEBP_USE_MSA
  #endif
  
@@ -2103,7 +1488,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/c
  #ifndef WEBP_DSP_OMIT_C_CODE
  #define WEBP_DSP_OMIT_C_CODE 1
  #endif
-@@ -134,13 +154,14 @@
+@@ -136,13 +154,14 @@
  #define WEBP_NEON_OMIT_C_CODE 0
  #endif
  
@@ -2120,7 +1505,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/c
  // This macro prevents thread_sanitizer from reporting known concurrent writes.
  #define WEBP_TSAN_IGNORE_FUNCTION
  #if defined(__has_feature)
-@@ -242,16 +263,7 @@
+@@ -244,16 +263,7 @@
    kMSA
  } CPUFeature;
  
@@ -2138,8 +1523,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/cpu.h b/src/3rdparty/libwebp/src/dsp/c
  
  #endif  // WEBP_DSP_CPU_H_
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/dec.c b/src/3rdparty/libwebp/src/dsp/dec.c
---- a/src/3rdparty/libwebp/src/dsp/dec.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/dec.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/dec.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/dec.c	2024-03-17 19:08:13.352376100 +0800
 @@ -734,6 +734,7 @@
  void (*VP8DitherCombine8x8)(const uint8_t* dither, uint8_t* dst,
                              int dst_stride);
@@ -2149,8 +1534,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/dec.c b/src/3rdparty/libwebp/src/dsp/d
  extern void VP8DspInitSSE41(void);
  extern void VP8DspInitNEON(void);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/dec_neon.c b/src/3rdparty/libwebp/src/dsp/dec_neon.c
---- a/src/3rdparty/libwebp/src/dsp/dec_neon.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/dec_neon.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/dec_neon.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/dec_neon.c	2024-03-17 19:08:13.359990700 +0800
 @@ -1428,7 +1428,7 @@
  
    if (do_top) {
@@ -2169,237 +1554,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/dec_neon.c b/src/3rdparty/libwebp/src/
      const uint16_t p3 = vaddlvq_u8(A);
      sum_top = vdupq_n_u16(p3);
  #else
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/dec_sse2.c b/src/3rdparty/libwebp/src/dsp/dec_sse2.c
---- a/src/3rdparty/libwebp/src/dsp/dec_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/dec_sse2.c	2023-09-14 06:11:07.000000000 +0800
-@@ -158,10 +158,10 @@
-       dst3 = _mm_loadl_epi64((__m128i*)(dst + 3 * BPS));
-     } else {
-       // Load four bytes/pixels per line.
--      dst0 = _mm_cvtsi32_si128(WebPMemToUint32(dst + 0 * BPS));
--      dst1 = _mm_cvtsi32_si128(WebPMemToUint32(dst + 1 * BPS));
--      dst2 = _mm_cvtsi32_si128(WebPMemToUint32(dst + 2 * BPS));
--      dst3 = _mm_cvtsi32_si128(WebPMemToUint32(dst + 3 * BPS));
-+      dst0 = _mm_cvtsi32_si128(WebPMemToInt32(dst + 0 * BPS));
-+      dst1 = _mm_cvtsi32_si128(WebPMemToInt32(dst + 1 * BPS));
-+      dst2 = _mm_cvtsi32_si128(WebPMemToInt32(dst + 2 * BPS));
-+      dst3 = _mm_cvtsi32_si128(WebPMemToInt32(dst + 3 * BPS));
-     }
-     // Convert to 16b.
-     dst0 = _mm_unpacklo_epi8(dst0, zero);
-@@ -187,10 +187,10 @@
-       _mm_storel_epi64((__m128i*)(dst + 3 * BPS), dst3);
-     } else {
-       // Store four bytes/pixels per line.
--      WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(dst0));
--      WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(dst1));
--      WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(dst2));
--      WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(dst3));
-+      WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(dst0));
-+      WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(dst1));
-+      WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(dst2));
-+      WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(dst3));
-     }
-   }
- }
-@@ -213,10 +213,10 @@
-   const __m128i m3 = _mm_subs_epi16(B, d4);
-   const __m128i zero = _mm_setzero_si128();
-   // Load the source pixels.
--  __m128i dst0 = _mm_cvtsi32_si128(WebPMemToUint32(dst + 0 * BPS));
--  __m128i dst1 = _mm_cvtsi32_si128(WebPMemToUint32(dst + 1 * BPS));
--  __m128i dst2 = _mm_cvtsi32_si128(WebPMemToUint32(dst + 2 * BPS));
--  __m128i dst3 = _mm_cvtsi32_si128(WebPMemToUint32(dst + 3 * BPS));
-+  __m128i dst0 = _mm_cvtsi32_si128(WebPMemToInt32(dst + 0 * BPS));
-+  __m128i dst1 = _mm_cvtsi32_si128(WebPMemToInt32(dst + 1 * BPS));
-+  __m128i dst2 = _mm_cvtsi32_si128(WebPMemToInt32(dst + 2 * BPS));
-+  __m128i dst3 = _mm_cvtsi32_si128(WebPMemToInt32(dst + 3 * BPS));
-   // Convert to 16b.
-   dst0 = _mm_unpacklo_epi8(dst0, zero);
-   dst1 = _mm_unpacklo_epi8(dst1, zero);
-@@ -233,10 +233,10 @@
-   dst2 = _mm_packus_epi16(dst2, dst2);
-   dst3 = _mm_packus_epi16(dst3, dst3);
-   // Store the results.
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(dst0));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(dst1));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(dst2));
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(dst3));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(dst0));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(dst1));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(dst2));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(dst3));
- }
- #undef MUL
- #endif   // USE_TRANSFORM_AC3
-@@ -477,11 +477,11 @@
-   // A0 = 63 62 61 60 23 22 21 20 43 42 41 40 03 02 01 00
-   // A1 = 73 72 71 70 33 32 31 30 53 52 51 50 13 12 11 10
-   const __m128i A0 = _mm_set_epi32(
--      WebPMemToUint32(&b[6 * stride]), WebPMemToUint32(&b[2 * stride]),
--      WebPMemToUint32(&b[4 * stride]), WebPMemToUint32(&b[0 * stride]));
-+      WebPMemToInt32(&b[6 * stride]), WebPMemToInt32(&b[2 * stride]),
-+      WebPMemToInt32(&b[4 * stride]), WebPMemToInt32(&b[0 * stride]));
-   const __m128i A1 = _mm_set_epi32(
--      WebPMemToUint32(&b[7 * stride]), WebPMemToUint32(&b[3 * stride]),
--      WebPMemToUint32(&b[5 * stride]), WebPMemToUint32(&b[1 * stride]));
-+      WebPMemToInt32(&b[7 * stride]), WebPMemToInt32(&b[3 * stride]),
-+      WebPMemToInt32(&b[5 * stride]), WebPMemToInt32(&b[1 * stride]));
- 
-   // B0 = 53 43 52 42 51 41 50 40 13 03 12 02 11 01 10 00
-   // B1 = 73 63 72 62 71 61 70 60 33 23 32 22 31 21 30 20
-@@ -540,7 +540,7 @@
-                                       uint8_t* dst, int stride) {
-   int i;
-   for (i = 0; i < 4; ++i, dst += stride) {
--    WebPUint32ToMem(dst, _mm_cvtsi128_si32(*x));
-+    WebPInt32ToMem(dst, _mm_cvtsi128_si32(*x));
-     *x = _mm_srli_si128(*x, 4);
-   }
- }
-@@ -908,10 +908,10 @@
-   const __m128i lsb = _mm_and_si128(_mm_xor_si128(ABCDEFGH, CDEFGH00), one);
-   const __m128i b = _mm_subs_epu8(a, lsb);
-   const __m128i avg = _mm_avg_epu8(b, BCDEFGH0);
--  const uint32_t vals = _mm_cvtsi128_si32(avg);
-+  const int vals = _mm_cvtsi128_si32(avg);
-   int i;
-   for (i = 0; i < 4; ++i) {
--    WebPUint32ToMem(dst + i * BPS, vals);
-+    WebPInt32ToMem(dst + i * BPS, vals);
-   }
- }
- 
-@@ -925,10 +925,10 @@
-   const __m128i lsb = _mm_and_si128(_mm_xor_si128(ABCDEFGH, CDEFGHH0), one);
-   const __m128i avg2 = _mm_subs_epu8(avg1, lsb);
-   const __m128i abcdefg = _mm_avg_epu8(avg2, BCDEFGH0);
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               abcdefg    ));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 1)));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 2)));
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 3)));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               abcdefg    ));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 1)));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 2)));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 3)));
- }
- 
- static void VR4_SSE2(uint8_t* dst) {   // Vertical-Right
-@@ -946,10 +946,10 @@
-   const __m128i lsb = _mm_and_si128(_mm_xor_si128(IXABCD, ABCD0), one);
-   const __m128i avg2 = _mm_subs_epu8(avg1, lsb);
-   const __m128i efgh = _mm_avg_epu8(avg2, XABCD);
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               abcd    ));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(               efgh    ));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_slli_si128(abcd, 1)));
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_slli_si128(efgh, 1)));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               abcd    ));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(               efgh    ));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_slli_si128(abcd, 1)));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_slli_si128(efgh, 1)));
- 
-   // these two are hard to implement in SSE2, so we keep the C-version:
-   DST(0, 2) = AVG3(J, I, X);
-@@ -970,11 +970,12 @@
-   const __m128i abbc = _mm_or_si128(ab, bc);
-   const __m128i lsb2 = _mm_and_si128(abbc, lsb1);
-   const __m128i avg4 = _mm_subs_epu8(avg3, lsb2);
--  const uint32_t extra_out = _mm_cvtsi128_si32(_mm_srli_si128(avg4, 4));
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               avg1    ));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(               avg4    ));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(avg1, 1)));
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(avg4, 1)));
-+  const uint32_t extra_out =
-+      (uint32_t)_mm_cvtsi128_si32(_mm_srli_si128(avg4, 4));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               avg1    ));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(               avg4    ));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(avg1, 1)));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(avg4, 1)));
- 
-   // these two are hard to get and irregular
-   DST(3, 2) = (extra_out >> 0) & 0xff;
-@@ -990,7 +991,7 @@
-   const uint32_t K = dst[-1 + 2 * BPS];
-   const uint32_t L = dst[-1 + 3 * BPS];
-   const __m128i LKJI_____ =
--      _mm_cvtsi32_si128(L | (K << 8) | (J << 16) | (I << 24));
-+      _mm_cvtsi32_si128((int)(L | (K << 8) | (J << 16) | (I << 24)));
-   const __m128i LKJIXABCD = _mm_or_si128(LKJI_____, ____XABCD);
-   const __m128i KJIXABCD_ = _mm_srli_si128(LKJIXABCD, 1);
-   const __m128i JIXABCD__ = _mm_srli_si128(LKJIXABCD, 2);
-@@ -998,10 +999,10 @@
-   const __m128i lsb = _mm_and_si128(_mm_xor_si128(JIXABCD__, LKJIXABCD), one);
-   const __m128i avg2 = _mm_subs_epu8(avg1, lsb);
-   const __m128i abcdefg = _mm_avg_epu8(avg2, KJIXABCD_);
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(               abcdefg    ));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 1)));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 2)));
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 3)));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(               abcdefg    ));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 1)));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 2)));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 3)));
- }
- 
- #undef DST
-@@ -1015,13 +1016,13 @@
-   const __m128i zero = _mm_setzero_si128();
-   int y;
-   if (size == 4) {
--    const __m128i top_values = _mm_cvtsi32_si128(WebPMemToUint32(top));
-+    const __m128i top_values = _mm_cvtsi32_si128(WebPMemToInt32(top));
-     const __m128i top_base = _mm_unpacklo_epi8(top_values, zero);
-     for (y = 0; y < 4; ++y, dst += BPS) {
-       const int val = dst[-1] - top[-1];
-       const __m128i base = _mm_set1_epi16(val);
-       const __m128i out = _mm_packus_epi16(_mm_add_epi16(base, top_base), zero);
--      WebPUint32ToMem(dst, _mm_cvtsi128_si32(out));
-+      WebPInt32ToMem(dst, _mm_cvtsi128_si32(out));
-     }
-   } else if (size == 8) {
-     const __m128i top_values = _mm_loadl_epi64((const __m128i*)top);
-@@ -1062,7 +1063,7 @@
- static void HE16_SSE2(uint8_t* dst) {     // horizontal
-   int j;
-   for (j = 16; j > 0; --j) {
--    const __m128i values = _mm_set1_epi8(dst[-1]);
-+    const __m128i values = _mm_set1_epi8((char)dst[-1]);
-     _mm_storeu_si128((__m128i*)dst, values);
-     dst += BPS;
-   }
-@@ -1070,7 +1071,7 @@
- 
- static WEBP_INLINE void Put16_SSE2(uint8_t v, uint8_t* dst) {
-   int j;
--  const __m128i values = _mm_set1_epi8(v);
-+  const __m128i values = _mm_set1_epi8((char)v);
-   for (j = 0; j < 16; ++j) {
-     _mm_storeu_si128((__m128i*)(dst + j * BPS), values);
-   }
-@@ -1130,7 +1131,7 @@
- // helper for chroma-DC predictions
- static WEBP_INLINE void Put8x8uv_SSE2(uint8_t v, uint8_t* dst) {
-   int j;
--  const __m128i values = _mm_set1_epi8(v);
-+  const __m128i values = _mm_set1_epi8((char)v);
-   for (j = 0; j < 8; ++j) {
-     _mm_storel_epi64((__m128i*)(dst + j * BPS), values);
-   }
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/dec_sse41.c b/src/3rdparty/libwebp/src/dsp/dec_sse41.c
---- a/src/3rdparty/libwebp/src/dsp/dec_sse41.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/dec_sse41.c	2023-09-14 06:11:07.000000000 +0800
-@@ -23,7 +23,7 @@
-   int j;
-   const __m128i kShuffle3 = _mm_set1_epi8(3);
-   for (j = 16; j > 0; --j) {
--    const __m128i in = _mm_cvtsi32_si128(WebPMemToUint32(dst - 4));
-+    const __m128i in = _mm_cvtsi32_si128(WebPMemToInt32(dst - 4));
-     const __m128i values = _mm_shuffle_epi8(in, kShuffle3);
-     _mm_storeu_si128((__m128i*)dst, values);
-     dst += BPS;
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/enc.c b/src/3rdparty/libwebp/src/dsp/enc.c
---- a/src/3rdparty/libwebp/src/dsp/enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/enc.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/enc.c	2024-03-17 19:08:13.362495000 +0800
 @@ -732,6 +732,7 @@
  VP8BlockCopy VP8Copy4x4;
  VP8BlockCopy VP8Copy16x8;
@@ -2409,26 +1566,18 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/enc.c b/src/3rdparty/libwebp/src/dsp/e
  extern void VP8EncDspInitSSE41(void);
  extern void VP8EncDspInitNEON(void);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/enc_neon.c b/src/3rdparty/libwebp/src/dsp/enc_neon.c
---- a/src/3rdparty/libwebp/src/dsp/enc_neon.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/enc_neon.c	2023-09-14 06:11:07.000000000 +0800
-@@ -764,9 +764,14 @@
+--- a/src/3rdparty/libwebp/src/dsp/enc_neon.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/enc_neon.c	2024-03-17 19:08:13.362495000 +0800
+@@ -764,7 +764,7 @@
  
  // Horizontal sum of all four uint32_t values in 'sum'.
  static int SumToInt_NEON(uint32x4_t sum) {
+-#if defined(__aarch64__)
 +#if WEBP_AARCH64
-+  return (int)vaddvq_u32(sum);
-+#else
+   return (int)vaddvq_u32(sum);
+ #else
    const uint64x2_t sum2 = vpaddlq_u32(sum);
--  const uint64_t sum3 = vgetq_lane_u64(sum2, 0) + vgetq_lane_u64(sum2, 1);
--  return (int)sum3;
-+  const uint32x2_t sum3 = vadd_u32(vreinterpret_u32_u64(vget_low_u64(sum2)),
-+                                   vreinterpret_u32_u64(vget_high_u64(sum2)));
-+  return (int)vget_lane_u32(sum3, 0);
-+#endif
- }
- 
- static int SSE16x16_NEON(const uint8_t* a, const uint8_t* b) {
-@@ -860,7 +865,7 @@
+@@ -865,7 +865,7 @@
    uint8x8x4_t shuffles;
    // vtbl?_u8 are marked unavailable for iOS arm64 with Xcode < 6.3, use
    // non-standard versions there.
@@ -2438,8 +1587,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/enc_neon.c b/src/3rdparty/libwebp/src/
    uint8x16x2_t all_out;
    INIT_VECTOR2(all_out, vreinterpretq_u8_s16(out0), vreinterpretq_u8_s16(out1));
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/enc_sse2.c b/src/3rdparty/libwebp/src/dsp/enc_sse2.c
---- a/src/3rdparty/libwebp/src/dsp/enc_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/enc_sse2.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/enc_sse2.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/enc_sse2.c	2024-03-17 19:08:13.362495000 +0800
 @@ -25,9 +25,160 @@
  //------------------------------------------------------------------------------
  // Transforms (Paragraph 14.4)
@@ -2663,10 +1812,10 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/enc_sse2.c b/src/3rdparty/libwebp/src/
 -      ref3 = _mm_loadl_epi64((const __m128i*)&ref[3 * BPS]);
 -    } else {
 -      // Load four bytes/pixels per line.
--      ref0 = _mm_cvtsi32_si128(WebPMemToUint32(&ref[0 * BPS]));
--      ref1 = _mm_cvtsi32_si128(WebPMemToUint32(&ref[1 * BPS]));
--      ref2 = _mm_cvtsi32_si128(WebPMemToUint32(&ref[2 * BPS]));
--      ref3 = _mm_cvtsi32_si128(WebPMemToUint32(&ref[3 * BPS]));
+-      ref0 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[0 * BPS]));
+-      ref1 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[1 * BPS]));
+-      ref2 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[2 * BPS]));
+-      ref3 = _mm_cvtsi32_si128(WebPMemToInt32(&ref[3 * BPS]));
 -    }
 +    // Load eight bytes/pixels per line.
 +    ref0 = _mm_loadl_epi64((const __m128i*)&ref[0 * BPS]);
@@ -2689,10 +1838,10 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/enc_sse2.c b/src/3rdparty/libwebp/src/
 -      _mm_storel_epi64((__m128i*)&dst[3 * BPS], ref3);
 -    } else {
 -      // Store four bytes/pixels per line.
--      WebPUint32ToMem(&dst[0 * BPS], _mm_cvtsi128_si32(ref0));
--      WebPUint32ToMem(&dst[1 * BPS], _mm_cvtsi128_si32(ref1));
--      WebPUint32ToMem(&dst[2 * BPS], _mm_cvtsi128_si32(ref2));
--      WebPUint32ToMem(&dst[3 * BPS], _mm_cvtsi128_si32(ref3));
+-      WebPInt32ToMem(&dst[0 * BPS], _mm_cvtsi128_si32(ref0));
+-      WebPInt32ToMem(&dst[1 * BPS], _mm_cvtsi128_si32(ref1));
+-      WebPInt32ToMem(&dst[2 * BPS], _mm_cvtsi128_si32(ref2));
+-      WebPInt32ToMem(&dst[3 * BPS], _mm_cvtsi128_si32(ref3));
 -    }
 +    // Store eight bytes/pixels per line.
 +    _mm_storel_epi64((__m128i*)&dst[0 * BPS], ref0);
@@ -2712,138 +1861,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/enc_sse2.c b/src/3rdparty/libwebp/src/
    }
  }
  
-@@ -481,7 +613,7 @@
- // helper for chroma-DC predictions
- static WEBP_INLINE void Put8x8uv_SSE2(uint8_t v, uint8_t* dst) {
-   int j;
--  const __m128i values = _mm_set1_epi8(v);
-+  const __m128i values = _mm_set1_epi8((char)v);
-   for (j = 0; j < 8; ++j) {
-     _mm_storel_epi64((__m128i*)(dst + j * BPS), values);
-   }
-@@ -489,7 +621,7 @@
- 
- static WEBP_INLINE void Put16_SSE2(uint8_t v, uint8_t* dst) {
-   int j;
--  const __m128i values = _mm_set1_epi8(v);
-+  const __m128i values = _mm_set1_epi8((char)v);
-   for (j = 0; j < 16; ++j) {
-     _mm_store_si128((__m128i*)(dst + j * BPS), values);
-   }
-@@ -540,7 +672,7 @@
- static WEBP_INLINE void HE8uv_SSE2(uint8_t* dst, const uint8_t* left) {
-   int j;
-   for (j = 0; j < 8; ++j) {
--    const __m128i values = _mm_set1_epi8(left[j]);
-+    const __m128i values = _mm_set1_epi8((char)left[j]);
-     _mm_storel_epi64((__m128i*)dst, values);
-     dst += BPS;
-   }
-@@ -549,7 +681,7 @@
- static WEBP_INLINE void HE16_SSE2(uint8_t* dst, const uint8_t* left) {
-   int j;
-   for (j = 0; j < 16; ++j) {
--    const __m128i values = _mm_set1_epi8(left[j]);
-+    const __m128i values = _mm_set1_epi8((char)left[j]);
-     _mm_store_si128((__m128i*)dst, values);
-     dst += BPS;
-   }
-@@ -722,10 +854,10 @@
-   const __m128i lsb = _mm_and_si128(_mm_xor_si128(ABCDEFGH, CDEFGH00), one);
-   const __m128i b = _mm_subs_epu8(a, lsb);
-   const __m128i avg = _mm_avg_epu8(b, BCDEFGH0);
--  const uint32_t vals = _mm_cvtsi128_si32(avg);
-+  const int vals = _mm_cvtsi128_si32(avg);
-   int i;
-   for (i = 0; i < 4; ++i) {
--    WebPUint32ToMem(dst + i * BPS, vals);
-+    WebPInt32ToMem(dst + i * BPS, vals);
-   }
- }
- 
-@@ -760,10 +892,10 @@
-   const __m128i lsb = _mm_and_si128(_mm_xor_si128(ABCDEFGH, CDEFGHH0), one);
-   const __m128i avg2 = _mm_subs_epu8(avg1, lsb);
-   const __m128i abcdefg = _mm_avg_epu8(avg2, BCDEFGH0);
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               abcdefg    ));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 1)));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 2)));
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 3)));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               abcdefg    ));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 1)));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 2)));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 3)));
- }
- 
- static WEBP_INLINE void VR4_SSE2(uint8_t* dst,
-@@ -782,10 +914,10 @@
-   const __m128i lsb = _mm_and_si128(_mm_xor_si128(IXABCD, ABCD0), one);
-   const __m128i avg2 = _mm_subs_epu8(avg1, lsb);
-   const __m128i efgh = _mm_avg_epu8(avg2, XABCD);
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               abcd    ));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(               efgh    ));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_slli_si128(abcd, 1)));
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_slli_si128(efgh, 1)));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               abcd    ));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(               efgh    ));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_slli_si128(abcd, 1)));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_slli_si128(efgh, 1)));
- 
-   // these two are hard to implement in SSE2, so we keep the C-version:
-   DST(0, 2) = AVG3(J, I, X);
-@@ -807,11 +939,12 @@
-   const __m128i abbc = _mm_or_si128(ab, bc);
-   const __m128i lsb2 = _mm_and_si128(abbc, lsb1);
-   const __m128i avg4 = _mm_subs_epu8(avg3, lsb2);
--  const uint32_t extra_out = _mm_cvtsi128_si32(_mm_srli_si128(avg4, 4));
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               avg1    ));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(               avg4    ));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(avg1, 1)));
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(avg4, 1)));
-+  const uint32_t extra_out =
-+      (uint32_t)_mm_cvtsi128_si32(_mm_srli_si128(avg4, 4));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(               avg1    ));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(               avg4    ));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(avg1, 1)));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(avg4, 1)));
- 
-   // these two are hard to get and irregular
-   DST(3, 2) = (extra_out >> 0) & 0xff;
-@@ -829,10 +962,10 @@
-   const __m128i lsb = _mm_and_si128(_mm_xor_si128(JIXABCD__, LKJIXABCD), one);
-   const __m128i avg2 = _mm_subs_epu8(avg1, lsb);
-   const __m128i abcdefg = _mm_avg_epu8(avg2, KJIXABCD_);
--  WebPUint32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(               abcdefg    ));
--  WebPUint32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 1)));
--  WebPUint32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 2)));
--  WebPUint32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 3)));
-+  WebPInt32ToMem(dst + 3 * BPS, _mm_cvtsi128_si32(               abcdefg    ));
-+  WebPInt32ToMem(dst + 2 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 1)));
-+  WebPInt32ToMem(dst + 1 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 2)));
-+  WebPInt32ToMem(dst + 0 * BPS, _mm_cvtsi128_si32(_mm_srli_si128(abcdefg, 3)));
- }
- 
- static WEBP_INLINE void HU4_SSE2(uint8_t* dst, const uint8_t* top) {
-@@ -875,14 +1008,14 @@
- 
- static WEBP_INLINE void TM4_SSE2(uint8_t* dst, const uint8_t* top) {
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i top_values = _mm_cvtsi32_si128(WebPMemToUint32(top));
-+  const __m128i top_values = _mm_cvtsi32_si128(WebPMemToInt32(top));
-   const __m128i top_base = _mm_unpacklo_epi8(top_values, zero);
-   int y;
-   for (y = 0; y < 4; ++y, dst += BPS) {
-     const int val = top[-2 - y] - top[-1];
-     const __m128i base = _mm_set1_epi16(val);
-     const __m128i out = _mm_packus_epi16(_mm_add_epi16(base, top_base), zero);
--    WebPUint32ToMem(dst, _mm_cvtsi128_si32(out));
-+    WebPInt32ToMem(dst, _mm_cvtsi128_si32(out));
-   }
- }
- 
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/filters.c b/src/3rdparty/libwebp/src/dsp/filters.c
---- a/src/3rdparty/libwebp/src/dsp/filters.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/filters.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/filters.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/filters.c	2024-03-17 19:08:13.362495000 +0800
 @@ -233,6 +233,7 @@
  WebPFilterFunc WebPFilters[WEBP_FILTER_LAST];
  WebPUnfilterFunc WebPUnfilters[WEBP_FILTER_LAST];
@@ -2853,49 +1873,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/filters.c b/src/3rdparty/libwebp/src/d
  extern void VP8FiltersInitMSA(void);
  extern void VP8FiltersInitNEON(void);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless.c b/src/3rdparty/libwebp/src/dsp/lossless.c
---- a/src/3rdparty/libwebp/src/dsp/lossless.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/lossless.c	2023-09-14 06:11:07.000000000 +0800
-@@ -49,7 +49,7 @@
- }
- 
- static WEBP_INLINE int AddSubtractComponentFull(int a, int b, int c) {
--  return Clip255(a + b - c);
-+  return Clip255((uint32_t)(a + b - c));
- }
- 
- static WEBP_INLINE uint32_t ClampedAddSubtractFull(uint32_t c0, uint32_t c1,
-@@ -66,7 +66,7 @@
- }
- 
- static WEBP_INLINE int AddSubtractComponentHalf(int a, int b) {
--  return Clip255(a + (a - b) / 2);
-+  return Clip255((uint32_t)(a + (a - b) / 2));
- }
- 
- static WEBP_INLINE uint32_t ClampedAddSubtractHalf(uint32_t c0, uint32_t c1,
-@@ -293,10 +293,10 @@
-     const uint32_t red = argb >> 16;
-     int new_red = red & 0xff;
-     int new_blue = argb & 0xff;
--    new_red += ColorTransformDelta(m->green_to_red_, green);
-+    new_red += ColorTransformDelta((int8_t)m->green_to_red_, green);
-     new_red &= 0xff;
--    new_blue += ColorTransformDelta(m->green_to_blue_, green);
--    new_blue += ColorTransformDelta(m->red_to_blue_, (int8_t)new_red);
-+    new_blue += ColorTransformDelta((int8_t)m->green_to_blue_, green);
-+    new_blue += ColorTransformDelta((int8_t)m->red_to_blue_, (int8_t)new_red);
-     new_blue &= 0xff;
-     dst[i] = (argb & 0xff00ff00u) | (new_red << 16) | (new_blue);
-   }
-@@ -395,7 +395,7 @@
-   assert(row_start < row_end);
-   assert(row_end <= transform->ysize_);
-   switch (transform->type_) {
--    case SUBTRACT_GREEN:
-+    case SUBTRACT_GREEN_TRANSFORM:
-       VP8LAddGreenToBlueAndRed(in, (row_end - row_start) * width, out);
-       break;
-     case PREDICTOR_TRANSFORM:
+--- a/src/3rdparty/libwebp/src/dsp/lossless.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/lossless.c	2024-03-17 19:08:13.362495000 +0800
 @@ -588,6 +588,7 @@
  VP8LMapARGBFunc VP8LMapColor32b;
  VP8LMapAlphaFunc VP8LMapColor8b;
@@ -2905,58 +1884,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless.c b/src/3rdparty/libwebp/src/
  extern void VP8LDspInitSSE41(void);
  extern void VP8LDspInitNEON(void);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_enc.c b/src/3rdparty/libwebp/src/dsp/lossless_enc.c
---- a/src/3rdparty/libwebp/src/dsp/lossless_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/lossless_enc.c	2023-09-14 06:11:07.000000000 +0800
-@@ -522,11 +522,11 @@
- void VP8LSubtractGreenFromBlueAndRed_C(uint32_t* argb_data, int num_pixels) {
-   int i;
-   for (i = 0; i < num_pixels; ++i) {
--    const int argb = argb_data[i];
-+    const int argb = (int)argb_data[i];
-     const int green = (argb >> 8) & 0xff;
-     const uint32_t new_r = (((argb >> 16) & 0xff) - green) & 0xff;
-     const uint32_t new_b = (((argb >>  0) & 0xff) - green) & 0xff;
--    argb_data[i] = (argb & 0xff00ff00u) | (new_r << 16) | new_b;
-+    argb_data[i] = ((uint32_t)argb & 0xff00ff00u) | (new_r << 16) | new_b;
-   }
- }
- 
-@@ -547,10 +547,10 @@
-     const int8_t red   = U32ToS8(argb >> 16);
-     int new_red = red & 0xff;
-     int new_blue = argb & 0xff;
--    new_red -= ColorTransformDelta(m->green_to_red_, green);
-+    new_red -= ColorTransformDelta((int8_t)m->green_to_red_, green);
-     new_red &= 0xff;
--    new_blue -= ColorTransformDelta(m->green_to_blue_, green);
--    new_blue -= ColorTransformDelta(m->red_to_blue_, red);
-+    new_blue -= ColorTransformDelta((int8_t)m->green_to_blue_, green);
-+    new_blue -= ColorTransformDelta((int8_t)m->red_to_blue_, red);
-     new_blue &= 0xff;
-     data[i] = (argb & 0xff00ff00u) | (new_red << 16) | (new_blue);
-   }
-@@ -560,7 +560,7 @@
-                                              uint32_t argb) {
-   const int8_t green = U32ToS8(argb >> 8);
-   int new_red = argb >> 16;
--  new_red -= ColorTransformDelta(green_to_red, green);
-+  new_red -= ColorTransformDelta((int8_t)green_to_red, green);
-   return (new_red & 0xff);
- }
- 
-@@ -569,9 +569,9 @@
-                                               uint32_t argb) {
-   const int8_t green = U32ToS8(argb >>  8);
-   const int8_t red   = U32ToS8(argb >> 16);
--  uint8_t new_blue = argb & 0xff;
--  new_blue -= ColorTransformDelta(green_to_blue, green);
--  new_blue -= ColorTransformDelta(red_to_blue, red);
-+  int new_blue = argb & 0xff;
-+  new_blue -= ColorTransformDelta((int8_t)green_to_blue, green);
-+  new_blue -= ColorTransformDelta((int8_t)red_to_blue, red);
-   return (new_blue & 0xff);
- }
- 
+--- a/src/3rdparty/libwebp/src/dsp/lossless_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/lossless_enc.c	2024-03-17 19:08:13.372402900 +0800
 @@ -791,6 +791,7 @@
  VP8LPredictorAddSubFunc VP8LPredictorsSub[16];
  VP8LPredictorAddSubFunc VP8LPredictorsSub_C[16];
@@ -2966,8 +1895,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_enc.c b/src/3rdparty/libwebp/
  extern void VP8LEncDspInitSSE41(void);
  extern void VP8LEncDspInitNEON(void);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c b/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c
---- a/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c	2024-03-17 19:08:13.372402900 +0800
 @@ -25,7 +25,7 @@
  
  // vtbl?_u8 are marked unavailable for iOS arm64 with Xcode < 6.3, use
@@ -2977,41 +1906,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_enc_neon.c b/src/3rdparty/lib
      defined(__apple_build_version__) && (__apple_build_version__< 6020037)
  #define USE_VTBLQ
  #endif
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_enc_sse2.c b/src/3rdparty/libwebp/src/dsp/lossless_enc_sse2.c
---- a/src/3rdparty/libwebp/src/dsp/lossless_enc_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/lossless_enc_sse2.c	2023-09-14 06:11:07.000000000 +0800
-@@ -54,8 +54,8 @@
-   const __m128i mults_rb = MK_CST_16(CST_5b(m->green_to_red_),
-                                      CST_5b(m->green_to_blue_));
-   const __m128i mults_b2 = MK_CST_16(CST_5b(m->red_to_blue_), 0);
--  const __m128i mask_ag = _mm_set1_epi32(0xff00ff00);  // alpha-green masks
--  const __m128i mask_rb = _mm_set1_epi32(0x00ff00ff);  // red-blue masks
-+  const __m128i mask_ag = _mm_set1_epi32((int)0xff00ff00);  // alpha-green masks
-+  const __m128i mask_rb = _mm_set1_epi32(0x00ff00ff);       // red-blue masks
-   int i;
-   for (i = 0; i + 4 <= num_pixels; i += 4) {
-     const __m128i in = _mm_loadu_si128((__m128i*)&argb_data[i]); // argb
-@@ -376,7 +376,7 @@
-       break;
-     }
-     case 2: {
--      const __m128i mask_or = _mm_set1_epi32(0xff000000);
-+      const __m128i mask_or = _mm_set1_epi32((int)0xff000000);
-       const __m128i mul_cst = _mm_set1_epi16(0x0104);
-       const __m128i mask_mul = _mm_set1_epi16(0x0f00);
-       for (x = 0; x + 16 <= width; x += 16, dst += 4) {
-@@ -427,7 +427,7 @@
- static void PredictorSub0_SSE2(const uint32_t* in, const uint32_t* upper,
-                                int num_pixels, uint32_t* out) {
-   int i;
--  const __m128i black = _mm_set1_epi32(ARGB_BLACK);
-+  const __m128i black = _mm_set1_epi32((int)ARGB_BLACK);
-   for (i = 0; i + 4 <= num_pixels; i += 4) {
-     const __m128i src = _mm_loadu_si128((const __m128i*)&in[i]);
-     const __m128i res = _mm_sub_epi8(src, black);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_neon.c b/src/3rdparty/libwebp/src/dsp/lossless_neon.c
---- a/src/3rdparty/libwebp/src/dsp/lossless_neon.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/lossless_neon.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/lossless_neon.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/lossless_neon.c	2024-03-17 19:08:13.375915300 +0800
 @@ -498,7 +498,7 @@
  
  // vtbl?_u8 are marked unavailable for iOS arm64 with Xcode < 6.3, use
@@ -3021,268 +1918,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_neon.c b/src/3rdparty/libwebp
      defined(__apple_build_version__) && (__apple_build_version__< 6020037)
  #define USE_VTBLQ
  #endif
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_sse2.c b/src/3rdparty/libwebp/src/dsp/lossless_sse2.c
---- a/src/3rdparty/libwebp/src/dsp/lossless_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/lossless_sse2.c	2023-09-14 06:11:07.000000000 +0800
-@@ -27,23 +27,22 @@
-                                                         uint32_t c1,
-                                                         uint32_t c2) {
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i C0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(c0), zero);
--  const __m128i C1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(c1), zero);
--  const __m128i C2 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(c2), zero);
-+  const __m128i C0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)c0), zero);
-+  const __m128i C1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)c1), zero);
-+  const __m128i C2 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)c2), zero);
-   const __m128i V1 = _mm_add_epi16(C0, C1);
-   const __m128i V2 = _mm_sub_epi16(V1, C2);
-   const __m128i b = _mm_packus_epi16(V2, V2);
--  const uint32_t output = _mm_cvtsi128_si32(b);
--  return output;
-+  return (uint32_t)_mm_cvtsi128_si32(b);
- }
- 
- static WEBP_INLINE uint32_t ClampedAddSubtractHalf_SSE2(uint32_t c0,
-                                                         uint32_t c1,
-                                                         uint32_t c2) {
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i C0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(c0), zero);
--  const __m128i C1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(c1), zero);
--  const __m128i B0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(c2), zero);
-+  const __m128i C0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)c0), zero);
-+  const __m128i C1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)c1), zero);
-+  const __m128i B0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)c2), zero);
-   const __m128i avg = _mm_add_epi16(C1, C0);
-   const __m128i A0 = _mm_srli_epi16(avg, 1);
-   const __m128i A1 = _mm_sub_epi16(A0, B0);
-@@ -52,16 +51,15 @@
-   const __m128i A3 = _mm_srai_epi16(A2, 1);
-   const __m128i A4 = _mm_add_epi16(A0, A3);
-   const __m128i A5 = _mm_packus_epi16(A4, A4);
--  const uint32_t output = _mm_cvtsi128_si32(A5);
--  return output;
-+  return (uint32_t)_mm_cvtsi128_si32(A5);
- }
- 
- static WEBP_INLINE uint32_t Select_SSE2(uint32_t a, uint32_t b, uint32_t c) {
-   int pa_minus_pb;
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i A0 = _mm_cvtsi32_si128(a);
--  const __m128i B0 = _mm_cvtsi32_si128(b);
--  const __m128i C0 = _mm_cvtsi32_si128(c);
-+  const __m128i A0 = _mm_cvtsi32_si128((int)a);
-+  const __m128i B0 = _mm_cvtsi32_si128((int)b);
-+  const __m128i C0 = _mm_cvtsi32_si128((int)c);
-   const __m128i AC0 = _mm_subs_epu8(A0, C0);
-   const __m128i CA0 = _mm_subs_epu8(C0, A0);
-   const __m128i BC0 = _mm_subs_epu8(B0, C0);
-@@ -94,8 +92,8 @@
-                                              __m128i* const avg) {
-   // (a + b) >> 1 = ((a + b + 1) >> 1) - ((a ^ b) & 1)
-   const __m128i ones = _mm_set1_epi8(1);
--  const __m128i A0 = _mm_cvtsi32_si128(a0);
--  const __m128i A1 = _mm_cvtsi32_si128(a1);
-+  const __m128i A0 = _mm_cvtsi32_si128((int)a0);
-+  const __m128i A1 = _mm_cvtsi32_si128((int)a1);
-   const __m128i avg1 = _mm_avg_epu8(A0, A1);
-   const __m128i one = _mm_and_si128(_mm_xor_si128(A0, A1), ones);
-   *avg = _mm_sub_epi8(avg1, one);
-@@ -103,8 +101,8 @@
- 
- static WEBP_INLINE __m128i Average2_uint32_16_SSE2(uint32_t a0, uint32_t a1) {
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i A0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(a0), zero);
--  const __m128i A1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(a1), zero);
-+  const __m128i A0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)a0), zero);
-+  const __m128i A1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)a1), zero);
-   const __m128i sum = _mm_add_epi16(A1, A0);
-   return _mm_srli_epi16(sum, 1);
- }
-@@ -112,19 +110,18 @@
- static WEBP_INLINE uint32_t Average2_SSE2(uint32_t a0, uint32_t a1) {
-   __m128i output;
-   Average2_uint32_SSE2(a0, a1, &output);
--  return _mm_cvtsi128_si32(output);
-+  return (uint32_t)_mm_cvtsi128_si32(output);
- }
- 
- static WEBP_INLINE uint32_t Average3_SSE2(uint32_t a0, uint32_t a1,
-                                           uint32_t a2) {
-   const __m128i zero = _mm_setzero_si128();
-   const __m128i avg1 = Average2_uint32_16_SSE2(a0, a2);
--  const __m128i A1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(a1), zero);
-+  const __m128i A1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128((int)a1), zero);
-   const __m128i sum = _mm_add_epi16(avg1, A1);
-   const __m128i avg2 = _mm_srli_epi16(sum, 1);
-   const __m128i A2 = _mm_packus_epi16(avg2, avg2);
--  const uint32_t output = _mm_cvtsi128_si32(A2);
--  return output;
-+  return (uint32_t)_mm_cvtsi128_si32(A2);
- }
- 
- static WEBP_INLINE uint32_t Average4_SSE2(uint32_t a0, uint32_t a1,
-@@ -134,8 +131,7 @@
-   const __m128i sum = _mm_add_epi16(avg2, avg1);
-   const __m128i avg3 = _mm_srli_epi16(sum, 1);
-   const __m128i A0 = _mm_packus_epi16(avg3, avg3);
--  const uint32_t output = _mm_cvtsi128_si32(A0);
--  return output;
-+  return (uint32_t)_mm_cvtsi128_si32(A0);
- }
- 
- static uint32_t Predictor5_SSE2(const uint32_t* const left,
-@@ -192,7 +188,7 @@
- static void PredictorAdd0_SSE2(const uint32_t* in, const uint32_t* upper,
-                                int num_pixels, uint32_t* out) {
-   int i;
--  const __m128i black = _mm_set1_epi32(ARGB_BLACK);
-+  const __m128i black = _mm_set1_epi32((int)ARGB_BLACK);
-   for (i = 0; i + 4 <= num_pixels; i += 4) {
-     const __m128i src = _mm_loadu_si128((const __m128i*)&in[i]);
-     const __m128i res = _mm_add_epi8(src, black);
-@@ -208,7 +204,7 @@
- static void PredictorAdd1_SSE2(const uint32_t* in, const uint32_t* upper,
-                                int num_pixels, uint32_t* out) {
-   int i;
--  __m128i prev = _mm_set1_epi32(out[-1]);
-+  __m128i prev = _mm_set1_epi32((int)out[-1]);
-   for (i = 0; i + 4 <= num_pixels; i += 4) {
-     // a | b | c | d
-     const __m128i src = _mm_loadu_si128((const __m128i*)&in[i]);
-@@ -285,12 +281,12 @@
- #undef GENERATE_PREDICTOR_2
- 
- // Predictor10: average of (average of (L,TL), average of (T, TR)).
--#define DO_PRED10(OUT) do {               \
--  __m128i avgLTL, avg;                    \
--  Average2_m128i(&L, &TL, &avgLTL);       \
--  Average2_m128i(&avgTTR, &avgLTL, &avg); \
--  L = _mm_add_epi8(avg, src);             \
--  out[i + (OUT)] = _mm_cvtsi128_si32(L);  \
-+#define DO_PRED10(OUT) do {                         \
-+  __m128i avgLTL, avg;                              \
-+  Average2_m128i(&L, &TL, &avgLTL);                 \
-+  Average2_m128i(&avgTTR, &avgLTL, &avg);           \
-+  L = _mm_add_epi8(avg, src);                       \
-+  out[i + (OUT)] = (uint32_t)_mm_cvtsi128_si32(L);  \
- } while (0)
- 
- #define DO_PRED10_SHIFT do {                                  \
-@@ -303,7 +299,7 @@
- static void PredictorAdd10_SSE2(const uint32_t* in, const uint32_t* upper,
-                                 int num_pixels, uint32_t* out) {
-   int i;
--  __m128i L = _mm_cvtsi32_si128(out[-1]);
-+  __m128i L = _mm_cvtsi32_si128((int)out[-1]);
-   for (i = 0; i + 4 <= num_pixels; i += 4) {
-     __m128i src = _mm_loadu_si128((const __m128i*)&in[i]);
-     __m128i TL = _mm_loadu_si128((const __m128i*)&upper[i - 1]);
-@@ -336,7 +332,7 @@
-   const __m128i B = _mm_andnot_si128(mask, T);                         \
-   const __m128i pred = _mm_or_si128(A, B); /* pred = (pa > b)? L : T*/ \
-   L = _mm_add_epi8(src, pred);                                         \
--  out[i + (OUT)] = _mm_cvtsi128_si32(L);                               \
-+  out[i + (OUT)] = (uint32_t)_mm_cvtsi128_si32(L);                     \
- } while (0)
- 
- #define DO_PRED11_SHIFT do {                                \
-@@ -351,7 +347,7 @@
-                                 int num_pixels, uint32_t* out) {
-   int i;
-   __m128i pa;
--  __m128i L = _mm_cvtsi32_si128(out[-1]);
-+  __m128i L = _mm_cvtsi32_si128((int)out[-1]);
-   for (i = 0; i + 4 <= num_pixels; i += 4) {
-     __m128i T = _mm_loadu_si128((const __m128i*)&upper[i]);
-     __m128i TL = _mm_loadu_si128((const __m128i*)&upper[i - 1]);
-@@ -384,12 +380,12 @@
- #undef DO_PRED11_SHIFT
- 
- // Predictor12: ClampedAddSubtractFull.
--#define DO_PRED12(DIFF, LANE, OUT) do {            \
--  const __m128i all = _mm_add_epi16(L, (DIFF));    \
--  const __m128i alls = _mm_packus_epi16(all, all); \
--  const __m128i res = _mm_add_epi8(src, alls);     \
--  out[i + (OUT)] = _mm_cvtsi128_si32(res);         \
--  L = _mm_unpacklo_epi8(res, zero);                \
-+#define DO_PRED12(DIFF, LANE, OUT) do {              \
-+  const __m128i all = _mm_add_epi16(L, (DIFF));      \
-+  const __m128i alls = _mm_packus_epi16(all, all);   \
-+  const __m128i res = _mm_add_epi8(src, alls);       \
-+  out[i + (OUT)] = (uint32_t)_mm_cvtsi128_si32(res); \
-+  L = _mm_unpacklo_epi8(res, zero);                  \
- } while (0)
- 
- #define DO_PRED12_SHIFT(DIFF, LANE) do {                    \
-@@ -402,7 +398,7 @@
-                                 int num_pixels, uint32_t* out) {
-   int i;
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i L8 = _mm_cvtsi32_si128(out[-1]);
-+  const __m128i L8 = _mm_cvtsi32_si128((int)out[-1]);
-   __m128i L = _mm_unpacklo_epi8(L8, zero);
-   for (i = 0; i + 4 <= num_pixels; i += 4) {
-     // Load 4 pixels at a time.
-@@ -468,7 +464,7 @@
-   const __m128i mults_b2 = MK_CST_16(CST(red_to_blue_), 0);
- #undef MK_CST_16
- #undef CST
--  const __m128i mask_ag = _mm_set1_epi32(0xff00ff00);  // alpha-green masks
-+  const __m128i mask_ag = _mm_set1_epi32((int)0xff00ff00);  // alpha-green masks
-   int i;
-   for (i = 0; i + 4 <= num_pixels; i += 4) {
-     const __m128i in = _mm_loadu_si128((const __m128i*)&src[i]); // argb
-@@ -532,7 +528,7 @@
- 
- static void ConvertBGRAToRGBA_SSE2(const uint32_t* src,
-                                    int num_pixels, uint8_t* dst) {
--  const __m128i red_blue_mask = _mm_set1_epi32(0x00ff00ffu);
-+  const __m128i red_blue_mask = _mm_set1_epi32(0x00ff00ff);
-   const __m128i* in = (const __m128i*)src;
-   __m128i* out = (__m128i*)dst;
-   while (num_pixels >= 8) {
-@@ -561,7 +557,7 @@
- static void ConvertBGRAToRGBA4444_SSE2(const uint32_t* src,
-                                        int num_pixels, uint8_t* dst) {
-   const __m128i mask_0x0f = _mm_set1_epi8(0x0f);
--  const __m128i mask_0xf0 = _mm_set1_epi8(0xf0);
-+  const __m128i mask_0xf0 = _mm_set1_epi8((char)0xf0);
-   const __m128i* in = (const __m128i*)src;
-   __m128i* out = (__m128i*)dst;
-   while (num_pixels >= 8) {
-@@ -596,8 +592,8 @@
- 
- static void ConvertBGRAToRGB565_SSE2(const uint32_t* src,
-                                      int num_pixels, uint8_t* dst) {
--  const __m128i mask_0xe0 = _mm_set1_epi8(0xe0);
--  const __m128i mask_0xf8 = _mm_set1_epi8(0xf8);
-+  const __m128i mask_0xe0 = _mm_set1_epi8((char)0xe0);
-+  const __m128i mask_0xf8 = _mm_set1_epi8((char)0xf8);
-   const __m128i mask_0x07 = _mm_set1_epi8(0x07);
-   const __m128i* in = (const __m128i*)src;
-   __m128i* out = (__m128i*)dst;
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/lossless_sse41.c b/src/3rdparty/libwebp/src/dsp/lossless_sse41.c
---- a/src/3rdparty/libwebp/src/dsp/lossless_sse41.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/lossless_sse41.c	2023-09-14 06:11:07.000000000 +0800
-@@ -25,11 +25,12 @@
-                                         int num_pixels, uint32_t* dst) {
- // sign-extended multiplying constants, pre-shifted by 5.
- #define CST(X)  (((int16_t)(m->X << 8)) >> 5)   // sign-extend
--  const __m128i mults_rb = _mm_set1_epi32((uint32_t)CST(green_to_red_) << 16 |
--                                          (CST(green_to_blue_) & 0xffff));
-+  const __m128i mults_rb =
-+      _mm_set1_epi32((int)((uint32_t)CST(green_to_red_) << 16 |
-+                           (CST(green_to_blue_) & 0xffff)));
-   const __m128i mults_b2 = _mm_set1_epi32(CST(red_to_blue_));
- #undef CST
--  const __m128i mask_ag = _mm_set1_epi32(0xff00ff00);
-+  const __m128i mask_ag = _mm_set1_epi32((int)0xff00ff00);
-   const __m128i perm1 = _mm_setr_epi8(-1, 1, -1, 1, -1, 5, -1, 5,
-                                       -1, 9, -1, 9, -1, 13, -1, 13);
-   const __m128i perm2 = _mm_setr_epi8(-1, 2, -1, -1, -1, 6, -1, -1,
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/neon.h b/src/3rdparty/libwebp/src/dsp/neon.h
---- a/src/3rdparty/libwebp/src/dsp/neon.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/neon.h	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/neon.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/neon.h	2024-03-17 19:08:13.382498000 +0800
 @@ -21,7 +21,7 @@
  // Right now, some intrinsics functions seem slower, so we disable them
  // everywhere except newer clang/gcc or aarch64 where the inline assembly is
@@ -3302,39 +1940,20 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/neon.h b/src/3rdparty/libwebp/src/dsp/
  #endif
  
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/quant.h b/src/3rdparty/libwebp/src/dsp/quant.h
---- a/src/3rdparty/libwebp/src/dsp/quant.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/quant.h	2023-09-14 06:11:07.000000000 +0800
-@@ -21,10 +21,15 @@
- 
+--- a/src/3rdparty/libwebp/src/dsp/quant.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/quant.h	2024-03-17 19:08:13.382498000 +0800
+@@ -22,7 +22,7 @@
  #define IsFlat IsFlat_NEON
  
--static uint32x2_t horizontal_add_uint32x4(const uint32x4_t a) {
-+static uint32_t horizontal_add_uint32x4(const uint32x4_t a) {
+ static uint32_t horizontal_add_uint32x4(const uint32x4_t a) {
+-#if defined(__aarch64__)
 +#if WEBP_AARCH64
-+  return vaddvq_u32(a);
-+#else
-   const uint64x2_t b = vpaddlq_u32(a);
--  return vadd_u32(vreinterpret_u32_u64(vget_low_u64(b)),
--                  vreinterpret_u32_u64(vget_high_u64(b)));
-+  const uint32x2_t c = vadd_u32(vreinterpret_u32_u64(vget_low_u64(b)),
-+                                vreinterpret_u32_u64(vget_high_u64(b)));
-+  return vget_lane_u32(c, 0);
-+#endif
- }
- 
- static WEBP_INLINE int IsFlat(const int16_t* levels, int num_blocks,
-@@ -45,7 +50,7 @@
- 
-     levels += 16;
-   }
--  return thresh >= (int32_t)vget_lane_u32(horizontal_add_uint32x4(sum), 0);
-+  return thresh >= (int)horizontal_add_uint32x4(sum);
- }
- 
+   return vaddvq_u32(a);
  #else
+   const uint64x2_t b = vpaddlq_u32(a);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/rescaler.c b/src/3rdparty/libwebp/src/dsp/rescaler.c
---- a/src/3rdparty/libwebp/src/dsp/rescaler.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/rescaler.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/rescaler.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/rescaler.c	2024-03-17 19:08:13.382498000 +0800
 @@ -197,6 +197,7 @@
  WebPRescalerExportRowFunc WebPRescalerExportRowExpand;
  WebPRescalerExportRowFunc WebPRescalerExportRowShrink;
@@ -3343,39 +1962,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/rescaler.c b/src/3rdparty/libwebp/src/
  extern void WebPRescalerDspInitSSE2(void);
  extern void WebPRescalerDspInitMIPS32(void);
  extern void WebPRescalerDspInitMIPSdspR2(void);
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/rescaler_sse2.c b/src/3rdparty/libwebp/src/dsp/rescaler_sse2.c
---- a/src/3rdparty/libwebp/src/dsp/rescaler_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/rescaler_sse2.c	2023-09-14 06:11:07.000000000 +0800
-@@ -85,7 +85,7 @@
-       const __m128i mult = _mm_cvtsi32_si128(((x_add - accum) << 16) | accum);
-       const __m128i out = _mm_madd_epi16(cur_pixels, mult);
-       assert(sizeof(*frow) == sizeof(uint32_t));
--      WebPUint32ToMem((uint8_t*)frow, _mm_cvtsi128_si32(out));
-+      WebPInt32ToMem((uint8_t*)frow, _mm_cvtsi128_si32(out));
-       frow += 1;
-       if (frow >= frow_end) break;
-       accum -= wrk->x_sub;
-@@ -132,7 +132,7 @@
-     __m128i base = zero;
-     accum += wrk->x_add;
-     while (accum > 0) {
--      const __m128i A = _mm_cvtsi32_si128(WebPMemToUint32(src));
-+      const __m128i A = _mm_cvtsi32_si128(WebPMemToInt32(src));
-       src += 4;
-       base = _mm_unpacklo_epi8(A, zero);
-       // To avoid overflow, we need: base * x_add / x_sub < 32768
-@@ -198,7 +198,7 @@
-                                         const __m128i* const mult,
-                                         uint8_t* const dst) {
-   const __m128i rounder = _mm_set_epi32(0, ROUNDER, 0, ROUNDER);
--  const __m128i mask = _mm_set_epi32(0xffffffffu, 0, 0xffffffffu, 0);
-+  const __m128i mask = _mm_set_epi32(~0, 0, ~0, 0);
-   const __m128i B0 = _mm_mul_epu32(*A0, *mult);
-   const __m128i B1 = _mm_mul_epu32(*A1, *mult);
-   const __m128i B2 = _mm_mul_epu32(*A2, *mult);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/ssim.c b/src/3rdparty/libwebp/src/dsp/ssim.c
---- a/src/3rdparty/libwebp/src/dsp/ssim.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/ssim.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/ssim.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/ssim.c	2024-03-17 19:08:13.382498000 +0800
 @@ -137,6 +137,7 @@
  VP8AccumulateSSEFunc VP8AccumulateSSE;
  #endif
@@ -3385,8 +1974,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/ssim.c b/src/3rdparty/libwebp/src/dsp/
  
  WEBP_DSP_INIT_FUNC(VP8SSIMDspInit) {
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/upsampling.c b/src/3rdparty/libwebp/src/dsp/upsampling.c
---- a/src/3rdparty/libwebp/src/dsp/upsampling.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/upsampling.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/upsampling.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/upsampling.c	2024-03-17 19:08:13.382498000 +0800
 @@ -215,6 +215,7 @@
  
  WebPYUV444Converter WebPYUV444Converters[MODE_LAST];
@@ -3396,8 +1985,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/upsampling.c b/src/3rdparty/libwebp/sr
  extern void WebPInitYUV444ConvertersSSE2(void);
  extern void WebPInitYUV444ConvertersSSE41(void);
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/upsampling_neon.c b/src/3rdparty/libwebp/src/dsp/upsampling_neon.c
---- a/src/3rdparty/libwebp/src/dsp/upsampling_neon.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/upsampling_neon.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/upsampling_neon.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/upsampling_neon.c	2024-03-17 19:08:13.382498000 +0800
 @@ -111,7 +111,7 @@
    vst4_u8(out, v255_r_g_b);                                             \
  } while (0)
@@ -3407,21 +1996,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/upsampling_neon.c b/src/3rdparty/libwe
  #define ZIP_U8(lo, hi) vzip_u8((lo), (hi))
  #else
  #define ZIP_U8(lo, hi) vzip_u8((hi), (lo))
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/upsampling_sse2.c b/src/3rdparty/libwebp/src/dsp/upsampling_sse2.c
---- a/src/3rdparty/libwebp/src/dsp/upsampling_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/upsampling_sse2.c	2023-09-14 06:11:07.000000000 +0800
-@@ -121,7 +121,7 @@
-   int uv_pos, pos;                                                             \
-   /* 16byte-aligned array to cache reconstructed u and v */                    \
-   uint8_t uv_buf[14 * 32 + 15] = { 0 };                                        \
--  uint8_t* const r_u = (uint8_t*)((uintptr_t)(uv_buf + 15) & ~15);             \
-+  uint8_t* const r_u = (uint8_t*)((uintptr_t)(uv_buf + 15) & ~(uintptr_t)15);  \
-   uint8_t* const r_v = r_u + 32;                                               \
-                                                                                \
-   assert(top_y != NULL);                                                       \
 diff -rNuZ a/src/3rdparty/libwebp/src/dsp/yuv.c b/src/3rdparty/libwebp/src/dsp/yuv.c
---- a/src/3rdparty/libwebp/src/dsp/yuv.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/yuv.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/dsp/yuv.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/dsp/yuv.c	2024-03-17 19:08:13.392497200 +0800
 @@ -70,6 +70,7 @@
  
  WebPSamplerRowFunc WebPSamplers[MODE_LAST];
@@ -3430,83 +2007,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/dsp/yuv.c b/src/3rdparty/libwebp/src/dsp/y
  extern void WebPInitSamplersSSE2(void);
  extern void WebPInitSamplersSSE41(void);
  extern void WebPInitSamplersMIPS32(void);
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/yuv_sse2.c b/src/3rdparty/libwebp/src/dsp/yuv_sse2.c
---- a/src/3rdparty/libwebp/src/dsp/yuv_sse2.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/yuv_sse2.c	2023-09-14 06:11:07.000000000 +0800
-@@ -15,10 +15,12 @@
- 
- #if defined(WEBP_USE_SSE2)
- 
--#include "src/dsp/common_sse2.h"
- #include <stdlib.h>
- #include <emmintrin.h>
- 
-+#include "src/dsp/common_sse2.h"
-+#include "src/utils/utils.h"
-+
- //-----------------------------------------------------------------------------
- // Convert spans of 32 pixels to various RGB formats for the fancy upsampler.
- 
-@@ -74,7 +76,7 @@
- // Load and replicate the U/V samples
- static WEBP_INLINE __m128i Load_UV_HI_8_SSE2(const uint8_t* src) {
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i tmp0 = _mm_cvtsi32_si128(*(const uint32_t*)src);
-+  const __m128i tmp0 = _mm_cvtsi32_si128(WebPMemToInt32(src));
-   const __m128i tmp1 = _mm_unpacklo_epi8(zero, tmp0);
-   return _mm_unpacklo_epi16(tmp1, tmp1);   // replicate samples
- }
-@@ -130,7 +132,7 @@
-   const __m128i rg0 = _mm_packus_epi16(*B, *A);
-   const __m128i ba0 = _mm_packus_epi16(*R, *G);
- #endif
--  const __m128i mask_0xf0 = _mm_set1_epi8(0xf0);
-+  const __m128i mask_0xf0 = _mm_set1_epi8((char)0xf0);
-   const __m128i rb1 = _mm_unpacklo_epi8(rg0, ba0);  // rbrbrbrbrb...
-   const __m128i ga1 = _mm_unpackhi_epi8(rg0, ba0);  // gagagagaga...
-   const __m128i rb2 = _mm_and_si128(rb1, mask_0xf0);
-@@ -147,9 +149,10 @@
-   const __m128i r0 = _mm_packus_epi16(*R, *R);
-   const __m128i g0 = _mm_packus_epi16(*G, *G);
-   const __m128i b0 = _mm_packus_epi16(*B, *B);
--  const __m128i r1 = _mm_and_si128(r0, _mm_set1_epi8(0xf8));
-+  const __m128i r1 = _mm_and_si128(r0, _mm_set1_epi8((char)0xf8));
-   const __m128i b1 = _mm_and_si128(_mm_srli_epi16(b0, 3), _mm_set1_epi8(0x1f));
--  const __m128i g1 = _mm_srli_epi16(_mm_and_si128(g0, _mm_set1_epi8(0xe0)), 5);
-+  const __m128i g1 =
-+      _mm_srli_epi16(_mm_and_si128(g0, _mm_set1_epi8((char)0xe0)), 5);
-   const __m128i g2 = _mm_slli_epi16(_mm_and_si128(g0, _mm_set1_epi8(0x1c)), 3);
-   const __m128i rg = _mm_or_si128(r1, g1);
-   const __m128i gb = _mm_or_si128(g2, b1);
-diff -rNuZ a/src/3rdparty/libwebp/src/dsp/yuv_sse41.c b/src/3rdparty/libwebp/src/dsp/yuv_sse41.c
---- a/src/3rdparty/libwebp/src/dsp/yuv_sse41.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/dsp/yuv_sse41.c	2023-09-14 06:11:07.000000000 +0800
-@@ -15,10 +15,12 @@
- 
- #if defined(WEBP_USE_SSE41)
- 
--#include "src/dsp/common_sse41.h"
- #include <stdlib.h>
- #include <smmintrin.h>
- 
-+#include "src/dsp/common_sse41.h"
-+#include "src/utils/utils.h"
-+
- //-----------------------------------------------------------------------------
- // Convert spans of 32 pixels to various RGB formats for the fancy upsampler.
- 
-@@ -74,7 +76,7 @@
- // Load and replicate the U/V samples
- static WEBP_INLINE __m128i Load_UV_HI_8_SSE41(const uint8_t* src) {
-   const __m128i zero = _mm_setzero_si128();
--  const __m128i tmp0 = _mm_cvtsi32_si128(*(const uint32_t*)src);
-+  const __m128i tmp0 = _mm_cvtsi32_si128(WebPMemToInt32(src));
-   const __m128i tmp1 = _mm_unpacklo_epi8(zero, tmp0);
-   return _mm_unpacklo_epi16(tmp1, tmp1);   // replicate samples
- }
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/alpha_enc.c b/src/3rdparty/libwebp/src/enc/alpha_enc.c
---- a/src/3rdparty/libwebp/src/enc/alpha_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/alpha_enc.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/enc/alpha_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/alpha_enc.c	2024-03-17 19:08:13.392497200 +0800
 @@ -13,6 +13,7 @@
  
  #include <assert.h>
@@ -3587,53 +2090,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/alpha_enc.c b/src/3rdparty/libwebp/src
        WebPGetWorkerInterface()->Launch(worker);
        return 1;
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/analysis_enc.c b/src/3rdparty/libwebp/src/enc/analysis_enc.c
---- a/src/3rdparty/libwebp/src/enc/analysis_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/analysis_enc.c	2023-09-14 06:11:07.000000000 +0800
-@@ -391,12 +391,14 @@
-   return ok;
- }
- 
-+#ifdef WEBP_USE_THREAD
- static void MergeJobs(const SegmentJob* const src, SegmentJob* const dst) {
-   int i;
-   for (i = 0; i <= MAX_ALPHA; ++i) dst->alphas[i] += src->alphas[i];
-   dst->alpha += src->alpha;
-   dst->uv_alpha += src->uv_alpha;
- }
-+#endif
- 
- // initialize the job struct with some tasks to perform
- static void InitSegmentJob(VP8Encoder* const enc, SegmentJob* const job,
-@@ -425,10 +427,10 @@
-       (enc->method_ <= 1);  // for method 0 - 1, we need preds_[] to be filled.
-   if (do_segments) {
-     const int last_row = enc->mb_h_;
--    // We give a little more than a half work to the main thread.
--    const int split_row = (9 * last_row + 15) >> 4;
-     const int total_mb = last_row * enc->mb_w_;
- #ifdef WEBP_USE_THREAD
-+    // We give a little more than a half work to the main thread.
-+    const int split_row = (9 * last_row + 15) >> 4;
-     const int kMinSplitRow = 2;  // minimal rows needed for mt to be worth it
-     const int do_mt = (enc->thread_level_ > 0) && (split_row >= kMinSplitRow);
- #else
-@@ -438,6 +440,7 @@
-         WebPGetWorkerInterface();
-     SegmentJob main_job;
-     if (do_mt) {
-+#ifdef WEBP_USE_THREAD
-       SegmentJob side_job;
-       // Note the use of '&' instead of '&&' because we must call the functions
-       // no matter what.
-@@ -455,6 +458,7 @@
-       }
-       worker_interface->End(&side_job.worker);
-       if (ok) MergeJobs(&side_job, &main_job);  // merge results together
-+#endif  // WEBP_USE_THREAD
-     } else {
-       // Even for single-thread case, we use the generic Worker tools.
-       InitSegmentJob(enc, &main_job, 0, last_row);
-@@ -470,6 +474,10 @@
+--- a/src/3rdparty/libwebp/src/enc/analysis_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/analysis_enc.c	2024-03-17 19:08:13.392497200 +0800
+@@ -474,6 +474,10 @@
    } else {   // Use only one default segment.
      ResetAllMBInfo(enc);
    }
@@ -3645,8 +2104,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/analysis_enc.c b/src/3rdparty/libwebp/
  }
  
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/backward_references_enc.c b/src/3rdparty/libwebp/src/enc/backward_references_enc.c
---- a/src/3rdparty/libwebp/src/enc/backward_references_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/backward_references_enc.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/enc/backward_references_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/backward_references_enc.c	2024-03-17 19:08:13.392497200 +0800
 @@ -283,8 +283,7 @@
    hash_to_first_index =
        (int32_t*)WebPSafeMalloc(HASH_SIZE, sizeof(*hash_to_first_index));
@@ -3678,8 +2137,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/backward_references_enc.c b/src/3rdpar
    }
  
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/frame_enc.c b/src/3rdparty/libwebp/src/enc/frame_enc.c
---- a/src/3rdparty/libwebp/src/enc/frame_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/frame_enc.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/enc/frame_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/frame_enc.c	2024-03-17 19:08:13.392497200 +0800
 @@ -689,7 +689,7 @@
    }
    if (!ok) {
@@ -3710,26 +2169,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/frame_enc.c b/src/3rdparty/libwebp/src
        ResetAfterSkip(&it);
      }
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/picture_csp_enc.c b/src/3rdparty/libwebp/src/enc/picture_csp_enc.c
---- a/src/3rdparty/libwebp/src/enc/picture_csp_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/picture_csp_enc.c	2023-09-14 06:11:07.000000000 +0800
-@@ -69,10 +69,12 @@
- int WebPPictureHasTransparency(const WebPPicture* picture) {
-   if (picture == NULL) return 0;
-   if (picture->use_argb) {
--    const int alpha_offset = ALPHA_OFFSET;
--    return CheckNonOpaque((const uint8_t*)picture->argb + alpha_offset,
--                          picture->width, picture->height,
--                          4, picture->argb_stride * sizeof(*picture->argb));
-+    if (picture->argb != NULL) {
-+      return CheckNonOpaque((const uint8_t*)picture->argb + ALPHA_OFFSET,
-+                            picture->width, picture->height,
-+                            4, picture->argb_stride * sizeof(*picture->argb));
-+    }
-+    return 0;
-   }
-   return CheckNonOpaque(picture->a, picture->width, picture->height,
-                         1, picture->a_stride);
-@@ -96,6 +98,7 @@
+--- a/src/3rdparty/libwebp/src/enc/picture_csp_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/picture_csp_enc.c	2024-03-17 19:08:13.402516100 +0800
+@@ -98,6 +98,7 @@
  static uint16_t kGammaToLinearTab[256];
  static volatile int kGammaTablesOk = 0;
  static void InitGammaTables(void);
@@ -3737,47 +2179,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/picture_csp_enc.c b/src/3rdparty/libwe
  
  WEBP_DSP_INIT_FUNC(InitGammaTables) {
    if (!kGammaTablesOk) {
-@@ -170,21 +173,6 @@
- //------------------------------------------------------------------------------
- // Main function
- 
--extern void SharpYuvInit(VP8CPUInfo cpu_info_func);
--
--static void SafeInitSharpYuv(void) {
--#if defined(WEBP_USE_THREAD) && !defined(_WIN32)
--  static pthread_mutex_t initsharpyuv_lock = PTHREAD_MUTEX_INITIALIZER;
--  if (pthread_mutex_lock(&initsharpyuv_lock)) return;
--#endif
--
--  SharpYuvInit(VP8GetCPUInfo);
--
--#if defined(WEBP_USE_THREAD) && !defined(_WIN32)
--  (void)pthread_mutex_unlock(&initsharpyuv_lock);
--#endif
--}
--
- static int PreprocessARGB(const uint8_t* r_ptr,
-                           const uint8_t* g_ptr,
-                           const uint8_t* b_ptr,
-@@ -481,6 +469,8 @@
-   }
- }
- 
-+extern void SharpYuvInit(VP8CPUInfo cpu_info_func);
-+
- static int ImportYUVAFromRGBA(const uint8_t* r_ptr,
-                               const uint8_t* g_ptr,
-                               const uint8_t* b_ptr,
-@@ -516,7 +506,7 @@
-   }
- 
-   if (use_iterative_conversion) {
--    SafeInitSharpYuv();
-+    SharpYuvInit(VP8GetCPUInfo);
-     if (!PreprocessARGB(r_ptr, g_ptr, b_ptr, step, rgb_stride, picture)) {
-       return 0;
-     }
-@@ -545,7 +535,9 @@
+@@ -534,7 +535,9 @@
      WebPInitConvertARGBToYUV();
      InitGammaTables();
  
@@ -3789,8 +2191,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/picture_csp_enc.c b/src/3rdparty/libwe
      // Downsample Y/U/V planes, two rows at a time
      for (y = 0; y < (height >> 1); ++y) {
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c b/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c
---- a/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c	2024-03-17 19:08:13.402516100 +0800
 @@ -137,7 +137,9 @@
    PictureGrabSpecs(pic, &tmp);
    tmp.width = width;
@@ -3862,8 +2264,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/picture_rescale_enc.c b/src/3rdparty/l
      AlphaMultiplyARGB(&tmp, 1);
    }
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/syntax_enc.c b/src/3rdparty/libwebp/src/enc/syntax_enc.c
---- a/src/3rdparty/libwebp/src/enc/syntax_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/syntax_enc.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/enc/syntax_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/syntax_enc.c	2024-03-17 19:08:13.402516100 +0800
 @@ -258,7 +258,10 @@
      buf[3 * p + 1] = (part_size >>  8) & 0xff;
      buf[3 * p + 2] = (part_size >> 16) & 0xff;
@@ -3885,22 +2287,20 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/syntax_enc.c b/src/3rdparty/libwebp/sr
  }
  
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8i_enc.h b/src/3rdparty/libwebp/src/enc/vp8i_enc.h
---- a/src/3rdparty/libwebp/src/enc/vp8i_enc.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/vp8i_enc.h	2023-09-14 06:11:07.000000000 +0800
-@@ -31,8 +31,8 @@
- 
+--- a/src/3rdparty/libwebp/src/enc/vp8i_enc.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/vp8i_enc.h	2024-03-17 19:08:13.402516100 +0800
+@@ -32,7 +32,7 @@
  // version numbers
  #define ENC_MAJ_VERSION 1
--#define ENC_MIN_VERSION 2
--#define ENC_REV_VERSION 4
-+#define ENC_MIN_VERSION 3
+ #define ENC_MIN_VERSION 3
+-#define ENC_REV_VERSION 0
 +#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 -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/enc/vp8l_enc.c
---- a/src/3rdparty/libwebp/src/enc/vp8l_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/vp8l_enc.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/enc/vp8l_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/vp8l_enc.c	2024-03-17 19:08:13.407896000 +0800
 @@ -196,8 +196,7 @@
    uint32_t palette_sorted[MAX_PALETTE_SIZE];
    lines = (uint32_t*)WebPSafeMalloc(2 * pic->width, sizeof(*lines));
@@ -3924,23 +2324,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/
      return 0;
    }
  
-@@ -361,10 +360,11 @@
-   kHistoTotal  // Must be last.
- } HistoIx;
- 
--static void AddSingleSubGreen(int p, uint32_t* const r, uint32_t* const b) {
--  const int green = p >> 8;  // The upper bits are masked away later.
--  ++r[((p >> 16) - green) & 0xff];
--  ++b[((p >>  0) - green) & 0xff];
-+static void AddSingleSubGreen(uint32_t p,
-+                              uint32_t* const r, uint32_t* const b) {
-+  const int green = (int)p >> 8;  // The upper bits are masked away later.
-+  ++r[(((int)p >> 16) - green) & 0xff];
-+  ++b[(((int)p >>  0) - green) & 0xff];
- }
- 
- static void AddSingle(uint32_t p,
-@@ -1011,8 +1011,7 @@
+@@ -1012,8 +1011,7 @@
      VP8LRefsCursorNext(&c);
    }
    if (bw->error_) {
@@ -3950,7 +2334,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/
    }
    return 1;
  }
-@@ -1296,7 +1295,10 @@
+@@ -1297,7 +1295,10 @@
            }
          }
          tokens = (HuffmanTreeToken*)WebPSafeMalloc(max_tokens, sizeof(*tokens));
@@ -3962,16 +2346,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/
          for (i = 0; i < 5 * histogram_image_size; ++i) {
            HuffmanTreeCode* const codes = &huffman_codes[i];
            StoreHuffmanCode(bw, huff_tree, tokens, codes);
-@@ -1354,7 +1356,7 @@
- static void ApplySubtractGreen(VP8LEncoder* const enc, int width, int height,
-                                VP8LBitWriter* const bw) {
-   VP8LPutBits(bw, TRANSFORM_PRESENT, 1);
--  VP8LPutBits(bw, SUBTRACT_GREEN, 2);
-+  VP8LPutBits(bw, SUBTRACT_GREEN_TRANSFORM, 2);
-   VP8LSubtractGreenFromBlueAndRed(enc->argb_, width * height);
- }
- 
-@@ -1447,18 +1449,21 @@
+@@ -1448,18 +1449,21 @@
    const size_t vp8l_size = VP8L_SIGNATURE_SIZE + webpll_size;
    const size_t pad = vp8l_size & 1;
    const size_t riff_size = TAG_SIZE + CHUNK_HEADER_SIZE + vp8l_size + pad;
@@ -3997,7 +2372,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/
      }
    }
    *coded_size = CHUNK_HEADER_SIZE + riff_size;
-@@ -1503,8 +1508,7 @@
+@@ -1504,8 +1508,7 @@
      ClearTransformBuffer(enc);
      mem = (uint32_t*)WebPSafeMalloc(mem_size, sizeof(*mem));
      if (mem == NULL) {
@@ -4007,7 +2382,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/
      }
      enc->transform_mem_ = mem;
      enc->transform_mem_size_ = (size_t)mem_size;
-@@ -1612,8 +1616,7 @@
+@@ -1613,8 +1616,7 @@
    int x, y;
  
    if (tmp_row == NULL) {
@@ -4017,7 +2392,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/
    }
  
    if (palette_size < APPLY_PALETTE_GREEDY_MAX) {
-@@ -1967,9 +1970,8 @@
+@@ -1968,9 +1970,8 @@
    int ok_main;
  
    if (enc_main == NULL || !VP8LBitWriterInit(&bw_side, 0)) {
@@ -4028,7 +2403,7 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/
    }
  
    // Avoid "garbage value" error from Clang's static analysis tool.
-@@ -2116,8 +2118,7 @@
+@@ -2117,8 +2118,7 @@
    if (picture == NULL) return 0;
  
    if (config == NULL || picture->argb == NULL) {
@@ -4039,8 +2414,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/vp8l_enc.c b/src/3rdparty/libwebp/src/
  
    width = picture->width;
 diff -rNuZ a/src/3rdparty/libwebp/src/enc/webp_enc.c b/src/3rdparty/libwebp/src/enc/webp_enc.c
---- a/src/3rdparty/libwebp/src/enc/webp_enc.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/enc/webp_enc.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/enc/webp_enc.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/enc/webp_enc.c	2024-03-17 19:08:13.407896000 +0800
 @@ -307,7 +307,10 @@
                           WebPEncodingError error) {
    assert((int)error < VP8_ENC_ERROR_LAST);
@@ -4073,22 +2448,20 @@ diff -rNuZ a/src/3rdparty/libwebp/src/enc/webp_enc.c b/src/3rdparty/libwebp/src/
      return WebPEncodingSetError(pic, VP8_ENC_ERROR_NULL_PARAMETER);
    }
 diff -rNuZ a/src/3rdparty/libwebp/src/mux/muxi.h b/src/3rdparty/libwebp/src/mux/muxi.h
---- a/src/3rdparty/libwebp/src/mux/muxi.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/mux/muxi.h	2023-09-14 06:11:07.000000000 +0800
-@@ -28,8 +28,8 @@
- // Defines and constants.
+--- a/src/3rdparty/libwebp/src/mux/muxi.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/mux/muxi.h	2024-03-17 19:08:13.407896000 +0800
+@@ -29,7 +29,7 @@
  
  #define MUX_MAJ_VERSION 1
--#define MUX_MIN_VERSION 2
--#define MUX_REV_VERSION 4
-+#define MUX_MIN_VERSION 3
+ #define MUX_MIN_VERSION 3
+-#define MUX_REV_VERSION 0
 +#define MUX_REV_VERSION 2
  
  // Chunk object.
  typedef struct WebPChunk WebPChunk;
 diff -rNuZ a/src/3rdparty/libwebp/src/mux/muxread.c b/src/3rdparty/libwebp/src/mux/muxread.c
---- a/src/3rdparty/libwebp/src/mux/muxread.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/mux/muxread.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/mux/muxread.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/mux/muxread.c	2024-03-17 19:08:13.412412500 +0800
 @@ -116,9 +116,12 @@
      // Each of ANMF chunk contain a header at the beginning. So, its size should
      // be at least 'hdr_size'.
@@ -4104,24 +2477,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/mux/muxread.c b/src/3rdparty/libwebp/src/m
    wpi->is_partial_ = 1;  // Waiting for ALPH and/or VP8/VP8L chunks.
  
    // Rest of the chunks.
-diff -rNuZ a/src/3rdparty/libwebp/src/utils/bit_reader_inl_utils.h b/src/3rdparty/libwebp/src/utils/bit_reader_inl_utils.h
---- a/src/3rdparty/libwebp/src/utils/bit_reader_inl_utils.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/utils/bit_reader_inl_utils.h	2023-09-14 06:11:07.000000000 +0800
-@@ -148,9 +148,9 @@
-     const range_t value = (range_t)(br->value_ >> pos);
-     const int32_t mask = (int32_t)(split - value) >> 31;  // -1 or 0
-     br->bits_ -= 1;
--    br->range_ += mask;
-+    br->range_ += (range_t)mask;
-     br->range_ |= 1;
--    br->value_ -= (bit_t)((split + 1) & mask) << pos;
-+    br->value_ -= (bit_t)((split + 1) & (uint32_t)mask) << pos;
-     BT_TRACK(br);
-     return (v ^ mask) - mask;
-   }
 diff -rNuZ a/src/3rdparty/libwebp/src/utils/bit_reader_utils.c b/src/3rdparty/libwebp/src/utils/bit_reader_utils.c
---- a/src/3rdparty/libwebp/src/utils/bit_reader_utils.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/utils/bit_reader_utils.c	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/utils/bit_reader_utils.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/utils/bit_reader_utils.c	2024-03-17 19:08:13.412412500 +0800
 @@ -15,6 +15,7 @@
  #include "src/webp/config.h"
  #endif
@@ -4140,8 +2498,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/utils/bit_reader_utils.c b/src/3rdparty/li
      defined(__x86_64__) || defined(_M_X64)
  #define VP8L_USE_FAST_LOAD
 diff -rNuZ a/src/3rdparty/libwebp/src/utils/bit_reader_utils.h b/src/3rdparty/libwebp/src/utils/bit_reader_utils.h
---- a/src/3rdparty/libwebp/src/utils/bit_reader_utils.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/utils/bit_reader_utils.h	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/utils/bit_reader_utils.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/utils/bit_reader_utils.h	2024-03-17 19:08:13.412412500 +0800
 @@ -19,6 +19,7 @@
  #ifdef _MSC_VER
  #include <stdlib.h>  // _byteswap_ulong
@@ -4160,17 +2518,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/utils/bit_reader_utils.h b/src/3rdparty/li
  #elif defined(__mips__)                        // MIPS
  #define BITS 24
 diff -rNuZ a/src/3rdparty/libwebp/src/utils/huffman_utils.c b/src/3rdparty/libwebp/src/utils/huffman_utils.c
---- a/src/3rdparty/libwebp/src/utils/huffman_utils.c	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/utils/huffman_utils.c	2023-09-14 06:11:07.000000000 +0800
-@@ -142,7 +142,7 @@
- 
-   {
-     int step;              // step size to replicate values in current table
--    uint32_t low = -1;     // low bits for current root entry
-+    uint32_t low = 0xffffffffu;        // low bits for current root entry
-     uint32_t mask = total_size - 1;    // mask for low bits
-     uint32_t key = 0;      // reversed prefix code
-     int num_nodes = 1;     // number of Huffman tree nodes
+--- a/src/3rdparty/libwebp/src/utils/huffman_utils.c	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/utils/huffman_utils.c	2024-03-17 19:08:13.412412500 +0800
 @@ -177,21 +177,24 @@
        if (num_open < 0) {
          return 0;
@@ -4299,8 +2648,8 @@ diff -rNuZ a/src/3rdparty/libwebp/src/utils/huffman_utils.c b/src/3rdparty/libwe
 +  }
 +}
 diff -rNuZ a/src/3rdparty/libwebp/src/utils/huffman_utils.h b/src/3rdparty/libwebp/src/utils/huffman_utils.h
---- a/src/3rdparty/libwebp/src/utils/huffman_utils.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/utils/huffman_utils.h	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/utils/huffman_utils.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/utils/huffman_utils.h	2024-03-17 19:08:13.412412500 +0800
 @@ -43,6 +43,29 @@
                      // or non-literal symbol otherwise
  } HuffmanCode32;
@@ -4342,42 +2691,9 @@ diff -rNuZ a/src/3rdparty/libwebp/src/utils/huffman_utils.h b/src/3rdparty/libwe
                            const int code_lengths[], int code_lengths_size);
  
  #ifdef __cplusplus
-diff -rNuZ a/src/3rdparty/libwebp/src/utils/utils.h b/src/3rdparty/libwebp/src/utils/utils.h
---- a/src/3rdparty/libwebp/src/utils/utils.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/utils/utils.h	2023-09-14 06:11:07.000000000 +0800
-@@ -64,7 +64,8 @@
- // Alignment
- 
- #define WEBP_ALIGN_CST 31
--#define WEBP_ALIGN(PTR) (((uintptr_t)(PTR) + WEBP_ALIGN_CST) & ~WEBP_ALIGN_CST)
-+#define WEBP_ALIGN(PTR) (((uintptr_t)(PTR) + WEBP_ALIGN_CST) & \
-+                         ~(uintptr_t)WEBP_ALIGN_CST)
- 
- #include <string.h>
- // memcpy() is the safe way of moving potentially unaligned 32b memory.
-@@ -73,10 +74,19 @@
-   memcpy(&A, ptr, sizeof(A));
-   return A;
- }
-+
-+static WEBP_INLINE int32_t WebPMemToInt32(const uint8_t* const ptr) {
-+  return (int32_t)WebPMemToUint32(ptr);
-+}
-+
- static WEBP_INLINE void WebPUint32ToMem(uint8_t* const ptr, uint32_t val) {
-   memcpy(ptr, &val, sizeof(val));
- }
- 
-+static WEBP_INLINE void WebPInt32ToMem(uint8_t* const ptr, int val) {
-+  WebPUint32ToMem(ptr, (uint32_t)val);
-+}
-+
- //------------------------------------------------------------------------------
- // Reading/writing data.
- 
 diff -rNuZ a/src/3rdparty/libwebp/src/webp/decode.h b/src/3rdparty/libwebp/src/webp/decode.h
---- a/src/3rdparty/libwebp/src/webp/decode.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/webp/decode.h	2023-09-14 06:11:07.000000000 +0800
+--- a/src/3rdparty/libwebp/src/webp/decode.h	2024-03-27 03:34:35.000000000 +0800
++++ b/src/3rdparty/libwebp/src/webp/decode.h	2024-03-17 19:08:13.420542900 +0800
 @@ -81,10 +81,11 @@
  // returned is the Y samples buffer. Upon return, *u and *v will point to
  // the U and V chroma data. These U and V buffers need NOT be passed to
@@ -4392,42 +2708,3 @@ diff -rNuZ a/src/3rdparty/libwebp/src/webp/decode.h b/src/3rdparty/libwebp/src/w
  // (*) Also named Y'CbCr. See: https://en.wikipedia.org/wiki/YCbCr
  WEBP_EXTERN uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size,
                                     int* width, int* height,
-diff -rNuZ a/src/3rdparty/libwebp/src/webp/format_constants.h b/src/3rdparty/libwebp/src/webp/format_constants.h
---- a/src/3rdparty/libwebp/src/webp/format_constants.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/webp/format_constants.h	2023-09-14 06:11:07.000000000 +0800
-@@ -55,7 +55,7 @@
- typedef enum {
-   PREDICTOR_TRANSFORM      = 0,
-   CROSS_COLOR_TRANSFORM    = 1,
--  SUBTRACT_GREEN           = 2,
-+  SUBTRACT_GREEN_TRANSFORM = 2,
-   COLOR_INDEXING_TRANSFORM = 3
- } VP8LImageTransformType;
- 
-diff -rNuZ a/src/3rdparty/libwebp/src/webp/types.h b/src/3rdparty/libwebp/src/webp/types.h
---- a/src/3rdparty/libwebp/src/webp/types.h	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/3rdparty/libwebp/src/webp/types.h	2023-09-14 06:11:07.000000000 +0800
-@@ -42,7 +42,11 @@
- # if defined(__GNUC__) && __GNUC__ >= 4
- #  define WEBP_EXTERN extern __attribute__ ((visibility ("default")))
- # else
--#  define WEBP_EXTERN extern
-+#  if defined(_MSC_VER) && defined(WEBP_DLL)
-+#   define WEBP_EXTERN __declspec(dllexport)
-+#  else
-+#   define WEBP_EXTERN extern
-+#  endif
- # endif  /* __GNUC__ >= 4 */
- #endif  /* WEBP_EXTERN */
- 
-diff -rNuZ a/src/plugins/imageformats/webp/CMakeLists.txt b/src/plugins/imageformats/webp/CMakeLists.txt
---- a/src/plugins/imageformats/webp/CMakeLists.txt	2023-11-01 02:38:38.000000000 +0800
-+++ b/src/plugins/imageformats/webp/CMakeLists.txt	2024-03-17 17:45:39.749372300 +0800
-@@ -30,6 +30,7 @@
- qt_internal_extend_target(QWebpPlugin CONDITION NOT QT_FEATURE_system_webp
-     SOURCES
-         ../../../3rdparty/libwebp/sharpyuv/sharpyuv.c
-+        ../../../3rdparty/libwebp/sharpyuv/sharpyuv_cpu.c
-         ../../../3rdparty/libwebp/sharpyuv/sharpyuv_csp.c
-         ../../../3rdparty/libwebp/sharpyuv/sharpyuv_dsp.c
-         ../../../3rdparty/libwebp/sharpyuv/sharpyuv_gamma.c