summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-11-04 12:47:48 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-11-04 12:47:48 +0900
commitc179335b1f7667016839848d52713d5dfff2a8aa (patch)
treeccefe5d0598bbd3c7d24c4c4eb33b79d58a3ec56 /src/lib
parent7e3286b4edbaba81fda348a08fe0e33938fce3e3 (diff)
evas: update use of eina_cow_free for latest change.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/evas/canvas/evas_object_image.c13
-rw-r--r--src/lib/evas/canvas/evas_object_main.c8
2 files changed, 9 insertions, 12 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 312b5c6dc7..b5080742f3 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -3609,14 +3609,11 @@ _evas_object_image_free(Evas_Object *obj)
3609 3609
3610 o = eo_data_scope_get(obj, MY_CLASS); 3610 o = eo_data_scope_get(obj, MY_CLASS);
3611 3611
3612 eina_cow_free(evas_object_image_load_opts_cow, o->load_opts); 3612 // eina_cow_free reset the pointer to the default read only state
3613 o->load_opts = &default_load_opts; 3613 eina_cow_free(evas_object_image_load_opts_cow, (const Eina_Cow_Data**) &o->load_opts);
3614 eina_cow_free(evas_object_image_pixels_cow, o->pixels); 3614 eina_cow_free(evas_object_image_pixels_cow, (const Eina_Cow_Data**) &o->pixels);
3615 o->pixels = &default_pixels; 3615 eina_cow_free(evas_object_image_state_cow, (const Eina_Cow_Data**) &o->cur);
3616 eina_cow_free(evas_object_image_state_cow, o->cur); 3616 eina_cow_free(evas_object_image_state_cow, (const Eina_Cow_Data**) &o->prev);
3617 o->cur = &default_state;
3618 eina_cow_free(evas_object_image_state_cow, o->prev);
3619 o->prev = &default_state;
3620} 3617}
3621 3618
3622static void 3619static void
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 27fc7adfe4..fa294d81c7 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -190,10 +190,10 @@ evas_object_free(Evas_Object *eo_obj, int clean_layer)
190 { 190 {
191 EVAS_MEMPOOL_FREE(_mp_sh, obj->size_hints); 191 EVAS_MEMPOOL_FREE(_mp_sh, obj->size_hints);
192 } 192 }
193 eina_cow_free(evas_object_proxy_cow, obj->proxy); 193 eina_cow_free(evas_object_proxy_cow, (const Eina_Cow_Data**) &obj->proxy);
194 eina_cow_free(evas_object_map_cow, obj->map); 194 eina_cow_free(evas_object_map_cow, (const Eina_Cow_Data**) &obj->map);
195 eina_cow_free(evas_object_state_cow, obj->cur); 195 eina_cow_free(evas_object_state_cow, (const Eina_Cow_Data**) &obj->cur);
196 eina_cow_free(evas_object_state_cow, obj->prev); 196 eina_cow_free(evas_object_state_cow, (const Eina_Cow_Data**) &obj->prev);
197 eo_data_unref(eo_obj, obj->private_data); 197 eo_data_unref(eo_obj, obj->private_data);
198 obj->private_data = NULL; 198 obj->private_data = NULL;
199 eo_manual_free(eo_obj); 199 eo_manual_free(eo_obj);