From d2f9c6518b1f450dbb00768a4448a0fd4d3ae6cb Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 3 Jun 2008 20:28:38 +0200 Subject: [PATCH] rename draw_image to draw_image_from_file Signed-off-by: Julien Danjou --- common/draw.c | 4 ++-- common/draw.h | 2 +- widgets/iconbox.c | 4 ++-- widgets/tasklist.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/draw.c b/common/draw.c index 0be52ecb8..768f46ed6 100644 --- a/common/draw.c +++ b/common/draw.c @@ -731,7 +731,7 @@ draw_image_from_argb_data(draw_context_t *ctx, int x, int y, int w, int h, * \param filename file name to draw */ void -draw_image(draw_context_t *ctx, int x, int y, int wanted_h, const char *filename) +draw_image_from_file(draw_context_t *ctx, int x, int y, int wanted_h, const char *filename) { double ratio; @@ -834,7 +834,7 @@ draw_imlib_load_strerror(Imlib_Load_Error e) * \param filename file name to draw */ void -draw_image(draw_context_t *ctx, int x, int y, int wanted_h, const char *filename) +draw_image_from_file(draw_context_t *ctx, int x, int y, int wanted_h, const char *filename) { int w, h, size, i; DATA32 *data; diff --git a/common/draw.h b/common/draw.h index edf46f44e..5ba10df7e 100644 --- a/common/draw.h +++ b/common/draw.h @@ -140,7 +140,7 @@ void draw_graph_setup(draw_context_t *); void draw_graph(draw_context_t *, area_t, int *, int *, int, position_t, area_t, xcolor_t *, xcolor_t *, xcolor_t *); void draw_graph_line(draw_context_t *, area_t, int *, int, position_t, area_t, xcolor_t *, xcolor_t *, xcolor_t *); void draw_circle(draw_context_t *, int, int, int, bool, xcolor_t); -void draw_image(draw_context_t *, int, int, int, const char *); +void draw_image_from_file(draw_context_t *, int, int, int, const char *); void draw_image_from_argb_data(draw_context_t *, int, int, int, int, int, unsigned char *); area_t draw_get_image_size(const char *filename); void draw_rotate(draw_context_t *, xcb_drawable_t, xcb_drawable_t, int, int, int, int, double, int, int); diff --git a/widgets/iconbox.c b/widgets/iconbox.c index ce3569bc2..81153f363 100644 --- a/widgets/iconbox.c +++ b/widgets/iconbox.c @@ -59,8 +59,8 @@ iconbox_draw(draw_context_t *ctx, int screen __attribute__ ((unused)), w->area.y = 0; - draw_image(ctx, w->area.x, w->area.y, - d->resize ? ctx->height : 0, d->image); + draw_image_from_file(ctx, w->area.x, w->area.y, + d->resize ? ctx->height : 0, d->image); return w->area.width; } diff --git a/widgets/tasklist.c b/widgets/tasklist.c index 0a655f3b2..736971a3e 100644 --- a/widgets/tasklist.c +++ b/widgets/tasklist.c @@ -121,11 +121,11 @@ tasklist_draw(draw_context_t *ctx, int screen, if(area.width > 0 && area.height > 0) { icon_width = ((double) ctx->height / (double) area.height) * area.width; - draw_image(ctx, - w->area.x + box_width * i, - w->area.y, - ctx->height, - c->icon_path); + draw_image_from_file(ctx, + w->area.x + box_width * i, + w->area.y, + ctx->height, + c->icon_path); } }