kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas font-engine: In continuation of the previous commit. Use Evas_Font_Set. 

SVN revision: 59783
This commit is contained in:
Tom Hacohen 2011-05-29 13:35:45 +00:00
parent 60aa86a0ef
commit 228c7548a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/evas/src/lib/canvas/evas_font_dir.c
View File

@ -29,7 +29,7 @@ struct _Fndat
const char *name; const char *name;
const char *source; const char *source;
int size; int size;
void *font; Evas_Font_Set *font;
int ref; int ref;
Font_Rend_Flags wanted_rend; Font_Rend_Flags wanted_rend;
@ -230,11 +230,11 @@ evas_font_init(void)
} }
#ifdef HAVE_FONTCONFIG #ifdef HAVE_FONTCONFIG
static void * static Evas_Font_Set *
evas_load_fontconfig(Evas *evas, FcFontSet *set, int size, evas_load_fontconfig(Evas *evas, FcFontSet *set, int size,
Font_Rend_Flags wanted_rend) Font_Rend_Flags wanted_rend)
{ {
void *font = NULL; Evas_Font_Set *font = NULL;
int i; int i;
/* Do loading for all in family */ /* 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; FcFontSet *set = NULL;
#endif #endif
void *font = NULL; Evas_Font_Set *font = NULL;
Eina_List *fonts, *l; Eina_List *fonts, *l;
Fndat *fd; Fndat *fd;
char *nm; char *nm;