From 2dce035395486b1345dedae87ba6bafa9cb3ee6f Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 22 Sep 2010 11:02:19 +0000 Subject: [PATCH] warning--, formatting. SVN revision: 52577 --- legacy/evas/src/lib/Evas.h | 10 +++++----- legacy/evas/src/lib/canvas/evas_object_image.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h index 51f042bb2e..3fba599c08 100644 --- a/legacy/evas/src/lib/Evas.h +++ b/legacy/evas/src/lib/Evas.h @@ -1739,14 +1739,14 @@ struct _Evas_Smart_Cb_Description evas_object_smart_data_set(o, priv); \ } - EAPI void evas_smart_free (Evas_Smart *s) EINA_ARG_NONNULL(1); - EAPI Evas_Smart *evas_smart_class_new (const Evas_Smart_Class *sc) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; - EAPI const Evas_Smart_Class *evas_smart_class_get (const Evas_Smart *s) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; + EAPI void evas_smart_free (Evas_Smart *s) EINA_ARG_NONNULL(1); + EAPI Evas_Smart *evas_smart_class_new (const Evas_Smart_Class *sc) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; + EAPI const Evas_Smart_Class *evas_smart_class_get (const Evas_Smart *s) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; - EAPI void *evas_smart_data_get (const Evas_Smart *s) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; + EAPI void *evas_smart_data_get (const Evas_Smart *s) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE; EAPI const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name) EINA_ARG_NONNULL(1, 2) EINA_PURE; - EAPI Eina_Bool evas_smart_class_inherit_full (Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size) EINA_ARG_NONNULL(1, 2); + EAPI Eina_Bool evas_smart_class_inherit_full (Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size) EINA_ARG_NONNULL(1, 2); /** * @def evas_smart_class_inherit * Easy to use version of evas_smart_class_inherit_full(). diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c index 66026e5188..54114c0e96 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/legacy/evas/src/lib/canvas/evas_object_image.c @@ -652,7 +652,7 @@ evas_object_image_fill_spread_set(Evas_Object *obj, Evas_Fill_Spread spread) MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE); return; MAGIC_CHECK_END(); - if (spread == o->cur.spread) return; + if (spread == (Evas_Fill_Spread)o->cur.spread) return; o->cur.spread = spread; o->changed = 1; evas_object_change(obj); @@ -677,7 +677,7 @@ evas_object_image_fill_spread_get(const Evas_Object *obj) MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE); return EVAS_TEXTURE_REPEAT; MAGIC_CHECK_END(); - return o->cur.spread; + return (Evas_Fill_Spread)o->cur.spread; } /**