dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "WebPMuxGetImage: allow image param to be NULL"

Browse Source
This commit is contained in:
pascal massimino 2012-02-22 21:58:48 -08:00 committed by Gerrit Code Review
commit cb5810dfbe
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mux/muxread.c
View File

@ -230,8 +230,8 @@ WebPMuxError WebPMuxGetImage(const WebPMux* const mux,
WebPMuxError err;
WebPMuxImage* wpi = NULL;
if (mux == NULL || image == NULL) return WEBP_MUX_INVALID_ARGUMENT;
memset(image, 0, sizeof(*image));
if (mux == NULL || (image == NULL && alpha == NULL))
return WEBP_MUX_INVALID_ARGUMENT;
err = ValidateForImage(mux);
if (err != WEBP_MUX_OK) return err;
@ -250,9 +250,12 @@ WebPMuxError WebPMuxGetImage(const WebPMux* const mux,
}
// Get image chunk.
if (wpi->vp8_ != NULL) {
image->bytes_ = wpi->vp8_->data_;
image->size_ = wpi->vp8_->payload_size_;
if (image != NULL) {
memset(image, 0, sizeof(*image));
if (wpi->vp8_ != NULL) {
image->bytes_ = wpi->vp8_->data_;
image->size_ = wpi->vp8_->payload_size_;
}
}
return WEBP_MUX_OK;
}

4
src/webp/mux.h
View File

@ -149,8 +149,8 @@ WEBP_EXTERN(WebPMuxError) WebPMuxSetImage(
// image - (out) the image data
// alpha - (out) the alpha data of the image (if present)
// Returns:
// WEBP_MUX_INVALID_ARGUMENT - if either mux or image is NULL
// OR if mux contains animation/tiling.
// WEBP_MUX_INVALID_ARGUMENT - if either mux or both image & alpha are NULL
// OR mux contains animation/tiling.
// WEBP_MUX_NOT_FOUND - if image is not present in mux object.
// WEBP_MUX_OK - on success.
WEBP_EXTERN(WebPMuxError) WebPMuxGetImage(const WebPMux* const mux,