enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

Evas font-engine: Use len in font_draw instead of \0 

SVN revision: 58617
This commit is contained in:
Tom Hacohen 2011-04-13 08:36:51 +00:00
parent ffbe4ed971
commit 680c4354ba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/evas/src/lib/engines/common/evas_font_draw.c
View File

@ -422,8 +422,7 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
#if defined(METRIC_CACHE) || defined(WORD_CACHE)
unsigned int len;
/* A fast strNlen would be nice (there is a wcsnlen strangely) */
len = eina_unicode_strnlen(text,WORD_CACHE_MAXLEN);
len = text_props->text_len;
if (len > 2 && (len < WORD_CACHE_MAXLEN))
{
@ -516,12 +515,13 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
/* Skip common chars */
const Eina_Unicode *tmp;
for (tmp = text ;
*tmp &&
((size_t) (tmp - text) < text_props->text_len) &&
evas_common_language_char_script_get(*tmp) ==
EVAS_SCRIPT_COMMON ;
tmp++)
;
if (!*tmp && (tmp > text)) tmp--;
if (((size_t) (tmp - text) == text_props->text_len) && (tmp > text))
tmp--;
evas_common_font_glyph_search(fn, &fi, *tmp);
}
@ -834,12 +834,12 @@ evas_font_word_prerender(RGBA_Draw_Context *dc, const Eina_Unicode *in_text, con
/* Skip common chars */
const Eina_Unicode *tmp;
for (tmp = text ;
*tmp &&
((tmp - text) < len) &&
evas_common_language_char_script_get(*tmp) ==
EVAS_SCRIPT_COMMON ;
tmp++)
;
if (!*tmp && (tmp > text)) tmp--;
if (((tmp - text) == len) && (tmp > text)) tmp--;
evas_common_font_glyph_search(fn, &fi, *tmp);
}