jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=31f2e6e88aa5e0e26152f72dd2db8874d1297c90
commit 31f2e6e88aa5e0e26152f72dd2db8874d1297c90 Author: Daniel Zaoui <[email protected]> Date: Tue Oct 21 11:08:13 2014 +0300 Evas-3D Tests: fix Eo usage. There are still Valgrind (invalid read) issues but at least, it doesn't segfault more. --- src/lib/evas/canvas/evas_3d_mesh.c | 1 - src/tests/evas/evas_test_mesh.c | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/lib/evas/canvas/evas_3d_mesh.c b/src/lib/evas/canvas/evas_3d_mesh.c index 7b47a20..350967a 100644 --- a/src/lib/evas/canvas/evas_3d_mesh.c +++ b/src/lib/evas/canvas/evas_3d_mesh.c @@ -29,7 +29,6 @@ evas_3d_mesh_frame_free(Evas_3D_Mesh_Frame *frame) if (frame->material) { evas_3d_material_mesh_del(frame->material, frame->mesh); - eo_unref(frame->mesh); } for (i = 0; i < EVAS_3D_VERTEX_ATTRIB_COUNT; i++) diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c index d3c3b9e..fe87e46 100644 --- a/src/tests/evas/evas_test_mesh.c +++ b/src/tests/evas/evas_test_mesh.c @@ -39,14 +39,15 @@ { \ mesh = eo_add(EVAS_3D_MESH_CLASS, e); \ mesh2 = eo_add(EVAS_3D_MESH_CLASS, e); \ - eo_do(mesh, evas_3d_mesh_file_set(type, file->path, NULL)); \ fail_if(mesh == NULL); \ + fail_if(mesh2 == NULL); \ + eo_do(mesh, evas_3d_mesh_file_set(type, file->path, NULL)); \ eo_do(mesh, evas_3d_mesh_save(EVAS_3D_MESH_FILE_TYPE_EET, buffer, NULL)); \ - fail_if(mesh == NULL); \ eo_do(mesh2, evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_EET, buffer, NULL)); \ - fail_if(mesh == NULL); \ res = _compare_meshes(mesh, mesh2); \ fail_if(res == 1); \ + eo_del(mesh2); \ + eo_del(mesh); \ } static Evas_3D_Mesh_Frame * @@ -114,9 +115,6 @@ START_TEST(evas_object_mesh_loader_saver) eina_iterator_free(it); - evas_object_del(mesh); - evas_object_del(mesh2); - evas_free(e); evas_shutdown(); } --
