From 7caab1d8f6fcdf56148ebff731aa57d638c9dbbd Mon Sep 17 00:00:00 2001 From: Urvang Joshi Date: Wed, 7 Nov 2012 16:04:08 -0800 Subject: [PATCH] Some cosmetic/comment fixes. Change-Id: Id0613f84cc53fcbeceb913c835a262451687e27b --- examples/webpmux.c | 6 +++--- src/dsp/yuv.h | 4 ++-- src/mux/muxedit.c | 2 +- src/utils/huffman_encode.c | 2 +- src/webp/mux.h | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/webpmux.c b/examples/webpmux.c index 4647dca0..9be48591 100644 --- a/examples/webpmux.c +++ b/examples/webpmux.c @@ -802,9 +802,9 @@ static int Process(const WebPMuxConfig* config) { if (!ok) goto Err2; switch (feature->type_) { case FEATURE_ANMF: - case FEATURE_FRGM: - ok = GetFrameFragment(mux, config, - (feature->type_ == FEATURE_ANMF) ? 1 : 0); + case FEATURE_FRGM: + ok = GetFrameFragment(mux, config, + (feature->type_ == FEATURE_ANMF) ? 1 : 0); break; case FEATURE_ICCP: diff --git a/src/dsp/yuv.h b/src/dsp/yuv.h index 6a7fcad3..ace4ce03 100644 --- a/src/dsp/yuv.h +++ b/src/dsp/yuv.h @@ -114,8 +114,8 @@ void VP8YUVInit(void); // RGB -> YUV conversion static WEBP_INLINE int VP8ClipUV(int v) { - v = (v + (257 << (YUV_FIX + 2 - 1))) >> (YUV_FIX + 2); - return ((v & ~0xff) == 0) ? v : (v < 0) ? 0 : 255; + v = (v + (257 << (YUV_FIX + 2 - 1))) >> (YUV_FIX + 2); + return ((v & ~0xff) == 0) ? v : (v < 0) ? 0 : 255; } #ifndef USE_YUVj diff --git a/src/mux/muxedit.c b/src/mux/muxedit.c index fd79e733..16d18b84 100644 --- a/src/mux/muxedit.c +++ b/src/mux/muxedit.c @@ -108,7 +108,7 @@ static WebPMuxError MuxAddChunk(WebPMux* const mux, uint32_t nth, uint32_t tag, return MuxSet(mux, idx, nth, &chunk_data, copy_data); } -// Create data for frame/tile given image data, offsets and duration. +// Create data for frame/fragment given image data, offsets and duration. static WebPMuxError CreateFrameFragmentData( const WebPData* const image, int x_offset, int y_offset, int duration, WebPMuxAnimDispose dispose_method, int is_lossless, int is_frame, diff --git a/src/utils/huffman_encode.c b/src/utils/huffman_encode.c index d4715687..e8cbc628 100644 --- a/src/utils/huffman_encode.c +++ b/src/utils/huffman_encode.c @@ -229,7 +229,7 @@ static int GenerateOptimalTree(const int* const histogram, int histogram_size, tree_pool[tree_pool_size++] = tree[tree_size - 1]; tree_pool[tree_pool_size++] = tree[tree_size - 2]; count = tree_pool[tree_pool_size - 1].total_count_ + - tree_pool[tree_pool_size - 2].total_count_; + tree_pool[tree_pool_size - 2].total_count_; tree_size -= 2; { // Search for the insertion point. diff --git a/src/webp/mux.h b/src/webp/mux.h index 2c0c379a..ea8caee4 100644 --- a/src/webp/mux.h +++ b/src/webp/mux.h @@ -229,7 +229,7 @@ enum WebPMuxAnimDispose { WEBP_MUX_DISPOSE_BACKGROUND // Dispose to background color. }; -// Encapsulates data about a single frame/tile. +// Encapsulates data about a single frame/fragment. struct WebPMuxFrameInfo { WebPData bitstream; // image data: can either be a raw VP8/VP8L bitstream // or a single-image WebP file. @@ -460,8 +460,8 @@ struct WebPIterator { WebPData fragment; // The frame or fragment given by 'frame_num' and // 'fragment_num'. - uint32_t pad[4]; // padding for later use - void* private_; // for internal use only. + uint32_t pad[4]; // padding for later use. + void* private_; // for internal use only. }; // Retrieves frame 'frame_number' from 'dmux'.