Mercurial > mplayer.hg
changeset 28200:56868e6fb340
Conditionally define render_one_glyph and kerning dummy functions in
font_load.c when FreeType is not enabled instead of conditionally
defining them in font_load.h. This moves the workaround closer to
where the actual problem is.
| author | diego |
|---|---|
| date | Fri, 02 Jan 2009 14:41:38 +0000 |
| parents | 0f4e0c39c20e |
| children | 4ff973912251 |
| files | libvo/font_load.c libvo/font_load.h |
| diffstat | 2 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/font_load.c Fri Jan 02 13:25:00 2009 +0000 +++ b/libvo/font_load.c Fri Jan 02 14:41:38 2009 +0000 @@ -335,3 +335,8 @@ free(desc); return NULL; } + +#ifndef CONFIG_FREETYPE +void render_one_glyph(font_desc_t *desc, int c) {} +int kerning(font_desc_t *desc, int prevc, int c) { return 0; } +#endif
--- a/libvo/font_load.h Fri Jan 02 13:25:00 2009 +0000 +++ b/libvo/font_load.h Fri Jan 02 14:41:38 2009 +0000 @@ -64,8 +64,6 @@ extern font_desc_t* vo_font; extern font_desc_t* sub_font; -#ifdef CONFIG_FREETYPE - extern char *subtitle_font_encoding; extern float text_font_scale_factor; extern float osd_font_scale_factor; @@ -92,13 +90,6 @@ void blur(unsigned char *buffer, unsigned short *tmp2, int width, int height, int stride, int *m2, int r, int mwidth); -#else - -static void render_one_glyph(font_desc_t *desc, int c) {} -static int kerning(font_desc_t *desc, int prevc, int c) { return 0; } - -#endif - raw_file* load_raw(char *name,int verbose); font_desc_t* read_font_desc(const char* fname,float factor,int verbose);