Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_gradient_angular.c evas_gradient_main.c
evas_op_add_main_.c evas_op_blend_main_.c evas_op_copy_main_.c
evas_op_mask_main_.c evas_op_mul_main_.c evas_op_sub_main_.c
evas_scale_smooth.c
Log Message:
Add const.
Remove unused variables.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_angular.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_gradient_angular.c 2 May 2006 07:28:47 -0000 1.3
+++ evas_gradient_angular.c 31 May 2006 18:33:45 -0000 1.4
@@ -2080,7 +2080,6 @@
int x, int y, int axx, int axy, int ayx, int ayy, void
*params_data)
{
DATA32 *dst_end = dst + dst_len;
- DATA32 mc1 = map[map_len - 1];
Angular_Data *gdata = (Angular_Data *)params_data;
int xx, yy;
int ss = (gdata->s) << 16;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_gradient_main.c 21 May 2006 09:43:58 -0000 1.8
+++ evas_gradient_main.c 31 May 2006 18:33:45 -0000 1.9
@@ -806,7 +806,6 @@
evas_common_convert_rgb_to_hsv(int r, int g, int b, float *h, float *s, float
*v)
{
int max, min, d = r - g;
- float hh, ss, vv;
//set min to MIN(g,r)
d = ((d & (~(d >> 8))) & 0xff);
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_add_main_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_op_add_main_.c 2 May 2006 07:28:47 -0000 1.1
+++ evas_op_add_main_.c 31 May 2006 18:33:45 -0000 1.2
@@ -145,7 +145,7 @@
static RGBA_Gfx_Func
op_add_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -157,7 +157,7 @@
static RGBA_Gfx_Func
op_add_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -173,7 +173,7 @@
static RGBA_Gfx_Func
op_add_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int
pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -191,7 +191,7 @@
static RGBA_Gfx_Func
op_add_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -207,7 +207,7 @@
static RGBA_Gfx_Func
op_add_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -240,7 +240,7 @@
static RGBA_Gfx_Pt_Func
op_add_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -252,7 +252,7 @@
static RGBA_Gfx_Pt_Func
op_add_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -268,7 +268,7 @@
static RGBA_Gfx_Pt_Func
op_add_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -286,7 +286,7 @@
static RGBA_Gfx_Pt_Func
op_add_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -302,8 +302,7 @@
static RGBA_Gfx_Pt_Func
op_add_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- RGBA_Gfx_Pt_Func func = NULL;
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -376,7 +375,7 @@
static RGBA_Gfx_Func
op_add_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -388,7 +387,7 @@
static RGBA_Gfx_Func
op_add_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -404,7 +403,7 @@
static RGBA_Gfx_Func
op_add_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst,
int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -422,7 +421,7 @@
static RGBA_Gfx_Func
op_add_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -438,7 +437,7 @@
static RGBA_Gfx_Func
op_add_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -471,7 +470,7 @@
static RGBA_Gfx_Pt_Func
op_add_rel_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -483,7 +482,7 @@
static RGBA_Gfx_Pt_Func
op_add_rel_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -499,7 +498,7 @@
static RGBA_Gfx_Pt_Func
op_add_rel_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -517,7 +516,7 @@
static RGBA_Gfx_Pt_Func
op_add_rel_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -533,7 +532,7 @@
static RGBA_Gfx_Pt_Func
op_add_rel_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_blend_main_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_op_blend_main_.c 2 May 2006 07:28:47 -0000 1.1
+++ evas_op_blend_main_.c 31 May 2006 18:33:45 -0000 1.2
@@ -146,7 +146,7 @@
static RGBA_Gfx_Func
op_blend_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -162,7 +162,7 @@
static RGBA_Gfx_Func
op_blend_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -178,7 +178,7 @@
static RGBA_Gfx_Func
op_blend_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst,
int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -200,7 +200,7 @@
static RGBA_Gfx_Func
op_blend_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -216,7 +216,7 @@
static RGBA_Gfx_Func
op_blend_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -254,7 +254,7 @@
static RGBA_Gfx_Pt_Func
op_blend_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -266,7 +266,7 @@
static RGBA_Gfx_Pt_Func
op_blend_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -282,7 +282,7 @@
static RGBA_Gfx_Pt_Func
op_blend_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -300,7 +300,7 @@
static RGBA_Gfx_Pt_Func
op_blend_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -316,7 +316,7 @@
static RGBA_Gfx_Pt_Func
op_blend_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -388,7 +388,7 @@
static RGBA_Gfx_Func
op_blend_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -400,7 +400,7 @@
static RGBA_Gfx_Func
op_blend_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -416,7 +416,7 @@
static RGBA_Gfx_Func
op_blend_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image
*dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -434,7 +434,7 @@
static RGBA_Gfx_Func
op_blend_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -450,7 +450,7 @@
static RGBA_Gfx_Func
op_blend_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -483,7 +483,7 @@
static RGBA_Gfx_Pt_Func
op_blend_rel_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -495,7 +495,7 @@
static RGBA_Gfx_Pt_Func
op_blend_rel_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -511,7 +511,7 @@
static RGBA_Gfx_Pt_Func
op_blend_rel_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -529,7 +529,7 @@
static RGBA_Gfx_Pt_Func
op_blend_rel_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -545,7 +545,7 @@
static RGBA_Gfx_Pt_Func
op_blend_rel_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_copy_main_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_op_copy_main_.c 2 May 2006 07:28:47 -0000 1.1
+++ evas_op_copy_main_.c 31 May 2006 18:33:45 -0000 1.2
@@ -147,7 +147,7 @@
static RGBA_Gfx_Func
op_copy_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
{
@@ -162,7 +162,7 @@
static RGBA_Gfx_Func
op_copy_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
{
@@ -182,7 +182,7 @@
static RGBA_Gfx_Func
op_copy_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int
pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
{
@@ -208,7 +208,7 @@
static RGBA_Gfx_Func
op_copy_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -224,7 +224,7 @@
static RGBA_Gfx_Func
op_copy_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -257,7 +257,7 @@
static RGBA_Gfx_Pt_Func
op_copy_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
{
@@ -272,7 +272,7 @@
static RGBA_Gfx_Pt_Func
op_copy_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
{
@@ -292,7 +292,7 @@
static RGBA_Gfx_Pt_Func
op_copy_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
{
@@ -318,7 +318,7 @@
static RGBA_Gfx_Pt_Func
op_copy_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -334,7 +334,7 @@
static RGBA_Gfx_Pt_Func
op_copy_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -406,7 +406,7 @@
static RGBA_Gfx_Func
op_copy_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
{
@@ -422,7 +422,7 @@
static RGBA_Gfx_Func
op_copy_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
{
@@ -442,7 +442,7 @@
static RGBA_Gfx_Func
op_copy_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst,
int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
{
@@ -468,7 +468,7 @@
static RGBA_Gfx_Func
op_copy_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -484,7 +484,7 @@
static RGBA_Gfx_Func
op_copy_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -517,7 +517,7 @@
static RGBA_Gfx_Pt_Func
op_copy_rel_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
{
@@ -533,7 +533,7 @@
static RGBA_Gfx_Pt_Func
op_copy_rel_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
{
@@ -553,7 +553,7 @@
static RGBA_Gfx_Pt_Func
op_copy_rel_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
{
@@ -579,7 +579,7 @@
static RGBA_Gfx_Pt_Func
op_copy_rel_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -595,7 +595,7 @@
static RGBA_Gfx_Pt_Func
op_copy_rel_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_mask_main_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_op_mask_main_.c 2 May 2006 07:28:47 -0000 1.1
+++ evas_op_mask_main_.c 31 May 2006 18:33:45 -0000 1.2
@@ -112,7 +112,7 @@
static RGBA_Gfx_Func
op_mask_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
{
@@ -127,7 +127,7 @@
static RGBA_Gfx_Func
op_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
{
@@ -147,7 +147,7 @@
static RGBA_Gfx_Func
op_mask_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int
pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
{
@@ -173,7 +173,7 @@
static RGBA_Gfx_Func
op_mask_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -189,7 +189,7 @@
static RGBA_Gfx_Func
op_mask_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -222,7 +222,7 @@
static RGBA_Gfx_Pt_Func
op_mask_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
{
@@ -237,7 +237,7 @@
static RGBA_Gfx_Pt_Func
op_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
{
@@ -257,7 +257,7 @@
static RGBA_Gfx_Pt_Func
op_mask_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
{
@@ -283,7 +283,7 @@
static RGBA_Gfx_Pt_Func
op_mask_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -299,7 +299,7 @@
static RGBA_Gfx_Pt_Func
op_mask_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_mul_main_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_op_mul_main_.c 2 May 2006 07:28:47 -0000 1.1
+++ evas_op_mul_main_.c 31 May 2006 18:33:45 -0000 1.2
@@ -111,7 +111,7 @@
static RGBA_Gfx_Func
op_mul_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
{
@@ -126,7 +126,7 @@
static RGBA_Gfx_Func
op_mul_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
{
@@ -146,7 +146,7 @@
static RGBA_Gfx_Func
op_mul_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int
pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
{
@@ -172,7 +172,7 @@
static RGBA_Gfx_Func
op_mul_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -188,7 +188,7 @@
static RGBA_Gfx_Func
op_mul_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -221,7 +221,7 @@
static RGBA_Gfx_Pt_Func
op_mul_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
{
@@ -236,7 +236,7 @@
static RGBA_Gfx_Pt_Func
op_mul_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
{
@@ -256,7 +256,7 @@
static RGBA_Gfx_Pt_Func
op_mul_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
{
@@ -282,7 +282,7 @@
static RGBA_Gfx_Pt_Func
op_mul_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -298,7 +298,7 @@
static RGBA_Gfx_Pt_Func
op_mul_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
if (dst)
dst->flags |= RGBA_IMAGE_HAS_ALPHA;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_sub_main_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_op_sub_main_.c 2 May 2006 07:28:47 -0000 1.1
+++ evas_op_sub_main_.c 31 May 2006 18:33:45 -0000 1.2
@@ -145,7 +145,7 @@
static RGBA_Gfx_Func
op_sub_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -157,7 +157,7 @@
static RGBA_Gfx_Func
op_sub_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -173,7 +173,7 @@
static RGBA_Gfx_Func
op_sub_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int
pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -191,7 +191,7 @@
static RGBA_Gfx_Func
op_sub_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -207,7 +207,7 @@
static RGBA_Gfx_Func
op_sub_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -240,7 +240,7 @@
static RGBA_Gfx_Pt_Func
op_sub_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -252,7 +252,7 @@
static RGBA_Gfx_Pt_Func
op_sub_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -268,7 +268,7 @@
static RGBA_Gfx_Pt_Func
op_sub_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -286,7 +286,7 @@
static RGBA_Gfx_Pt_Func
op_sub_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -302,8 +302,7 @@
static RGBA_Gfx_Pt_Func
op_sub_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- RGBA_Gfx_Pt_Func func = NULL;
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -376,7 +375,7 @@
static RGBA_Gfx_Func
op_sub_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -388,7 +387,7 @@
static RGBA_Gfx_Func
op_sub_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -404,7 +403,7 @@
static RGBA_Gfx_Func
op_sub_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst,
int pixels)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -422,7 +421,7 @@
static RGBA_Gfx_Func
op_sub_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -438,7 +437,7 @@
static RGBA_Gfx_Func
op_sub_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src && (src->flags & RGBA_IMAGE_HAS_ALPHA))
s = SP;
@@ -471,7 +470,7 @@
static RGBA_Gfx_Pt_Func
op_sub_rel_pixel_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -483,7 +482,7 @@
static RGBA_Gfx_Pt_Func
op_sub_rel_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -499,7 +498,7 @@
static RGBA_Gfx_Pt_Func
op_sub_rel_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
@@ -517,7 +516,7 @@
static RGBA_Gfx_Pt_Func
op_sub_rel_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
{
- int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN, cpu;
+ int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
if ((col >> 24) < 255)
c = SC;
@@ -533,7 +532,7 @@
static RGBA_Gfx_Pt_Func
op_sub_rel_pixel_mask_pt_get(int src_flags, RGBA_Image *dst)
{
- int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN, cpu;
+ int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
if (src_flags & RGBA_IMAGE_HAS_ALPHA)
s = SP;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_smooth.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas_scale_smooth.c 2 May 2006 07:28:47 -0000 1.11
+++ evas_scale_smooth.c 31 May 2006 18:33:45 -0000 1.12
@@ -690,7 +690,6 @@
int tx = txx >> 16, ntx, x = 0;
DATA32 *dst_end = dst + dst_len;
DATA32 *src_end = src + src_len;
- DATA32 q = 0;
pxor_r2r(mm0, mm0);
pxor_r2r(mm2, mm2);
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
