summaryrefslogtreecommitdiff
path: root/src/lib/ector/software/ector_software_surface.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-01 18:06:28 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 09:58:08 +0000
commitf21ade6123b9053fca8d1632644c48525a99d6e0 (patch)
treec5eb0445f471d21365a7a5a7b0ec7d279c11b398 /src/lib/ector/software/ector_software_surface.c
parent3faf3f3fc68a839f06b311c35ba020cb25e7c9c4 (diff)
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to 'src/lib/ector/software/ector_software_surface.c')
-rw-r--r--src/lib/ector/software/ector_software_surface.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index 6ad79053ae..f67b1947d2 100644
--- a/src/lib/ector/software/ector_software_surface.c
+++ b/src/lib/ector/software/ector_software_surface.c
@@ -16,17 +16,13 @@ _ector_software_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
16 const Eo_Class *type) 16 const Eo_Class *type)
17{ 17{
18 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) 18 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
19 return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, 19 return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
20 ector_renderer_surface_set(obj));
21 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) 20 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
22 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, 21 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
23 ector_renderer_surface_set(obj));
24 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) 22 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
25 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, 23 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
26 ector_renderer_surface_set(obj));
27 else if (type == ECTOR_RENDERER_GENERIC_BUFFER_MIXIN) 24 else if (type == ECTOR_RENDERER_GENERIC_BUFFER_MIXIN)
28 return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, 25 return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
29 ector_renderer_surface_set(obj));
30 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 26 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
31 return NULL; 27 return NULL;
32} 28}
@@ -34,7 +30,7 @@ _ector_software_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
34static Eo * 30static Eo *
35_ector_software_surface_eo_base_constructor(Eo *obj, Ector_Software_Surface_Data *pd) 31_ector_software_surface_eo_base_constructor(Eo *obj, Ector_Software_Surface_Data *pd)
36{ 32{
37 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 33 obj = eo_constructor(eo_super(obj, MY_CLASS));
38 pd->rasterizer = (Software_Rasterizer *) calloc(1, sizeof(Software_Rasterizer)); 34 pd->rasterizer = (Software_Rasterizer *) calloc(1, sizeof(Software_Rasterizer));
39 ector_software_rasterizer_init(pd->rasterizer); 35 ector_software_rasterizer_init(pd->rasterizer);
40 pd->rasterizer->fill_data.raster_buffer = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 36 pd->rasterizer->fill_data.raster_buffer = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
@@ -48,7 +44,7 @@ _ector_software_surface_eo_base_destructor(Eo *obj, Ector_Software_Surface_Data
48 eo_data_unref(obj, pd->rasterizer->fill_data.raster_buffer); 44 eo_data_unref(obj, pd->rasterizer->fill_data.raster_buffer);
49 free(pd->rasterizer); 45 free(pd->rasterizer);
50 pd->rasterizer = NULL; 46 pd->rasterizer = NULL;
51 eo_do_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS, eo_destructor()); 47 eo_destructor(eo_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS));
52} 48}
53 49
54static void 50static void