X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=images%2Fmath.h;h=b322949ddbaa5e4529021da583f647c49b8726b3;hb=ae7dfec55384883a72867d4877b5283a3c1c8aa1;hp=ecbecbf5ffb74705b288bfa7b133ae7ae384914f;hpb=0192d9f3a127c82b32131d26ed9b5fb5a90db723;p=libucw.git diff --git a/images/math.h b/images/math.h index ecbecbf5..b322949d 100644 --- a/images/math.h +++ b/images/math.h @@ -9,19 +9,19 @@ extern const u32 fast_div_tab[]; extern const byte fast_sqrt_tab[]; -static inline uns isqr(int x) +static inline uint isqr(int x) { return x * x; } -static inline uns fast_div_u32_u8(uns x, uns y) +static inline uint fast_div_u32_u8(uint x, uint y) { return ((u64)(x) * fast_div_tab[y]) >> 32; } -static inline uns fast_sqrt_u16(uns x) +static inline uint fast_sqrt_u16(uint x) { - uns y; + uint y; if (x < (1 << 10) - 3) y = fast_sqrt_tab[(x + 3) >> 2] >> 3; else if (x < (1 << 14) - 28) @@ -31,9 +31,9 @@ static inline uns fast_sqrt_u16(uns x) return (x < y * y) ? y - 1 : y; } -static inline uns fast_sqrt_u32(uns x) +static inline uint fast_sqrt_u32(uint x) { - uns y; + uint y; if (x < (1 << 16)) { if (x < (1 << 10) - 3)