From 6f4db357dd4a756cb71ea420c470ee551a74e1b0 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 1 Nov 2009 09:03:01 +0000 Subject: [PATCH] i shoudl use join macro SVN revision: 43385 --- legacy/evas/src/lib/canvas/evas_object_image.c | 4 +--- legacy/evas/src/lib/canvas/evas_render.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c index ef65bf1bab..441eb23468 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/legacy/evas/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/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c index b095dd1c3c..2704ecd7c4 100644 --- a/legacy/evas/src/lib/canvas/evas_render.c +++ b/legacy/evas/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)