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

evas: remove unused parameter. 

SVN revision: 70550
This commit is contained in:
Cedric BAIL 2012-04-30 09:42:42 +00:00
parent 71090cd4fd
commit f046fa4c46
15 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/lib/engines/common/evas_font.h
View File

@ -17,7 +17,7 @@ EAPI int evas_common_font_get_line_advance (RGBA_Font *fn);
/* draw */ /* 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 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 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); EAPI FT_UInt evas_common_get_char_index (RGBA_Font_Int* fi, Eina_Unicode gl);

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

@ -296,7 +296,7 @@ evas_common_font_draw_prepare(const Evas_Text_Props *text_props)
} }
EAPI void 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 ext_x, ext_y, ext_w, ext_h;
int im_w, im_h; int im_w, im_h;

14
legacy/evas/src/lib/engines/common/evas_pipe.c
View File

@ -350,7 +350,6 @@ evas_common_pipe_poly_draw(RGBA_Image *dst, RGBA_Draw_Context *dc,
static void static void
evas_common_pipe_op_text_free(RGBA_Pipe_Op *op) 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_text_props_content_unref(&(op->op.text.intl_props));
evas_common_pipe_op_free(op); evas_common_pipe_op_free(op);
} }
@ -364,33 +363,26 @@ evas_common_pipe_text_draw_do(RGBA_Image *dst, RGBA_Pipe_Op *op, RGBA_Pipe_Threa
memcpy(&(context), &(op->context), sizeof(RGBA_Draw_Context)); 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_draw_context_clip_clip(&(context), info->x, info->y, info->w, info->h);
evas_common_font_draw(dst, &(context), evas_common_font_draw(dst, &(context), op->op.text.x, op->op.text.y, &op->op.text.intl_props);
op->op.text.font, op->op.text.x, op->op.text.y,
&op->op.text.intl_props);
} }
else else
{ {
evas_common_font_draw(dst, &(op->context), evas_common_font_draw(dst, &(op->context), op->op.text.x, op->op.text.y, &op->op.text.intl_props);
op->op.text.font, op->op.text.x, op->op.text.y,
&op->op.text.intl_props);
} }
} }
EAPI void EAPI void
evas_common_pipe_text_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, 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; RGBA_Pipe_Op *op;
if (!fn) return;
dst->cache_entry.pipe = evas_common_pipe_add(dst->cache_entry.pipe, &op); dst->cache_entry.pipe = evas_common_pipe_add(dst->cache_entry.pipe, &op);
if (!dst->cache_entry.pipe) return; if (!dst->cache_entry.pipe) return;
op->op.text.x = x; op->op.text.x = x;
op->op.text.y = y; op->op.text.y = y;
evas_common_text_props_content_copy_and_ref(&(op->op.text.intl_props), evas_common_text_props_content_copy_and_ref(&(op->op.text.intl_props),
intl_props); intl_props);
fn->references++;
op->op.text.font = fn;
op->op_func = evas_common_pipe_text_draw_do; op->op_func = evas_common_pipe_text_draw_do;
op->free_func = evas_common_pipe_op_text_free; op->free_func = evas_common_pipe_op_text_free;
evas_common_pipe_draw_context_copy(dc, op); evas_common_pipe_draw_context_copy(dc, op);

2
legacy/evas/src/lib/engines/common/evas_pipe.h
View File

@ -22,7 +22,7 @@ EAPI void evas_common_pipe_free(RGBA_Image *im);
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_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_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_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_text_prepare(const Evas_Text_Props *text_props);
EAPI void evas_common_pipe_image_load(RGBA_Image *im); 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); 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);

1
legacy/evas/src/lib/include/evas_common.h
View File

@ -731,7 +731,6 @@ struct _RGBA_Pipe_Op
RGBA_Polygon_Point *points; RGBA_Polygon_Point *points;
} poly; } poly;
struct { struct {
RGBA_Font *font;
int x, y; int x, y;
Evas_Text_Props intl_props; Evas_Text_Props intl_props;
} text; } text;

2
legacy/evas/src/modules/engines/direct3d/evas_engine.c
View File

@ -403,7 +403,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
evas_direct3d_font_texture_new, evas_direct3d_font_texture_new,
evas_direct3d_font_texture_free, evas_direct3d_font_texture_free,
evas_direct3d_font_texture_draw); 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); evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
} }

2
legacy/evas/src/modules/engines/directfb/evas_engine.c
View File

@ -1049,7 +1049,7 @@ evas_engine_dfb_font_draw(void *data, void *context, void *surface, void *font,
if (!_dfb_lock_and_sync_image(screen, im, DSLF_READ | DSLF_WRITE)) if (!_dfb_lock_and_sync_image(screen, im, DSLF_READ | DSLF_WRITE))
return; 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(); evas_common_cpu_end_opt();
im->image.data = NULL; im->image.data = NULL;

3
legacy/evas/src/modules/engines/gl_cocoa/evas_engine.c
View File

@ -1067,8 +1067,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
evas_gl_font_texture_new, evas_gl_font_texture_new,
evas_gl_font_texture_free, evas_gl_font_texture_free,
evas_gl_font_texture_draw); evas_gl_font_texture_draw);
evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, evas_common_font_draw(im, context, x, y, intl_props);
intl_props);
evas_common_draw_context_font_ext_set(context, evas_common_draw_context_font_ext_set(context,
NULL, NULL,
NULL, NULL,

3
legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
View File

@ -858,8 +858,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
evas_gl_font_texture_new, evas_gl_font_texture_new,
evas_gl_font_texture_free, evas_gl_font_texture_free,
evas_gl_font_texture_draw); evas_gl_font_texture_draw);
evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, evas_common_font_draw(im, context, x, y, intl_props);
intl_props);
evas_common_draw_context_font_ext_set(context, evas_common_draw_context_font_ext_set(context,
NULL, NULL,
NULL, NULL,

3
legacy/evas/src/modules/engines/gl_x11/evas_engine.c
View File

@ -2812,8 +2812,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
evas_gl_font_texture_new, evas_gl_font_texture_new,
evas_gl_font_texture_free, evas_gl_font_texture_free,
evas_gl_font_texture_draw); evas_gl_font_texture_draw);
evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, evas_common_font_draw(im, context, x, y, intl_props);
intl_props);
evas_common_draw_context_font_ext_set(context, evas_common_draw_context_font_ext_set(context,
NULL, NULL,
NULL, NULL,

2
legacy/evas/src/modules/engines/software_16/evas_engine.c
View File

@ -305,7 +305,7 @@ eng_font_draw(void *data __UNUSED__, void *context, void *surface, Evas_Font_Set
evas_common_soft16_font_glyph_new, evas_common_soft16_font_glyph_new,
evas_common_soft16_font_glyph_free, evas_common_soft16_font_glyph_free,
evas_common_soft16_font_glyph_draw); 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, evas_common_draw_context_font_ext_set(context,
NULL, NULL,
NULL, NULL,

2
legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c
View File

@ -917,7 +917,7 @@ evas_engine_sdl16_font_draw(void *data __UNUSED__, void *context, void *surface,
evas_common_soft16_font_glyph_new, evas_common_soft16_font_glyph_new,
evas_common_soft16_font_glyph_free, evas_common_soft16_font_glyph_free,
evas_common_soft16_font_glyph_draw); 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, evas_common_draw_context_font_ext_set(context,
NULL, NULL,
NULL, NULL,

3
legacy/evas/src/modules/engines/software_8/evas_engine.c
View File

@ -343,8 +343,7 @@ eng_font_draw(void *data __UNUSED__, void *context, void *surface,
Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, 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) int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props)
{ {
evas_common_font_draw(surface, context, (RGBA_Font *) font, x, y, evas_common_font_draw(surface, context, x, y, text_props);
text_props);
evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL); evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
} }

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

@ -1168,13 +1168,11 @@ eng_font_draw(void *data __UNUSED__, void *context, void *surface, Evas_Font_Set
{ {
#ifdef BUILD_PIPE_RENDER #ifdef BUILD_PIPE_RENDER
if ((cpunum > 1)) if ((cpunum > 1))
evas_common_pipe_text_draw(surface, context, (RGBA_Font *) font, x, y, evas_common_pipe_text_draw(surface, context, x, y, text_props);
text_props);
else else
#endif #endif
{ {
evas_common_font_draw(surface, context, (RGBA_Font *) font, x, y, evas_common_font_draw(surface, context, x, y, text_props);
text_props);
evas_common_cpu_end_opt(); evas_common_cpu_end_opt();
} }
} }

3
legacy/evas/src/modules/engines/wayland_egl/evas_engine.c
View File

@ -1932,8 +1932,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
evas_gl_font_texture_new, evas_gl_font_texture_new,
evas_gl_font_texture_free, evas_gl_font_texture_free,
evas_gl_font_texture_draw); evas_gl_font_texture_draw);
evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, evas_common_font_draw(im, context, x, y, intl_props);
intl_props);
evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL); evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
} }
} }