rggammon
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas font-engine: Conform to the API changes in Harfbuzz 0.6.0. 

SVN revision: 59779
This commit is contained in:
Tom Hacohen 2011-05-29 11:09:47 +00:00
parent 81b217f8c4
commit 422d9358bf
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/evas/ChangeLog
View File

@ -376,3 +376,7 @@
* Font-engine: Fixed a bug in glyph search causing inconsistent return * Font-engine: Fixed a bug in glyph search causing inconsistent return
values. The found fi should always be NULL if there was no fi found. values. The found fi should always be NULL if there was no fi found.
2011-05-29 Tom Hacohen (TAsn)
* Font-engine: Conform to the API changes in Harfbuzz 0.6.0

2
legacy/evas/configure.ac
View File

@ -351,7 +351,7 @@ AC_ARG_ENABLE([harfbuzz],
if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
PKG_CHECK_MODULES([HARFBUZZ], PKG_CHECK_MODULES([HARFBUZZ],
[harfbuzz >= 0.5.0], [harfbuzz >= 0.6.0],
[ [
have_harfbuzz="yes" have_harfbuzz="yes"
requirement_evas="harfbuzz ${requirement_evas}" requirement_evas="harfbuzz ${requirement_evas}"

23
legacy/evas/src/lib/engines/common/evas_font_ot.c
View File

@ -180,10 +180,9 @@ evas_common_font_ot_cluster_size_get(const Evas_Text_Props *props, size_t char_i
/* Harfbuzz font functions */ /* Harfbuzz font functions */
static void static hb_position_t
_evas_common_font_ot_hb_get_glyph_advance(hb_font_t *font, _evas_common_font_ot_hb_get_glyph_advance(hb_font_t *font,
void *font_data, hb_codepoint_t glyph, void *font_data, hb_codepoint_t glyph,
hb_position_t *x_advance, hb_position_t *y_advance,
void *user_data) void *user_data)
{ {
/* Use our cache*/ /* Use our cache*/
@ -194,25 +193,23 @@ _evas_common_font_ot_hb_get_glyph_advance(hb_font_t *font,
fg = evas_common_font_int_cache_glyph_get(fi, glyph); fg = evas_common_font_int_cache_glyph_get(fi, glyph);
if (fg) if (fg)
{ {
*x_advance = fg->glyph->advance.x >> 10; return fg->glyph->advance.x >> 10;
*y_advance = fg->glyph->advance.y >> 10;
} }
return 0;
} }
static void static hb_position_t
_evas_common_font_ot_hb_get_kerning(hb_font_t *font, void *font_data, _evas_common_font_ot_hb_get_kerning(hb_font_t *font, void *font_data,
hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, void *user_data)
hb_position_t *x_kern, hb_position_t *y_kern, void *user_data)
{ {
RGBA_Font_Int *fi = (RGBA_Font_Int *) font_data; RGBA_Font_Int *fi = (RGBA_Font_Int *) font_data;
int kern; int kern;
(void) font; (void) font;
(void) user_data; (void) user_data;
if (evas_common_font_query_kerning(fi, first_glyph, second_glyph, &kern)) if (evas_common_font_query_kerning(fi, first_glyph, second_glyph, &kern))
*x_kern = kern; return kern;
else
return; return 0;
*y_kern = 0;
} }
/* End of harfbuzz font funcs */ /* End of harfbuzz font funcs */
@ -224,9 +221,9 @@ _evas_common_font_ot_font_funcs_get(void)
if (!font_funcs) if (!font_funcs)
{ {
font_funcs = hb_font_funcs_create(); font_funcs = hb_font_funcs_create();
hb_font_funcs_set_glyph_advance_func(font_funcs, hb_font_funcs_set_glyph_h_advance_func(font_funcs,
_evas_common_font_ot_hb_get_glyph_advance, NULL, NULL); _evas_common_font_ot_hb_get_glyph_advance, NULL, NULL);
hb_font_funcs_set_kerning_func(font_funcs, hb_font_funcs_set_glyph_h_kerning_func(font_funcs,
_evas_common_font_ot_hb_get_kerning, NULL, NULL); _evas_common_font_ot_hb_get_kerning, NULL, NULL);
} }