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

evas: initalize orient property in file_set() 

Summary:
Someone calls evas_object_image_file_set() and set orient,
and then re-set another file.
At that time, there is a mismatch between Evas_Image_Data's
cur->orient and engine's orient data.

So, "file_set(a) -> orient_set(90) -> file_set(b) -> orient_set(90)"
is not working now.

Therefore, when a file_set() is finished, initialization is needed.

@fix

Reviewers: jypark, jpeg

Reviewed By: jpeg

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D4515
This commit is contained in:
Jiwon Kim 2017-01-02 15:22:04 +09:00 committed by Jean-Philippe Andre
parent a3ac151591
commit 4a0a9d8ae1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/canvas/evas_object_image.c
View File

@ -350,12 +350,14 @@ _evas_image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Dat
{
int w, h;
int stride;
Evas_Image_Orient orient;
ENFN->image_size_get(ENDT, o->engine_data, &w, &h);
if (ENFN->image_stride_get)
ENFN->image_stride_get(ENDT, o->engine_data, &stride);
else
stride = w * 4;
orient = ENFN->image_orient_get(ENDT, o->engine_data);
EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
{
@ -368,6 +370,7 @@ _evas_image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Dat
state_write->image.w = w;
state_write->image.h = h;
state_write->image.stride = stride;
state_write->orient = orient;
}
EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
}
@ -387,6 +390,7 @@ _evas_image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Dat
state_write->image.w = 0;
state_write->image.h = 0;
state_write->image.stride = 0;
state_write->orient = EVAS_IMAGE_ORIENT_NONE;
}
EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
}