Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_blend_alpha_color_pixel.c evas_blend_color_pixel.c
evas_blend_main.c evas_blend_pixel_mul_pixel.c
evas_blend_pixel_pixel.c
Log Message:
oops - this DOESNT actually work - i thought as much! i knew i had my
reasons...
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_blend_alpha_color_pixel.c 16 Mar 2004 08:03:00 -0000 1.4
+++ evas_blend_alpha_color_pixel.c 18 Mar 2004 09:06:11 -0000 1.5
@@ -169,8 +169,7 @@
BLEND_COLOR(a, B_VAL(dst_ptr),
B_VAL(&col), B_VAL(dst_ptr),
tmp);
- BLEND_COLOR(A_VAL(src),A_VAL(dst),255,A_VAL(dst),tmp);
-/* A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((aa * (255 - A_VAL(dst_ptr))) / 255);*/
+ A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((aa * (255 - A_VAL(dst_ptr))) / 255);
break;
}
src_ptr++;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_color_pixel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_blend_color_pixel.c 16 Mar 2004 08:03:00 -0000 1.4
+++ evas_blend_color_pixel.c 18 Mar 2004 09:06:12 -0000 1.5
@@ -105,8 +105,7 @@
BLEND_COLOR(a, B_VAL(dst_ptr),
B_VAL(&src), B_VAL(dst_ptr),
tmp);
- BLEND_COLOR(A_VAL(src),A_VAL(dst),255,A_VAL(dst),tmp);
-/* A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((A_VAL(&src) * (255 - A_VAL(dst_ptr))) /
255);*/
+ A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((A_VAL(&src) * (255 - A_VAL(dst_ptr))) /
255);
dst_ptr++;
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_blend_main.c 12 May 2003 02:26:26 -0000 1.3
+++ evas_blend_main.c 18 Mar 2004 09:06:12 -0000 1.4
@@ -4,7 +4,7 @@
#include "evas_mmx.h"
#endif
-static void blend_init__evas_pow_lut(void);
+static void evas_blend_init_evas_pow_lut(void);
DATA8 _evas_pow_lut[256][256];
const DATA16 _evas_const_c1[4] = {1, 1, 1, 1};
@@ -22,11 +22,11 @@
evas_common_cpu_can_do(&mmx, &sse, &sse2);
- blend_init__evas_pow_lut();
+ evas_blend_init_evas_pow_lut();
}
void
-blend_init__evas_pow_lut(void)
+evas_blend_init_evas_pow_lut(void)
{
int i, j;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_blend_pixel_mul_pixel.c 16 Mar 2004 08:03:00 -0000 1.4
+++ evas_blend_pixel_mul_pixel.c 18 Mar 2004 09:06:12 -0000 1.5
@@ -211,8 +211,7 @@
BLEND_COLOR(a, B_VAL(dst_ptr),
B_VAL(src_ptr), B_VAL(dst_ptr),
tmp);
- BLEND_COLOR(A_VAL(src),A_VAL(dst),255,A_VAL(dst),tmp);
-/* A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((aa * (255 - A_VAL(dst_ptr))) /
255);*/
+ A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((aa * (255 - A_VAL(dst_ptr))) /
255);
break;
}
src_ptr++;
@@ -249,8 +248,7 @@
BLEND_COLOR(a, B_VAL(dst_ptr),
((B_VAL(src_ptr) * (B_VAL(&mul_color) + 1)) >> 8),
B_VAL(dst_ptr),
tmp);
- BLEND_COLOR(A_VAL(src),A_VAL(dst),255,A_VAL(dst),tmp);
-/* A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((aa * (255 - A_VAL(dst_ptr))) /
255);*/
+ A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((aa * (255 - A_VAL(dst_ptr))) /
255);
break;
}
src_ptr++;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_pixel_pixel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_blend_pixel_pixel.c 16 Mar 2004 08:03:00 -0000 1.7
+++ evas_blend_pixel_pixel.c 18 Mar 2004 09:06:12 -0000 1.8
@@ -149,8 +149,7 @@
BLEND_COLOR(a, B_VAL(dst_ptr),
B_VAL(src_ptr), B_VAL(dst_ptr),
tmp);
- BLEND_COLOR(A_VAL(src),A_VAL(dst),255,A_VAL(dst),tmp);
-/* A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((A_VAL(src_ptr) * (255 -
A_VAL(dst_ptr))) / 255);*/
+ A_VAL(dst_ptr) = A_VAL(dst_ptr) + ((A_VAL(src_ptr) * (255 -
A_VAL(dst_ptr))) / 255);
}
src_ptr++;
dst_ptr++;
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
