evas vg: Removed warnings

Change-Id: I5c31dd88331ebd2f030fca1e54900d64d5f16000

diff --git a/src/lib/evas/canvas/efl_canvas_vg_container.c b/src/lib/evas/canvas/efl_canvas_vg_container.c
index 7bac14b..df8dfbc 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg_container.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_container.c
@@ -27,8 +27,7 @@ _efl_canvas_vg_container_render_pre_tvg(Evas_Object_Protected_Data *obj,
                                     EINA_UNUSED Efl_VG *node,
                                     Efl_Canvas_Vg_Node_Data *nd,
                                     Eina_Matrix3 *pTransform,
-                                    void *canvas, void *scene,
-                                    EINA_UNUSED int w, EINA_UNUSED int h)
+                                    void *canvas, void *scene)
 {
    Efl_Canvas_Vg_Container_Data *cd = NULL;
    Efl_VG *child = NULL;

diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient.c b/src/lib/evas/canvas/efl_canvas_vg_gradient.c
index fec5e93..bf9cc61 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient.c
@@ -13,7 +13,7 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj,
                                                  const Efl_Gfx_Gradient_Stop *colors,
                                                  unsigned int length)
 {
-   evas_vg_gradient_stop_set(obj, colors, length);
+   evas_vg_gradient_stop_set((Evas_Vg_Gradient*)obj, (const Evas_Vg_Gradient_Stop*)colors, length);
 }
 
 static void
@@ -22,7 +22,7 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_stop_get(const Eo *obj,
                                                   const Efl_Gfx_Gradient_Stop **colors,
                                                   unsigned int *length)
 {
-   evas_vg_gradient_stop_get(obj, colors, length);
+   evas_vg_gradient_stop_get((Evas_Vg_Gradient*)obj, (const Evas_Vg_Gradient_Stop**)colors, length);
 }
 
 static void
@@ -30,14 +30,14 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj,
                                                     Efl_Canvas_Vg_Gradient_Data *pd EINA_UNUSED,
                                                     Efl_Gfx_Gradient_Spread spread)
 {
-   evas_vg_gradient_spread_set(obj, spread);
+   evas_vg_gradient_spread_set((Evas_Vg_Gradient*)obj, (Evas_Vg_Gradient_Spread)spread);
 }
 
 static Efl_Gfx_Gradient_Spread
 _efl_canvas_vg_gradient_efl_gfx_gradient_spread_get(const Eo *obj,
                                                     Efl_Canvas_Vg_Gradient_Data *pd EINA_UNUSED)
 {
-   return evas_vg_gradient_spread_get(obj);
+   return evas_vg_gradient_spread_get((Evas_Vg_Gradient*)obj);
 }
 
 static Eina_Bool

diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
index 2ce599d..ecef501 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
@@ -21,7 +21,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj,
                                                                  Efl_Canvas_Vg_Gradient_Linear_Data *pd EINA_UNUSED,
                                                                  double x, double y)
 {
-   evas_vg_gradient_linear_start_set(obj, x, y);
+   evas_vg_gradient_linear_start_set((Evas_Vg_Gradient_Linear*)obj, x, y);
 }
 
 static void
@@ -29,7 +29,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_get(const Eo *obj,
                                                                  Efl_Canvas_Vg_Gradient_Linear_Data *pd EINA_UNUSED,
                                                                  double *x, double *y)
 {
-   evas_vg_gradient_linear_start_get(obj, x, y);
+   evas_vg_gradient_linear_start_get((Evas_Vg_Gradient_Linear*)obj, x, y);
 }
 
 static void
@@ -37,7 +37,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj,
                                                                Efl_Canvas_Vg_Gradient_Linear_Data *pd EINA_UNUSED,
                                                                double x, double y)
 {
-   evas_vg_gradient_linear_end_set(obj, x, y);
+   evas_vg_gradient_linear_end_set((Evas_Vg_Gradient_Linear*)obj, x, y);
 }
 
 static void
@@ -45,7 +45,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_get(const Eo *obj,
                                                                Efl_Canvas_Vg_Gradient_Linear_Data *pd EINA_UNUSED,
                                                                double *x, double *y)
 {
-   evas_vg_gradient_linear_end_get(obj, x, y);
+   evas_vg_gradient_linear_end_get((Evas_Vg_Gradient_Linear*)obj, x, y);
 }
 
 static void

diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.c b/src/lib/evas/canvas/efl_canvas_vg_node.c
index 65d4e07..76a6fed 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg_node.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.c
@@ -266,7 +266,7 @@ _efl_canvas_vg_node_efl_object_constructor(Eo *obj,
 }
 
 static void
-_efl_canvas_vg_node_efl_object_invalidate(Eo *obj, Efl_Canvas_Vg_Node_Data *pd)
+_efl_canvas_vg_node_efl_object_invalidate(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
 {
    efl_invalidate(efl_super(obj, MY_CLASS));
 }

diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index f75d6e2..5303be7 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -417,8 +417,7 @@ _efl_canvas_vg_object_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Object_Data *pd
 }
 
 static void
