summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2017-09-13 14:38:10 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2017-09-13 14:42:34 +0200
commitb737d4fea7141b8076dd01ee7c7dd8c2c54d3284 (patch)
tree600ff456c9935ad0d720f41d2a24b50d1caf7bd5 /src
parent3984148b8e540c788ac1538704f8f6c44365100d (diff)
examples/evas: fix recent build break from rectangle change
Introduced with commit 13da5e980eb43288b9b9f502cb6a7a000e1f26ea 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);
Diffstat (limited to 'src')
-rw-r--r--src/examples/evas/evas-map-utils-eo.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/examples/evas/evas-map-utils-eo.c b/src/examples/evas/evas-map-utils-eo.c
index 2c701a03ac..005358b797 100644
--- a/src/examples/evas/evas-map-utils-eo.c
+++ b/src/examples/evas/evas-map-utils-eo.c
@@ -70,8 +70,8 @@ _anim_cb(void *data)
70{ 70{
71 App_Data *ad = data; 71 App_Data *ad = data;
72 Evas_Object *o; 72 Evas_Object *o;
73 Eina_Rectangle r; 73 Eina_Rectangle rect;
74 int r, g, b, a, f; 74 int r, g, b, a, f, h, w;
75 int win_w, win_h, mx, my; 75 int win_w, win_h, mx, my;
76 76
77 f = ad->frame; 77 f = ad->frame;
@@ -128,12 +128,12 @@ _anim_cb(void *data)
128 128
129 129
130 o = evas_object_name_find(ad->canvas, "obj4"); 130 o = evas_object_name_find(ad->canvas, "obj4");
131 r = efl_gfx_geometry_get(o); 131 rect = efl_gfx_geometry_get(o);
132 efl_gfx_map_reset(o); 132 efl_gfx_map_reset(o);
133 efl_gfx_map_smooth_set(o, ad->smooth); 133 efl_gfx_map_smooth_set(o, ad->smooth);
134 efl_gfx_map_alpha_set(o, ad->alpha); 134 efl_gfx_map_alpha_set(o, ad->alpha);
135 efl_gfx_map_coord_absolute_set(o, 0, r.x, r.y + r.h, 0); 135 efl_gfx_map_coord_absolute_set(o, 0, rect.x, rect.y + rect.h, 0);
136 efl_gfx_map_coord_absolute_set(o, 1, r.x + r.w, r.y + r.h, 0); 136 efl_gfx_map_coord_absolute_set(o, 1, rect.x + rect.w, rect.y + rect.h, 0);
137 efl_gfx_map_coord_absolute_set(o, 2, win_w - 10, win_h - 30, 0); 137 efl_gfx_map_coord_absolute_set(o, 2, win_w - 10, win_h - 30, 0);
138 efl_gfx_map_coord_absolute_set(o, 3, (win_w / 2) + 10, win_h - 30, 0); 138 efl_gfx_map_coord_absolute_set(o, 3, (win_w / 2) + 10, win_h - 30, 0);
139 efl_gfx_map_uv_set(o, 0, 0, 1); 139 efl_gfx_map_uv_set(o, 0, 0, 1);