From 207b73499e9dfaf089fc6d69e0fc107b9ea44d69 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Wed, 28 Jun 2017 15:13:00 +0900 Subject: [PATCH] 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. Change-Id: Icb0b393773f14b24949ad33188253e84669bd21c --- src/lib/evas/canvas/evas_object_image.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index cafe04a..39c36c9 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -498,12 +498,14 @@ _image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Data *o) { 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) { @@ -516,6 +518,7 @@ _image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Data *o) 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); } @@ -535,6 +538,7 @@ _image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Data *o) 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); } -- 2.7.4