billiob pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e8c0e71f89bfd127bbc7cb227a698d27c7f3cf82
commit e8c0e71f89bfd127bbc7cb227a698d27c7f3cf82 Author: Boris Faure <[email protected]> Date: Mon Feb 3 22:06:37 2014 +0100 evas: @fix use the correct composite op on lines with pixman --- src/lib/evas/common/evas_line_main.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/lib/evas/common/evas_line_main.c b/src/lib/evas/common/evas_line_main.c index 8f4d160..9d3aa6b 100644 --- a/src/lib/evas/common/evas_line_main.c +++ b/src/lib/evas/common/evas_line_main.c @@ -1261,8 +1261,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x (uint32_t *)&alpha_data_buffer, 4); if ((dst->pixman.im) && (dc->col.pixman_color_image)) - pixman_image_composite(PIXMAN_OP_OVER, - dc->col.pixman_color_image, + pixman_image_composite(op, dc->col.pixman_color_image, aa_mask_image, dst->pixman.im, pix_x, pix_y, 0, 0, pix_x, pix_y, 1, 1); @@ -1285,8 +1284,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x (uint32_t *)&alpha_data_buffer, 4); if ((dst->pixman.im) && (dc->col.pixman_color_image)) - pixman_image_composite(PIXMAN_OP_OVER, - dc->col.pixman_color_image, + pixman_image_composite(op, dc->col.pixman_color_image, aa_mask_image, dst->pixman.im, pix_x, pix_y + 1, 0, 0, pix_x, pix_y + 1, 1, 1); @@ -1354,8 +1352,7 @@ next_x: aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, (uint32_t *)&alpha_data_buffer, 4); if ((dst->pixman.im) && (dc->col.pixman_color_image)) - pixman_image_composite(PIXMAN_OP_OVER, - dc->col.pixman_color_image, + pixman_image_composite(op, dc->col.pixman_color_image, aa_mask_image, dst->pixman.im, pix_x, pix_y, 0, 0, pix_x, pix_y, 1, 1); @@ -1377,12 +1374,11 @@ next_x: alpha_data_buffer = aa; aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, (uint32_t *)&alpha_data_buffer, 4); - + if ((dst->pixman.im) && (dc->col.pixman_color_image)) - pixman_image_composite(PIXMAN_OP_OVER, - dc->col.pixman_color_image, + pixman_image_composite(op, dc->col.pixman_color_image, aa_mask_image, dst->pixman.im, - pix_x + 1, pix_y, 0, 0, + pix_x + 1, pix_y, 0, 0, pix_x + 1, pix_y, 1, 1); else # endif --
