(svn r11390) -Fix r11387: AB() was wrong (spotted by Rafal Rzepecki, patch by skidd13)
--- a/src/macros.h Wed Nov 07 21:35:33 2007 +0000
+++ b/src/macros.h Wed Nov 07 22:41:50 2007 +0000
@@ -66,9 +66,8 @@
*/
template<typename T, typename U> static inline T AB(T& x, const uint8 s, const uint8 n, const U i)
{
- const T tmp = (T)(((1U << n) - 1) << s);
- x &= ~tmp;
- x |= (T)((x + (i << s)) & tmp);
+ const T mask = (T)(((1U << n) - 1) << s);
+ x = (T)((x & ~mask) | ((x + (i << s)) & mask));
return x;
}