From 0bee0601e18cece01e59fa7bd61b84691886778a Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 9 Feb 2011 18:39:54 +0000 Subject: [PATCH] Evas: Fixed a few 'implicit declaration' warnings. Add missing evas_object_image_source functions. (was giving nasty 'implicit declarations' prior to this change) Add UNUSED to evas_common_map_rgba for npoints variable (wasn't used in that function) Fixed a little formatting in evas_object_main.c Add UNUSED to the eng_image_map_draw function of the gl_x11 engine. (npoints variable not used there) Fixed a little formatting in gl_x11 engine. SVN revision: 56869 --- legacy/evas/src/lib/Evas.h | 4 +++- legacy/evas/src/lib/canvas/evas_object_main.c | 5 +++-- legacy/evas/src/lib/engines/common/evas_map_image.c | 2 +- legacy/evas/src/modules/engines/gl_x11/evas_engine.c | 8 +++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h index 639af296a0..2fc71ea2c0 100644 --- a/legacy/evas/src/lib/Evas.h +++ b/legacy/evas/src/lib/Evas.h @@ -1293,7 +1293,9 @@ typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o); EAPI void evas_object_image_content_hint_set (Evas_Object *obj, Evas_Image_Content_Hint hint) EINA_ARG_NONNULL(1); EAPI Evas_Image_Content_Hint evas_object_image_content_hint_get (const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; - EAPI void evas_object_image_alpha_mask_set (Evas_Object *, Eina_Bool) EINA_ARG_NONNULL(1); + EAPI void evas_object_image_alpha_mask_set (Evas_Object *obj, Eina_Bool ismask) EINA_ARG_NONNULL(1); + EAPI Eina_Bool evas_object_image_source_set (Evas_Object *obj, Evas_Object *src) EINA_ARG_NONNULL(1, 2); + EAPI Eina_Bool evas_object_image_source_unset (Evas_Object *obj) EINA_ARG_NONNULL(1); /** * @defgroup Evas_Object_Text Text Object Functions diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c index bc9489ab96..57c36e0470 100644 --- a/legacy/evas/src/lib/canvas/evas_object_main.c +++ b/legacy/evas/src/lib/canvas/evas_object_main.c @@ -401,9 +401,10 @@ evas_object_del(Evas_Object *obj) obj->mouse_in = 0; evas_object_hide(obj); evas_object_grabs_cleanup(obj); - while (obj->clip.clipees) evas_object_clip_unset(obj->clip.clipees->data); + while (obj->clip.clipees) + evas_object_clip_unset(obj->clip.clipees->data); while (obj->proxy.proxies) - evas_object_image_source_unset(obj->proxy.proxies->data); + evas_object_image_source_unset(obj->proxy.proxies->data); if (obj->cur.clipper) evas_object_clip_unset(obj); if (obj->smart.smart) evas_object_smart_del(obj); evas_object_map_set(obj, NULL); diff --git a/legacy/evas/src/lib/engines/common/evas_map_image.c b/legacy/evas/src/lib/engines/common/evas_map_image.c index 733091034a..6ac74a390e 100644 --- a/legacy/evas/src/lib/engines/common/evas_map_image.c +++ b/legacy/evas/src/lib/engines/common/evas_map_image.c @@ -341,7 +341,7 @@ _calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy EAPI void evas_common_map_rgba(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, - int npoints, RGBA_Map_Point *p, + int npoints __UNUSED__, RGBA_Map_Point *p, int smooth, int level) { #ifdef BUILD_MMX diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c index 8434dafce9..1e7a8e75ba 100644 --- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c @@ -1738,7 +1738,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image) } static void -eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level) +eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, int npoints __UNUSED__, RGBA_Map_Point *p, int smooth, int level) { Evas_GL_Image *gim = image; Render_Engine *re; @@ -1773,10 +1773,8 @@ eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *im dy = p[0].y >> FP; dw = (p[2].x >> FP) - dx; dh = (p[2].y >> FP) - dy; - eng_image_draw - (data, context, surface, image, - 0, 0, gim->w, gim->h, - dx, dy, dw, dh, smooth); + eng_image_draw(data, context, surface, image, + 0, 0, gim->w, gim->h, dx, dy, dw, dh, smooth); } else {