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

Manually fix extra eo_do calls that were added after I migrated

This commit is contained in:
Tom Hacohen 2016-03-03 10:00:26 +00:00
parent dbdb5b8a33
commit f1b1c5354b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/evas/canvas/evas_filter_mixin.c
View File

@ -702,7 +702,7 @@ _evas_filter_efl_gfx_filter_filter_data_set(Eo *eo_obj, Evas_Filter_Data *pd,
FCOW_END(fcow, pd);
// update object
eo_do(eo_obj, evas_filter_dirty());
evas_filter_dirty(eo_obj);
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);

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

@ -2340,13 +2340,13 @@ _evas_text_efl_gfx_filter_filter_program_set(Eo *obj, Evas_Text_Data *pd EINA_UN
EAPI void
evas_object_text_filter_program_set(Evas_Object *obj, const char *code, const char *name)
{
eo_do(obj, efl_gfx_filter_program_set(code, name));
efl_gfx_filter_program_set(obj, code, name);
}
EAPI void
evas_object_text_filter_source_set(Evas_Object *obj, const char *name, Evas_Object *source)
{
eo_do(obj, efl_gfx_filter_source_set(name, source));
efl_gfx_filter_source_set(obj, name, source);
}
EOLIAN static void

8
src/tests/evas/evas_test_filters.c
View File

@ -438,8 +438,8 @@ START_TEST(evas_filter_state_test)
ecore_evas_transparent_set(ee, EINA_TRUE);
evas_object_color_set(to, 255, 0, 0, 255);
eo_do(to, efl_gfx_filter_program_set(code, "merf"));
eo_do(to, efl_gfx_filter_state_set("state1", 0.0, "state2", 1.0, 0.5));
efl_gfx_filter_program_set(to, code, "merf");
efl_gfx_filter_state_set(to, "state1", 0.0, "state2", 1.0, 0.5);
/* check pixels */
ecore_evas_manual_render(ee);
@ -447,12 +447,12 @@ START_TEST(evas_filter_state_test)
fail_if(!pixels || (*pixels != 0xFFFF0000),
"state render test failed: %p (%#x)", pixels, pixels ? *pixels : 0);
eo_do(to, efl_gfx_filter_state_get(&s1, &v1, &s2, &v2, &p));
efl_gfx_filter_state_get(to, &s1, &v1, &s2, &v2, &p);
fail_unless(strequal(s1, "state1") && strequal(s2, "state2") && (v1 == 0.0) && (v2 == 1.0) && (p == 0.5),
"got: %s %f %s %f %f", s1, v1, s2, v2, p);
/* data test */
eo_do(to, efl_gfx_filter_data_set("data", "{r=0, g=255, b=0, a=255}", 1));
efl_gfx_filter_data_set(to, "data", "{r=0, g=255, b=0, a=255}", 1);
ecore_evas_manual_render(ee);
pixels = ecore_evas_buffer_pixels_get(ee);
fail_if(!pixels || (*pixels != 0xFF00FF00),