From 0a900d7f40f2a643ff1980ac48147ce9cf416960 Mon Sep 17 00:00:00 2001 From: Oneric Date: Wed, 16 Dec 2020 22:18:25 +0100 Subject: Replace M_PI M_PI is not part of ISO C and also not part of base POSIX, but an XSI extension. For simplicity, just always use our own macro for PI. The value is identical to the one used in glibc and musl. --- libass/ass_blur.c | 2 +- libass/ass_render.c | 6 +++--- libass/ass_utils.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libass/ass_blur.c b/libass/ass_blur.c index a114e92..5302832 100644 --- a/libass/ass_blur.c +++ b/libass/ass_blur.c @@ -407,7 +407,7 @@ static void calc_gauss(double *res, int n, double r2) { double alpha = 0.5 / r2; double mul = exp(-alpha), mul2 = mul * mul; - double cur = sqrt(alpha / M_PI); + double cur = sqrt(alpha / ASS_PI); res[0] = cur; cur *= mul; diff --git a/libass/ass_render.c b/libass/ass_render.c index ef1e654..eaf135b 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -1246,9 +1246,9 @@ size_t ass_outline_construct(void *key, void *value, void *priv) static void calc_transform_matrix(ASS_Renderer *render_priv, GlyphInfo *info, double m[3][3]) { - double frx = M_PI / 180 * info->frx; - double fry = M_PI / 180 * info->fry; - double frz = M_PI / 180 * info->frz; + double frx = ASS_PI / 180 * info->frx; + double fry = ASS_PI / 180 * info->fry; + double frz = ASS_PI / 180 * info->frz; double sx = -sin(frx), cx = cos(frx); double sy = sin(fry), cy = cos(fry); diff --git a/libass/ass_utils.h b/libass/ass_utils.h index 567f5b5..377d532 100644 --- a/libass/ass_utils.h +++ b/libass/ass_utils.h @@ -46,6 +46,8 @@ #define FFMIN(a,b) ((a) > (b) ? (b) : (a)) #define FFMINMAX(c,a,b) FFMIN(FFMAX(c, a), b) +#define ASS_PI 3.14159265358979323846 + #if (defined(__i386__) || defined(__x86_64__)) && CONFIG_ASM int has_sse2(void); int has_avx(void); -- cgit v1.2.3