jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=37f3d00a5c3ce7a306b6ef036fb96a13d31ad412
commit 37f3d00a5c3ce7a306b6ef036fb96a13d31ad412 Author: Jean-Philippe Andre <jp.an...@samsung.com> Date: Wed Jan 7 17:30:46 2015 +0900 Evas map: Kill build warnings and don't set image flag Don't change a source image alpha flag at render time. It doesn't make sense at this point. Also remove unused int pa. --- src/lib/evas/common/evas_map_image_internal.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/lib/evas/common/evas_map_image_internal.c b/src/lib/evas/common/evas_map_image_internal.c index d124eed..e7ca8e5 100644 --- a/src/lib/evas/common/evas_map_image_internal.c +++ b/src/lib/evas/common/evas_map_image_internal.c @@ -94,15 +94,13 @@ FUNC_NAME(RGBA_Image *src, RGBA_Image *dst, /* FIXME: even if anti-alias is enabled, only edges may require the pixels composition. we can optimize it. */ - if ((!sa) && (!dst->cache_entry.flags.alpha) && + if ((!sa) && (!da) && (mul_col == 0xffffffff) && (!havea) && (!anti_alias) && (!mask_ie)) { direct = 1; } else { - int pa; - buf = alloca(cw * sizeof(DATA32)); if (havea) sa = 1; if (!mask_ie) @@ -118,9 +116,6 @@ FUNC_NAME(RGBA_Image *src, RGBA_Image *dst, if (mul_col != 0xffffffff) func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, ssa, mul_col, da, cw, render_op); } - - if (anti_alias) src->cache_entry.flags.alpha = EINA_TRUE; - else src->cache_entry.flags.alpha = pa; } if (havecol == 0) { @@ -187,8 +182,6 @@ FUNC_NAME_DO(RGBA_Image *src, RGBA_Image *dst, // if operation is solid, bypass buf and draw func and draw direct to dst if (!direct) { - int pa; - buf = alloca(cw * sizeof(DATA32)); if (ms->havea) sa = 1; if (mask_ie) --