diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2019-11-21 13:50:25 +0100 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2019-11-29 09:57:36 +0100 |
| commit | 218e5a342b289edeac82dbebf9ab62f893964dc2 (patch) | |
| tree | 4f37d3c2b3866e18700765316805f0fd2ede7960 /src/3rdparty/libwebp/src/enc/syntax_enc.c | |
| parent | 35382896a4c8f155d45a02ecfc5479b5d6e0db47 (diff) | |
Update bundled libwebp to version 1.0.3
[ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.3
(This is a squashed cherry pick from 5.12 branch)
Change-Id: I177a6818c5e073298fc565f91d4126af628b7639
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/libwebp/src/enc/syntax_enc.c')
| -rw-r--r-- | src/3rdparty/libwebp/src/enc/syntax_enc.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/3rdparty/libwebp/src/enc/syntax_enc.c b/src/3rdparty/libwebp/src/enc/syntax_enc.c index 90665bd..a9e5a6c 100644 --- a/src/3rdparty/libwebp/src/enc/syntax_enc.c +++ b/src/3rdparty/libwebp/src/enc/syntax_enc.c @@ -13,10 +13,10 @@ #include <assert.h> -#include "../utils/utils.h" -#include "../webp/format_constants.h" // RIFF constants -#include "../webp/mux_types.h" // ALPHA_FLAG -#include "./vp8i_enc.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" // RIFF constants +#include "src/webp/mux_types.h" // ALPHA_FLAG +#include "src/enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Helper functions @@ -289,11 +289,17 @@ static int GeneratePartition0(VP8Encoder* const enc) { pos3 = VP8BitWriterPos(bw); +#if !defined(WEBP_DISABLE_STATS) if (enc->pic_->stats) { enc->pic_->stats->header_bytes[0] = (int)((pos2 - pos1 + 7) >> 3); enc->pic_->stats->header_bytes[1] = (int)((pos3 - pos2 + 7) >> 3); enc->pic_->stats->alpha_data_size = (int)enc->alpha_data_size_; } +#else + (void)pos1; + (void)pos2; + (void)pos3; +#endif if (bw->error_) { return WebPEncodingSetError(enc->pic_, VP8_ENC_ERROR_OUT_OF_MEMORY); } |