-_render_to_tvg_buffer(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data *pd,
-                      Efl_VG *root, int w EINA_UNUSED, int h EINA_UNUSED)
+_render_to_tvg_buffer(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data *pd, Efl_VG *root)
 {
    if (!efl_isa(root, EFL_CANVAS_VG_GRADIENT_CLASS))
      {
@@ -433,9 +432,9 @@ _render_to_tvg_buffer(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data
 }
 
 static void
-_render_tvg_buffer_to_screen(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data *pd,
-                             void *engine, void *output, void *context, void *surface,
-                             void *buffer, int x, int y, int w, int h, Eina_Bool do_async)
+_render_tvg_buffer_to_screen(Evas_Object_Protected_Data *obj, void *engine, void *output,
+                             void *context, void *surface, void *buffer, int x, int y,
+                             int w, int h, Eina_Bool do_async)
 {
    Eina_Bool async_unref = EINA_FALSE;
    Image_Entry *image = NULL;
@@ -509,20 +508,13 @@ _efl_canvas_vg_object_render(Evas_Object *eo_obj EINA_UNUSED,
         Efl_VG *root = evas_cache_vg_tree_get(pd->vg_entry, pd->frame_idx);
         if (!root) return;
 
-        _render_to_tvg_buffer(obj, pd, root,
-                              vg_entry->w,
-                              vg_entry->h);
+        _render_to_tvg_buffer(obj, pd, root);
      }
 
    if (pd->user_entry)
-     {
-        //FIX_TVG: see _user_vg_entry_render() how it handles the render region for optimal buffer size
-        _render_to_tvg_buffer(obj, pd, pd->user_entry->root,
-                              obj->cur->geometry.w,
-                              obj->cur->geometry.h);
-     }
+     _render_to_tvg_buffer(obj, pd, pd->user_entry->root);
 
-   _render_tvg_buffer_to_screen(obj, pd, engine, output, context, surface,
+   _render_tvg_buffer_to_screen(obj, engine, output, context, surface,
                                 pd->tvg_buffer, obj->cur->geometry.x + x,
                                 obj->cur->geometry.y + y, size.w, size.h, do_async);
 

diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.c b/src/lib/evas/canvas/efl_canvas_vg_shape.c
index 78f7a47..70b608c 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg_shape.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_shape.c
@@ -428,8 +428,8 @@ _shape_properties_interpolate(Evas_Vg_Shape *obj,
    nd->y = _interpolate(nd_from->y, nd_to->y, pos_map);
 
    Efl_Canvas_Vg_Shape_Data *sd = _get_shape_data(obj);
-   Efl_Canvas_Vg_Shape_Data *sd_from = _get_shape_data(from);
-   Efl_Canvas_Vg_Shape_Data *sd_to = _get_shape_data(to);
+   Efl_Canvas_Vg_Shape_Data *sd_from = _get_shape_data((Evas_Vg_Shape*)from);
+   Efl_Canvas_Vg_Shape_Data *sd_to = _get_shape_data((Evas_Vg_Shape*)to);
 
    if (!sd || !sd_from || !sd_to) return EINA_FALSE;
 
@@ -980,7 +980,7 @@ evas_vg_shape_fill_rule_set(Evas_Vg_Shape *obj, Evas_Vg_Fill_Rule r)
 EAPI void
 evas_vg_shape_fill_rule_get(Evas_Vg_Shape *obj, Evas_Vg_Fill_Rule *r)
 {
-   tvg_shape_get_fill_rule(_get_tvg_shape(obj), r);
+   tvg_shape_get_fill_rule(_get_tvg_shape(obj), (Tvg_Fill_Rule*)r);
 }
 
 EAPI void

diff --git a/src/modules/evas/vg_savers/svg/evas_vg_save_svg.c b/src/modules/evas/vg_savers/svg/evas_vg_save_svg.c
index ecb2b84..ff25111 100644 (file)
--- a/src/modules/evas/vg_savers/svg/evas_vg_save_svg.c
+++ b/src/modules/evas/vg_savers/svg/evas_vg_save_svg.c
@@ -25,9 +25,9 @@ printf_style(Svg_Style_Property *style, Eina_Strbuf *buf)
      eina_strbuf_append_printf(buf, " stroke=\"#%02X%02X%02X\" ", style->stroke.paint.r, style->stroke.paint.g, style->stroke.paint.b);
    if (EINA_DBL_NONZERO(style->stroke.width))
      eina_strbuf_append_printf(buf, " stroke-width=\"%f\" ", style->stroke.width);
-   if (style->stroke.cap == EFL_GFX_CAP_ROUND)
+   if (style->stroke.cap == EVAS_VG_CAP_ROUND)
      eina_strbuf_append_printf(buf, " stroke-linecap=\"round\" ");
-   else if (style->stroke.cap == EFL_GFX_CAP_SQUARE)
+   else if (style->stroke.cap == EVAS_VG_CAP_SQUARE)
      eina_strbuf_append_printf(buf, " stroke-linecap=\"square\" ");
 }
 
@@ -37,7 +37,7 @@ _svg_node_printf(Svg_Node *parent, Eina_Strbuf *buf)
    int i = 0;
    double *points;
    double last_x = 0, last_y = 0;
-   Efl_Gfx_Path_Command *commands;
+   Evas_Vg_Path_Command *commands;
    Eina_List *l;
    Svg_Node *data;