diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2015-02-09 21:34:04 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2015-02-10 11:39:24 +0900 |
commit | 888fc6e93f8261666fe9c40addbc40bcd720decc (patch) | |
tree | 502b6bbb32e01b80f05781b5dfbc54c34c734213 /src/lib/evas/common | |
parent | c394479afe80e8edf2cc747f22acff0014406ed1 (diff) |
Evas masking: Fix potential issues with map & masking
These bugs have not been observed but the code logic did not
make sense.
@fix
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r-- | src/lib/evas/common/evas_map_image_internal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/evas/common/evas_map_image_internal.c b/src/lib/evas/common/evas_map_image_internal.c index aac6932..bc3a809 100644 --- a/src/lib/evas/common/evas_map_image_internal.c +++ b/src/lib/evas/common/evas_map_image_internal.c | |||
@@ -114,7 +114,7 @@ FUNC_NAME(RGBA_Image *src, RGBA_Image *dst, | |||
114 | { | 114 | { |
115 | func = evas_common_gfx_func_composite_pixel_mask_span_get(sa, ssa, da, cw, render_op); | 115 | func = evas_common_gfx_func_composite_pixel_mask_span_get(sa, ssa, da, cw, render_op); |
116 | if (mul_col != 0xffffffff) | 116 | if (mul_col != 0xffffffff) |
117 | 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, EVAS_RENDER_COPY); |
118 | } | 118 | } |
119 | if (sa || anti_alias) src->cache_entry.flags.alpha = EINA_TRUE; | 119 | if (sa || anti_alias) src->cache_entry.flags.alpha = EINA_TRUE; |
120 | } | 120 | } |
@@ -185,7 +185,7 @@ FUNC_NAME_DO(RGBA_Image *src, RGBA_Image *dst, | |||
185 | { | 185 | { |
186 | buf = alloca(cw * sizeof(DATA32)); | 186 | buf = alloca(cw * sizeof(DATA32)); |
187 | if (ms->havea) sa = 1; | 187 | if (ms->havea) sa = 1; |
188 | if (mask_ie) | 188 | if (!mask_ie) |
189 | { | 189 | { |
190 | if (mul_col != 0xffffffff) | 190 | if (mul_col != 0xffffffff) |
191 | func = evas_common_gfx_func_composite_pixel_color_span_get(sa, ssa, dc->mul.col, da, cw, dc->render_op); | 191 | func = evas_common_gfx_func_composite_pixel_color_span_get(sa, ssa, dc->mul.col, da, cw, dc->render_op); |
@@ -196,7 +196,7 @@ FUNC_NAME_DO(RGBA_Image *src, RGBA_Image *dst, | |||
196 | { | 196 | { |
197 | func = evas_common_gfx_func_composite_pixel_mask_span_get(sa, ssa, da, cw, dc->render_op); | 197 | func = evas_common_gfx_func_composite_pixel_mask_span_get(sa, ssa, da, cw, dc->render_op); |
198 | if (mul_col != 0xffffffff) | 198 | if (mul_col != 0xffffffff) |
199 | func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, ssa, dc->mul.col, da, cw, dc->render_op); | 199 | func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, ssa, dc->mul.col, da, cw, EVAS_RENDER_COPY); |
200 | } | 200 | } |
201 | if (sa || anti_alias) src->cache_entry.flags.alpha = EINA_TRUE; | 201 | if (sa || anti_alias) src->cache_entry.flags.alpha = EINA_TRUE; |
202 | } | 202 | } |