enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix some warnings! 

SVN revision: 24599
This commit is contained in:
Carsten Haitzler 2006-08-12 14:46:15 +00:00
parent 57a4117e2d
commit 7f41aeb177
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -917,7 +917,7 @@ evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op render_op)
return;
MAGIC_CHECK_END();
if (obj->delete_me) return;
if (obj->cur.render_op == render_op)
if ((Evas_Render_Op)obj->cur.render_op == render_op)
return;
obj->cur.render_op = render_op;
evas_object_change(obj);

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

@ -2069,7 +2069,7 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node *n, in
it = (Evas_Object_Textblock_Item *)ll;
if (it->source_node == n)
{
if ((it->source_pos + strlen(it->text)) >= pos)
if ((int)(it->source_pos + strlen(it->text)) >= pos)
{
*lnr = ln;
*itr = it;
@ -2389,7 +2389,7 @@ evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text)
{
int i;
for (i = 0; i < (sizeof(_escapes) / sizeof(char *)); i += 2)
for (i = 0; i < (int)(sizeof(_escapes) / sizeof(char *)); i += 2)
{
if (!strncmp(_escapes[i], esc_start,
esc_end - esc_start + 1))
@ -2492,7 +2492,7 @@ evas_object_textblock_text_markup_get(Evas_Object *obj)
{
int i;
for (i = 1; i < (sizeof(_escapes) / sizeof(char *)); i += 2)
for (i = 1; i < (int)(sizeof(_escapes) / sizeof(char *)); i += 2)
{
if (!strncmp(_escapes[i], p,
strlen(_escapes[i])))

2
legacy/evas/src/lib/engines/common/evas_font_draw.c
View File

@ -82,7 +82,7 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, int gl)
}
else if (!fi->src->ft.face) /* Charmap not loaded, FI/FS blank */
{
if (evas_common_font_source_load_complete(fi->src));
if (evas_common_font_source_load_complete(fi->src))
return 0;
index = FT_Get_Char_Index(fi->src->ft.face, gl);

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

@ -1182,16 +1182,14 @@ angular_restrict_reflect_aa_annulus(DATA32 *map, int map_len, DATA32 *dst, DATA8
DATA32 a = 1 + ((ll - (l << 16)) >> 8), a0 = a;
lp = l + off;
/* FIXME: Statement with no effect */
if (lp < 0) { lp = -lp; 257 - a; }
if (lp < 0) { lp = -lp; a = 257 - a; }
if (lp >= map_len)
{
int m = (lp % (2 * map_len));
lp = (lp % map_len);
/* FIXME: Statement with no effect */
if (m >= map_len)
{ lp = map_len - lp - 1; 257 - a; }
{ lp = map_len - lp - 1; a = 257 - a; }
}
*dst = map[lp];
if (lp + 1 < map_len)
@ -1290,16 +1288,14 @@ angular_restrict_reflect_aa_masked_annulus(DATA32 *map, int map_len, DATA32 *dst
DATA32 a = 1 + ((ll - (l << 16)) >> 8), a0 = a - 1;
lp = l + off;
/* FIXME: Statement with no effect */
if (lp < 0) { lp = -lp; 257 - a; }
if (lp < 0) { lp = -lp; a = 257 - a; }
if (lp >= map_len)
{
int m = (lp % (2 * map_len));
lp = (lp % map_len);
/* FIXME: Statement with no effect */
if (m >= map_len)
{ lp = map_len - lp - 1; 257 - a; }
{ lp = map_len - lp - 1; a = 257 - a; }
}
*dst = map[lp]; *mask = 255;
if (lp + 1 < map_len)