evas vector: Fixed build error with thorvg flag.

Code conflicts was inproperly resolved. This commit fixed build error
witch occurs when thorvg flag is set.

Change-Id: Iea3b2aafb3ff4c9ba0e28e4f4f2f22951590562f

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 750e7b7..9dcd598 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
@@ -121,9 +121,7 @@ _efl_canvas_vg_gradient_linear_efl_object_constructor(Eo *obj,
    nd->render_pre = _efl_canvas_vg_gradient_linear_render_pre;
 #else
    gd->gradient_render_pre_tvg = _gradient_linear_render_pre_tvg;
-   gd->shape = NULL;
    gd->spread = EFL_GFX_GRADIENT_SPREAD_PAD;
-   //removed by tvg_canvas_destroy()
    gd->gradient = tvg_linear_gradient_new();
 #endif
    nd->data = pd;

diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
index f423f50..1231b55 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
@@ -138,7 +138,6 @@ _efl_canvas_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_Canvas_Vg_Gra
    Efl_Canvas_Vg_Gradient_Data *gd;
    gd = efl_data_scope_get(obj, EFL_CANVAS_VG_GRADIENT_CLASS);
    gd->gradient_render_pre_tvg = _gradient_radial_render_pre_tvg;
-   gd->shape = NULL;
    gd->spread = EFL_GFX_GRADIENT_SPREAD_PAD;
    gd->gradient = tvg_radial_gradient_new();
 #endif

diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index 0e124ed..2111d60 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -141,6 +141,7 @@ struct _Efl_Canvas_Vg_Gradient_Data
 
 #ifdef HAVE_THORVG
    Tvg_Gradient *gradient;
+   void (*gradient_render_pre_tvg)(Efl_Canvas_Vg_Node *nd, Efl_Canvas_Vg_Gradient_Data *gd, Tvg_Paint *shape);
 #endif
 };