enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

oops - in the process i disabled the multiple fonts in the fontsets to 

load on demand when first needed. fixed. rendering etc. works again
for all intl fonts.



SVN revision: 54085
This commit is contained in:
Carsten Haitzler 2010-11-02 04:56:57 +00:00
parent ecd54f41fe
commit 05246414c6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/evas/src/lib/engines/common/evas_font_draw.c
View File

@ -105,7 +105,7 @@ _fash_int_find(Fash_Int *fash, int item)
{
int grp, maj, min;
item &= 0xffffff; // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
// 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
grp = (item >> 16) & 0xff;
maj = (item >> 8) & 0xff;
min = item & 0xff;
@ -119,7 +119,7 @@ _fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int index)
{
int grp, maj, min;
item &= 0xffffff; // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
// 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
grp = (item >> 16) & 0xff;
maj = (item >> 8) & 0xff;
min = item & 0xff;
@ -162,7 +162,7 @@ _fash_gl_find(Fash_Glyph *fash, int item)
{
int grp, maj, min;
item &= 0xffffff; // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
// 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
grp = (item >> 16) & 0xff;
maj = (item >> 8) & 0xff;
min = item & 0xff;
@ -176,7 +176,7 @@ _fash_gl_add(Fash_Glyph *fash, int item, RGBA_Font_Glyph *glyph)
{
int grp, maj, min;
item &= 0xffffff; // 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
// 24bits for unicode - v6 up to E01EF (chrs) & 10FFFD for private use (plane 16)
grp = (item >> 16) & 0xff;
maj = (item >> 8) & 0xff;
min = item & 0xff;

10
legacy/evas/src/lib/engines/common/evas_font_load.c
View File

@ -299,7 +299,8 @@ evas_common_font_int_memory_load(const char *name, int size, const void *data, i
fi = calloc(1, sizeof(RGBA_Font_Int));
if (!fi) return NULL;
fi->src = evas_common_font_source_find(name);
if (!fi->src) fi->src = evas_common_font_source_memory_load(name, data, data_size);
if (!fi->src)
fi->src = evas_common_font_source_memory_load(name, data, data_size);
if (!fi->src)
{
free(fi);
@ -331,7 +332,9 @@ evas_common_font_int_load(const char *name, int size)
}
fi->size = size;
_evas_common_font_int_cache_init(fi);
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;
}
EAPI RGBA_Font_Int *
@ -803,8 +806,9 @@ evas_common_font_int_unload(RGBA_Font_Int *fi)
void
evas_common_font_int_reload(RGBA_Font_Int *fi)
{
return;
if (fi->src->ft.face) return;
evas_common_font_source_load_complete(fi->src);
return;
evas_common_font_source_reload(fi->src);
evas_common_font_int_load_complete(fi);
}