diff options
author | Sebastian Rasmussen <sebras@gmail.com> | 2017-05-29 00:10:28 +0800 |
---|---|---|
committer | Sebastian Rasmussen <sebras@gmail.com> | 2017-05-31 20:29:30 +0800 |
commit | 2d68de96c62c1e6d6a2b615336d99b671fc672b7 (patch) | |
tree | c309b8fdf623a0fd56aebc38c863b596e23c379f /include/mupdf/fitz/system.h | |
parent | 73d7b296bd549a7e985ea9df9f13e6ad3701ef89 (diff) | |
download | mupdf-2d68de96c62c1e6d6a2b615336d99b671fc672b7.tar.xz |
Avoid double literals causing casts to float.
Diffstat (limited to 'include/mupdf/fitz/system.h')
-rw-r--r-- | include/mupdf/fitz/system.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h index 571edf01..5fbc59be 100644 --- a/include/mupdf/fitz/system.h +++ b/include/mupdf/fitz/system.h @@ -409,27 +409,27 @@ static inline float my_sinf(float x) float x2, xn; int i; /* Map x into the -PI to PI range. We could do this using: - * x = fmodf(x, (float)(2.0 * FZ_PI)); + * x = fmodf(x, 2.0f * FZ_PI); * but that's C99, and seems to misbehave with negative numbers * on some platforms. */ x -= FZ_PI; - i = x / (float)(2.0f * FZ_PI); - x -= i * (float)(2.0f * FZ_PI); + i = x / (2.0f * FZ_PI); + x -= i * 2.0f * FZ_PI; if (x < 0.0f) - x += (float)(2.0f * FZ_PI); + x += 2.0f * FZ_PI; x -= FZ_PI; - if (x <= (float)(-FZ_PI/2.0)) - x = -FZ_PI-x; - else if (x >= (float)(FZ_PI/2.0)) + if (x <= -FZ_PI / 2.0f) + x = -FZ_PI - x; + else if (x >= FZ_PI / 2.0f) x = FZ_PI-x; - x2 = x*x; - xn = x*x2/6.0f; + x2 = x * x; + xn = x * x2 / 6.0f; x -= xn; - xn *= x2/20.0f; + xn *= x2 / 20.0f; x += xn; - xn *= x2/42.0f; + xn *= x2 / 42.0f; x -= xn; - xn *= x2/72.0f; + xn *= x2 / 72.0f; x += xn; return x; } @@ -450,14 +450,14 @@ static inline float my_atan2f(float o, float a) if (a < 0) a = -a, flip = 1; if (o < a) - i = (int)(65536.0f*o/a + 0.5f); + i = 65536.0f * o / a + 0.5f; else - i = (int)(65536.0f*a/o + 0.5f); - r = my_atan_table[i>>8]; - s = my_atan_table[(i>>8)+1]; - r += (s-r)*(i&255)/256.0f; + i = 65536.0f * a / o + 0.5f; + r = my_atan_table[i >> 8]; + s = my_atan_table[(i >> 8) + 1]; + r += (s - r) * (i & 255) / 256.0f; if (o >= a) - r = (float)(FZ_PI/2.0f) - r; + r = FZ_PI / 2.0f - r; if (flip) r = FZ_PI - r; if (negate) @@ -466,7 +466,7 @@ static inline float my_atan2f(float o, float a) } #define sinf(x) my_sinf(x) -#define cosf(x) my_sinf((FZ_PI / 2.0f) + (x)) +#define cosf(x) my_sinf(FZ_PI / 2.0f + (x)) #define atan2f(x,y) my_atan2f((x),(y)) #endif |