Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_font_dir.c
Log Message:
use engine add's
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_font_dir.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_font_dir.c 20 Mar 2005 15:57:55 -0000 1.4
+++ evas_font_dir.c 20 Mar 2005 16:41:49 -0000 1.5
@@ -88,7 +88,7 @@
char *nm;
nm = l->data;
- if (l == fonts)
+ if ((l == fonts) || (!font))
{
#ifdef BUILD_FONT_LOADER_EET
if (source)
@@ -148,7 +148,7 @@
}
else
{
- int ok = 0;
+ void *ok = NULL;
#ifdef BUILD_FONT_LOADER_EET
if (source)
@@ -160,7 +160,7 @@
if (fake_name)
{
/* FIXME: make an engine func */
- if (!evas_common_font_add(font, fake_name, size))
+ if
(!evas->engine.func->font_add(evas->engine.data.output, font, fake_name, size))
{
/* read original!!! */
ef = eet_open(source, EET_FILE_MODE_READ);
@@ -172,14 +172,14 @@
fdata = eet_read(ef, nm, &fsize);
if ((fdata) && (fsize > 0))
{
- ok = evas_common_font_memory_add(font,
fake_name, size, fdata, fsize);
+ ok =
evas->engine.func->font_memory_add(evas->engine.data.output, font, fake_name,
size, fdata, fsize);
free(fdata);
}
eet_close(ef);
}
}
else
- ok = 1;
+ ok = (void *)1;
free(fake_name);
}
}
@@ -187,7 +187,7 @@
{
#endif
if (evas_file_path_is_full_path((char *)nm))
- evas_common_font_add(font, (char *)nm, size);
+ evas->engine.func->font_add(evas->engine.data.output, font,
(char *)nm, size);
else
{
Evas_List *l;
@@ -199,7 +199,7 @@
f_file = evas_font_dir_cache_find(l->data, (char
*)nm);
if (f_file)
{
- if (evas_common_font_add(font, f_file, size))
+ if
(evas->engine.func->font_add(evas->engine.data.output, font, f_file, size))
break;
}
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
