From bd57d1b9f11a303378df09711a7e7c7d46aea8db Mon Sep 17 00:00:00 2001 From: barbieri Date: Thu, 19 Mar 2009 19:29:05 +0000 Subject: [PATCH] warnings-- git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@39593 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/engines/common/evas_convert_colorspace.c | 2 +- src/lib/engines/common/evas_font_load.c | 4 ++-- src/lib/engines/common/evas_op_blend/op_blend_pixel_.c | 1 - src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c | 2 +- src/modules/engines/buffer/evas_outbuf.c | 8 ++++---- src/modules/engines/gl_common/evas_gl_texture.c | 5 ++--- src/modules/engines/software_16_x11/evas_engine.c | 3 --- src/modules/engines/xrender_x11/evas_engine_xrender.c | 2 +- 8 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/lib/engines/common/evas_convert_colorspace.c b/src/lib/engines/common/evas_convert_colorspace.c index 7d113cb..c158317 100644 --- a/src/lib/engines/common/evas_convert_colorspace.c +++ b/src/lib/engines/common/evas_convert_colorspace.c @@ -34,7 +34,7 @@ evas_common_convert_rgb565_a5p_to_argb8888(void *data, int w, int h, int stride, { DATA8 *alpha; - alpha = end; + alpha = (DATA8 *)end; for (; src < end; src++, alpha++, dst++) *dst = (CONVERT_A5P_TO_A8(*alpha) << 24) | CONVERT_RGB_565_TO_RGB_888(*src); diff --git a/src/lib/engines/common/evas_font_load.c b/src/lib/engines/common/evas_font_load.c index cbccb45..c57a1d1 100644 --- a/src/lib/engines/common/evas_font_load.c +++ b/src/lib/engines/common/evas_font_load.c @@ -167,7 +167,7 @@ _evas_common_font_double_int_cmp(const int *key1, __UNUSED__ int key1_length, } static int -_evas_common_font_double_int_hash(const int key[2], int key_length) +_evas_common_font_double_int_hash(const unsigned int key[2], int key_length) { int tmp; @@ -183,7 +183,7 @@ _evas_commont_font_int_cache_init(RGBA_Font_Int *fi) /* Add some font kerning cache. */ fi->indexes = eina_hash_new(EINA_KEY_LENGTH(_evas_common_font_int_length), EINA_KEY_CMP(_evas_common_font_int_cmp), - eina_hash_int32, + EINA_KEY_HASH(eina_hash_int32), free, 3); fi->kerning = eina_hash_new(EINA_KEY_LENGTH(_evas_common_font_double_int_length), EINA_KEY_CMP(_evas_common_font_double_int_cmp), diff --git a/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c b/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c index a5db1c0..761c3a6 100644 --- a/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c +++ b/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c @@ -104,7 +104,6 @@ _op_blend_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { static void _op_blend_rel_pan_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { DATA32 *e; - int alpha; UNROLL8_PLD_WHILE(d, l, e, { c = 1 + (*d >> 24); diff --git a/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c b/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c index 6f029ca..8893462 100644 --- a/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c +++ b/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c @@ -28,7 +28,7 @@ _op_blend_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) { } static void -_op_blend_pas_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) { +_op_blend_pas_mas_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { DATA32 *e; int alpha; UNROLL8_PLD_WHILE(d, l, e, diff --git a/src/modules/engines/buffer/evas_outbuf.c b/src/modules/engines/buffer/evas_outbuf.c index 27c7ed7..93f8db4 100644 --- a/src/modules/engines/buffer/evas_outbuf.c +++ b/src/modules/engines/buffer/evas_outbuf.c @@ -265,7 +265,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int int yy, row_bytes; row_bytes = buf->dest_row_bytes; - dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4); + dest = (DATA32 *)((DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4)); if (buf->func.new_update_region) { dest = buf->func.new_update_region(x, y, w, h, &row_bytes); @@ -281,7 +281,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int for (yy = 0; yy < h; yy++) { src = update->image.data + (yy * update->cache_entry.w); - dst = (DATA8 *)(buf->dest) + ((y + yy) * row_bytes); + dst = (DATA32 *)((DATA8 *)(buf->dest) + ((y + yy) * row_bytes)); func(src, dst, w); } @@ -307,7 +307,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int } for (yy = 0; yy < h; yy++) { - dst = dest + (yy * row_bytes); + dst = (DATA32 *)(dest + (yy * row_bytes)); src = update->image.data + (yy * update->cache_entry.w); for (xx = 0; xx < w; xx++) { @@ -338,7 +338,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int } for (yy = 0; yy < h; yy++) { - dst = dest + (yy * row_bytes); + dst = (DATA32 *)(dest + (yy * row_bytes)); src = update->image.data + (yy * update->cache_entry.w); for (xx = 0; xx < w; xx++) { diff --git a/src/modules/engines/gl_common/evas_gl_texture.c b/src/modules/engines/gl_common/evas_gl_texture.c index 70b4bf6..97d8fe7 100644 --- a/src/modules/engines/gl_common/evas_gl_texture.c +++ b/src/modules/engines/gl_common/evas_gl_texture.c @@ -425,7 +425,7 @@ Evas_GL_Texture * evas_gl_common_ycbcr601pl_texture_new(Evas_GL_Context *gc, unsigned char **rows, int w, int h, int smooth) { Evas_GL_Texture *tex; - int im_w, im_h, tw, th, y; + int tw, th; GLenum texfmt; // on an nv 6600gt this is fast - but on a 5500fx its DEAD SLOW!!!!! @@ -546,8 +546,7 @@ void evas_gl_common_ycbcr601pl_texture_update(Evas_GL_Texture *tex, unsigned char **rows, int w __UNUSED__, int h __UNUSED__, int smooth) { int texfmt; - int y; - + /* FIXME: should use subimage */ glEnable(GL_TEXTURE_2D); texfmt = GL_LUMINANCE; diff --git a/src/modules/engines/software_16_x11/evas_engine.c b/src/modules/engines/software_16_x11/evas_engine.c index 3452942..de897af 100644 --- a/src/modules/engines/software_16_x11/evas_engine.c +++ b/src/modules/engines/software_16_x11/evas_engine.c @@ -436,8 +436,6 @@ static void _tmp_out_process(Render_Engine *re, int out_x, int out_y, int w, int h) { Soft16_Image *d, *s; - DATA16 *dp, *sp; - int y, x, d_dir; d = re->shbuf->im; s = re->tmp_out; @@ -502,7 +500,6 @@ static void eng_output_flush(void *data) { Render_Engine *re; - int w, h; re = (Render_Engine *)data; if (re->clip_rects) diff --git a/src/modules/engines/xrender_x11/evas_engine_xrender.c b/src/modules/engines/xrender_x11/evas_engine_xrender.c index d0c66c4..25ae684 100644 --- a/src/modules/engines/xrender_x11/evas_engine_xrender.c +++ b/src/modules/engines/xrender_x11/evas_engine_xrender.c @@ -168,7 +168,7 @@ _xr_render_surface_solid_rectangle_set(Xrender_Surface *rs, int r, int g, int b, } void -_xr_render_surface_argb_pixels_fill(Xrender_Surface *rs, int sw, int sh, void *pixels, int x, int y, int w, int h, int ox, int oy) +_xr_render_surface_argb_pixels_fill(Xrender_Surface *rs, int sw, int sh __UNUSED__, void *pixels, int x, int y, int w, int h, int ox, int oy) { Ximage_Image *xim; unsigned int *p, *sp, *sple, *spe; -- 2.7.4