Evas font-engine: Use Eina_Unicode instead of int for unicode codepoints

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@59179 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/engines/common/evas_font.h b/src/lib/engines/common/evas_font.h
index 06d105b..62e2597 100644 (file)
--- a/src/lib/engines/common/evas_font.h
+++ b/src/lib/engines/common/evas_font.h
@@ -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 */

diff --git a/src/lib/engines/common/evas_font_draw.c b/src/lib/engines/common/evas_font_draw.c
index fc49f2e..515c702 100644 (file)
--- a/src/lib/engines/common/evas_font_draw.c
+++ b/src/lib/engines/common/evas_font_draw.c
@@ -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;