[MPlayer-cvslog] r28235 - in trunk/libvo: font_load.c font_load.h

[diego]

Author: diego
Date: Fri Jan  2 15:41:38 2009
New Revision: 28235

Log:
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.

Modified:
   trunk/libvo/font_load.c
   trunk/libvo/font_load.h

Modified: trunk/libvo/font_load.c
==============================================================================
--- trunk/libvo/font_load.c	Fri Jan  2 14:25:00 2009	(r28234)
+++ trunk/libvo/font_load.c	Fri Jan  2 15:41:38 2009	(r28235)
@@ -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

Modified: trunk/libvo/font_load.h
==============================================================================
--- trunk/libvo/font_load.h	Fri Jan  2 14:25:00 2009	(r28234)
+++ trunk/libvo/font_load.h	Fri Jan  2 15:41:38 2009	(r28235)
@@ -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,
 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);