summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_vg_shape.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-01 18:06:28 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 09:58:08 +0000
commitf21ade6123b9053fca8d1632644c48525a99d6e0 (patch)
treec5eb0445f471d21365a7a5a7b0ec7d279c11b398 /src/lib/evas/canvas/evas_vg_shape.c
parent3faf3f3fc68a839f06b311c35ba020cb25e7c9c4 (diff)
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to 'src/lib/evas/canvas/evas_vg_shape.c')
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c153
1 files changed, 70 insertions, 83 deletions
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 84c0d79..906f242 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -22,7 +22,7 @@ _efl_vg_shape_efl_vg_base_bounds_get(Eo *obj,
22 Eina_Rectangle *r) 22 Eina_Rectangle *r)
23{ 23{
24 // FIXME: Use the renderer bounding box when it has been created instead of an estimation 24 // FIXME: Use the renderer bounding box when it has been created instead of an estimation
25 eo_do(obj, efl_gfx_shape_bounds_get(r)); 25 efl_gfx_shape_bounds_get(obj, r);
26} 26}
27 27
28static void 28static void
@@ -53,12 +53,11 @@ _efl_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UN
53 53
54 if (part && !strcmp(part, "stroke")) 54 if (part && !strcmp(part, "stroke"))
55 { 55 {
56 eo_do(obj, efl_gfx_shape_stroke_color_set(r, g, b, a)); 56 efl_gfx_shape_stroke_color_set(obj, r, g, b, a);
57 return EINA_TRUE; 57 return EINA_TRUE;
58 } 58 }
59 59
60 eo_do_super(obj, EFL_VG_SHAPE_CLASS, 60 ret = efl_gfx_color_part_set(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
61 ret = efl_gfx_color_part_set(part, r, g, b, a));
62 61
63 return ret; 62 return ret;
64} 63}
@@ -72,12 +71,11 @@ _efl_vg_shape_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UN
72 71
73 if (part && !strcmp(part, "stroke")) 72 if (part && !strcmp(part, "stroke"))
74 { 73 {
75 eo_do(obj, efl_gfx_shape_stroke_color_get(r, g, b, a)); 74 efl_gfx_shape_stroke_color_get(obj, r, g, b, a);
76 return EINA_TRUE; 75 return EINA_TRUE;
77 } 76 }
78 77
79 eo_do_super(obj, EFL_VG_SHAPE_CLASS, 78 ret = efl_gfx_color_part_get(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
80 ret = efl_gfx_color_part_get(part, r, g, b, a));
81 79
82 return ret; 80 return ret;
83} 81}
@@ -147,20 +145,19 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
147 145
148 if (!nd->renderer) 146 if (!nd->renderer)
149 { 147 {
150 eo_do(s, nd->renderer = ector_surface_renderer_factory_new(ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)); 148 nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN);
151 } 149 }
152 150
153 eo_do(nd->renderer, 151 ector_renderer_transformation_set(nd->renderer, current);
154 ector_renderer_transformation_set(current), 152 ector_renderer_origin_set(nd->renderer, xn, yn);
155 ector_renderer_origin_set(xn, yn), 153 ector_renderer_color_set(nd->renderer, nd->r, nd->g, nd->b, nd->a);
156 ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a), 154 ector_renderer_visibility_set(nd->renderer, nd->visibility);
157 ector_renderer_visibility_set(nd->visibility), 155 ector_renderer_mask_set(nd->renderer, mask ? mask->renderer : NULL);
158 ector_renderer_mask_set(mask ? mask->renderer : NULL), 156 ector_renderer_shape_fill_set(nd->renderer, fill ? fill->renderer : NULL);
159 ector_renderer_shape_fill_set(fill ? fill->renderer : NULL), 157 ector_renderer_shape_stroke_fill_set(nd->renderer, stroke_fill ? stroke_fill->renderer : NULL);
160 ector_renderer_shape_stroke_fill_set(stroke_fill ? stroke_fill->renderer : NULL), 158 ector_renderer_shape_stroke_marker_set(nd->renderer, stroke_marker ? stroke_marker->renderer : NULL);
161 ector_renderer_shape_stroke_marker_set(stroke_marker ? stroke_marker->renderer : NULL), 159 efl_gfx_shape_dup(nd->renderer, obj);
162 efl_gfx_shape_dup(obj), 160 ector_renderer_prepare(nd->renderer);
163 ector_renderer_prepare());
164} 161}
165 162
166static Eo * 163static Eo *
@@ -168,13 +165,12 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
168{ 165{
169 Efl_VG_Base_Data *nd; 166 Efl_VG_Base_Data *nd;
170 167
171 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 168 obj = eo_constructor(eo_super(obj, MY_CLASS));
172 169
173 eo_do(obj, 170 efl_gfx_shape_stroke_scale_set(obj, 1);
174 efl_gfx_shape_stroke_scale_set(1), 171 efl_gfx_shape_stroke_location_set(obj, 0.5);
175 efl_gfx_shape_stroke_location_set(0.5), 172 efl_gfx_shape_stroke_cap_set(obj, EFL_GFX_CAP_BUTT);
176 efl_gfx_shape_stroke_cap_set(EFL_GFX_CAP_BUTT), 173 efl_gfx_shape_stroke_join_set(obj, EFL_GFX_JOIN_MITER);
177 efl_gfx_shape_stroke_join_set(EFL_GFX_JOIN_MITER));
178 174
179 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 175 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
180 nd->render_pre = _efl_vg_shape_render_pre; 176 nd->render_pre = _efl_vg_shape_render_pre;
@@ -186,7 +182,7 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
186static void 182static void
187_efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED) 183_efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED)
188{ 184{
189 eo_do_super(obj, MY_CLASS, eo_destructor()); 185 eo_destructor(eo_super(obj, MY_CLASS));
190} 186}
191 187
192static Eina_Bool 188static Eina_Bool
@@ -201,23 +197,21 @@ _efl_vg_shape_efl_vg_base_interpolate(Eo *obj,
201 fromd = eo_data_scope_get(from, EFL_VG_SHAPE_CLASS); 197 fromd = eo_data_scope_get(from, EFL_VG_SHAPE_CLASS);
202 tod = eo_data_scope_get(to, EFL_VG_SHAPE_CLASS); 198 tod = eo_data_scope_get(to, EFL_VG_SHAPE_CLASS);
203 199
204 eo_do_super(obj, MY_CLASS, r = efl_vg_interpolate(from, to, pos_map)); 200 r = efl_vg_interpolate(eo_super(obj, MY_CLASS), from, to, pos_map);
205 201
206 eo_do(obj, r &= efl_gfx_shape_interpolate(from, to, pos_map)); 202 r &= efl_gfx_shape_interpolate(obj, from, to, pos_map);
207 203
208 if (fromd->fill && tod->fill && pd->fill) 204 if (fromd->fill && tod->fill && pd->fill)
209 { 205 {
210 eo_do(pd->fill, r &= efl_vg_interpolate(fromd->fill, tod->fill, pos_map)); 206 r &= efl_vg_interpolate(pd->fill, fromd->fill, tod->fill, pos_map);
211 } 207 }
212 if (fromd->stroke.fill && tod->stroke.fill && pd->stroke.fill) 208 if (fromd->stroke.fill && tod->stroke.fill && pd->stroke.fill)
213 { 209 {
214 eo_do(pd->stroke.fill, 210 r &= efl_vg_interpolate(pd->stroke.fill, fromd->stroke.fill, tod->stroke.fill, pos_map);
215 r &= efl_vg_interpolate(fromd->stroke.fill, tod->stroke.fill, pos_map));
216 } 211 }
217 if (fromd->stroke.marker && tod->stroke.marker && pd->stroke.marker) 212 if (fromd->stroke.marker && tod->stroke.marker && pd->stroke.marker)
218 { 213 {
219 eo_do(pd->stroke.marker, 214 r &= efl_vg_interpolate(pd->stroke.marker, fromd->stroke.marker, tod->stroke.marker, pos_map);
220 r &= efl_vg_interpolate(fromd->stroke.marker, tod->stroke.marker, pos_map));
221 } 215 }
222 216
223 return r; 217 return r;
@@ -230,38 +224,31 @@ _efl_vg_shape_efl_vg_base_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const
230 Eo *parent; 224 Eo *parent;
231 Eo *fill = NULL, *stroke_fill = NULL, *stroke_marker = NULL; 225 Eo *fill = NULL, *stroke_fill = NULL, *stroke_marker = NULL;
232 226
233 eo_do_super(obj, MY_CLASS, efl_vg_dup(from)); 227 efl_vg_dup(eo_super(obj, MY_CLASS), from);
234 228
235 eo_do(obj, parent = eo_parent_get()); 229 parent = eo_parent_get(obj);
236 230
237 fromd = eo_data_scope_get(from, MY_CLASS); 231 fromd = eo_data_scope_get(from, MY_CLASS);
238 232
239 if (fromd->fill) 233 if (fromd->fill)
240 { 234 {
241 fill = eo_add(eo_class_get(fromd->fill), 235 fill = eo_add(eo_class_get(fromd->fill), parent, efl_vg_dup(eoid, fromd->fill));
242 parent,
243 efl_vg_dup(fromd->fill));
244 } 236 }
245 237
246 if (fromd->stroke.fill) 238 if (fromd->stroke.fill)
247 { 239 {
248 stroke_fill = eo_add(eo_class_get(fromd->stroke.fill), 240 stroke_fill = eo_add(eo_class_get(fromd->stroke.fill), parent, efl_vg_dup(eoid, fromd->stroke.fill));
249 parent,
250 efl_vg_dup(fromd->stroke.fill));
251 } 241 }
252 242
253 if (fromd->stroke.marker) 243 if (fromd->stroke.marker)
254 { 244 {
255 stroke_marker = eo_add(eo_class_get(fromd->stroke.marker), 245 stroke_marker = eo_add(eo_class_get(fromd->stroke.marker), parent, efl_vg_dup(eoid, fromd->stroke.marker));
256 parent,
257 efl_vg_dup(fromd->stroke.marker));
258 } 246 }
259 247
260 eo_do(obj, 248 efl_vg_shape_fill_set(obj, fill);
261 efl_vg_shape_fill_set(fill), 249 efl_vg_shape_stroke_fill_set(obj, stroke_fill);
262 efl_vg_shape_stroke_fill_set(stroke_fill), 250 efl_vg_shape_stroke_marker_set(obj, stroke_marker);
263 efl_vg_shape_stroke_marker_set(stroke_marker), 251 efl_gfx_shape_dup(obj, from);
264 efl_gfx_shape_dup(from));
265} 252}
266 253
267EAPI double 254EAPI double
@@ -269,25 +256,25 @@ evas_vg_shape_stroke_scale_get(Eo *obj)
269{ 256{
270 double ret; 257 double ret;
271 258
272 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_scale_get()); 259 return efl_gfx_shape_stroke_scale_get(obj);
273} 260}
274 261
275EAPI void 262EAPI void
276evas_vg_shape_stroke_scale_set(Eo *obj, double s) 263evas_vg_shape_stroke_scale_set(Eo *obj, double s)
277{ 264{
278 eo_do(obj, efl_gfx_shape_stroke_scale_set(s)); 265 efl_gfx_shape_stroke_scale_set(obj, s);
279} 266}
280 267
281EAPI void 268EAPI void
282evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a) 269evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a)
283{ 270{
284 eo_do(obj, efl_gfx_shape_stroke_color_get(r, g, b, a)); 271 efl_gfx_shape_stroke_color_get(obj, r, g, b, a);
285} 272}
286 273
287EAPI void 274EAPI void
288evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a) 275evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a)
289{ 276{
290 eo_do(obj, efl_gfx_shape_stroke_color_set(r, g, b, a)); 277 efl_gfx_shape_stroke_color_set(obj, r, g, b, a);
291} 278}
292 279
293EAPI double 280EAPI double
@@ -295,13 +282,13 @@ evas_vg_shape_stroke_width_get(Eo *obj)
295{ 282{
296 double ret; 283 double ret;
297 284
298 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_width_get()); 285 return efl_gfx_shape_stroke_width_get(obj);
299} 286}
300 287
301EAPI void 288EAPI void
302evas_vg_shape_stroke_width_set(Eo *obj, double w) 289evas_vg_shape_stroke_width_set(Eo *obj, double w)
303{ 290{
304 eo_do(obj, efl_gfx_shape_stroke_width_set(w)); 291 efl_gfx_shape_stroke_width_set(obj, w);
305} 292}
306 293
307EAPI double 294EAPI double
@@ -309,25 +296,25 @@ evas_vg_shape_stroke_location_get(Eo *obj)
309{ 296{
310 double ret; 297 double ret;
311 298
312 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_location_get()); 299 return efl_gfx_shape_stroke_location_get(obj);
313} 300}
314 301
315EAPI void 302EAPI void
316evas_vg_shape_stroke_location_set(Eo *obj, double centered) 303evas_vg_shape_stroke_location_set(Eo *obj, double centered)
317{ 304{
318 eo_do(obj, efl_gfx_shape_stroke_location_set(centered)); 305 efl_gfx_shape_stroke_location_set(obj, centered);
319} 306}
320 307
321EAPI void 308EAPI void
322evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int *length) 309evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int *length)
323{ 310{
324 eo_do(obj, efl_gfx_shape_stroke_dash_get(dash, length)); 311 efl_gfx_shape_stroke_dash_get(obj, dash, length);
325} 312}
326 313
327EAPI void 314EAPI void
328evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length) 315evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length)
329{ 316{
330 eo_do(obj, efl_gfx_shape_stroke_dash_set(dash, length)); 317 efl_gfx_shape_stroke_dash_set(obj, dash, length);
331} 318}
332 319
333EAPI Efl_Gfx_Cap 320EAPI Efl_Gfx_Cap
@@ -335,13 +322,13 @@ evas_vg_shape_stroke_cap_get(Eo *obj)
335{ 322{
336 Efl_Gfx_Cap ret; 323 Efl_Gfx_Cap ret;
337 324
338 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_cap_get()); 325 return efl_gfx_shape_stroke_cap_get(obj);
339} 326}
340 327
341EAPI void 328EAPI void
342evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c) 329evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c)
343{ 330{
344 eo_do(obj, efl_gfx_shape_stroke_cap_set(c)); 331 efl_gfx_shape_stroke_cap_set(obj, c);
345} 332}
346 333
347EAPI Efl_Gfx_Join 334EAPI Efl_Gfx_Join
@@ -349,121 +336,121 @@ evas_vg_shape_stroke_join_get(Eo *obj)
349{ 336{
350 Efl_Gfx_Join ret; 337 Efl_Gfx_Join ret;
351 338
352 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_join_get()); 339 return efl_gfx_shape_stroke_join_get(obj);
353} 340}
354 341
355EAPI void 342EAPI void
356evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j) 343evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j)
357{ 344{
358 eo_do(obj, efl_gfx_shape_stroke_join_set(j)); 345 efl_gfx_shape_stroke_join_set(obj, j);
359} 346}
360 347
361EAPI void 348EAPI void
362evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points) 349evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points)
363{ 350{
364 eo_do(obj, efl_gfx_shape_path_set(op, points)); 351 efl_gfx_shape_path_set(obj, op, points);
365} 352}
366 353
367EAPI void 354EAPI void
368evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points) 355evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points)
369{ 356{
370 eo_do(obj, efl_gfx_shape_path_get(op, points)); 357 efl_gfx_shape_path_get(obj, op, points);
371} 358}
372 359
373EAPI void 360EAPI void
374evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points) 361evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points)
375{ 362{
376 eo_do(obj, efl_gfx_shape_path_length_get(commands, points)); 363 efl_gfx_shape_path_length_get(obj, commands, points);
377} 364}
378 365
379EAPI void 366EAPI void
380evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y) 367evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y)
381{ 368{
382 eo_do(obj, efl_gfx_shape_current_get(x, y)); 369 efl_gfx_shape_current_get(obj, x, y);
383} 370}
384 371
385EAPI void 372EAPI void
386evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y) 373evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y)
387{ 374{
388 eo_do(obj, efl_gfx_shape_current_ctrl_get(x, y)); 375 efl_gfx_shape_current_ctrl_get(obj, x, y);
389} 376}
390 377
391EAPI void 378EAPI void
392evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from) 379evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from)
393{ 380{
394 eo_do(obj, efl_gfx_shape_dup(dup_from)); 381 efl_gfx_shape_dup(obj, dup_from);
395} 382}
396 383
397EAPI void 384EAPI void
398evas_vg_shape_shape_reset(Eo *obj) 385evas_vg_shape_shape_reset(Eo *obj)
399{ 386{
400 eo_do(obj, efl_gfx_shape_reset()); 387 efl_gfx_shape_reset(obj);
401} 388}
402 389
403EAPI void 390EAPI void
404evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y) 391evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y)
405{ 392{
406 eo_do(obj, efl_gfx_shape_append_move_to(x, y)); 393 efl_gfx_shape_append_move_to(obj, x, y);
407} 394}
408 395
409EAPI void 396EAPI void
410evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y) 397evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y)
411{ 398{
412 eo_do(obj, efl_gfx_shape_append_line_to(x, y)); 399 efl_gfx_shape_append_line_to(obj, x, y);
413} 400}
414 401
415EAPI void 402EAPI void
416evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) 403evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
417{ 404{
418 eo_do(obj, efl_gfx_shape_append_quadratic_to(x, y, ctrl_x, ctrl_y)); 405 efl_gfx_shape_append_quadratic_to(obj, x, y, ctrl_x, ctrl_y);
419} 406}
420 407
421EAPI void 408EAPI void
422evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y) 409evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y)
423{ 410{
424 eo_do(obj, efl_gfx_shape_append_squadratic_to(x, y)); 411 efl_gfx_shape_append_squadratic_to(obj, x, y);
425} 412}
426 413
427EAPI void 414EAPI void
428evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1) 415evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1)
429{ 416{
430 eo_do(obj, efl_gfx_shape_append_cubic_to(x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1)); 417 efl_gfx_shape_append_cubic_to(obj, x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1);
431} 418}
432 419
433EAPI void 420EAPI void
434evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) 421evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
435{ 422{
436 eo_do(obj, efl_gfx_shape_append_scubic_to(x, y, ctrl_x, ctrl_y)); 423 efl_gfx_shape_append_scubic_to(obj, x, y, ctrl_x, ctrl_y);
437} 424}
438 425
439EAPI void 426EAPI void
440evas_vg_shape_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep) 427evas_vg_shape_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep)
441{ 428{
442 eo_do(obj, efl_gfx_shape_append_arc_to(x, y, rx, ry, angle, large_arc, sweep)); 429 efl_gfx_shape_append_arc_to(obj, x, y, rx, ry, angle, large_arc, sweep);
443} 430}
444 431
445EAPI void 432EAPI void
446evas_vg_shape_shape_append_close(Eo *obj) 433evas_vg_shape_shape_append_close(Eo *obj)
447{ 434{
448 eo_do(obj, efl_gfx_shape_append_close()); 435 efl_gfx_shape_append_close(obj);
449} 436}
450 437
451EAPI void 438EAPI void
452evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius) 439evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius)
453{ 440{
454 eo_do(obj, efl_gfx_shape_append_circle(x, y, radius)); 441 efl_gfx_shape_append_circle(obj, x, y, radius);
455} 442}
456 443
457EAPI void 444EAPI void
458evas_vg_shape_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry) 445evas_vg_shape_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry)
459{ 446{
460 eo_do(obj, efl_gfx_shape_append_rect(x, y, w, h, rx, ry)); 447 efl_gfx_shape_append_rect(obj, x, y, w, h, rx, ry);
461} 448}
462 449
463EAPI void 450EAPI void
464evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data) 451evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data)
465{ 452{
466 eo_do(obj, efl_gfx_shape_append_svg_path(svg_path_data)); 453 efl_gfx_shape_append_svg_path(obj, svg_path_data);
467} 454}
468 455
469EAPI Eina_Bool 456EAPI Eina_Bool
@@ -471,7 +458,7 @@ evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double po
471{ 458{
472 Eina_Bool ret; 459 Eina_Bool ret;
473 460
474 return eo_do_ret(obj, ret, efl_gfx_shape_interpolate(from, to, pos_map)); 461 return efl_gfx_shape_interpolate(obj, from, to, pos_map);
475} 462}
476 463
477EAPI Eina_Bool 464EAPI Eina_Bool
@@ -479,7 +466,7 @@ evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with)
479{ 466{
480 Eina_Bool ret; 467 Eina_Bool ret;
481 468
482 return eo_do_ret(obj, ret, efl_gfx_shape_equal_commands(with)); 469 return efl_gfx_shape_equal_commands(obj, with);
483} 470}
484 471
485EAPI Efl_VG* 472EAPI Efl_VG*