summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_map_image_internal.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-01-07 17:30:46 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-01-07 17:50:33 +0900
commit37f3d00a5c3ce7a306b6ef036fb96a13d31ad412 (patch)
tree3deb4d96839e54945e91349d179d71cad246c2b1 /src/lib/evas/common/evas_map_image_internal.c
parent83eb1aa3c2e15568c89546048d72d7cae071ee42 (diff)
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.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/common/evas_map_image_internal.c9
1 files changed, 1 insertions, 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 d124eedbee..e7ca8e5c32 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,
94 /* FIXME: even if anti-alias is enabled, only edges may require the 94 /* FIXME: even if anti-alias is enabled, only edges may require the
95 pixels composition. we can optimize it. */ 95 pixels composition. we can optimize it. */
96 96
97 if ((!sa) && (!dst->cache_entry.flags.alpha) && 97 if ((!sa) && (!da) &&
98 (mul_col == 0xffffffff) && (!havea) && (!anti_alias) && (!mask_ie)) 98 (mul_col == 0xffffffff) && (!havea) && (!anti_alias) && (!mask_ie))
99 { 99 {
100 direct = 1; 100 direct = 1;
101 } 101 }
102 else 102 else
103 { 103 {
104 int pa;
105
106 buf = alloca(cw * sizeof(DATA32)); 104 buf = alloca(cw * sizeof(DATA32));
107 if (havea) sa = 1; 105 if (havea) sa = 1;
108 if (!mask_ie) 106 if (!mask_ie)
@@ -118,9 +116,6 @@ FUNC_NAME(RGBA_Image *src, RGBA_Image *dst,
118 if (mul_col != 0xffffffff) 116 if (mul_col != 0xffffffff)
119 func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, ssa, mul_col, da, cw, render_op); 117 func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, ssa, mul_col, da, cw, render_op);
120 } 118 }
121
122 if (anti_alias) src->cache_entry.flags.alpha = EINA_TRUE;
123 else src->cache_entry.flags.alpha = pa;
124 } 119 }
125 if (havecol == 0) 120 if (havecol == 0)
126 { 121 {
@@ -187,8 +182,6 @@ FUNC_NAME_DO(RGBA_Image *src, RGBA_Image *dst,
187 // if operation is solid, bypass buf and draw func and draw direct to dst 182 // if operation is solid, bypass buf and draw func and draw direct to dst
188 if (!direct) 183 if (!direct)
189 { 184 {
190 int pa;
191
192 buf = alloca(cw * sizeof(DATA32)); 185 buf = alloca(cw * sizeof(DATA32));
193 if (ms->havea) sa = 1; 186 if (ms->havea) sa = 1;
194 if (mask_ie) 187 if (mask_ie)