summaryrefslogtreecommitdiff
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
parentadc2be188c2c40e4f3faa72e36e599e249aa9dce (diff)
ector: fix property/method name conflict for "fill"
Shape implements a property, sw/gl/cairo implements a method rename method to op_fill
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.eo2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c6
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.eo2
-rw-r--r--src/lib/ector/software/ector_renderer_software.eo2
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.c2
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.eo2
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.c2
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.eo2
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c6
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.eo2
21 files changed, 26 insertions, 26 deletions
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo
index a0ee972d28..02431e0b25 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -2,7 +2,7 @@ abstract Ector.Renderer.Cairo (Ector.Renderer)
2{ 2{
3 [[Ector cairo renderer abstract class]] 3 [[Ector cairo renderer abstract class]]
4 methods { 4 methods {
5 fill @pure_virtual { 5 op_fill @pure_virtual {
6 [[Fill operation]] 6 [[Fill operation]]
7 return: bool; [[$true on success, $false otherwise]] 7 return: bool; [[$true on success, $false otherwise]]
8 params { 8 params {
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
index 95b42432c2..eb46ee73a0 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -91,7 +91,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_draw(Eo *obj,
91} 91}
92 92
93static Eina_Bool 93static Eina_Bool
94_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj, 94_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_op_fill(Eo *obj,
95 Ector_Renderer_Cairo_Gradient_Linear_Data *pd, 95 Ector_Renderer_Cairo_Gradient_Linear_Data *pd,
96 unsigned int mul_col) 96 unsigned int mul_col)
97{ 97{
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
index 670371c7c6..f8356c1be0 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.Cairo.fill; 10 Ector.Renderer.Cairo.op_fill;
11 Efl.Object.finalize; 11 Efl.Object.finalize;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 Efl.Gfx.Gradient.stop { set; } 13 Efl.Gfx.Gradient.stop { set; }
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
index 30149e78a8..dabb8438ba 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -114,7 +114,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Rendere
114 114
115// Clearly duplicated and should be in a common place... 115// Clearly duplicated and should be in a common place...
116static Eina_Bool 116static Eina_Bool
117_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj, 117_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_op_fill(Eo *obj,
118 Ector_Renderer_Cairo_Gradient_Radial_Data *pd, 118 Ector_Renderer_Cairo_Gradient_Radial_Data *pd,
119 unsigned int mul_col) 119 unsigned int mul_col)
120{ 120{
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
index adb1219f98..97ba1d1783 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.Cairo.fill; 10 Ector.Renderer.Cairo.op_fill;
11 Efl.Object.destructor; 11 Efl.Object.destructor;
12 Efl.Object.finalize; 12 Efl.Object.finalize;
13 Efl.Gfx.Gradient.stop { set; } 13 Efl.Gfx.Gradient.stop { set; }
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
179 cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING); 179 cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING);
180 180
181 if (pd->shape->fill) 181 if (pd->shape->fill)
182 ector_renderer_cairo_fill(pd->shape->fill, mul_col); 182 ector_renderer_cairo_op_fill(pd->shape->fill, mul_col);
183 183
184 if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0) 184 if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0)
185 { 185 {
186 cairo_fill_preserve(pd->parent->cairo); 186 cairo_fill_preserve(pd->parent->cairo);
187 187
188 if (pd->shape->stroke.fill) 188 if (pd->shape->stroke.fill)
189 ector_renderer_cairo_fill(pd->shape->stroke.fill, mul_col); 189 ector_renderer_cairo_op_fill(pd->shape->stroke.fill, mul_col);
190 else 190 else
191 { 191 {
192 r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8); 192 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
226} 226}
227 227
228static Eina_Bool 228static Eina_Bool
229_ector_renderer_cairo_shape_ector_renderer_cairo_fill(Eo *obj EINA_UNUSED, 229_ector_renderer_cairo_shape_ector_renderer_cairo_op_fill(Eo *obj EINA_UNUSED,
230 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, 230 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
231 unsigned int mul_col EINA_UNUSED) 231 unsigned int mul_col EINA_UNUSED)
232{ 232{
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index dc65a407e2..fe40d8954c 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape)
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.Cairo.fill; 10 Ector.Renderer.Cairo.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.finalize; 12 Efl.Object.finalize;
13 Efl.Object.destructor; 13 Efl.Object.destructor;
diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index 18b305b8ab..97941d28c2 100644
--- a/src/lib/ector/gl/ector_renderer_gl.eo
+++ b/src/lib/ector/gl/ector_renderer_gl.eo
@@ -4,7 +4,7 @@ abstract Ector.Renderer.GL (Ector.Renderer)
4{ 4{
5 [[Ector GL renderer abstract class]] 5 [[Ector GL renderer abstract class]]
6 methods { 6 methods {
7 fill @pure_virtual { 7 op_fill @pure_virtual {
8 [[Fill operation]] 8 [[Fill operation]]
9 return: bool; [[$true on success, $false otherwise]] 9 return: bool; [[$true on success, $false otherwise]]
10 params { 10 params {
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
index 87c5594b88..8856e7a84d 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -52,7 +52,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_bounds_get(Eo *obj EINA_UNUSED
52} 52}
53 53
54static Eina_Bool 54static Eina_Bool
55_ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col) 55_ector_renderer_gl_gradient_linear_ector_renderer_gl_op_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
56{ 56{
57 // FIXME: The idea here is to select the right shader and push the needed parameter for it 57 // FIXME: The idea here is to select the right shader and push the needed parameter for it
58 // along with the other value 58 // along with the other value
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
index 33b1389b40..053c8c1af9 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradi
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 Efl.Gfx.Gradient.stop { set; } 13 Efl.Gfx.Gradient.stop { set; }
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
index 827b120600..8d00558e21 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -39,7 +39,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_G
39} 39}
40 40
41static Eina_Bool 41static Eina_Bool
42_ector_renderer_gl_gradient_radial_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col) 42_ector_renderer_gl_gradient_radial_ector_renderer_gl_op_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
43{ 43{
44 // FIXME: The idea here is to select the right shader and push the needed parameter for it 44 // FIXME: The idea here is to select the right shader and push the needed parameter for it
45 // along with the other value 45 // along with the other value
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
index 47bfb400eb..240d73628f 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradi
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 Efl.Gfx.Gradient.stop { set; } 13 Efl.Gfx.Gradient.stop { set; }
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index ecf78faec1..7e595687d5 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -85,7 +85,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
85 85
86 if (pd->shape->fill) 86 if (pd->shape->fill)
87 { 87 {
88 ector_renderer_gl_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col); 88 ector_renderer_gl_op_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
89 } 89 }
90 else 90 else
91 { 91 {
@@ -96,7 +96,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
96} 96}
97 97
98static Eina_Bool 98static Eina_Bool
99_ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED, 99_ector_renderer_gl_shape_ector_renderer_gl_op_fill(Eo *obj EINA_UNUSED,
100 Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED, 100 Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED,
101 uint64_t flags EINA_UNUSED, 101 uint64_t flags EINA_UNUSED,
102 GLshort *vertex EINA_UNUSED, 102 GLshort *vertex EINA_UNUSED,
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index f3882e1315..7b99724dcf 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape)
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 } 13 }
diff --git a/src/lib/ector/software/ector_renderer_software.eo b/src/lib/ector/software/ector_renderer_software.eo
index 4d226fc7ee..46251e3a4b 100644
--- a/src/lib/ector/software/ector_renderer_software.eo
+++ b/src/lib/ector/software/ector_renderer_software.eo
@@ -3,7 +3,7 @@ class Ector.Renderer.Software (Ector.Renderer)
3 [[Ector software renderer class]] 3 [[Ector software renderer class]]
4 data: null; 4 data: null;
5 methods { 5 methods {
6 fill @pure_virtual { 6 op_fill @pure_virtual {
7 [[Renderer fill operation]] 7 [[Renderer fill operation]]
8 return: bool; [[$true on success, $false otherwise]] 8 return: bool; [[$true on success, $false otherwise]]
9 } 9 }
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.c b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
index f024594ea2..229159673a 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -54,7 +54,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_draw(Eo *obj EINA_UNUSED
54} 54}
55 55
56static Eina_Bool 56static Eina_Bool
57_ector_renderer_software_gradient_linear_ector_renderer_software_fill(Eo *obj EINA_UNUSED, 57_ector_renderer_software_gradient_linear_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED,
58 Ector_Renderer_Software_Gradient_Data *pd) 58 Ector_Renderer_Software_Gradient_Data *pd)
59{ 59{
60 ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd); 60 ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd);
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
index 666ff7a05f..5cc4bdf7f2 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient.Linear (Ector.Renderer.Software, Ector.Re
7 Ector.Renderer.prepare; 7 Ector.Renderer.prepare;
8 Ector.Renderer.draw; 8 Ector.Renderer.draw;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.Software.fill; 10 Ector.Renderer.Software.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 Efl.Gfx.Gradient.stop { set; } 13 Efl.Gfx.Gradient.stop { set; }
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.c b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
index d28ed0ce74..d64d903977 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -66,7 +66,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_draw(Eo *obj EINA_UNUSED
66 66
67// Clearly duplicated and should be in a common place... 67// Clearly duplicated and should be in a common place...
68static Eina_Bool 68static Eina_Bool
69_ector_renderer_software_gradient_radial_ector_renderer_software_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd) 69_ector_renderer_software_gradient_radial_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd)
70{ 70{
71 ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd); 71 ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd);
72 ector_software_gradient_color_update(pd); 72 ector_software_gradient_color_update(pd);
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
index 6de4786c8b..f05ea41a67 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient.Radial (Ector.Renderer.Software, Ector.Re
7 Ector.Renderer.prepare; 7 Ector.Renderer.prepare;
8 Ector.Renderer.draw; 8 Ector.Renderer.draw;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.Software.fill; 10 Ector.Renderer.Software.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 Efl.Gfx.Gradient.stop { set; } 13 Efl.Gfx.Gradient.stop { set; }
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index e60e1d6e95..e5be165351 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -673,7 +673,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
673 673
674 if (pd->shape->fill) 674 if (pd->shape->fill)
675 { 675 {
676 ector_renderer_software_fill(pd->shape->fill); 676 ector_renderer_software_op_fill(pd->shape->fill);
677 ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, 677 ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
678 x, y, mul_col, op, 678 x, y, mul_col, op,
679 pd->shape_data); 679 pd->shape_data);
@@ -695,7 +695,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
695 695
696 if (pd->shape->stroke.fill) 696 if (pd->shape->stroke.fill)
697 { 697 {
698 ector_renderer_software_fill(pd->shape->stroke.fill); 698 ector_renderer_software_op_fill(pd->shape->stroke.fill);
699 ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, 699 ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
700 x, y, mul_col, op, 700 x, y, mul_col, op,
701 pd->outline_data); 701 pd->outline_data);
@@ -719,7 +719,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
719} 719}
720 720
721static Eina_Bool 721static Eina_Bool
722_ector_renderer_software_shape_ector_renderer_software_fill(Eo *obj EINA_UNUSED, 722_ector_renderer_software_shape_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED,
723 Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED) 723 Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED)
724{ 724{
725 // FIXME: let's find out how to fill a shape with a shape later. 725 // FIXME: let's find out how to fill a shape with a shape later.
diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo
index 1382c6adf7..97b15ca153 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.eo
+++ b/src/lib/ector/software/ector_renderer_software_shape.eo
@@ -5,7 +5,7 @@ class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Sha
5 implements { 5 implements {
6 Ector.Renderer.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.Software.fill; 8 Ector.Renderer.Software.op_fill;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Efl.Gfx.Path.path { set; } 10 Efl.Gfx.Path.path { set; }
11 Efl.Object.constructor; 11 Efl.Object.constructor;