summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libwebp/src/enc/webp_enc.c
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2022-08-09 15:43:43 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-22 13:58:39 +0000
commit3bd32281c337770e2bd6b67f8adea9ed901b02bc (patch)
treee57197e052b21db633a58a2645ab4e99f0236562 /src/3rdparty/libwebp/src/enc/webp_enc.c
parent5eb8af5d9aa78b2de5d0bcf50a93646b61c5378a (diff)
Update bundled libwebp to version 1.2.4
[ChangeLog][Third-Party Code] Update bundled libwebp to version 1.2.4 Change-Id: Ibd50e3ee67dbe0f7c385224cd9e07df75ea838b9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 91c2c3832d1853c737998a1277957d487ef1301f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty/libwebp/src/enc/webp_enc.c')
-rw-r--r--src/3rdparty/libwebp/src/enc/webp_enc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/3rdparty/libwebp/src/enc/webp_enc.c b/src/3rdparty/libwebp/src/enc/webp_enc.c
index ce2db2e..9620e05 100644
--- a/src/3rdparty/libwebp/src/enc/webp_enc.c
+++ b/src/3rdparty/libwebp/src/enc/webp_enc.c
@@ -336,9 +336,7 @@ int WebPEncode(const WebPConfig* config, WebPPicture* pic) {
if (!WebPValidateConfig(config)) {
return WebPEncodingSetError(pic, VP8_ENC_ERROR_INVALID_CONFIGURATION);
}
- if (pic->width <= 0 || pic->height <= 0) {
- return WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_DIMENSION);
- }
+ if (!WebPValidatePicture(pic)) return 0;
if (pic->width > WEBP_MAX_DIMENSION || pic->height > WEBP_MAX_DIMENSION) {
return WebPEncodingSetError(pic, VP8_ENC_ERROR_BAD_DIMENSION);
}