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

elm els_icon.c: There is some bug in _els_smart_icon_orient_set function. 

it didn't work if orient were ELM_IMAGE_ROTATE_90_CW or CCW.
and it also make seg fault if application calls elm_image_orient_set more than twice.
for 90 or 270 rotation, we need seperate memory.
(It can be algorithm without more memory, but I selected readability than memory efficiency)

Before, els icon use file name for data2.
So it make problem, if file name was removed because of obj's data_set or size_set function.
I modified els icon code using copy data function.


SVN revision: 65634
This commit is contained in:
Jiyoun Park 2011-11-28 04:42:34 +00:00
parent b4ca9b3eee
commit 89738a7fd6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/elementary/src/lib/els_icon.c
View File

@ -356,10 +356,8 @@ void
_els_smart_icon_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
{
Smart_Data *sd;
Evas_Object *tmp;
unsigned int *data, *data2, *to, *from;
unsigned int *data, *data2 = NULL, *to, *from;
int x, y, w, hw, iw, ih;
const char *file, *key;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
@ -382,10 +380,9 @@ _els_smart_icon_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
}
evas_object_image_size_get(sd->obj, &iw, &ih);
evas_object_image_file_get(sd->obj, &file, &key);
tmp = evas_object_image_add(evas_object_evas_get(sd->obj));
evas_object_image_file_set(tmp, file, key);
data2 = evas_object_image_data_get(tmp, EINA_FALSE);
/* we need seperate destination memory if we want rotate 90 or 270 degree */
evas_object_image_data_copy_set(sd->obj, data2);
if (!data2) return;
w = ih;
ih = iw;
@ -394,6 +391,7 @@ _els_smart_icon_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
evas_object_image_size_set(sd->obj, iw, ih);
data = evas_object_image_data_get(sd->obj, EINA_TRUE);
switch (orient)
{
case ELM_IMAGE_FLIP_TRANSPOSE:
@ -416,8 +414,8 @@ _els_smart_icon_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
break;
default:
ERR("unknown orient %d", orient);
evas_object_del(tmp);
evas_object_image_data_set(sd->obj, data); // give it back
if (data2) free(data2);
return;
}
from = data2;
@ -432,7 +430,7 @@ _els_smart_icon_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
to += hw;
}
sd->orient = orient;
evas_object_del(tmp);
if (data2) free(data2);
evas_object_image_data_set(sd->obj, data);
evas_object_image_data_update_add(sd->obj, 0, 0, iw, ih);
_smart_reconfigure(sd);