diff options
author | kabeer khan <kabeer.khan@samsung.com> | 2014-11-25 09:55:36 +0000 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2014-11-25 09:55:36 +0000 |
commit | c3ee589b8f2faebb7dc25ddf3c461c075edec58c (patch) | |
tree | 1ef36ee311963b413fc58bd8cc27b32f6fafb936 /src/lib/evas/canvas | |
parent | 83a3b45e3386852c21ad79753abdf9bb680cd06b (diff) |
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
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 2534f20fa4..9ae9f0986d 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c | |||
@@ -5607,7 +5607,7 @@ _relayout_if_needed(Evas_Object *eo_obj, const Evas_Textblock_Data *o) | |||
5607 | * @see _find_layout_format_item_line_match() | 5607 | * @see _find_layout_format_item_line_match() |
5608 | */ | 5608 | */ |
5609 | static void | 5609 | static void |
5610 | _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) | 5610 | _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) |
5611 | { | 5611 | { |
5612 | Evas_Object_Textblock_Paragraph *found_par; | 5612 | Evas_Object_Textblock_Paragraph *found_par; |
5613 | Evas_Object_Textblock_Line *ln; | 5613 | Evas_Object_Textblock_Line *ln; |
@@ -5625,22 +5625,21 @@ _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Tex | |||
5625 | 5625 | ||
5626 | EINA_INLIST_FOREACH(ln->items, it) | 5626 | EINA_INLIST_FOREACH(ln->items, it) |
5627 | { | 5627 | { |
5628 | /* FIXME: p should be size_t, same goes for pos */ | 5628 | size_t p = it->text_pos; |
5629 | int p = (int) it->text_pos; | ||
5630 | 5629 | ||
5631 | if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) | 5630 | if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) |
5632 | { | 5631 | { |
5633 | Evas_Object_Textblock_Text_Item *ti = | 5632 | Evas_Object_Textblock_Text_Item *ti = |
5634 | _ITEM_TEXT(it); | 5633 | _ITEM_TEXT(it); |
5635 | 5634 | ||
5636 | p += (int) ti->text_props.text_len; | 5635 | p += ti->text_props.text_len; |
5637 | } | 5636 | } |
5638 | else | 5637 | else |
5639 | { | 5638 | { |
5640 | p++; | 5639 | p++; |
5641 | } | 5640 | } |
5642 | 5641 | ||
5643 | if (((pos >= (int) it->text_pos) && (pos < p))) | 5642 | if (((pos >= it->text_pos) && (pos < p))) |
5644 | { | 5643 | { |
5645 | *lnr = ln; | 5644 | *lnr = ln; |
5646 | *itr = it; | 5645 | *itr = it; |