RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-06 15:11:58 +00:00
Code Issues Releases Wiki Activity

Conditionally define render_one_glyph and kerning dummy functions in

Browse Source 
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
This commit is contained in:
diego 2009-01-02 14:41:38 +00:00
parent 7b64246370
commit d19fef9187
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libvo/font_load.c
View File

@ -335,3 +335,8 @@ fail_out:
free(desc); free(desc);
return NULL; 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

9
libvo/font_load.h
View File

@ -64,8 +64,6 @@ typedef struct font_desc {
extern font_desc_t* vo_font; extern font_desc_t* vo_font;
extern font_desc_t* sub_font; extern font_desc_t* sub_font;
#ifdef CONFIG_FREETYPE
extern char *subtitle_font_encoding; extern char *subtitle_font_encoding;
extern float text_font_scale_factor; extern float text_font_scale_factor;
extern float osd_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, void blur(unsigned char *buffer, unsigned short *tmp2, int width, int height,
int stride, int *m2, int r, int mwidth); 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); raw_file* load_raw(char *name,int verbose);
font_desc_t* read_font_desc(const char* fname,float factor,int verbose); font_desc_t* read_font_desc(const char* fname,float factor,int verbose);