[EGIT] [core/efl] efl-1.13 02/02: Evas masking: Fix potential issues with map & masking

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch efl-1.13.

http://git.enlightenment.org/core/efl.git/commit/?id=6f980e735022fb2fb53020025959ed65e8902e96

commit 6f980e735022fb2fb53020025959ed65e8902e96
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Mon Feb 9 21:34:04 2015 +0900

    Evas masking: Fix potential issues with map & masking
    
    These bugs have not been observed but the code logic did not
    make sense.
    
    @fix
---
 src/lib/evas/common/evas_map_image_internal.c | 6 +++---
 1 file 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,
           {
              func = evas_common_gfx_func_composite_pixel_mask_span_get(sa, 
ssa, da, cw, render_op);
              if (mul_col != 0xffffffff)
-               func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, 
ssa, mul_col, da, cw, render_op);
+               func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, 
ssa, mul_col, da, cw, EVAS_RENDER_COPY);
           }
         if (sa || anti_alias) src->cache_entry.flags.alpha = EINA_TRUE;
      }
@@ -185,7 +185,7 @@ FUNC_NAME_DO(RGBA_Image *src, RGBA_Image *dst,
      {
         buf = alloca(cw * sizeof(DATA32));
         if (ms->havea) sa = 1;
-        if (mask_ie)
+        if (!mask_ie)
           {
              if (mul_col != 0xffffffff)
                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,
           {
              func = evas_common_gfx_func_composite_pixel_mask_span_get(sa, 
ssa, da, cw, dc->render_op);
              if (mul_col != 0xffffffff)
-               func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, 
ssa, dc->mul.col, da, cw, dc->render_op);
+               func2 = evas_common_gfx_func_composite_pixel_color_span_get(sa, 
ssa, dc->mul.col, da, cw, EVAS_RENDER_COPY);
           }
         if (sa || anti_alias) src->cache_entry.flags.alpha = EINA_TRUE;
      }

--