From 24fd293d0cdcadf6bf54947fffa3e24184562885 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Fri, 7 Oct 2016 16:57:15 +0900 Subject: [PATCH] Revert "evas: backported vg api renaming patch" This reverts commit 1777c46a57342451e71bc4bfd8f7a5a1e643f309. Change-Id: I85499c40a0fabc254e1e4d77a249be2e4b52f5dd --- src/examples/evas/evas-vg-batman.c | 10 ++-- src/examples/evas/evas-vg-simple.c | 22 ++++----- src/lib/evas/Evas_Legacy.h | 68 +++++++++------------------ src/lib/evas/canvas/evas_vg_gradient_linear.c | 6 --- src/lib/evas/canvas/evas_vg_gradient_radial.c | 6 --- src/lib/evas/canvas/evas_vg_shape.c | 42 ++++++++--------- src/lib/evas/vg/evas_vg_eet_handler.c | 20 ++++---- 7 files changed, 70 insertions(+), 104 deletions(-) diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c index f03bc82..f17636d 100644 --- a/src/examples/evas/evas-vg-batman.c +++ b/src/examples/evas/evas-vg-batman.c @@ -79,7 +79,7 @@ _animator(void *data EINA_UNUSED, double pos) { int next = (animation_position + 1) % (sizeof (batmans_path) / sizeof (batmans_path[0])); - evas_vg_shape_interpolate(batman, + evas_vg_shape_shape_interpolate(batman, batmans_vg[next], batmans_vg[animation_position], ecore_animator_pos_map(pos, ECORE_POS_MAP_SINUSOIDAL, 0.0, 0.0)); @@ -140,7 +140,7 @@ main(void) evas_vg_node_color_set(batmans_vg[i], 120, 120, 120, 255); evas_vg_shape_stroke_join_set(batmans_vg[i], EFL_GFX_JOIN_ROUND); } - evas_vg_shape_append_svg_path(batmans_vg[i], batmans_path[i]); + evas_vg_shape_shape_append_svg_path(batmans_vg[i], batmans_path[i]); } animation = ecore_animator_timeline_add(1, _animator, NULL); @@ -154,7 +154,7 @@ main(void) circle = evas_vg_shape_add(root); - evas_vg_shape_append_circle(circle, WIDTH / 2, HEIGHT / 2, 200); + evas_vg_shape_shape_append_circle(circle, WIDTH / 2, HEIGHT / 2, 200); evas_vg_node_color_set(circle, 255, 255, 255, 255); evas_vg_shape_stroke_width_set(circle, 1); evas_vg_shape_stroke_color_set(circle, 255, 0, 0, 255); @@ -162,8 +162,8 @@ main(void) batman = evas_vg_shape_add(root); evas_vg_node_color_set(batman, 0, 0, 0, 255); evas_vg_node_origin_set(batman, 100, 150); - evas_vg_shape_append_move_to(batman, 256, 213); - evas_vg_shape_dup(batman, batmans_vg[0]); + evas_vg_shape_shape_append_move_to(batman, 256, 213); + evas_vg_shape_shape_dup(batman, batmans_vg[0]); ecore_main_loop_begin(); diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c index 7b444ad..5e0b0e4 100644 --- a/src/examples/evas/evas-vg-simple.c +++ b/src/examples/evas/evas-vg-simple.c @@ -365,25 +365,25 @@ void _arcto(Efl_VG *obj, int x, int y, int width, int height, int startAngle, in int cy = y + (height)/2; int i; - evas_vg_shape_append_move_to(obj, cx, cy); - evas_vg_shape_append_line_to(obj, curve_start.x, curve_start.y); + evas_vg_shape_shape_append_move_to(obj, cx, cy); + evas_vg_shape_shape_append_line_to(obj, curve_start.x, curve_start.y); for (i = 0; i < point_count; i += 3) { - evas_vg_shape_append_cubic_to(obj, + evas_vg_shape_shape_append_cubic_to(obj, pts[i+2].x, pts[i+2].y, pts[i].x, pts[i].y, pts[i+1].x, pts[i+1].y); } - evas_vg_shape_append_close(obj); + evas_vg_shape_shape_append_close(obj); } void _rect_add(Efl_VG *obj, int x, int y, int w, int h) { - evas_vg_shape_append_move_to(obj, x, y); - evas_vg_shape_append_line_to(obj, x + w, y); - evas_vg_shape_append_line_to(obj, x + w, y +h); - evas_vg_shape_append_line_to(obj, x, y +h); - evas_vg_shape_append_close(obj); + evas_vg_shape_shape_append_move_to(obj, x, y); + evas_vg_shape_shape_append_line_to(obj, x + w, y); + evas_vg_shape_shape_append_line_to(obj, x + w, y +h); + evas_vg_shape_shape_append_line_to(obj, x, y +h); + evas_vg_shape_shape_append_close(obj); } @@ -539,14 +539,14 @@ vector_set(int x, int y, int w, int h) Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set("tst")); - evas_vg_shape_append_rect(tst, 50, 25, 200, 200, 3, 5); + evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5); evas_vg_node_color_set(tst, 0, 0, 200, 200); evas_vg_shape_stroke_width_set(tst, 2); evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255); Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set("vc")); - evas_vg_shape_append_circle(vc, 100, 100, 23); + evas_vg_shape_shape_append_circle(vc, 100, 100, 23); evas_vg_node_color_set(vc, 0, 200, 0, 255); evas_vg_shape_stroke_width_set(vc, 4); evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255); diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index d0948d5..33464a9 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -2506,7 +2506,7 @@ EAPI void evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j); * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points); +EAPI void evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points); /** * @@ -2521,10 +2521,10 @@ EAPI void evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const * @endif */ -EAPI void evas_vg_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points); -EAPI void evas_vg_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points); -EAPI void evas_vg_shape_current_get(Eo *obj, double *x, double *y); -EAPI void evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y); +EAPI void evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points); +EAPI void evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points); +EAPI void evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y); +EAPI void evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y); /** * @@ -2539,7 +2539,7 @@ EAPI void evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y); * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_dup(Eo *obj, Eo *dup_from); +EAPI void evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from); /** * @@ -2553,7 +2553,7 @@ EAPI void evas_vg_shape_dup(Eo *obj, Eo *dup_from); * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_reset(Eo *obj); +EAPI void evas_vg_shape_shape_reset(Eo *obj); /** * @@ -2571,7 +2571,7 @@ EAPI void evas_vg_shape_reset(Eo *obj); * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_move_to(Eo *obj, double x, double y); +EAPI void evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y); /** * @@ -2593,7 +2593,7 @@ EAPI void evas_vg_shape_append_move_to(Eo *obj, double x, double y); * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_line_to(Eo *obj, double x, double y); +EAPI void evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y); /** * @@ -2614,7 +2614,7 @@ EAPI void evas_vg_shape_append_line_to(Eo *obj, double x, double y); * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y); +EAPI void evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y); /** * @@ -2632,7 +2632,7 @@ EAPI void evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y); +EAPI void evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y); /** * @@ -2655,7 +2655,7 @@ EAPI void evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y); * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1); +EAPI void evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1); /** * @@ -2676,7 +2676,7 @@ EAPI void evas_vg_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y); +EAPI void evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y); /** * @@ -2703,7 +2703,8 @@ EAPI void evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctr * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep); +EAPI void evas_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); + /** * @brief Append an arc that enclosed in the given rectangle (x, y, w, h). The @@ -2719,7 +2720,8 @@ EAPI void evas_vg_shape_append_arc_to(Eo *obj, double x, double y, double rx, do * * @ingroup Efl_Gfx_Shape */ -EAPI void evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length); +EAPI void evas_vg_shape_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length); + /** * @@ -2737,7 +2739,7 @@ EAPI void evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_close(Eo *obj); +EAPI void evas_vg_shape_shape_append_close(Eo *obj); /** * @@ -2755,7 +2757,7 @@ EAPI void evas_vg_shape_append_close(Eo *obj); * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius); +EAPI void evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius); /** * @@ -2782,11 +2784,11 @@ EAPI void evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius * @elseif WEARABLE @since_tizen 3.0 * @endif */ -EAPI void evas_vg_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry); +EAPI void evas_vg_shape_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry); -EAPI void evas_vg_shape_append_svg_path(Eo *obj, const char *svg_path_data); -EAPI Eina_Bool evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map); -EAPI Eina_Bool evas_vg_shape_equal_commands(Eo *obj, const Eo *with); +EAPI void evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data); +EAPI Eina_Bool evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map); +EAPI Eina_Bool evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with); #include "canvas/efl_vg_shape.eo.legacy.h" @@ -2847,18 +2849,6 @@ EAPI Efl_Gfx_Gradient_Spread evas_vg_gradient_spread_get(Eo *obj); #include "canvas/efl_vg_gradient.eo.legacy.h" /** - * Creates a new linear gradient object \. - * - * @param parent The given vector container object. - * @return The created linear gradient object handle. - * - * @if MOBILE @since_tizen 3.0 - * @elseif WEARABLE @since_tizen 3.0 - * @endif - */ -EAPI Efl_VG* evas_vg_gradient_linear_add(Efl_VG *parent); - -/** * * Sets the start point of this linear gradient. * @@ -2913,18 +2903,6 @@ EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y); #include "canvas/efl_vg_gradient_linear.eo.legacy.h" /** - * Creates a new radial gradient object \. - * - * @param parent The given vector container object. - * @return The created radial gradient object handle. - * - * @if MOBILE @since_tizen 3.0 - * @elseif WEARABLE @since_tizen 3.0 - * @endif - */ -EAPI Efl_VG* evas_vg_gradient_radial_add(Efl_VG *parent); - -/** * * Sets the center of this radial gradient. * diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c index 04c1cb3..712e80f 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_linear.c +++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c @@ -192,10 +192,4 @@ evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y) eo_do(obj, efl_gfx_gradient_linear_end_get(x, y)); } -EAPI Efl_VG* -evas_vg_gradient_linear_add(Efl_VG *parent) -{ - return eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, parent); -} - #include "efl_vg_gradient_linear.eo.c" diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c index 22d8a33..d865cc2 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_radial.c +++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c @@ -226,10 +226,4 @@ evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y) eo_do(obj, efl_gfx_gradient_radial_focal_get(x, y)); } -EAPI Efl_VG* -evas_vg_gradient_radial_add(Efl_VG *parent) -{ - return eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, parent); -} - #include "efl_vg_gradient_radial.eo.c" diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c index 5f6a2cc..9bfa8bb 100644 --- a/src/lib/evas/canvas/evas_vg_shape.c +++ b/src/lib/evas/canvas/evas_vg_shape.c @@ -359,121 +359,121 @@ evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j) } EAPI void -evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points) +evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points) { eo_do(obj, efl_gfx_shape_path_set(op, points)); } EAPI void -evas_vg_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points) +evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points) { eo_do(obj, efl_gfx_shape_path_get(op, points)); } EAPI void -evas_vg_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points) +evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points) { eo_do(obj, efl_gfx_shape_path_length_get(commands, points)); } EAPI void -evas_vg_shape_current_get(Eo *obj, double *x, double *y) +evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y) { eo_do(obj, efl_gfx_shape_current_get(x, y)); } EAPI void -evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y) +evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y) { eo_do(obj, efl_gfx_shape_current_ctrl_get(x, y)); } EAPI void -evas_vg_shape_dup(Eo *obj, Eo *dup_from) +evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from) { eo_do(obj, efl_gfx_shape_dup(dup_from)); } EAPI void -evas_vg_shape_reset(Eo *obj) +evas_vg_shape_shape_reset(Eo *obj) { eo_do(obj, efl_gfx_shape_reset()); } EAPI void -evas_vg_shape_append_move_to(Eo *obj, double x, double y) +evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y) { eo_do(obj, efl_gfx_shape_append_move_to(x, y)); } EAPI void -evas_vg_shape_append_line_to(Eo *obj, double x, double y) +evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y) { eo_do(obj, efl_gfx_shape_append_line_to(x, y)); } EAPI void -evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) +evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) { eo_do(obj, efl_gfx_shape_append_quadratic_to(x, y, ctrl_x, ctrl_y)); } EAPI void -evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y) +evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y) { eo_do(obj, efl_gfx_shape_append_squadratic_to(x, y)); } EAPI void -evas_vg_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1) +evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1) { eo_do(obj, efl_gfx_shape_append_cubic_to(x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1)); } EAPI void -evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) +evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) { eo_do(obj, efl_gfx_shape_append_scubic_to(x, y, ctrl_x, ctrl_y)); } EAPI void -evas_vg_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep) +evas_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) { eo_do(obj, efl_gfx_shape_append_arc_to(x, y, rx, ry, angle, large_arc, sweep)); } EAPI void -evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length) +evas_vg_shape_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length) { eo_do(obj, efl_gfx_shape_append_arc(x, y, w, h, start_angle, sweep_length)); } EAPI void -evas_vg_shape_append_close(Eo *obj) +evas_vg_shape_shape_append_close(Eo *obj) { eo_do(obj, efl_gfx_shape_append_close()); } EAPI void -evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius) +evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius) { eo_do(obj, efl_gfx_shape_append_circle(x, y, radius)); } EAPI void -evas_vg_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry) +evas_vg_shape_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry) { eo_do(obj, efl_gfx_shape_append_rect(x, y, w, h, rx, ry)); } EAPI void -evas_vg_shape_append_svg_path(Eo *obj, const char *svg_path_data) +evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data) { eo_do(obj, efl_gfx_shape_append_svg_path(svg_path_data)); } EAPI Eina_Bool -evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map) +evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map) { Eina_Bool ret; @@ -481,7 +481,7 @@ evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map) } EAPI Eina_Bool -evas_vg_shape_equal_commands(Eo *obj, const Eo *with) +evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with) { Eina_Bool ret; diff --git a/src/lib/evas/vg/evas_vg_eet_handler.c b/src/lib/evas/vg/evas_vg_eet_handler.c index c2c1e48..9132c2f 100644 --- a/src/lib/evas/vg/evas_vg_eet_handler.c +++ b/src/lib/evas/vg/evas_vg_eet_handler.c @@ -578,12 +578,12 @@ _add_polyline(Efl_VG *vg, double *array, int size, Eina_Bool polygon) if (size < 2) return; - evas_vg_shape_append_move_to(vg, array[0], array[1]); + evas_vg_shape_shape_append_move_to(vg, array[0], array[1]); for (i=2; i < size; i+=2) - evas_vg_shape_append_line_to(vg, array[i], array[i+1]); + evas_vg_shape_shape_append_line_to(vg, array[i], array[i+1]); if (polygon) - evas_vg_shape_append_close(vg); + evas_vg_shape_shape_append_close(vg); } static void @@ -608,7 +608,7 @@ _create_vg_node(Svg_Node *node, Efl_VG *parent) break; case SVG_NODE_PATH: vg = evas_vg_shape_add(parent); - evas_vg_shape_append_svg_path(vg, node->node.path.path); + evas_vg_shape_shape_append_svg_path(vg, node->node.path.path); break; case SVG_NODE_POLYGON: vg = evas_vg_shape_add(parent); @@ -620,24 +620,24 @@ _create_vg_node(Svg_Node *node, Efl_VG *parent) break; case SVG_NODE_ELLIPSE: vg = evas_vg_shape_add(parent); - evas_vg_shape_append_arc(vg, node->node.ellipse.cx - node->node.ellipse.rx, + evas_vg_shape_shape_append_arc(vg, node->node.ellipse.cx - node->node.ellipse.rx, node->node.ellipse.cy - node->node.ellipse.ry, 2*node->node.ellipse.rx, 2*node->node.ellipse.ry, 0, 360); - evas_vg_shape_append_close(vg); + evas_vg_shape_shape_append_close(vg); break; case SVG_NODE_CIRCLE: vg = evas_vg_shape_add(parent); - evas_vg_shape_append_circle(vg, node->node.circle.cx, node->node.circle.cy, node->node.circle.r); + evas_vg_shape_shape_append_circle(vg, node->node.circle.cx, node->node.circle.cy, node->node.circle.r); break; case SVG_NODE_RECT: vg = evas_vg_shape_add(parent); - evas_vg_shape_append_rect(vg, node->node.rect.x, node->node.rect.y, node->node.rect.w, node->node.rect.h, + evas_vg_shape_shape_append_rect(vg, node->node.rect.x, node->node.rect.y, node->node.rect.w, node->node.rect.h, node->node.rect.rx, node->node.rect.ry); break; case SVG_NODE_LINE: vg = evas_vg_shape_add(parent); - evas_vg_shape_append_move_to(vg, node->node.line.x1, node->node.line.y1); - evas_vg_shape_append_line_to(vg, node->node.line.x2, node->node.line.y2); + evas_vg_shape_shape_append_move_to(vg, node->node.line.x1, node->node.line.y1); + evas_vg_shape_shape_append_line_to(vg, node->node.line.x2, node->node.line.y2); break; default: break; -- 2.7.4