Menu
▾
▴
E SVN: cedric IN trunk/evas/src: lib/engines/common lib/include modules/engines/direct3d modules/engines/directfb modules/engines/gl_cocoa modules/engines/gl_sdl modules/engines/gl_x11 modules/engines/software_16 modules/engines/software_16_sdl modules/engines/software_8 modules/engines/software_generic modules/engines/wayland_egl
|
From: Enlightenment S. <no-...@en...> - 2012-04-30 09:42:49
|
Log: evas: remove unused parameter. Author: cedric Date: 2012-04-30 02:42:42 -0700 (Mon, 30 Apr 2012) New Revision: 70550 Trac: http://trac.enlightenment.org/e/changeset/70550 Modified: trunk/evas/src/lib/engines/common/evas_font.h trunk/evas/src/lib/engines/common/evas_font_draw.c trunk/evas/src/lib/engines/common/evas_pipe.c trunk/evas/src/lib/engines/common/evas_pipe.h trunk/evas/src/lib/include/evas_common.h trunk/evas/src/modules/engines/direct3d/evas_engine.c trunk/evas/src/modules/engines/directfb/evas_engine.c trunk/evas/src/modules/engines/gl_cocoa/evas_engine.c trunk/evas/src/modules/engines/gl_sdl/evas_engine.c trunk/evas/src/modules/engines/gl_x11/evas_engine.c trunk/evas/src/modules/engines/software_16/evas_engine.c trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c trunk/evas/src/modules/engines/software_8/evas_engine.c trunk/evas/src/modules/engines/software_generic/evas_engine.c trunk/evas/src/modules/engines/wayland_egl/evas_engine.c Modified: trunk/evas/src/lib/engines/common/evas_font.h =================================================================== --- trunk/evas/src/lib/engines/common/evas_font.h 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/lib/engines/common/evas_font.h 2012-04-30 09:42:42 UTC (rev 70550) @@ -17,7 +17,7 @@ /* draw */ -EAPI void evas_common_font_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const Evas_Text_Props *intl_props); +EAPI void evas_common_font_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, const Evas_Text_Props *intl_props); EAPI int evas_common_font_glyph_search (RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicode gl); EAPI RGBA_Font_Glyph *evas_common_font_int_cache_glyph_get (RGBA_Font_Int *fi, FT_UInt index); EAPI FT_UInt evas_common_get_char_index (RGBA_Font_Int* fi, Eina_Unicode gl); Modified: trunk/evas/src/lib/engines/common/evas_font_draw.c =================================================================== --- trunk/evas/src/lib/engines/common/evas_font_draw.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/lib/engines/common/evas_font_draw.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -296,7 +296,7 @@ } EAPI void -evas_common_font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const Evas_Text_Props *text_props) +evas_common_font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, const Evas_Text_Props *text_props) { int ext_x, ext_y, ext_w, ext_h; int im_w, im_h; Modified: trunk/evas/src/lib/engines/common/evas_pipe.c =================================================================== --- trunk/evas/src/lib/engines/common/evas_pipe.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/lib/engines/common/evas_pipe.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -350,7 +350,6 @@ static void evas_common_pipe_op_text_free(RGBA_Pipe_Op *op) { - evas_common_font_free(op->op.text.font); evas_common_text_props_content_unref(&(op->op.text.intl_props)); evas_common_pipe_op_free(op); } @@ -364,33 +363,26 @@ memcpy(&(context), &(op->context), sizeof(RGBA_Draw_Context)); evas_common_draw_context_clip_clip(&(context), info->x, info->y, info->w, info->h); - evas_common_font_draw(dst, &(context), - op->op.text.font, op->op.text.x, op->op.text.y, - &op->op.text.intl_props); + evas_common_font_draw(dst, &(context), op->op.text.x, op->op.text.y, &op->op.text.intl_props); } else { - evas_common_font_draw(dst, &(op->context), - op->op.text.font, op->op.text.x, op->op.text.y, - &op->op.text.intl_props); + evas_common_font_draw(dst, &(op->context), op->op.text.x, op->op.text.y, &op->op.text.intl_props); } } EAPI void evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, - RGBA_Font *fn, int x, int y, const Evas_Text_Props *intl_props) + int x, int y, const Evas_Text_Props *intl_props) { RGBA_Pipe_Op *op; - if (!fn) return; dst->cache_entry.pipe = evas_common_pipe_add(dst->cache_entry.pipe, &op); if (!dst->cache_entry.pipe) return; op->op.text.x = x; op->op.text.y = y; evas_common_text_props_content_copy_and_ref(&(op->op.text.intl_props), intl_props); - fn->references++; - op->op.text.font = fn; op->op_func = evas_common_pipe_text_draw_do; op->free_func = evas_common_pipe_op_text_free; evas_common_pipe_draw_context_copy(dc, op); Modified: trunk/evas/src/lib/engines/common/evas_pipe.h =================================================================== --- trunk/evas/src/lib/engines/common/evas_pipe.h 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/lib/engines/common/evas_pipe.h 2012-04-30 09:42:42 UTC (rev 70550) @@ -22,7 +22,7 @@ EAPI void evas_common_pipe_rectangle_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); EAPI void evas_common_pipe_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x1, int y1); EAPI void evas_common_pipe_poly_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y); -EAPI void evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const Evas_Text_Props *intl_props); +EAPI void evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, const Evas_Text_Props *intl_props); EAPI void evas_common_pipe_text_prepare(const Evas_Text_Props *text_props); EAPI void evas_common_pipe_image_load(RGBA_Image *im); EAPI void evas_common_pipe_image_draw(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); Modified: trunk/evas/src/lib/include/evas_common.h =================================================================== --- trunk/evas/src/lib/include/evas_common.h 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/lib/include/evas_common.h 2012-04-30 09:42:42 UTC (rev 70550) @@ -731,7 +731,6 @@ RGBA_Polygon_Point *points; } poly; struct { - RGBA_Font *font; int x, y; Evas_Text_Props intl_props; } text; Modified: trunk/evas/src/modules/engines/direct3d/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/direct3d/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/direct3d/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -403,7 +403,7 @@ evas_direct3d_font_texture_new, evas_direct3d_font_texture_free, evas_direct3d_font_texture_draw); - evas_common_font_draw(&im, context, (RGBA_Font *) font, x, y, intl_props); + evas_common_font_draw(&im, context, x, y, intl_props); evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL); } Modified: trunk/evas/src/modules/engines/directfb/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/directfb/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/directfb/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -1049,7 +1049,7 @@ if (!_dfb_lock_and_sync_image(screen, im, DSLF_READ | DSLF_WRITE)) return; - evas_common_font_draw(im, context, font, x, y, intl_props); + evas_common_font_draw(im, context, x, y, intl_props); evas_common_cpu_end_opt(); im->image.data = NULL; Modified: trunk/evas/src/modules/engines/gl_cocoa/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/gl_cocoa/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/gl_cocoa/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -1067,8 +1067,7 @@ evas_gl_font_texture_new, evas_gl_font_texture_free, evas_gl_font_texture_draw); - evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, - intl_props); + evas_common_font_draw(im, context, x, y, intl_props); evas_common_draw_context_font_ext_set(context, NULL, NULL, Modified: trunk/evas/src/modules/engines/gl_sdl/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/gl_sdl/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/gl_sdl/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -858,8 +858,7 @@ evas_gl_font_texture_new, evas_gl_font_texture_free, evas_gl_font_texture_draw); - evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, - intl_props); + evas_common_font_draw(im, context, x, y, intl_props); evas_common_draw_context_font_ext_set(context, NULL, NULL, Modified: trunk/evas/src/modules/engines/gl_x11/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/gl_x11/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/gl_x11/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -2812,8 +2812,7 @@ evas_gl_font_texture_new, evas_gl_font_texture_free, evas_gl_font_texture_draw); - evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, - intl_props); + evas_common_font_draw(im, context, x, y, intl_props); evas_common_draw_context_font_ext_set(context, NULL, NULL, Modified: trunk/evas/src/modules/engines/software_16/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/software_16/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/software_16/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -305,7 +305,7 @@ evas_common_soft16_font_glyph_new, evas_common_soft16_font_glyph_free, evas_common_soft16_font_glyph_draw); - evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, text_props); + evas_common_font_draw(im, context, x, y, text_props); evas_common_draw_context_font_ext_set(context, NULL, NULL, Modified: trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/software_16_sdl/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -917,7 +917,7 @@ evas_common_soft16_font_glyph_new, evas_common_soft16_font_glyph_free, evas_common_soft16_font_glyph_draw); - evas_common_font_draw((RGBA_Image *) eim->cache_entry.src, context, font, x, y, intl_props); + evas_common_font_draw((RGBA_Image *) eim->cache_entry.src, context, x, y, intl_props); evas_common_draw_context_font_ext_set(context, NULL, NULL, Modified: trunk/evas/src/modules/engines/software_8/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/software_8/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/software_8/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -343,8 +343,7 @@ Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props) { - evas_common_font_draw(surface, context, (RGBA_Font *) font, x, y, - text_props); + evas_common_font_draw(surface, context, x, y, text_props); evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL); } Modified: trunk/evas/src/modules/engines/software_generic/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/software_generic/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/software_generic/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -1168,13 +1168,11 @@ { #ifdef BUILD_PIPE_RENDER if ((cpunum > 1)) - evas_common_pipe_text_draw(surface, context, (RGBA_Font *) font, x, y, - text_props); + evas_common_pipe_text_draw(surface, context, x, y, text_props); else #endif { - evas_common_font_draw(surface, context, (RGBA_Font *) font, x, y, - text_props); + evas_common_font_draw(surface, context, x, y, text_props); evas_common_cpu_end_opt(); } } Modified: trunk/evas/src/modules/engines/wayland_egl/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/wayland_egl/evas_engine.c 2012-04-30 09:39:31 UTC (rev 70549) +++ trunk/evas/src/modules/engines/wayland_egl/evas_engine.c 2012-04-30 09:42:42 UTC (rev 70550) @@ -1932,8 +1932,7 @@ evas_gl_font_texture_new, evas_gl_font_texture_free, evas_gl_font_texture_draw); - evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, - intl_props); + evas_common_font_draw(im, context, x, y, intl_props); evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL); } } |