From 7ee17d11740110575112edf633768c479bcbcbf1 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 27 Feb 2006 15:40:46 +0000 Subject: [PATCH] oops - yeah. watch the ptr. SVN revision: 20830 --- .../src/lib/engines/common/evas_font_load.c | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/legacy/evas/src/lib/engines/common/evas_font_load.c index fc69825a34..4f436109a1 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_load.c +++ b/legacy/evas/src/lib/engines/common/evas_font_load.c @@ -273,9 +273,9 @@ evas_common_font_add(RGBA_Font *fn, const char *name, int size) if (fi) { fn->fonts = evas_list_append(fn->fonts, fi); + fi->hinting = fn->hinting; return fn; } - // fi->hinting = fn->hinting; return NULL; } @@ -290,9 +290,9 @@ evas_common_font_memory_add(RGBA_Font *fn, const char *name, int size, const voi if (fi) { fn->fonts = evas_list_append(fn->fonts, fi); + fi->hinting = fn->hinting; return fn; } - // fi->hinting = fn->hinting; return NULL; } @@ -359,6 +359,42 @@ evas_common_hinting_available(Font_Hint_Flags hinting) return 0; } +RGBA_Font * +evas_common_font_memory_hinting_load(const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting) +{ + RGBA_Font *fn; + + fn = evas_common_font_memory_load(name, size, data, data_size); + if (fn) evas_common_font_hinting_set(fn, hinting); + return fn; +} + +RGBA_Font * +evas_common_font_hinting_load(const char *name, int size, Font_Hint_Flags hinting) +{ + RGBA_Font *fn; + + fn = evas_common_font_load(name, size); + if (fn) evas_common_font_hinting_set(fn, hinting); + return fn; +} + +RGBA_Font * +evas_common_font_hinting_add(RGBA_Font *fn, const char *name, int size, Font_Hint_Flags hinting) +{ + fn = evas_common_font_add(fn, name, size); + if (fn) evas_common_font_hinting_set(fn, hinting); + return fn; +} + +RGBA_Font * +evas_common_font_memory_hinting_add(RGBA_Font *fn, const char *name, int size, const void *data, int data_size, Font_Hint_Flags hinting) +{ + fn = evas_common_font_memory_add(fn, name, size, data, data_size); + if (fn) evas_common_font_hinting_set(fn, hinting); + return fn; +} + static Evas_Bool font_modify_cache_cb(Evas_Hash *hash, const char *key, void *data, void *fdata) {