Merge "cosmetics,FindClosestDiscretized: use uint in mask creation"

This commit is contained in:
Pascal Massimino 2017-05-23 05:47:20 +00:00 committed by Gerrit Code Review
commit e1118d624d

View File

@ -27,7 +27,7 @@
// Quantizes the value up or down to a multiple of 1<<bits (or to 255), // Quantizes the value up or down to a multiple of 1<<bits (or to 255),
// choosing the closer one, resolving ties using bankers' rounding. // choosing the closer one, resolving ties using bankers' rounding.
static uint32_t FindClosestDiscretized(uint32_t a, int bits) { static uint32_t FindClosestDiscretized(uint32_t a, int bits) {
const uint32_t mask = (1 << bits) - 1; const uint32_t mask = (1u << bits) - 1;
const uint32_t biased = a + (mask >> 1) + ((a >> bits) & 1); const uint32_t biased = a + (mask >> 1) + ((a >> bits) & 1);
assert(bits > 0); assert(bits > 0);
if (biased > 0xff) return 0xff; if (biased > 0xff) return 0xff;