From: Hermet Park Date: Fri, 19 Mar 2021 06:11:30 +0000 (+0900) Subject: evas vg: fix build break. X-Git-Tag: accepted/tizen/unified/20210330.111316~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F255539%2F1;p=platform%2Fupstream%2Fefl.git evas vg: fix build break. some typing mistake by 4cebc065fba8a7eaf051d75881fa48377c41490f Change-Id: Ie57849869b1bb4257713230c3839b5521960beee --- diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.c b/src/lib/evas/canvas/efl_canvas_vg_shape.c index 02434f5..ff3b556 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_shape.c +++ b/src/lib/evas/canvas/efl_canvas_vg_shape.c @@ -1093,8 +1093,6 @@ evas_vg_shape_path_set(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command *op, const unsigned int pts_length = 0; unsigned int i = 0, k = 0; - Tvg_Point *pts = NULL; - _get_path_length(op, &cmd_length, &pts_length); Tvg_Path_Command* commands = malloc(sizeof(Tvg_Path_Command) * (cmd_length - 1)); @@ -1224,7 +1222,7 @@ evas_vg_shape_current_ctrl_get(Evas_Vg_Shape *obj, double *x, double *y) Efl_Canvas_Vg_Node_Data *nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS); if (!nd) return; - Efl_Canva_Vg_Shape_Data *sd = nd->data; + Efl_Canvas_Vg_Shape_Data *sd = nd->data; if (!sd) return; if (x) *x = sd->curr_ctrl.x; @@ -1272,7 +1270,7 @@ evas_vg_shape_append_move_to(Evas_Vg_Shape *obj, double x, double y) #ifdef HAVE_THORVG if (!obj) return; - Efl_Canva_Vg_Shape_Data *sd = _get_shape_data(obj); + Efl_Canvas_Vg_Shape_Data *sd = _get_shape_data(obj); if (!sd || !sd->shape) return; tvg_shape_move_to(sd->shape, x, y); @@ -1376,7 +1374,6 @@ evas_vg_shape_append_arc(Evas_Vg_Shape *obj, double x, double y, double w, doubl Efl_Canvas_Vg_Shape_Data *sd = _get_shape_data(obj); if (!sd || !sd->shape) return; - Efl_Canvas_Vg_Shape_Data *sd = NULL; const Tvg_Path_Command *cmds = NULL; uint32_t cmds_count = 0; @@ -1429,7 +1426,7 @@ evas_vg_shape_append_circle(Evas_Vg_Shape *obj, double x, double y, double radiu #ifdef HAVE_THORVG if (!obj) return; - Efl_Canva_Vg_Shape_Data *sd = _get_shape_data(obj); + Efl_Canvas_Vg_Shape_Data *sd = _get_shape_data(obj); if (!sd || !sd->shape) return; tvg_shape_append_circle(sd->shape, x, y, radius, radius); diff --git a/src/lib/evas/canvas/evas_vg_path_helper.h b/src/lib/evas/canvas/evas_vg_path_helper.h index 51a916a..2646e96 100644 --- a/src/lib/evas/canvas/evas_vg_path_helper.h +++ b/src/lib/evas/canvas/evas_vg_path_helper.h @@ -10,7 +10,7 @@ typedef struct _Shape_Svg_Path { char *svg_path_data; - Tvg_Path_Commtand *cmds; + Tvg_Path_Command *cmds; Tvg_Point *pts; uint32_t cmds_cnt; uint32_t pts_cnt; @@ -18,7 +18,7 @@ typedef struct _Shape_Svg_Path { uint32_t pts_reserved; } Shape_Svg_Path; -struct _Arc_To_Init_Variables { +typedef struct _Arc_To_Init_Variables { double cx, cy; double theta1; double delta, bcp; diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h index cf5f128..ae27786 100644 --- a/src/lib/evas/canvas/evas_vg_private.h +++ b/src/lib/evas/canvas/evas_vg_private.h @@ -80,12 +80,12 @@ struct _Efl_Canvas_Vg_Node_Data void (*render_pre_tvg)(Evas_Object_Protected_Data *vg_pd, Efl_VG *node, Efl_Canvas_Vg_Node_Data *nd, Eina_Matrix3 *ptransform, void *canvas, void *scene); #else Ector_Renderer *renderer; +#endif void (*render_pre)(Evas_Object_Protected_Data *vg_pd, Efl_VG *node, Efl_Canvas_Vg_Node_Data *nd, void *engine, void *output, void *contenxt, Ector_Surface *surface, Eina_Matrix3 *ptransform, int opacity, Ector_Buffer *comp, Efl_Gfx_Vg_Composite_Method comp_method, void *data); -#endif void *data;