From ec92726ca981806a2eb6f9c153af8f7dd46d6a03 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 20 Nov 2015 12:07:01 +0900 Subject: [PATCH] Ector: Simplify confusing code The base class data was already stored, no need to figure it out again --- src/examples/evas/evas-vg-simple.c | 2 +- .../ector/software/ector_renderer_software_shape.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c index 5e0b0e4017..96afcb17bc 100644 --- a/src/examples/evas/evas-vg-simple.c +++ b/src/examples/evas/evas-vg-simple.c @@ -5,7 +5,7 @@ * one). See stdout/stderr for output. * * @verbatim - * gcc -o evas_vg_simple evas-vg-simple.c `pkg-config --libs --cflags evas ecore ecore-evas eina ector eo efl` + * gcc -o evas_vg_simple evas-vg-simple.c `pkg-config --libs --cflags evas ecore ecore-evas eina ector eo efl` -lm * @endverbatim */ diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c index 0cbc9ee23f..71c2898394 100644 --- a/src/lib/ector/software/ector_renderer_software_shape.c +++ b/src/lib/ector/software/ector_renderer_software_shape.c @@ -577,12 +577,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_prepare(Eo *obj, // shouldn't that be moved to the software base object if (!pd->surface) - { - Ector_Renderer_Generic_Base_Data *base; - - base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); - pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); - } + pd->surface = eo_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); return EINA_TRUE; } @@ -710,8 +705,6 @@ _ector_renderer_software_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Softw static void _ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd) { - Ector_Renderer_Generic_Base_Data *base; - //FIXME, As base class destructor can't call destructor of mixin class. // call explicit API to free shape data. eo_do(obj, efl_gfx_shape_reset()); @@ -719,9 +712,7 @@ _ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Softwa if (pd->shape_data) ector_software_rasterizer_destroy_rle_data(pd->shape_data); if (pd->outline_data) ector_software_rasterizer_destroy_rle_data(pd->outline_data); - base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); - eo_data_xunref(base->surface, pd->surface, obj); - + eo_data_xunref(pd->base->surface, pd->surface, obj); eo_data_xunref(obj, pd->shape, obj); eo_data_xunref(obj, pd->base, obj); eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, eo_destructor());