evas: @fix use the correct composite op on lines with pixman
authorBoris Faure <billiob@gmail.com>
Mon, 3 Feb 2014 21:06:37 +0000 (22:06 +0100)
committerBoris Faure <billiob@gmail.com>
Tue, 11 Mar 2014 21:34:35 +0000 (22:34 +0100)
src/lib/evas/common/evas_line_main.c

index 8f4d160..9d3aa6b 100644 (file)
@@ -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