From 84d4cac05ef21d18bcea3e0fc202514363b9ccba Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 18 Mar 2004 09:06:12 +0000 Subject: [PATCH] oops - this DOESNT actually work - i thought as much! i knew i had my reasons... SVN revision: 9387 --- .../src/lib/engines/common/evas_blend_alpha_color_pixel.c | 3 +-- legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c | 3 +-- legacy/evas/src/lib/engines/common/evas_blend_main.c | 6 +++--- .../src/lib/engines/common/evas_blend_pixel_mul_pixel.c | 6 ++---- legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c | 3 +-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c index 3b3896f4b0..5bdbcef80b 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c @@ -169,8 +169,7 @@ evas_common_blend_alpha_color_rgba_to_rgba_c (DATA8 *src, DATA32 *dst, int len, 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++; diff --git a/legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c index 88fe7b875c..6d86ac86e7 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c @@ -105,8 +105,7 @@ evas_common_blend_color_rgba_to_rgba_c(DATA32 src, DATA32 *dst, int len) 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++; } diff --git a/legacy/evas/src/lib/engines/common/evas_blend_main.c b/legacy/evas/src/lib/engines/common/evas_blend_main.c index 2d31c715fc..a9d9f8f07a 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_main.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_main.c @@ -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_blend_init(void) 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; diff --git a/legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c index f35c5c042f..677c9e509d 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c @@ -211,8 +211,7 @@ evas_common_blend_pixels_mul_color_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int 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 @@ evas_common_blend_pixels_mul_color_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int 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++; diff --git a/legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c index 8868f27b98..8bca7a0e4c 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c @@ -149,8 +149,7 @@ evas_common_blend_pixels_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) 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++;