summaryrefslogtreecommitdiff
path: root/src/lib/ector/cairo/ector_renderer_cairo_shape.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 13:23:25 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 13:47:15 -0500
commit11d5bac1d3d9cf9655eb0b7c086e80d77a487563 (patch)
tree33d2eeb8b438dcc64e667449da223a639be23a22 /src/lib/ector/cairo/ector_renderer_cairo_shape.c
parentadc2be188c2c40e4f3faa72e36e599e249aa9dce (diff)
downloadefl-11d5bac1d3d9cf9655eb0b7c086e80d77a487563.tar.gz
ector: fix property/method name conflict for "fill"
Shape implements a property, sw/gl/cairo implements a method rename method to op_fill
Diffstat (limited to 'src/lib/ector/cairo/ector_renderer_cairo_shape.c')
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 7012491341..1b7df1e74a 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -179,14 +179,14 @@ _ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Sh
cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING);
if (pd->shape->fill)
- ector_renderer_cairo_fill(pd->shape->fill, mul_col);
+ ector_renderer_cairo_op_fill(pd->shape->fill, mul_col);
if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0)
{
cairo_fill_preserve(pd->parent->cairo);
if (pd->shape->stroke.fill)
- ector_renderer_cairo_fill(pd->shape->stroke.fill, mul_col);
+ ector_renderer_cairo_op_fill(pd->shape->stroke.fill, mul_col);
else
{
r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8);
@@ -226,7 +226,7 @@ _ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Sh
}
static Eina_Bool
-_ector_renderer_cairo_shape_ector_renderer_cairo_fill(Eo *obj EINA_UNUSED,
+_ector_renderer_cairo_shape_ector_renderer_cairo_op_fill(Eo *obj EINA_UNUSED,
Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
unsigned int mul_col EINA_UNUSED)
{