Enlightenment CVS committal
Author : shorne
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_font_load.c
Log Message:
Make sure to finish initializing sourced fonts
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- evas_font_load.c 9 Apr 2006 00:02:47 -0000 1.33
+++ evas_font_load.c 9 Apr 2006 02:36:03 -0000 1.34
@@ -1,4 +1,5 @@
#include "evas_common.h"
+#include "evas_private.h"
extern FT_Library evas_ft_lib;
@@ -40,7 +41,6 @@
RGBA_Font_Source *
evas_common_font_source_load(const char *name)
{
- int error;
RGBA_Font_Source *fs;
fs = calloc(1, sizeof(RGBA_Font_Source));
@@ -150,7 +150,10 @@
fi->size = size;
- return evas_common_font_int_load_init(fi);
+ fi = evas_common_font_int_load_init(fi);
+ evas_common_font_int_load_complete(fi);
+
+ return fi;
}
RGBA_Font_Int *
@@ -160,14 +163,12 @@
fi = evas_common_font_int_find(name, size);
if (fi) return fi;
-
- if (!evas_file_path_is_file(name)) return NULL;
fi = calloc(1, sizeof(RGBA_Font_Int));
if (!fi) return NULL;
fi->src = evas_common_font_source_find(name);
- if (!fi->src)
+ if (!fi->src && evas_file_path_is_file(name))
fi->src = evas_common_font_source_load(name);
if (!fi->src)
@@ -184,6 +185,7 @@
RGBA_Font_Int *
evas_common_font_int_load_init(RGBA_Font_Int *fi)
{
+ fi->ft.size = NULL;
fi->glyphs = NULL;
fi->usage = 0;
fi->references = 1;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
