From: hermet <hermet@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Fri, 17 Jun 2011 01:16:16 +0000 (+0000)
Subject: evas/evas_map - stuffed trivial missing things.
X-Git-Tag: accepted/2.0/20130306.225542~242^2~440
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfa1b30788888bc67143e460659ac82ea2becc5e;p=profile%2Fivi%2Fevas.git

evas/evas_map - stuffed trivial missing things.



git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@60415 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/canvas/evas_map.c b/src/lib/canvas/evas_map.c
index e289f81..d322b92 100644
--- a/src/lib/canvas/evas_map.c
+++ b/src/lib/canvas/evas_map.c
@@ -166,6 +166,7 @@ _evas_map_free(Evas_Object *obj, Evas_Map *m)
           obj->layer->evas->engine.func->image_map_surface_free
           (obj->layer->evas->engine.data.output, m->surface);
      }
+   m->magic = 0;
    free(m);
 }
 
@@ -364,6 +365,7 @@ evas_object_map_enable_set(Evas_Object *obj, Eina_Bool enabled)
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
+
    enabled = !!enabled;
    if (obj->cur.usemap == enabled) return;
    obj->cur.usemap = enabled;
@@ -422,6 +424,7 @@ evas_object_map_set(Evas_Object *obj, const Evas_Map *map)
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
+
    if (!map)
      {
         if (obj->cur.map)
@@ -451,7 +454,7 @@ evas_object_map_set(Evas_Object *obj, const Evas_Map *map)
         return;
      }
 
-   if (obj->cur.map && obj->cur.map->count == map->count)
+   if ((obj->cur.map) && (obj->cur.map->count == map->count))
      {
         Evas_Map *omap = obj->cur.map;
         obj->cur.map = _evas_map_new(map->count);
@@ -476,8 +479,8 @@ evas_object_map_get(const Evas_Object *obj)
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
    return NULL;
    MAGIC_CHECK_END();
-   if (obj->cur.map) return obj->cur.map;
-   return NULL;
+
+   return obj->cur.map;
 }
 
 EAPI Evas_Map *
@@ -488,6 +491,7 @@ evas_map_new(int count)
         ERR("map point count (%i) != 4 is unsupported!", count);
         return NULL;
      }
+
    return _evas_map_new(count);
 }