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

examples/evas: fix recent build break from rectangle change 

Introduced with commit 13da5e980e

A compile before pushing would have been great, again.
Having the same name for two variables is something no compiler likes.

evas-map-utils-eo.c:74:8: error: conflicting types for ‘r’
    int r, g, b, a, f;
        ^
evas-map-utils-eo.c:73:19: note: previous declaration of ‘r’ was here
    Eina_Rectangle r;
                   ^
evas-map-utils-eo.c:93:31: error: ‘h’ undeclared (first use in this function)
    efl_gfx_size_get(o, NULL, &h);
                               ^
evas-map-utils-eo.c:93:31: note: each undeclared identifier is reported only once for each function it appears in
evas-map-utils-eo.c:108:25: error: ‘w’ undeclared (first use in this function)
    efl_gfx_size_get(o, &w, &h);
This commit is contained in:
Stefan Schmidt 2017-09-13 14:38:10 +02:00
parent 3984148b8e
commit b737d4fea7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/examples/evas/evas-map-utils-eo.c
View File

@ -70,8 +70,8 @@ _anim_cb(void *data)
{
App_Data *ad = data;
Evas_Object *o;
Eina_Rectangle r;
int r, g, b, a, f;
Eina_Rectangle rect;
int r, g, b, a, f, h, w;
int win_w, win_h, mx, my;
f = ad->frame;
@ -128,12 +128,12 @@ _anim_cb(void *data)
o = evas_object_name_find(ad->canvas, "obj4");
r = efl_gfx_geometry_get(o);
rect = efl_gfx_geometry_get(o);
efl_gfx_map_reset(o);
efl_gfx_map_smooth_set(o, ad->smooth);
efl_gfx_map_alpha_set(o, ad->alpha);
efl_gfx_map_coord_absolute_set(o, 0, r.x, r.y + r.h, 0);
efl_gfx_map_coord_absolute_set(o, 1, r.x + r.w, r.y + r.h, 0);
efl_gfx_map_coord_absolute_set(o, 0, rect.x, rect.y + rect.h, 0);
efl_gfx_map_coord_absolute_set(o, 1, rect.x + rect.w, rect.y + rect.h, 0);
efl_gfx_map_coord_absolute_set(o, 2, win_w - 10, win_h - 30, 0);
efl_gfx_map_coord_absolute_set(o, 3, (win_w / 2) + 10, win_h - 30, 0);
efl_gfx_map_uv_set(o, 0, 0, 1);