aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/evas/src/lib/engines/common/evas_font_load.c
diff options
context:
space:
mode:
authorDavid Walter Seikel2012-04-22 09:19:23 +1000
committerDavid Walter Seikel2012-04-22 09:19:23 +1000
commitc963d75dfdeec11f82e79e727062fbf89afa2c04 (patch)
tree895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/lib/engines/common/evas_font_load.c
parentAdding the new extantz viewer and grid manager. (diff)
downloadSledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip
SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz
SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2
SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz
Update EFL to latest beta.
Diffstat (limited to 'libraries/evas/src/lib/engines/common/evas_font_load.c')
-rw-r--r--libraries/evas/src/lib/engines/common/evas_font_load.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libraries/evas/src/lib/engines/common/evas_font_load.c b/libraries/evas/src/lib/engines/common/evas_font_load.c
index 3fc4521..abba9e3 100644
--- a/libraries/evas/src/lib/engines/common/evas_font_load.c
+++ b/libraries/evas/src/lib/engines/common/evas_font_load.c
@@ -71,9 +71,7 @@ _evas_common_font_int_free(RGBA_Font_Int *fi)
71 _evas_common_font_int_clear(fi); 71 _evas_common_font_int_clear(fi);
72 eina_hash_free(fi->kerning); 72 eina_hash_free(fi->kerning);
73 73
74#ifdef HAVE_PTHREAD 74 LKD(fi->ft_mutex);
75 pthread_mutex_destroy(&fi->ft_mutex);
76#endif
77#ifdef USE_HARFBUZZ 75#ifdef USE_HARFBUZZ
78 hb_font_destroy(fi->ft.hb_font); 76 hb_font_destroy(fi->ft.hb_font);
79#endif 77#endif
@@ -301,9 +299,7 @@ _evas_common_font_int_cache_init(RGBA_Font_Int *fi)
301 EINA_KEY_CMP(_evas_common_font_double_int_cmp), 299 EINA_KEY_CMP(_evas_common_font_double_int_cmp),
302 EINA_KEY_HASH(_evas_common_font_double_int_hash), 300 EINA_KEY_HASH(_evas_common_font_double_int_hash),
303 free, 3); 301 free, 3);
304#ifdef HAVE_PTHREAD 302 LKI(fi->ft_mutex);
305 pthread_mutex_init(&fi->ft_mutex, NULL);
306#endif
307} 303}
308 304
309EAPI RGBA_Font_Int * 305EAPI RGBA_Font_Int *