i shoudl use join macro

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

diff --git a/src/lib/canvas/evas_object_image.c b/src/lib/canvas/evas_object_image.c
index ef65bf1..441eb23 100644 (file)
--- a/src/lib/canvas/evas_object_image.c
+++ b/src/lib/canvas/evas_object_image.c
@@ -2346,9 +2346,7 @@ evas_object_image_render(Evas_Object *obj, void *output, void *context, void *su
                   pt->z = (p->z)     << FP;
                   pt->u = p->u * FP1;
                   pt->v = p->v * FP1;
-                  pt->col = 
-                   (((DATA32)p->a) << 24) | (((DATA32)p->r) << 16) | 
-                    (((DATA32)p->g) << 8) | (((DATA32)p->b));
+                  pt->col = ARGB_JOIN(p->a, p->r, p->g, p->b);
               }
              obj->layer->evas->engine.func->image_map4_draw
                (output, context, surface, o->engine_data, pts,

diff --git a/src/lib/canvas/evas_render.c b/src/lib/canvas/evas_render.c
index b095dd1..2704ecd 100644 (file)
--- a/src/lib/canvas/evas_render.c
+++ b/src/lib/canvas/evas_render.c
@@ -401,9 +401,7 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface, int
              pt->z = (p->z)         << FP;
              pt->u = p->u * FP1;
              pt->v = p->v * FP1;
-             pt->col = 
-               (((DATA32)p->a) << 24) | (((DATA32)p->r) << 16) | 
-               (((DATA32)p->g) << 8) | (((DATA32)p->b));
+             pt->col = ARGB_JOIN(p->a, p->r, p->g, p->b);
           }
         
         if (obj->cur.map->surface)