bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add const. 

Remove unused variables.


SVN revision: 23027
This commit is contained in:
sebastid 2006-05-31 18:33:46 +00:00 committed by sebastid
parent 572985b263
commit a17c875ddc
24 changed files with 173 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/evas/src/lib/Evas.h
View File

@ -423,7 +423,7 @@ tile_mode);
EAPI Evas_Object *evas_object_image_add (Evas *e);
EAPI void evas_object_image_file_set (Evas_Object *obj, const char *file, const char *key);
EAPI void evas_object_image_file_get (Evas_Object *obj, char **file, char **key);
EAPI void evas_object_image_file_get (Evas_Object *obj, const char **file, const char **key);
EAPI void evas_object_image_border_set (Evas_Object *obj, int l, int r, int t, int b);
EAPI void evas_object_image_border_get (Evas_Object *obj, int *l, int *r, int *t, int *b);
EAPI void evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Bool fill);
@ -471,7 +471,7 @@ tile_mode);
EAPI void evas_object_text_font_source_set (Evas_Object *obj, const char *font);
EAPI const char *evas_object_text_font_source_get (Evas_Object *obj);
EAPI void evas_object_text_font_set (Evas_Object *obj, const char *font, Evas_Font_Size size);
EAPI void evas_object_text_font_get (Evas_Object *obj, char **font, Evas_Font_Size *size);
EAPI void evas_object_text_font_get (Evas_Object *obj, const char **font, Evas_Font_Size *size);
EAPI void evas_object_text_text_set (Evas_Object *obj, const char *text);
EAPI const char *evas_object_text_text_get (Evas_Object *obj);
EAPI Evas_Coord evas_object_text_ascent_get (Evas_Object *obj);

18
legacy/evas/src/lib/canvas/evas_font_dir.c
View File

