From 6b359ab3cb5491d502a63a9decb69063c53b63c4 Mon Sep 17 00:00:00 2001 From: nash Date: Fri, 30 Jul 2010 04:53:30 +0000 Subject: [PATCH] Two fixes: Use the correct string for the stringshare and if gl is on, but metric is compiled out, just bail out of all word/metric cache git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@50678 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/engines/common/evas_font_draw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/engines/common/evas_font_draw.c b/src/lib/engines/common/evas_font_draw.c index 2014c59..e0c2470 100644 --- a/src/lib/engines/common/evas_font_draw.c +++ b/src/lib/engines/common/evas_font_draw.c @@ -823,6 +823,11 @@ evas_font_word_prerender(RGBA_Draw_Context *dc, const Eina_Unicode *in_text, Eva struct prword *w; int gl; +#ifndef METRIC_CACHE + gl = dc->font_ext.func.gl_new ? 1: 0; + if (gl) return NULL; +#endif + LKL(lock_words); EINA_INLIST_FOREACH(words,w){ @@ -929,7 +934,7 @@ evas_font_word_prerender(RGBA_Draw_Context *dc, const Eina_Unicode *in_text, Eva save = malloc(sizeof(struct prword)); save->cinfo = metrics; - save->str = eina_ustringshare_add(text); + save->str = eina_ustringshare_add(in_text); save->font = fn; save->size = fi->size; save->len = len; -- 2.7.4