dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-01-30 00:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

demux,WebPIterator: remove fragment_num/num_fragments

Browse Source 
these are remnants of an unused experiment

Change-Id: Ia08f9e6a895d5afff41a49f6e680fd76f024a5ee
This commit is contained in:
James Zern 2015-12-15 14:05:21 -08:00
parent 11714ff158
commit 466c92e829
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/demux/demux.c
View File

@ -757,6 +757,7 @@ static const Frame* GetFrame(const WebPDemuxer* const dmux, int frame_num) {
} }
// Returns fragment 'fragment_num' and the total count. // Returns fragment 'fragment_num' and the total count.
// TODO(jzern): this function is no longer necessary.
static const Frame* GetFragment( static const Frame* GetFragment(
const Frame* const frame_set, int fragment_num, int* const count) { const Frame* const frame_set, int fragment_num, int* const count) {
const int this_frame = frame_set->frame_num_; const int this_frame = frame_set->frame_num_;
@ -811,8 +812,6 @@ static int SynthesizeFrame(const WebPDemuxer* const dmux,
iter->frame_num = first_frame->frame_num_; iter->frame_num = first_frame->frame_num_;
iter->num_frames = dmux->num_frames_; iter->num_frames = dmux->num_frames_;
iter->fragment_num = fragment_num;
iter->num_fragments = num_fragments;
iter->x_offset = fragment->x_offset_; iter->x_offset = fragment->x_offset_;
iter->y_offset = fragment->y_offset_; iter->y_offset = fragment->y_offset_;
iter->width = fragment->width_; iter->width = fragment->width_;

12
src/webp/demux.h
View File

@ -55,7 +55,7 @@
extern "C" { extern "C" {
#endif #endif
#define WEBP_DEMUX_ABI_VERSION 0x0106 // MAJOR(8b) + MINOR(8b) #define WEBP_DEMUX_ABI_VERSION 0x0107 // MAJOR(8b) + MINOR(8b)
// Note: forward declaring enumerations is not allowed in (strict) C and C++, // Note: forward declaring enumerations is not allowed in (strict) C and C++,
// the types are left here for reference. // the types are left here for reference.
@ -137,17 +137,15 @@ WEBP_EXTERN(uint32_t) WebPDemuxGetI(
struct WebPIterator { struct WebPIterator {
int frame_num; int frame_num;
int num_frames; // equivalent to WEBP_FF_FRAME_COUNT. int num_frames; // equivalent to WEBP_FF_FRAME_COUNT.
int fragment_num;
int num_fragments;
int x_offset, y_offset; // offset relative to the canvas. int x_offset, y_offset; // offset relative to the canvas.
int width, height; // dimensions of this frame or fragment. int width, height; // dimensions of this frame.
int duration; // display duration in milliseconds. int duration; // display duration in milliseconds.
WebPMuxAnimDispose dispose_method; // dispose method for the frame. WebPMuxAnimDispose dispose_method; // dispose method for the frame.
int complete; // true if 'fragment' contains a full frame. partial images int complete; // true if 'fragment' contains a full frame. partial images
// may still be decoded with the WebP incremental decoder. // may still be decoded with the WebP incremental decoder.
WebPData fragment; // The frame or fragment given by 'frame_num' and WebPData fragment; // The frame given by 'frame_num'. Note for historical
// 'fragment_num'. // reasons this is called a fragment.
int has_alpha; // True if the frame or fragment contains transparency. int has_alpha; // True if the frame contains transparency.
WebPMuxAnimBlend blend_method; // Blend operation for the frame. WebPMuxAnimBlend blend_method; // Blend operation for the frame.
uint32_t pad[2]; // padding for later use. uint32_t pad[2]; // padding for later use.