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

Evas textblock: clean up text_append, and possibly solve infinite loop. 

I removed the workaround that solved it, for this cleaner, solution that
should work.

SVN revision: 59802
This commit is contained in:
Tom Hacohen 2011-05-30 08:16:35 +00:00
parent 0967176b12
commit 7e01aebd17
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -2824,13 +2824,13 @@ skip:
return;
}
do
while (cur_len > 0)
{
Evas_Font_Instance *script_fi = NULL;
int script_len, tmp_cut;
Evas_Script_Type script;
script_len = off - (str - tbase);
script_len = cur_len;
tmp_cut = evas_common_language_script_end_of_run_get(str,
c->par->bidi_props, start + str - tbase, script_len);
@ -2838,18 +2838,12 @@ skip:
{
script_len = tmp_cut;
}
/* FIXME: This is a possible fix for an infinite loops that happens
* if script_len < 0. Should find the source of the issue,
* i.e why (off - (str - tbase)) is ever < 0. I can't reproduce the
* issue so I can't really do anything about it. */
if (script_len < 0)
break;
cur_len -= script_len;
script = evas_common_language_script_type_get(str, script_len);
do
while (script_len > 0)
{
Evas_Font_Instance *cur_fi;
int run_len = script_len;
@ -2875,15 +2869,11 @@ skip:
ti->parent.text_pos, run_len);
}
str += run_len;
cur_len -= run_len;
script_len -= run_len;
_layout_text_add_logical_item(c, ti, NULL);
}
while (script_len > 0);
}
while (*str);
}
/**