summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_line_main.c
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2014-02-03 22:06:37 +0100
committerBoris Faure <billiob@gmail.com>2014-03-11 22:34:35 +0100
commite8c0e71f89bfd127bbc7cb227a698d27c7f3cf82 (patch)
treedea53c7ba5036b9afbc40dff01f3c43831b91b82 /src/lib/evas/common/evas_line_main.c
parente280f32c010764b7b1dfbabfe32386b06615b7ed (diff)
evas: @fix use the correct composite op on lines with pixman
Diffstat (limited to 'src/lib/evas/common/evas_line_main.c')
-rw-r--r--src/lib/evas/common/evas_line_main.c16
1 files 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 8f4d160de8..9d3aa6bae0 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
1261 (uint32_t *)&alpha_data_buffer, 4); 1261 (uint32_t *)&alpha_data_buffer, 4);
1262 1262
1263 if ((dst->pixman.im) && (dc->col.pixman_color_image)) 1263 if ((dst->pixman.im) && (dc->col.pixman_color_image))
1264 pixman_image_composite(PIXMAN_OP_OVER, 1264 pixman_image_composite(op, dc->col.pixman_color_image,
1265 dc->col.pixman_color_image,
1266 aa_mask_image, dst->pixman.im, 1265 aa_mask_image, dst->pixman.im,
1267 pix_x, pix_y, 0, 0, 1266 pix_x, pix_y, 0, 0,
1268 pix_x, pix_y, 1, 1); 1267 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
1285 (uint32_t *)&alpha_data_buffer, 4); 1284 (uint32_t *)&alpha_data_buffer, 4);
1286 1285
1287 if ((dst->pixman.im) && (dc->col.pixman_color_image)) 1286 if ((dst->pixman.im) && (dc->col.pixman_color_image))
1288 pixman_image_composite(PIXMAN_OP_OVER, 1287 pixman_image_composite(op, dc->col.pixman_color_image,
1289 dc->col.pixman_color_image,
1290 aa_mask_image, dst->pixman.im, 1288 aa_mask_image, dst->pixman.im,
1291 pix_x, pix_y + 1, 0, 0, 1289 pix_x, pix_y + 1, 0, 0,
1292 pix_x, pix_y + 1, 1, 1); 1290 pix_x, pix_y + 1, 1, 1);
@@ -1354,8 +1352,7 @@ next_x:
1354 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, (uint32_t *)&alpha_data_buffer, 4); 1352 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, (uint32_t *)&alpha_data_buffer, 4);
1355 1353
1356 if ((dst->pixman.im) && (dc->col.pixman_color_image)) 1354 if ((dst->pixman.im) && (dc->col.pixman_color_image))
1357 pixman_image_composite(PIXMAN_OP_OVER, 1355 pixman_image_composite(op, dc->col.pixman_color_image,
1358 dc->col.pixman_color_image,
1359 aa_mask_image, dst->pixman.im, 1356 aa_mask_image, dst->pixman.im,
1360 pix_x, pix_y, 0, 0, 1357 pix_x, pix_y, 0, 0,
1361 pix_x, pix_y, 1, 1); 1358 pix_x, pix_y, 1, 1);
@@ -1377,12 +1374,11 @@ next_x:
1377 alpha_data_buffer = aa; 1374 alpha_data_buffer = aa;
1378 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, 1375 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1,
1379 (uint32_t *)&alpha_data_buffer, 4); 1376 (uint32_t *)&alpha_data_buffer, 4);
1380 1377
1381 if ((dst->pixman.im) && (dc->col.pixman_color_image)) 1378 if ((dst->pixman.im) && (dc->col.pixman_color_image))
1382 pixman_image_composite(PIXMAN_OP_OVER, 1379 pixman_image_composite(op, dc->col.pixman_color_image,
1383 dc->col.pixman_color_image,
1384 aa_mask_image, dst->pixman.im, 1380 aa_mask_image, dst->pixman.im,
1385 pix_x + 1, pix_y, 0, 0, 1381 pix_x + 1, pix_y, 0, 0,
1386 pix_x + 1, pix_y, 1, 1); 1382 pix_x + 1, pix_y, 1, 1);
1387 else 1383 else
1388# endif 1384# endif