You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1.4 KiB
27 lines
1.4 KiB
3 months ago
|
diff -rupN --no-dereference libwebp-1.3.2/src/dec/vp8l_dec.c libwebp-1.3.2-new/src/dec/vp8l_dec.c
|
||
|
|
--- libwebp-1.3.2/src/dec/vp8l_dec.c 2023-09-14 00:11:07.000000000 +0200
|
||
|
|
+++ libwebp-1.3.2-new/src/dec/vp8l_dec.c 2023-09-28 20:47:39.648154201 +0200
|
||
|
|
@@ -1241,9 +1241,20 @@ static int DecodeImageData(VP8LDecoder*
|
||
|
|
}
|
||
|
|
|
||
|
|
br->eos_ = VP8LIsEndOfStream(br);
|
||
|
|
- if (dec->incremental_ && br->eos_ && src < src_end) {
|
||
|
|
+ // In incremental decoding:
|
||
|
|
+ // br->eos_ && src < src_last: if 'br' reached the end of the buffer and
|
||
|
|
+ // 'src_last' has not been reached yet, there is not enough data. 'dec' has to
|
||
|
|
+ // be reset until there is more data.
|
||
|
|
+ // !br->eos_ && src < src_last: this cannot happen as either the buffer is
|
||
|
|
+ // fully read, either enough has been read to reach 'src_last'.
|
||
|
|
+ // src >= src_last: 'src_last' is reached, all is fine. 'src' can actually go
|
||
|
|
+ // beyond 'src_last' in case the image is cropped and an LZ77 goes further.
|
||
|
|
+ // The buffer might have been enough or there is some left. 'br->eos_' does
|
||
|
|
+ // not matter.
|
||
|
|
+ assert(!dec->incremental_ || (br->eos_ && src < src_last) || src >= src_last);
|
||
|
|
+ if (dec->incremental_ && br->eos_ && src < src_last) {
|
||
|
|
RestoreState(dec);
|
||
|
|
- } else if (!br->eos_) {
|
||
|
|
+ } else if ((dec->incremental_ && src >= src_last) || !br->eos_) {
|
||
|
|
// Process the remaining rows corresponding to last row-block.
|
||
|
|
if (process_func != NULL) {
|
||
|
|
process_func(dec, row > last_row ? last_row : row);
|