From 39a970835b58fe82a0e2cb0f809c5ecdee201861 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 22 Mar 2016 15:25:37 +0900 Subject: [PATCH] Evas: Remove unimplemented border_set/get (engine internal) --- src/lib/evas/canvas/evas_object_image.c | 6 ------ src/lib/evas/include/evas_private.h | 2 -- src/modules/evas/engines/gl_cocoa/evas_engine.c | 13 ------------- .../evas/engines/gl_generic/evas_engine.c | 13 ------------- .../evas/engines/software_generic/evas_engine.c | 17 ----------------- 5 files changed, 51 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 12fa3b60a5..f275120605 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -1823,12 +1823,6 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, int offx, offy; ENFN->image_scale_hint_set(output, pixels, o->scale_hint); - /* This is technically a bug here: If the value is recreated - * (which is returned)it may be a new object, however exactly 0 - * of all the evas engines do this. */ - ENFN->image_border_set(output, pixels, - o->cur->border.l, o->cur->border.r, - o->cur->border.t, o->cur->border.b); idx = evas_object_image_figure_x_fill(eo_obj, obj, o->cur->fill.x, o->cur->fill.w, &idw); idy = evas_object_image_figure_y_fill(eo_obj, obj, o->cur->fill.y, o->cur->fill.h, &idh); if (idw < 1) idw = 1; diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index e3eab642f2..b9f2ce3223 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h @@ -1355,8 +1355,6 @@ struct _Evas_Func int (*image_alpha_get) (void *data, void *image); void *(*image_orient_set) (void *data, void *image, Evas_Image_Orient orient); Evas_Image_Orient (*image_orient_get) (void *data, void *image); - void *(*image_border_set) (void *data, void *image, int l, int r, int t, int b); - void (*image_border_get) (void *data, void *image, int *l, int *r, int *t, int *b); Eina_Bool (*image_draw) (void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth, Eina_Bool do_async); void (*image_colorspace_set) (void *data, void *image, Evas_Colorspace cspace); Evas_Colorspace (*image_colorspace_get) (void *data, void *image); diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c index 58f26d0cc4..31bc120d25 100644 --- a/src/modules/evas/engines/gl_cocoa/evas_engine.c +++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c @@ -444,17 +444,6 @@ eng_image_alpha_set(void *data, void *image, int has_alpha) // return image; } -static void * -eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED) -{ - return image; -} - -static void -eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED) -{ -} - static Evas_Colorspace eng_image_file_colorspace_get(void *data EINA_UNUSED, void *image) { @@ -1371,8 +1360,6 @@ module_open(Evas_Module *em) ORD(image_data_preload_cancel); ORD(image_alpha_set); ORD(image_alpha_get); - ORD(image_border_set); - ORD(image_border_get); ORD(image_draw); ORD(image_colorspace_set); ORD(image_colorspace_get); diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index a0d956b094..cb25114bd1 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -231,17 +231,6 @@ eng_image_alpha_set(void *data, void *image, int has_alpha) return evas_gl_common_image_alpha_set(im, has_alpha ? 1 : 0); } -static void * -eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED) -{ - return image; -} - -static void -eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED) -{ -} - static Evas_Colorspace eng_image_file_colorspace_get(void *data EINA_UNUSED, void *image) { @@ -2818,8 +2807,6 @@ module_open(Evas_Module *em) ORD(image_alpha_get); ORD(image_orient_set); ORD(image_orient_get); - ORD(image_border_set); - ORD(image_border_get); ORD(image_draw); ORD(image_colorspace_set); ORD(image_colorspace_get); diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index 2981f5a75e..b30b77853d 100644 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -1055,20 +1055,6 @@ eng_image_alpha_set(void *data EINA_UNUSED, void *image, int has_alpha) return im; } -static void * -eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED) -{ - RGBA_Image *im; - - im = image; - return im; -} - -static void -eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED) -{ -} - static Evas_Colorspace eng_image_file_colorspace_get(void *data EINA_UNUSED, void *image) { @@ -1122,7 +1108,6 @@ eng_image_native_shutdown(void *data EINA_UNUSED, Evas_Native_Surface_Type type) static void * eng_image_native_set(void *data EINA_UNUSED, void *image, void *native) { - //return image; Evas_Native_Surface *ns = native; Image_Entry *im = image, *im2 = NULL; @@ -4141,8 +4126,6 @@ static Evas_Func func = eng_image_alpha_get, eng_image_orient_set, eng_image_orient_get, - eng_image_border_set, - eng_image_border_get, eng_image_draw, eng_image_colorspace_set, eng_image_colorspace_get,