forked from enlightenment/efl
Evas font-engine: Use Eina_Unicode instead of int for unicode codepoints
SVN revision: 59179
This commit is contained in:
parent
97a12de552
commit
b186585231
|
@ -18,9 +18,9 @@ EAPI int evas_common_font_get_line_advance (RGBA_Font *fn);
|
|||
/* draw */
|
||||
|
||||
EAPI void evas_common_font_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const Evas_Text_Props *intl_props);
|
||||
EAPI int evas_common_font_glyph_search (RGBA_Font *fn, RGBA_Font_Int **fi_ret, int gl);
|
||||
EAPI int evas_common_font_glyph_search (RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl);
|
||||
EAPI RGBA_Font_Glyph *evas_common_font_int_cache_glyph_get (RGBA_Font_Int *fi, FT_UInt index);
|
||||
EAPI FT_UInt evas_common_get_char_index (RGBA_Font_Int* fi, int gl);
|
||||
EAPI FT_UInt evas_common_get_char_index (RGBA_Font_Int* fi, Eina_Unicode gl);
|
||||
EAPI void evas_common_font_draw_init (void);
|
||||
|
||||
/* load */
|
||||
|
|
|
@ -287,11 +287,11 @@ typedef struct _Font_Char_Index Font_Char_Index;
|
|||
struct _Font_Char_Index
|
||||
{
|
||||
FT_UInt index;
|
||||
int gl;
|
||||
Eina_Unicode gl;
|
||||
};
|
||||
|
||||
EAPI FT_UInt
|
||||
evas_common_get_char_index(RGBA_Font_Int* fi, int gl)
|
||||
evas_common_get_char_index(RGBA_Font_Int* fi, Eina_Unicode gl)
|
||||
{
|
||||
Font_Char_Index result;
|
||||
//FT_UInt ret;
|
||||
|
@ -328,7 +328,7 @@ evas_common_get_char_index(RGBA_Font_Int* fi, int gl)
|
|||
}
|
||||
|
||||
EAPI int
|
||||
evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, int gl)
|
||||
evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl)
|
||||
{
|
||||
Eina_List *l;
|
||||
|
||||
|
@ -790,7 +790,7 @@ evas_font_word_prerender(RGBA_Draw_Context *dc, const Evas_Text_Props *text_prop
|
|||
unsigned int i,j;
|
||||
struct prword *w;
|
||||
int last_delta = 0;
|
||||
int gl;
|
||||
Eina_Unicode gl;
|
||||
struct cinfo *ci;
|
||||
unsigned int len = text_props->len;
|
||||
RGBA_Font_Int *fi = (RGBA_Font_Int *) text_props->font_instance;
|
||||
|
|
Loading…
Reference in New Issue