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

Merge "cosmetics"

Browse Source
This commit is contained in:
pascal massimino 2014-08-06 12:30:08 -07:00 committed by Gerrit Code Review
commit bb07022b66
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dec/tree.c
View File

@ -11,7 +11,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "vp8i.h" #include "./vp8i.h"
#include "../utils/bit_reader_inl.h" #include "../utils/bit_reader_inl.h"
#define USE_GENERIC_TREE #define USE_GENERIC_TREE

8
src/dsp/enc_neon.c
View File

@ -1002,10 +1002,10 @@ static int16x8_t Quantize(int16_t* const in,
} }
static const uint8_t kShuffles[4][8] = { static const uint8_t kShuffles[4][8] = {
{ 0, 1, 2, 3, 8, 9, 16, 17 }, { 0, 1, 2, 3, 8, 9, 16, 17 },
{ 10, 11, 4, 5, 6, 7, 12, 13 }, { 10, 11, 4, 5, 6, 7, 12, 13 },
{ 18, 19, 24, 25, 26, 27, 20, 21 }, { 18, 19, 24, 25, 26, 27, 20, 21 },
{ 14, 15, 22, 23, 28, 29, 30, 31 } { 14, 15, 22, 23, 28, 29, 30, 31 }
}; };
static int QuantizeBlock(int16_t in[16], int16_t out[16], static int QuantizeBlock(int16_t in[16], int16_t out[16],

2
src/dsp/lossless.c
View File

@ -1169,7 +1169,7 @@ static void ColorSpaceInverseTransform(const VP8LTransform* const transform,
data += remaining_width; data += remaining_width;
} }
++y; ++y;
if ((y & mask) == 0) pred_row += tiles_per_row;; if ((y & mask) == 0) pred_row += tiles_per_row;
} }
} }

2
src/enc/frame.c
View File

@ -508,7 +508,7 @@ static void StoreSideInfo(const VP8EncIterator* const it) {
} }
case 7: *info = mb->alpha_; break; case 7: *info = mb->alpha_; break;
default: *info = 0; break; default: *info = 0; break;
}; }
} }
#if SEGMENT_VISU // visualize segments and prediction modes #if SEGMENT_VISU // visualize segments and prediction modes
SetBlock(it->yuv_out_ + Y_OFF, mb->segment_ * 64, 16); SetBlock(it->yuv_out_ + Y_OFF, mb->segment_ * 64, 16);

8
src/utils/quant_levels_dec.c
View File

@ -32,10 +32,10 @@
#define DSIZE 4 // dithering size (must be a power of two) #define DSIZE 4 // dithering size (must be a power of two)
// cf. http://en.wikipedia.org/wiki/Ordered_dithering // cf. http://en.wikipedia.org/wiki/Ordered_dithering
static const uint8_t kOrderedDither[DSIZE][DSIZE] = { static const uint8_t kOrderedDither[DSIZE][DSIZE] = {
{ 0, 8, 2, 10 }, // coefficients are in DFIX fixed-point precision { 0, 8, 2, 10 }, // coefficients are in DFIX fixed-point precision
{ 12, 4, 14, 6 }, { 12, 4, 14, 6 },
{ 3, 11, 1, 9 }, { 3, 11, 1, 9 },
{ 15, 7, 13, 5 } { 15, 7, 13, 5 }
}; };
#else #else

6
src/utils/utils.c
View File

@ -155,9 +155,9 @@ static void SubMem(void* ptr) {
} }
#else #else
#define Increment(v) do {} while(0) #define Increment(v) do {} while (0)
#define AddMem(p, s) do {} while(0) #define AddMem(p, s) do {} while (0)
#define SubMem(p) do {} while(0) #define SubMem(p) do {} while (0)
#endif #endif
// Returns 0 in case of overflow of nmemb * size. // Returns 0 in case of overflow of nmemb * size.