diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-02 14:41:38 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-02 14:41:38 +0000 |
| commit | d19fef9187b4c925577ee1ab6011e8d1041f548a (patch) | |
| tree | 4d94a1ecc0fa1f15b13b388e25cec9fdec185a0f /libvo | |
| parent | 7b6424637050d1dafd1fa93bcdd7ad42bfda0bb2 (diff) | |
| download | mpv-d19fef9187b4c925577ee1ab6011e8d1041f548a.tar.bz2 mpv-d19fef9187b4c925577ee1ab6011e8d1041f548a.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28235 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/font_load.c | 5 | ||||
| -rw-r--r-- | libvo/font_load.h | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/libvo/font_load.c b/libvo/font_load.c index a18459b036..ba747dc7dc 100644 --- a/libvo/font_load.c +++ b/libvo/font_load.c @@ -335,3 +335,8 @@ fail_out: 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 diff --git a/libvo/font_load.h b/libvo/font_load.h index df3000efb5..ad355e6b4c 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -64,8 +64,6 @@ typedef struct font_desc { 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 load_font_ft(int width, int height, font_desc_t **desc, const char *name, f 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); |