From 13a1404f9d4c471ea9f2a166d84ea520cf3d284f Mon Sep 17 00:00:00 2001 From: tasn Date: Sun, 29 May 2011 13:35:45 +0000 Subject: [PATCH] Evas font-engine: In continuation of the previous commit. Use Evas_Font_Set. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@59783 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_font_dir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/canvas/evas_font_dir.c b/src/lib/canvas/evas_font_dir.c index c33afd4..9618c4b 100644 --- a/src/lib/canvas/evas_font_dir.c +++ b/src/lib/canvas/evas_font_dir.c @@ -29,7 +29,7 @@ struct _Fndat const char *name; const char *source; int size; - void *font; + Evas_Font_Set *font; int ref; Font_Rend_Flags wanted_rend; @@ -230,11 +230,11 @@ evas_font_init(void) } #ifdef HAVE_FONTCONFIG -static void * +static Evas_Font_Set * evas_load_fontconfig(Evas *evas, FcFontSet *set, int size, Font_Rend_Flags wanted_rend) { - void *font = NULL; + Evas_Font_Set *font = NULL; int i; /* Do loading for all in family */ @@ -306,7 +306,7 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size) FcFontSet *set = NULL; #endif - void *font = NULL; + Evas_Font_Set *font = NULL; Eina_List *fonts, *l; Fndat *fd; char *nm; -- 2.7.4