Merge "rename some symbols clashing with MSVC headers"

This commit is contained in:
Pascal Massimino
2017-03-16 17:53:37 +00:00
committed by Gerrit Code Review
2 changed files with 24 additions and 22 deletions

View File

@ -71,10 +71,11 @@ typedef struct {
//------------------------------------------------------------------------------
#define CLIP_MASK (int)(~0U << (8 + DFIX))
#define CLIP_8b_MASK (int)(~0U << (8 + DFIX))
static WEBP_INLINE uint8_t clip_8b(int v) {
return (!(v & CLIP_MASK)) ? (uint8_t)(v >> DFIX) : (v < 0) ? 0u : 255u;
return (!(v & CLIP_8b_MASK)) ? (uint8_t)(v >> DFIX) : (v < 0) ? 0u : 255u;
}
#undef CLIP_8b_MASK
// vertical accumulation
static void VFilter(SmoothParams* const p) {