diff options
author | Grigori Goronzy <greg@blackbox> | 2009-06-27 05:54:26 +0200 |
---|---|---|
committer | Grigori Goronzy <greg@blackbox> | 2009-06-27 06:46:20 +0200 |
commit | 8a8943ca115db2d865bbbaecd709ef87fae49480 (patch) | |
tree | c20514f801f15d8c53c4c64ddfbe0c7c2bd09c3c /libass | |
parent | 3060fc2e6547cac9eea0dc2d33ad5e65d3b4125f (diff) | |
download | libass-8a8943ca115db2d865bbbaecd709ef87fae49480.tar.bz2 libass-8a8943ca115db2d865bbbaecd709ef87fae49480.tar.xz |
Rename various non-static functions
Rename a few functions to avoid symbol clashes.
Clean up mputils.h.
Diffstat (limited to 'libass')
-rw-r--r-- | libass/ass.c | 2 | ||||
-rw-r--r-- | libass/ass_bitmap.c | 14 | ||||
-rw-r--r-- | libass/ass_fontconfig.c | 2 | ||||
-rw-r--r-- | libass/ass_render.c | 2 | ||||
-rw-r--r-- | libass/mputils.c | 6 | ||||
-rw-r--r-- | libass/mputils.h | 20 |
6 files changed, 23 insertions, 23 deletions
diff --git a/libass/ass.c b/libass/ass.c index 19e3fd36..49a448e7 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -905,7 +905,7 @@ static char *sub_recode(char *data, size_t size, char *codepage) || sscanf(codepage, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) { cp_tmp = - guess_buffer_cp((unsigned char *) data, size, enca_lang, + ass_guess_buffer_cp((unsigned char *) data, size, enca_lang, enca_fallback); } #endif diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c index 75281dbe..6dac7690 100644 --- a/libass/ass_bitmap.c +++ b/libass/ass_bitmap.c @@ -340,13 +340,15 @@ int glyph_to_bitmap(ass_synth_priv_t *priv_blur, if (blur_radius > 0.0) { generate_tables(priv_blur, blur_radius); if (*bm_o) - blur((*bm_o)->buffer, priv_blur->tmp, (*bm_o)->w, - (*bm_o)->h, (*bm_o)->w, (int *) priv_blur->gt2, - priv_blur->g_r, priv_blur->g_w); + ass_gauss_blur((*bm_o)->buffer, priv_blur->tmp, + (*bm_o)->w, (*bm_o)->h, (*bm_o)->w, + (int *) priv_blur->gt2, priv_blur->g_r, + priv_blur->g_w); else - blur((*bm_g)->buffer, priv_blur->tmp, (*bm_g)->w, - (*bm_g)->h, (*bm_g)->w, (int *) priv_blur->gt2, - priv_blur->g_r, priv_blur->g_w); + ass_gauss_blur((*bm_g)->buffer, priv_blur->tmp, + (*bm_g)->w, (*bm_g)->h, (*bm_g)->w, + (int *) priv_blur->gt2, priv_blur->g_r, + priv_blur->g_w); } } if (*bm_o) diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 4fb21557..241ffc8c 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -292,7 +292,7 @@ static char *validate_fname(char *name) q = fname = malloc(sz + 1); p = name; while (*p) { - code = utf8_get_char(&p); + code = ass_utf8_get_char(&p); if (code == 0) break; if ((code > 0x7F) || diff --git a/libass/ass_render.c b/libass/ass_render.c index f21069d8..592058ce 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -1438,7 +1438,7 @@ static unsigned get_next_char(ass_renderer_t *render_priv, char **str) return ' '; } } - chr = utf8_get_char((char **) &p); + chr = ass_utf8_get_char((char **) &p); *str = p; return chr; } diff --git a/libass/mputils.c b/libass/mputils.c index 611a5154..7ab7bc0a 100644 --- a/libass/mputils.c +++ b/libass/mputils.c @@ -44,7 +44,7 @@ void ass_msg(int lvl, char *fmt, ...) va_end(va); } -unsigned utf8_get_char(char **str) +unsigned ass_utf8_get_char(char **str) { uint8_t *strp = (uint8_t *) * str; unsigned c = *strp++; @@ -75,7 +75,7 @@ unsigned utf8_get_char(char **str) } // gaussian blur -void blur(unsigned char *buffer, +void ass_gauss_blur(unsigned char *buffer, unsigned short *tmp2, int width, int height, int stride, int *m2, int r, int mwidth) { @@ -194,7 +194,7 @@ void blur(unsigned char *buffer, } #ifdef CONFIG_ENCA -void *guess_buffer_cp(unsigned char *buffer, int buflen, +void *ass_guess_buffer_cp(unsigned char *buffer, int buflen, char *preferred_language, char *fallback) { const char **languages; diff --git a/libass/mputils.h b/libass/mputils.h index d99167c9..199f74be 100644 --- a/libass/mputils.h +++ b/libass/mputils.h @@ -8,19 +8,17 @@ #define MSGL_V 6 #define MSGL_DBG2 7 -#include "help_mp.h" +#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) -unsigned utf8_get_char(char **str); +#include "help_mp.h" +unsigned ass_utf8_get_char(char **str); void ass_msg(int lvl, char *fmt, ...); - -void blur(unsigned char *buffer, unsigned short *tmp2, int width, - int height, int stride, int *m2, int r, int mwidth); - -void *guess_buffer_cp(unsigned char *buffer, int buflen, - char *preferred_language, char *fallback); - -#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) +void ass_gauss_blur(unsigned char *buffer, unsigned short *tmp2, + int width, int height, int stride, int *m2, + int r, int mwidth); +void *ass_guess_buffer_cp(unsigned char *buffer, int buflen, + char *preferred_language, char *fallback); #endif |