summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_line_main.c
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-05 13:52:59 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-05 13:52:59 +0000
commita332d1c86984c380c1e8d94db12d28b9b71b167f (patch)
tree5bc25177cd8cfc383461871b15e631c701460308 /src/lib/evas/common/evas_line_main.c
parent3604cc2f4f4ebda49d2f4a87cb4f0ff6d92e8f88 (diff)
efl/evas: remove mask of non-rectangle objects.
it was broken and mostly disabled, so now we do remove it in the hope who does that next time, does it properly. SVN revision: 80252
Diffstat (limited to 'src/lib/evas/common/evas_line_main.c')
-rw-r--r--src/lib/evas/common/evas_line_main.c89
1 files changed, 9 insertions, 80 deletions
diff --git a/src/lib/evas/common/evas_line_main.c b/src/lib/evas/common/evas_line_main.c
index 51f851b6ae..baea395d5d 100644
--- a/src/lib/evas/common/evas_line_main.c
+++ b/src/lib/evas/common/evas_line_main.c
@@ -200,17 +200,10 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i
200 p = dst->image.data + (dstw * y0) + x0; 200 p = dst->image.data + (dstw * y0) + x0;
201#ifdef HAVE_PIXMAN 201#ifdef HAVE_PIXMAN
202# ifdef PIXMAN_LINE 202# ifdef PIXMAN_LINE
203 if ((dst->pixman.im) && (dc->col.pixman_color_image) && 203 if ((dst->pixman.im) && (dc->col.pixman_color_image))
204 (!dc->mask.mask))
205 pixman_image_composite(op, dc->col.pixman_color_image, 204 pixman_image_composite(op, dc->col.pixman_color_image,
206 NULL, dst->pixman.im, 205 NULL, dst->pixman.im,
207 x0, y0, 0, 0, x0, y0, len, 1); 206 x0, y0, 0, 0, x0, y0, len, 1);
208 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
209 (dc->mask.mask))
210 pixman_image_composite(op, dc->col.pixman_color_image,
211 dc->mask.mask->pixman.im,
212 dst->pixman.im,
213 x0, y0, 0, 0, x0, y0, len, 1);
214 else 207 else
215# endif 208# endif
216#endif 209#endif
@@ -237,16 +230,10 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i
237 p = dst->image.data + (dstw * y0) + x0; 230 p = dst->image.data + (dstw * y0) + x0;
238#ifdef HAVE_PIXMAN 231#ifdef HAVE_PIXMAN
239# ifdef PIXMAN_LINE 232# ifdef PIXMAN_LINE
240 if ((dst->pixman.im) && (dc->col.pixman_color_image) && 233 if ((dst->pixman.im) && (dc->col.pixman_color_image))
241 (!dc->mask.mask))
242 pixman_image_composite(op, dc->col.pixman_color_image, 234 pixman_image_composite(op, dc->col.pixman_color_image,
243 NULL, dst->pixman.im, 235 NULL, dst->pixman.im,
244 x0, y0, 0, 0, x0, y0, 1, len); 236 x0, y0, 0, 0, x0, y0, 1, len);
245 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
246 (dc->mask.mask))
247 pixman_image_composite(op, dc->col.pixman_color_image,
248 dc->mask.mask->pixman.im, dst->pixman.im,
249 x0, y0, 0, 0, x0, y0, 1, len);
250 else 237 else
251# endif 238# endif
252#endif 239#endif
@@ -347,23 +334,13 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i
347 { 334 {
348#ifdef HAVE_PIXMAN 335#ifdef HAVE_PIXMAN
349# ifdef PIXMAN_LINE 336# ifdef PIXMAN_LINE
350 if ((dst->pixman.im) && (dc->col.pixman_color_image) && 337 if ((dst->pixman.im) && (dc->col.pixman_color_image))
351 (!dc->mask.mask))
352 pixman_image_composite(op, dc->col.pixman_color_image, 338 pixman_image_composite(op, dc->col.pixman_color_image,
353 NULL, dst->pixman.im, 339 NULL, dst->pixman.im,
354 pixman_x_position, 340 pixman_x_position,
355 pixman_y_position, 341 pixman_y_position,
356 0, 0, pixman_x_position, 342 0, 0, pixman_x_position,
357 pixman_y_position, 1, 1); 343 pixman_y_position, 1, 1);
358 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
359 (dc->mask.mask))
360 pixman_image_composite(op, dc->col.pixman_color_image,
361 dc->mask.mask->pixman.im,
362 dst->pixman.im,
363 pixman_x_position,
364 pixman_y_position, 0, 0,
365 pixman_x_position,
366 pixman_y_position, 1, 1);
367 else 344 else
368# endif 345# endif
369#endif 346#endif
@@ -621,19 +598,11 @@ _evas_draw_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1,
621 { 598 {
622#ifdef HAVE_PIXMAN 599#ifdef HAVE_PIXMAN
623# ifdef PIXMAN_LINE 600# ifdef PIXMAN_LINE
624 if ((dst->pixman.im) && (dc->col.pixman_color_image) && 601 if ((dst->pixman.im) && (dc->col.pixman_color_image))
625 (!dc->mask.mask))
626 pixman_image_composite(op, dc->col.pixman_color_image, 602 pixman_image_composite(op, dc->col.pixman_color_image,
627 NULL, dst->pixman.im, 603 NULL, dst->pixman.im,
628 pix_x, pix_y, 0, 0, 604 pix_x, pix_y, 0, 0,
629 pix_x, pix_y, 1, 1); 605 pix_x, pix_y, 1, 1);
630 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
631 (dc->mask.mask))
632 pixman_image_composite(op, dc->col.pixman_color_image,
633 dc->mask.mask->pixman.im,
634 dst->pixman.im,
635 pix_x, pix_y, 0, 0,
636 pix_x, pix_y, 1, 1);
637 else 606 else
638# endif 607# endif
639#endif 608#endif
@@ -685,19 +654,11 @@ next_x:
685 { 654 {
686#ifdef HAVE_PIXMAN 655#ifdef HAVE_PIXMAN
687# ifdef PIXMAN_LINE 656# ifdef PIXMAN_LINE
688 if ((dst->pixman.im) && (dc->col.pixman_color_image) && 657 if ((dst->pixman.im) && (dc->col.pixman_color_image))
689 (!dc->mask.mask))
690 pixman_image_composite(op, dc->col.pixman_color_image, 658 pixman_image_composite(op, dc->col.pixman_color_image,
691 NULL, dst->pixman.im, 659 NULL, dst->pixman.im,
692 pix_x, pix_y, 0, 0, 660 pix_x, pix_y, 0, 0,
693 pix_x, pix_y, 1, 1); 661 pix_x, pix_y, 1, 1);
694 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
695 (dc->mask.mask))
696 pixman_image_composite(op, dc->col.pixman_color_image,
697 dc->mask.mask->pixman.im,
698 dst->pixman.im,
699 pix_x, pix_y, 0, 0,
700 pix_x, pix_y, 1, 1);
701 else 662 else
702# endif 663# endif
703#endif 664#endif
@@ -828,20 +789,12 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x
828 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, 789 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1,
829 (uint32_t *)&alpha_data_buffer, 4); 790 (uint32_t *)&alpha_data_buffer, 4);
830 791
831 if ((dst->pixman.im) && (dc->col.pixman_color_image ) && 792 if ((dst->pixman.im) && (dc->col.pixman_color_image))
832 (!dc->mask.mask))
833 pixman_image_composite(PIXMAN_OP_OVER, 793 pixman_image_composite(PIXMAN_OP_OVER,
834 dc->col.pixman_color_image, 794 dc->col.pixman_color_image,
835 aa_mask_image, dst->pixman.im, 795 aa_mask_image, dst->pixman.im,
836 pix_x, pix_y, 0, 0, 796 pix_x, pix_y, 0, 0,
837 pix_x, pix_y, 1, 1); 797 pix_x, pix_y, 1, 1);
838 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
839 (dc->mask.mask) )
840 pixman_image_composite(op, dc->col.pixman_color_image,
841 dc->mask.mask->pixman.im,
842 dst->pixman.im,
843 pix_x, pix_y, 0, 0,
844 pix_x, pix_y, 1, 1);
845 else 798 else
846# endif 799# endif
847#endif 800#endif
@@ -860,20 +813,12 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x
860 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, 813 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1,
861 (uint32_t *)&alpha_data_buffer, 4); 814 (uint32_t *)&alpha_data_buffer, 4);
862 815
863 if ((dst->pixman.im) && (dc->col.pixman_color_image) && 816 if ((dst->pixman.im) && (dc->col.pixman_color_image))
864 (!dc->mask.mask))
865 pixman_image_composite(PIXMAN_OP_OVER, 817 pixman_image_composite(PIXMAN_OP_OVER,
866 dc->col.pixman_color_image, 818 dc->col.pixman_color_image,
867 aa_mask_image, dst->pixman.im, 819 aa_mask_image, dst->pixman.im,
868 pix_x, pix_y + 1, 0, 0, 820 pix_x, pix_y + 1, 0, 0,
869 pix_x, pix_y + 1, 1, 1); 821 pix_x, pix_y + 1, 1, 1);
870 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
871 (dc->mask.mask))
872 pixman_image_composite(op, dc->col.pixman_color_image,
873 dc->mask.mask->pixman.im,
874 dst->pixman.im,
875 pix_x, pix_y + 1, 0, 0,
876 pix_x, pix_y + 1, 1, 1);
877 else 822 else
878# endif 823# endif
879#endif 824#endif
@@ -937,20 +882,12 @@ next_x:
937 alpha_data_buffer = 255 - aa; 882 alpha_data_buffer = 255 - aa;
938 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, (uint32_t *)&alpha_data_buffer, 4); 883 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, (uint32_t *)&alpha_data_buffer, 4);
939 884
940 if ((dst->pixman.im) && (dc->col.pixman_color_image) && 885 if ((dst->pixman.im) && (dc->col.pixman_color_image))
941 (!dc->mask.mask))
942 pixman_image_composite(PIXMAN_OP_OVER, 886 pixman_image_composite(PIXMAN_OP_OVER,
943 dc->col.pixman_color_image, 887 dc->col.pixman_color_image,
944 aa_mask_image, dst->pixman.im, 888 aa_mask_image, dst->pixman.im,
945 pix_x, pix_y, 0, 0, 889 pix_x, pix_y, 0, 0,
946 pix_x, pix_y, 1, 1); 890 pix_x, pix_y, 1, 1);
947 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
948 (dc->mask.mask))
949 pixman_image_composite(op, dc->col.pixman_color_image,
950 dc->mask.mask->pixman.im,
951 dst->pixman.im,
952 pix_x, pix_y, 0, 0,
953 pix_x, pix_y, 1, 1);
954 else 891 else
955# endif 892# endif
956#endif 893#endif
@@ -970,20 +907,12 @@ next_x:
970 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, 907 aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1,
971 (uint32_t *)&alpha_data_buffer, 4); 908 (uint32_t *)&alpha_data_buffer, 4);
972 909
973 if ((dst->pixman.im) && (dc->col.pixman_color_image) && 910 if ((dst->pixman.im) && (dc->col.pixman_color_image))
974 (!dc->mask.mask))
975 pixman_image_composite(PIXMAN_OP_OVER, 911 pixman_image_composite(PIXMAN_OP_OVER,
976 dc->col.pixman_color_image, 912 dc->col.pixman_color_image,
977 aa_mask_image, dst->pixman.im, 913 aa_mask_image, dst->pixman.im,
978 pix_x + 1, pix_y, 0, 0, 914 pix_x + 1, pix_y, 0, 0,
979 pix_x + 1, pix_y, 1, 1); 915 pix_x + 1, pix_y, 1, 1);
980 else if ((dst->pixman.im) && (dc->col.pixman_color_image) &&
981 (dc->mask.mask))
982 pixman_image_composite(op, dc->col.pixman_color_image,
983 dc->mask.mask->pixman.im,
984 dst->pixman.im,
985 pix_x + 1, pix_y, 0, 0,
986 pix_x + 1, pix_y, 1, 1);
987 else 916 else
988# endif 917# endif
989#endif 918#endif