dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-13 15:32:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "make ExUtilLoadWebP() accept NULL bitstream param."

Browse Source
This commit is contained in:
James Zern 2014-04-26 12:22:53 -07:00 committed by Gerrit Code Review
commit 8e5f90b086
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/example_util.c
View File

@ -131,8 +131,13 @@ int ExUtilLoadWebP(const char* const in_file,
const uint8_t** data, size_t* data_size, const uint8_t** data, size_t* data_size,
WebPBitstreamFeatures* bitstream) { WebPBitstreamFeatures* bitstream) {
VP8StatusCode status; VP8StatusCode status;
WebPBitstreamFeatures local_features;
if (!ExUtilReadFile(in_file, data, data_size)) return 0; if (!ExUtilReadFile(in_file, data, data_size)) return 0;
if (bitstream == NULL) {
bitstream = &local_features;
}
status = WebPGetFeatures(*data, *data_size, bitstream); status = WebPGetFeatures(*data, *data_size, bitstream);
if (status != VP8_STATUS_OK) { if (status != VP8_STATUS_OK) {
free((void*)*data); free((void*)*data);

2
examples/example_util.h
View File

@ -47,7 +47,7 @@ int ExUtilWriteFile(const char* const file_name,
void ExUtilPrintWebPError(const char* const in_file, int status); void ExUtilPrintWebPError(const char* const in_file, int status);
// Reads a WebP from 'in_file', returning the contents and size in 'data' and // Reads a WebP from 'in_file', returning the contents and size in 'data' and
// 'data_size'. 'bitstream' is populated using WebPGetFeatures(). // 'data_size'. If not NULL, 'bitstream' is populated using WebPGetFeatures().
// Returns true on success. // Returns true on success.
int ExUtilLoadWebP(const char* const in_file, int ExUtilLoadWebP(const char* const in_file,
const uint8_t** data, size_t* data_size, const uint8_t** data, size_t* data_size,