summaryrefslogtreecommitdiffstats
path: root/media/libwebp/webp/decode.h
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-01-21 13:09:32 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-01-21 13:09:32 +0100
commitd1a0bfe221b91ea37a34d0b0360f347d2a6394e5 (patch)
tree5bba8c28b5415c90e90156bfa59a641a99118b99 /media/libwebp/webp/decode.h
parent9a954e2d1619788f658f6ec30c7dbd89b3d48b0d (diff)
downloadUXP-d1a0bfe221b91ea37a34d0b0360f347d2a6394e5.tar
UXP-d1a0bfe221b91ea37a34d0b0360f347d2a6394e5.tar.gz
UXP-d1a0bfe221b91ea37a34d0b0360f347d2a6394e5.tar.lz
UXP-d1a0bfe221b91ea37a34d0b0360f347d2a6394e5.tar.xz
UXP-d1a0bfe221b91ea37a34d0b0360f347d2a6394e5.zip
Update libwebp to version 1.0.2
This resolves #939.
Diffstat (limited to 'media/libwebp/webp/decode.h')
-rw-r--r--media/libwebp/webp/decode.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/media/libwebp/webp/decode.h b/media/libwebp/webp/decode.h
index 2165e96c9..ae8bfe840 100644
--- a/media/libwebp/webp/decode.h
+++ b/media/libwebp/webp/decode.h
@@ -42,6 +42,12 @@ WEBP_EXTERN int WebPGetDecoderVersion(void);
// This function will also validate the header, returning true on success,
// false otherwise. '*width' and '*height' are only valid on successful return.
// Pointers 'width' and 'height' can be passed NULL if deemed irrelevant.
+// Note: The following chunk sequences (before the raw VP8/VP8L data) are
+// considered valid by this function:
+// RIFF + VP8(L)
+// RIFF + VP8X + (optional chunks) + VP8(L)
+// ALPH + VP8 <-- Not a valid WebP format: only allowed for internal purpose.
+// VP8(L) <-- Not a valid WebP format: only allowed for internal purpose.
WEBP_EXTERN int WebPGetInfo(const uint8_t* data, size_t data_size,
int* width, int* height);
@@ -425,6 +431,12 @@ WEBP_EXTERN VP8StatusCode WebPGetFeaturesInternal(
// Returns VP8_STATUS_OK when the features are successfully retrieved. Returns
// VP8_STATUS_NOT_ENOUGH_DATA when more data is needed to retrieve the
// features from headers. Returns error in other cases.
+// Note: The following chunk sequences (before the raw VP8/VP8L data) are
+// considered valid by this function:
+// RIFF + VP8(L)
+// RIFF + VP8X + (optional chunks) + VP8(L)
+// ALPH + VP8 <-- Not a valid WebP format: only allowed for internal purpose.
+// VP8(L) <-- Not a valid WebP format: only allowed for internal purpose.
static WEBP_INLINE VP8StatusCode WebPGetFeatures(
const uint8_t* data, size_t data_size,
WebPBitstreamFeatures* features) {
@@ -491,4 +503,4 @@ WEBP_EXTERN VP8StatusCode WebPDecode(const uint8_t* data, size_t data_size,
} // extern "C"
#endif
-#endif /* WEBP_WEBP_DECODE_H_ */
+#endif // WEBP_WEBP_DECODE_H_