summaryrefslogtreecommitdiff
path: root/src/lib/ector/software
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/software
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
Diffstat (limited to 'src/lib/ector/software')
-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
7 files changed, 9 insertions, 9 deletions
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;