bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas_object_textblock: Resolved FIXME replaced int with size_t 

Summary:
Since Evas_Textblock_Cursor has pos  of type size_t so changed
pos argument in _find_layout_item_line_match from int to size_t
Also Evas_Object_Textblock_Item has text_pos of size_t so defined
variable p of type size_t

Signed-off-by: kabeer khan <kabeer.khan@samsung.com>

Reviewers: tasn

Subscribers: devilhorns, cedric

Differential Revision: https://phab.enlightenment.org/D1692
This commit is contained in:
kabeer khan 2014-11-25 09:55:36 +00:00 committed by Tom Hacohen
parent 83a3b45e33
commit c3ee589b8f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -5607,7 +5607,7 @@ _relayout_if_needed(Evas_Object *eo_obj, const Evas_Textblock_Data *o)
* @see _find_layout_format_item_line_match() * @see _find_layout_format_item_line_match()
*/ */
static void static void
_find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Text *n, int pos, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr) _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Text *n, size_t pos, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr)
{ {
Evas_Object_Textblock_Paragraph *found_par; Evas_Object_Textblock_Paragraph *found_par;
Evas_Object_Textblock_Line *ln; Evas_Object_Textblock_Line *ln;
@ -5625,22 +5625,21 @@ _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Tex
EINA_INLIST_FOREACH(ln->items, it) EINA_INLIST_FOREACH(ln->items, it)
{ {
/* FIXME: p should be size_t, same goes for pos */ size_t p = it->text_pos;
int p = (int) it->text_pos;
if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
{ {
Evas_Object_Textblock_Text_Item *ti = Evas_Object_Textblock_Text_Item *ti =
_ITEM_TEXT(it); _ITEM_TEXT(it);
p += (int) ti->text_props.text_len; p += ti->text_props.text_len;
} }
else else
{ {
p++; p++;
} }
if (((pos >= (int) it->text_pos) && (pos < p))) if (((pos >= it->text_pos) && (pos < p)))
{ {
*lnr = ln; *lnr = ln;
*itr = it; *itr = it;