diff options
| author | Pascal Massimino <pascal.massimino@gmail.com> | 2021-06-28 23:19:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-28 23:19:21 +0000 |
| commit | e1a8d4f3feea780486a5e730f229d3e5d3f288f0 (patch) | |
| tree | 74a1598b51b00040b6d1974c1b1d6cffd9183017 | |
| parent | 4de35f4383b498453b1d576221a2dfee2ee42f36 (diff) | |
| parent | 0f13eec7bf3b158f755602db2bd1ab6733bba26d (diff) | |
| download | libwebp-e1a8d4f3feea780486a5e730f229d3e5d3f288f0.tar.gz | |
Merge "bit_reader_inl_utils: uniformly apply WEBP_RESTRICT" into main
| -rw-r--r-- | src/utils/bit_reader_inl_utils.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/utils/bit_reader_inl_utils.h b/src/utils/bit_reader_inl_utils.h index c5f9ae5c..404b9a6d 100644 --- a/src/utils/bit_reader_inl_utils.h +++ b/src/utils/bit_reader_inl_utils.h @@ -55,7 +55,7 @@ void VP8LoadFinalBytes(VP8BitReader* const br); // makes sure br->value_ has at least BITS bits worth of data static WEBP_UBSAN_IGNORE_UNDEF WEBP_INLINE -void VP8LoadNewBytes(VP8BitReader* const br) { +void VP8LoadNewBytes(VP8BitReader* WEBP_RESTRICT const br) { assert(br != NULL && br->buf_ != NULL); // Read 'BITS' bits at a time if possible. if (br->buf_ < br->buf_max_) { @@ -137,7 +137,8 @@ static WEBP_INLINE int VP8GetBit(VP8BitReader* WEBP_RESTRICT const br, // simplified version of VP8GetBit() for prob=0x80 (note shift is always 1 here) static WEBP_UBSAN_IGNORE_UNSIGNED_OVERFLOW WEBP_INLINE -int VP8GetSigned(VP8BitReader* const br, int v, const char label[]) { +int VP8GetSigned(VP8BitReader* WEBP_RESTRICT const br, int v, + const char label[]) { if (br->bits_ < 0) { VP8LoadNewBytes(br); } @@ -155,7 +156,7 @@ int VP8GetSigned(VP8BitReader* const br, int v, const char label[]) { } } -static WEBP_INLINE int VP8GetBitAlt(VP8BitReader* const br, +static WEBP_INLINE int VP8GetBitAlt(VP8BitReader* WEBP_RESTRICT const br, int prob, const char label[]) { // Don't move this declaration! It makes a big speed difference to store // 'range' *before* calling VP8LoadNewBytes(), even if this function doesn't |