@ -16,11 +16,11 @@ typedef struct _Fndat Fndat;
struct _Fndat
{
char *name;
char *source;
int size;
void *font;
int ref;
const char *name;
const char *source;
int size;
void *font;
int ref;
};
/* private methods for font dir cache */
@ -44,7 +44,7 @@ evas_font_dir_cache_free(void)
font_dirs = NULL;
}
char *
const char *
evas_font_dir_cache_find(char *dir, char *font)
{
Evas_Font_Dir *fd;
@ -227,7 +227,7 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
for (l = evas->font_path; l; l = l->next)
{
char *f_file;
const char *f_file;
f_file = evas_font_dir_cache_find(l->data, (char *)nm);
if (f_file)
@ -289,7 +289,7 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
for (l = evas->font_path; l; l = l->next)
{
char *f_file;
const char *f_file;
f_file = evas_font_dir_cache_find(l->data, (char *)nm);
if (f_file)
@ -390,7 +390,7 @@ evas_font_dir_available_list(Evas *evas)
{
for (i = 0; i < set->nfont; i++)
{
char * font;
char *font;
font = FcNameUnparse(set->fonts[i]);
available = evas_list_append(available, evas_stringshare_add(font));

6
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -23,8 +23,8 @@ struct _Evas_Object_Image
unsigned char fill;
} border;
char *file;
char *key;
const char *file;
const char *key;
char smooth_scale : 1;
char has_alpha :1;
@ -186,7 +186,7 @@ evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
* @ingroup Evas_Object_Image_File_Group
*/
EAPI void
evas_object_image_file_get(Evas_Object *obj, char **file, char **key)
evas_object_image_file_get(Evas_Object *obj, const char **file, const char **key)
{
Evas_Object_Image *o;

2
legacy/evas/src/lib/canvas/evas_object_smart.c
View File

@ -12,7 +12,7 @@ struct _Evas_Object_Smart
struct _Evas_Smart_Callback
{
char *event;
const char *event;
char delete_me : 1;
void (*func) (void *data, Evas_Object *obj, void *event_info);
void *func_data;

8
legacy/evas/src/lib/canvas/evas_object_text.c
View File

@ -16,9 +16,9 @@ struct _Evas_Object_Text
DATA32 magic;
struct {
char *text;
char *font;
char *source;
const char *text;
const char *font;
const char *source;
Evas_Font_Size size;
struct {
unsigned char r, g, b, a;
@ -252,7 +252,7 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz
*
*/
EAPI void
evas_object_text_font_get(Evas_Object *obj, char **font, Evas_Font_Size *size)
evas_object_text_font_get(Evas_Object *obj, const char **font, Evas_Font_Size *size)
{
Evas_Object_Text *o;

10
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -61,7 +61,7 @@ struct _Evas_Object_Textblock_Item
struct _Evas_Object_Textblock_Format_Item
{ Evas_Object_List _list_data;
char *item;
const char *item;
Evas_Object_Textblock_Node *source_node;
int x, w;
};
@ -72,9 +72,9 @@ struct _Evas_Object_Textblock_Format
double halign;
double valign;
struct {
char *name;
char *source;
char *fallbacks;
const char *name;
const char *source;
const char *fallbacks;
int size;
void *font;
} font;
@ -244,7 +244,7 @@ _style_match_tag(Evas_Textblock_Style *ts, char *s)
}
static char *
_strbuf_append(char *s, char *s2, int *len, int *alloc)
_strbuf_append(char *s, const char *s2, int *len, int *alloc)
{
int l2;
int tlen;

1
legacy/evas/src/lib/engines/common/evas_gradient_angular.c
View File

@ -2080,7 +2080,6 @@ angular_pad_aa_annulus(DATA32 *map, int map_len, DATA32 *dst, DATA8 *mask, int d
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;

1
legacy/evas/src/lib/engines/common/evas_gradient_main.c
View File

@ -806,7 +806,6 @@ void
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);

41
legacy/evas/src/lib/engines/common/evas_op_add_main_.c
View File

@ -145,7 +145,7 @@ add_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_add_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_add_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_add_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi
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 @@ op_add_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ add_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_add_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_add_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_add_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_add_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ add_rel_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_add_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_add_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_add_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, in
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 @@ op_add_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ add_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_add_rel_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_add_rel_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_add_rel_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_add_rel_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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;

40
legacy/evas/src/lib/engines/common/evas_op_blend_main_.c
View File

@ -146,7 +146,7 @@ blend_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_blend_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_blend_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_blend_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int
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 @@ op_blend_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ blend_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_blend_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_blend_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_blend_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_blend_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ blend_rel_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_blend_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_blend_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_blend_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst,
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 @@ op_blend_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ blend_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_blend_rel_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_blend_rel_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_blend_rel_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_blend_rel_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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;

40
legacy/evas/src/lib/engines/common/evas_op_copy_main_.c
View File

@ -147,7 +147,7 @@ copy_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_copy_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_copy_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_copy_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int p
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 @@ op_copy_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ copy_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_copy_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_copy_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_copy_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_copy_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ copy_rel_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_copy_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_copy_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_copy_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, i
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 @@ op_copy_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ copy_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_copy_rel_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_copy_rel_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_copy_rel_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_copy_rel_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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;

20
legacy/evas/src/lib/engines/common/evas_op_mask_main_.c
View File

@ -112,7 +112,7 @@ mask_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_mask_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_mask_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int p
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 @@ op_mask_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ mask_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_mask_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_mask_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_mask_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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;

20
legacy/evas/src/lib/engines/common/evas_op_mul_main_.c
View File

@ -111,7 +111,7 @@ mul_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_mul_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_mul_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_mul_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi
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 @@ op_mul_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ mul_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_mul_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_mul_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_mul_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_mul_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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;

41
legacy/evas/src/lib/engines/common/evas_op_sub_main_.c
View File

@ -145,7 +145,7 @@ sub_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_sub_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_sub_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_sub_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi
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 @@ op_sub_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ sub_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_sub_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_sub_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_sub_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_sub_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ sub_rel_gfx_span_func_cpu(int s, int m, int c, int d)
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 @@ op_sub_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels)
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 @@ op_sub_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ op_sub_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, in
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 @@ op_sub_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels)
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 @@ sub_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
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 @@ op_sub_rel_pixel_pt_get(int src_flags, RGBA_Image *dst)
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 @@ op_sub_rel_color_pt_get(DATA32 col, RGBA_Image *dst)
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 @@ op_sub_rel_pixel_color_pt_get(int src_flags, DATA32 col, RGBA_Image *dst)
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 @@ op_sub_rel_mask_color_pt_get(DATA32 col, RGBA_Image *dst)
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;

1
legacy/evas/src/lib/engines/common/evas_scale_smooth.c
View File

@ -690,7 +690,6 @@ evas_common_scale_rgba_span_mmx(DATA32 *src, int src_len, DATA32 mul_col, DATA32
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);

1
legacy/evas/src/lib/file/evas_module.c
View File

@ -133,7 +133,6 @@ evas_module_init(void)
{
Evas_List *l;
int new_id_engine = 1;
int new_id_loader = 1;
/* printf("[init modules]\n"); */
evas_module_paths_init();

8
legacy/evas/src/lib/file/evas_path.c
View File

@ -20,7 +20,7 @@
#include "evas_private.h"
int
evas_file_path_is_full_path(char *path)
evas_file_path_is_full_path(const char *path)
{
if (!path) return 0;
if (path[0] == '/') return 1;
@ -48,7 +48,7 @@ evas_file_path_join(const char *path, const char *end)
}
int
evas_file_path_exists(char *path)
evas_file_path_exists(const char *path)
{
struct stat st;
@ -57,7 +57,7 @@ evas_file_path_exists(char *path)
}
int
evas_file_path_is_file(char *path)
evas_file_path_is_file(const char *path)
{
struct stat st;
@ -67,7 +67,7 @@ evas_file_path_is_file(char *path)
}
int
evas_file_path_is_dir(char *path)
evas_file_path_is_dir(const char *path)
{
struct stat st;

4
legacy/evas/src/lib/imaging/evas_imaging.c
View File

@ -88,7 +88,6 @@ evas_imaging_font_load(const char *file, const char *key, int size)
{
Evas_Imaging_Font *fn;
RGBA_Font *font;
Font_Hint_Flags h;
evas_common_cpu_init();
evas_common_font_init();
@ -213,4 +212,5 @@ EAPI int
evas_imaging_font_cache_get(void)
{
return evas_common_font_cache_get();
}
}

42
legacy/evas/src/lib/include/evas_private.h
View File

@ -59,7 +59,7 @@ typedef struct _Evas_Module_Path Evas_Module_Path;
struct _Evas_Module_Path
{
Evas_Module_Type type;
const char *path;
char *path;
};
typedef struct _Evas_Module_Engine Evas_Module_Engine;
@ -465,18 +465,18 @@ struct _Evas_Font
{
char type;
struct {
char *prop[14];
const char *prop[14];
} x;
struct {
char *name;
const char *name;
} simple;
char *path;
const char *path;
};
struct _Evas_Font_Alias
{
char *alias;
Evas_Font *fn;
const char *alias;
Evas_Font *fn;
};
struct _Evas_Object_Func
@ -559,7 +559,7 @@ struct _Evas_Func
void (*gradient_map) (void *data, void *context, void *gradient, int spread);
void (*gradient_draw) (void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle, int spread);
void *(*image_load) (void *data, char *file, char *key, int *error);
void *(*image_load) (void *data, const char *file, const char *key, int *error);
void *(*image_new_from_data) (void *data, int w, int h, DATA32 *image_data);
void *(*image_new_from_copied_data) (void *data, int w, int h, DATA32 *image_data);
void (*image_free) (void *data, void *image);
@ -578,22 +578,22 @@ struct _Evas_Func
void (*image_cache_set) (void *data, int bytes);
int (*image_cache_get) (void *data);
void *(*font_load) (void *data, char *name, int size);
void *(*font_load) (void *data, const char *name, int size);
void *(*font_memory_load) (void *data, char *name, int size, const void *fdata, int fdata_size);
void *(*font_add) (void *data, void *font, char *name, int size);
void *(*font_add) (void *data, void *font, const char *name, int size);
void *(*font_memory_add) (void *data, void *font, char *name, int size, const void *fdata, int fdata_size);
void (*font_free) (void *data, void *font);
int (*font_ascent_get) (void *data, void *font);
int (*font_descent_get) (void *data, void *font);
int (*font_max_ascent_get) (void *data, void *font);
int (*font_max_descent_get) (void *data, void *font);
void (*font_string_size_get) (void *data, void *font, char *text, int *w, int *h);
int (*font_inset_get) (void *data, void *font, char *text);
int (*font_h_advance_get) (void *data, void *font, char *text);
int (*font_v_advance_get) (void *data, void *font, char *text);
int (*font_char_coords_get) (void *data, void *font, char *text, int pos, int *cx, int *cy, int *cw, int *ch);
int (*font_char_at_coords_get) (void *data, void *font, char *text, int x, int y, int *cx, int *cy, int *cw, int *ch);
void (*font_draw) (void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, char *text);
void (*font_string_size_get) (void *data, void *font, const char *text, int *w, int *h);
int (*font_inset_get) (void *data, void *font, const char *text);
int (*font_h_advance_get) (void *data, void *font, const char *text);
int (*font_v_advance_get) (void *data, void *font, const char *text);
int (*font_char_coords_get) (void *data, void *font, const char *text, int pos, int *cx, int *cy, int *cw, int *ch);
int (*font_char_at_coords_get) (void *data, void *font, const char *text, int x, int y, int *cx, int *cy, int *cw, int *ch);
void (*font_draw) (void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const char *text);
void (*font_cache_flush) (void *data);
void (*font_cache_set) (void *data, int bytes);
@ -656,11 +656,11 @@ int evas_object_clippers_was_visible(Evas_Object *obj);
void evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void *event_info);
int evas_event_passes_through(Evas_Object *obj);
Evas_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y);
int evas_file_path_is_full_path(char *path);
int evas_file_path_is_full_path(const char *path);
char *evas_file_path_join(const char *path, const char *end);
int evas_file_path_exists(char *path);
int evas_file_path_is_file(char *path);
int evas_file_path_is_dir(char *path);
int evas_file_path_exists(const char *path);
int evas_file_path_is_file(const char *path);
int evas_file_path_is_dir(const char *path);
Evas_List *evas_file_path_list(char *path, char *match, int match_case);
DATA64 evas_file_modified_time(const char *file);
char *evas_file_path_resolve(const char *file);
@ -696,7 +696,7 @@ int evas_object_intercept_call_layer_set(Evas_Object *obj, int l);
void evas_object_grabs_cleanup(Evas_Object *obj);
void evas_key_grab_free(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
void evas_font_dir_cache_free(void);
char *evas_font_dir_cache_find(char *dir, char *font);
const char *evas_font_dir_cache_find(char *dir, char *font);
Evas_List *evas_font_dir_available_list(Evas* evas);
void evas_font_dir_available_list_free(Evas_List *available);
void evas_font_free(Evas *evas, void *font);

2
legacy/evas/src/modules/engines/buffer/evas_outbuf.c
View File

@ -264,7 +264,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int
case OUTBUF_DEPTH_ARGB_32BPP_8888_8888:
{
DATA32 *dest, *src, *dst;
int xx, yy, row_bytes;
int yy, row_bytes;
row_bytes = buf->dest_row_bytes;
dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4);

20
legacy/evas/src/modules/engines/software_generic/evas_engine.c
View File

@ -259,7 +259,7 @@ eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int
}
static void *
eng_image_load(void *data, char *file, char *key, int *error)
eng_image_load(void *data, const char *file, const char *key, int *error)
{
*error = 0;
return evas_common_load_image_from_file(file, key);
@ -476,7 +476,7 @@ eng_image_cache_get(void *data)
}
static void *
eng_font_load(void *data, char *name, int size)
eng_font_load(void *data, const char *name, int size)
{
return evas_common_font_load(name, size);
}
@ -488,7 +488,7 @@ eng_font_memory_load(void *data, char *name, int size, const void *fdata, int fd
}
static void *
eng_font_add(void *data, void *font, char *name, int size)
eng_font_add(void *data, void *font, const char *name, int size)
{
return evas_common_font_add(font, name, size);
}
@ -530,19 +530,19 @@ eng_font_max_descent_get(void *data, void *font)
}
static void
eng_font_string_size_get(void *data, void *font, char *text, int *w, int *h)
eng_font_string_size_get(void *data, void *font, const char *text, int *w, int *h)
{
evas_common_font_query_size(font, text, w, h);
}
static int
eng_font_inset_get(void *data, void *font, char *text)
eng_font_inset_get(void *data, void *font, const char *text)
{
return evas_common_font_query_inset(font, text);
}
static int
eng_font_h_advance_get(void *data, void *font, char *text)
eng_font_h_advance_get(void *data, void *font, const char *text)
{
int h, v;
@ -551,7 +551,7 @@ eng_font_h_advance_get(void *data, void *font, char *text)
}
static int
eng_font_v_advance_get(void *data, void *font, char *text)
eng_font_v_advance_get(void *data, void *font, const char *text)
{
int h, v;
@ -560,19 +560,19 @@ eng_font_v_advance_get(void *data, void *font, char *text)
}
static int
eng_font_char_coords_get(void *data, void *font, char *text, int pos, int *cx, int *cy, int *cw, int *ch)
eng_font_char_coords_get(void *data, void *font, const char *text, int pos, int *cx, int *cy, int *cw, int *ch)
{
return evas_common_font_query_char_coords(font, text, pos, cx, cy, cw, ch);
}
static int
eng_font_char_at_coords_get(void *data, void *font, char *text, int x, int y, int *cx, int *cy, int *cw, int *ch)
eng_font_char_at_coords_get(void *data, void *font, const char *text, int x, int y, int *cx, int *cy, int *cw, int *ch)
{
return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch);
}
static void
eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, char *text)
eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const char *text)
{
if ((w == ow) && (h == oh))
evas_common_font_draw(surface, context, font, x, y, text);

12
legacy/evas/src/modules/engines/xrender_x11/evas_engine.c
View File

@ -65,7 +65,7 @@ static void *eng_gradient_geometry_init(void *data, void *gradient, int spread);
static int eng_gradient_alpha_get(void *data, void *gradient, int spread, int op);
static void eng_gradient_map(void *data, void *context, void *gradient, int spread);
static void eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle, int spread);
static void *eng_image_load(void *data, char *file, char *key, int *error);
static void *eng_image_load(void *data, const char *file, const char *key, int *error);
static void *eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data);
static void *eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data);
static void eng_image_free(void *data, void *image);
@ -77,12 +77,12 @@ static void *eng_image_data_put(void *data, void *image, DATA32 *image_data);
static void *eng_image_alpha_set(void *data, void *image, int has_alpha);
static int eng_image_alpha_get(void *data, void *image);
static void eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth);
static char *eng_image_comment_get(void *data, void *image, char *key);
static const char *eng_image_comment_get(void *data, void *image, char *key);
static char *eng_image_format_get(void *data, void *image);
static void eng_image_cache_flush(void *data);
static void eng_image_cache_set(void *data, int bytes);
static int eng_image_cache_get(void *data);
static void eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, char *text);
static void eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const char *text);
/* internal engine routines */
@ -474,7 +474,7 @@ eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int
}
static void *
eng_image_load(void *data, char *file, char *key, int *error)
eng_image_load(void *data, const char *file, const char *key, int *error)
{
Render_Engine *re;
XR_Image *im;
@ -671,7 +671,7 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x,
smooth);
}
static char *
static const char *
eng_image_comment_get(void *data, void *image, char *key)
{
if (!image) return NULL;
@ -710,7 +710,7 @@ eng_image_cache_get(void *data)
}
static void
eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, char *text)
eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const char *text)
{
Render_Engine *re;

8
legacy/evas/src/modules/engines/xrender_x11/evas_engine.h
View File

@ -87,8 +87,8 @@ typedef struct _XR_Image XR_Image;
struct _XR_Image
{
Ximage_Info *xinf;
char *file;
char *key;
const char *file;
const char *key;
char *fkey;
RGBA_Image *im;
void *data;
@ -96,14 +96,14 @@ struct _XR_Image
Xrender_Surface *surface;
int references;
char *format;
char *comment;
const char *comment;
Tilebuf *updates;
unsigned char alpha : 1;
unsigned char dirty : 1;
unsigned char free_data : 1;
};
XR_Image *_xre_image_load(Ximage_Info *xinf, char *file, char *key);
XR_Image *_xre_image_load(Ximage_Info *xinf, const char *file, const char *key);
XR_Image *_xre_image_new_from_data(Ximage_Info *xinf, int w, int h, void *data);
XR_Image *_xre_image_new_from_copied_data(Ximage_Info *xinf, int w, int h, void *data);
XR_Image *_xre_image_new(Ximage_Info *xinf, int w, int h);

2
legacy/evas/src/modules/engines/xrender_x11/evas_engine_image.c
View File

@ -66,7 +66,7 @@ __xre_image_find(char *fkey)
}
XR_Image *
_xre_image_load(Ximage_Info *xinf, char *file, char *key)
_xre_image_load(Ximage_Info *xinf, const char *file, const char *key)
{
XR_Image *im;
char buf[4096];