dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

cosmetics after mux changes b74ed6e, b494ad5

Browse Source 
Change-Id: I8f693b1ba2537de89bda1dfbcf3b95abd17e420a
This commit is contained in:
James Zern 2012-06-20 16:02:53 -07:00
parent b494ad5096
commit b9ae4f0d88
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/webpmux.c
View File

@ -798,7 +798,7 @@ static int Process(const WebPMuxConfig* config) {
ERROR_GOTO1("ERROR: Could not parse frame properties.\n", Err2); ERROR_GOTO1("ERROR: Could not parse frame properties.\n", Err2);
} }
err = WebPMuxPushFrame(mux, &webpdata, x_offset, y_offset, err = WebPMuxPushFrame(mux, &webpdata, x_offset, y_offset,
duration, 1); duration, 1);
WebPDataClear(&webpdata); WebPDataClear(&webpdata);
if (err != WEBP_MUX_OK) { if (err != WEBP_MUX_OK) {
ERROR_GOTO3("ERROR#%d: Could not add a frame at index %d.\n", ERROR_GOTO3("ERROR#%d: Could not add a frame at index %d.\n",

20
src/mux/muxedit.c
View File

@ -432,20 +432,20 @@ static WebPMuxError MuxPushFrameTileInternal(
} }
WebPMuxError WebPMuxPushFrame(WebPMux* const mux, WebPMuxError WebPMuxPushFrame(WebPMux* const mux,
const WebPData* const bitstream, const WebPData* const bitstream,
uint32_t x_offset, uint32_t y_offset, uint32_t x_offset, uint32_t y_offset,
uint32_t duration, int copy_data) { uint32_t duration, int copy_data) {
return MuxPushFrameTileInternal(mux, bitstream, x_offset, y_offset, return MuxPushFrameTileInternal(mux, bitstream, x_offset, y_offset,
duration, copy_data, kChunks[IDX_FRAME].tag); duration, copy_data, kChunks[IDX_FRAME].tag);
} }
WebPMuxError WebPMuxPushTile(WebPMux* const mux, WebPMuxError WebPMuxPushTile(WebPMux* const mux,
const WebPData* const bitstream, const WebPData* const bitstream,
uint32_t x_offset, uint32_t y_offset, uint32_t x_offset, uint32_t y_offset,
int copy_data) { int copy_data) {
return MuxPushFrameTileInternal(mux, bitstream, x_offset, y_offset, return MuxPushFrameTileInternal(mux, bitstream, x_offset, y_offset,
1 /* unused duration*/, copy_data, 1 /* unused duration */, copy_data,
kChunks[IDX_TILE].tag); kChunks[IDX_TILE].tag);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -493,7 +493,7 @@ WebPMuxError WebPMuxDeleteTile(WebPMux* const mux, uint32_t nth) {
// Assembly of the WebP RIFF file. // Assembly of the WebP RIFF file.
WebPMuxError MuxGetImageWidthHeight(const WebPChunk* const image_chunk, WebPMuxError MuxGetImageWidthHeight(const WebPChunk* const image_chunk,
int* const width, int* const height) { int* const width, int* const height) {
const uint32_t tag = image_chunk->tag_; const uint32_t tag = image_chunk->tag_;
const WebPData* const data = &image_chunk->data_; const WebPData* const data = &image_chunk->data_;
int w, h; int w, h;

2
src/mux/muxinternal.c
View File

@ -331,7 +331,7 @@ WebPMuxError MuxImagePush(const WebPMuxImage* wpi, WebPMuxImage** wpi_list) {
if (*wpi_list != NULL) { if (*wpi_list != NULL) {
(*wpi_list)->next_ = new_wpi; (*wpi_list)->next_ = new_wpi;
} else { } else {
*wpi_list = new_wpi; *wpi_list = new_wpi;
} }
return WEBP_MUX_OK; return WEBP_MUX_OK;
} }

4
src/mux/muxread.c
View File

@ -382,8 +382,8 @@ static int CountChunks(const WebPChunk* const chunk_list, uint32_t tag) {
return count; return count;
} }
WebPMuxError WebPMuxNumChunks(const WebPMux* const mux, WebPChunkId id, WebPMuxError WebPMuxNumChunks(const WebPMux* const mux,
int* num_elements) { WebPChunkId id, int* num_elements) {
if (mux == NULL || num_elements == NULL) { if (mux == NULL || num_elements == NULL) {
return WEBP_MUX_INVALID_ARGUMENT; return WEBP_MUX_INVALID_ARGUMENT;
} }