From 3128ecf2a5c94102e0e1659f947a345d36750afe Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 28 Jun 2011 20:17:39 +0000 Subject: Unify content_redraw params in content_redraw_data struct. Core and RISC OS content handlers updated. svn path=/trunk/netsurf/; revision=12529 --- image/ico.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'image/ico.c') diff --git a/image/ico.c b/image/ico.c index e9cfc3a55..a64f76e70 100644 --- a/image/ico.c +++ b/image/ico.c @@ -157,13 +157,11 @@ static bool nsico_convert(struct content *c) } -static bool nsico_redraw(struct content *c, int x, int y, - int width, int height, const struct rect *clip, - float scale, colour background_colour, - bool repeat_x, bool repeat_y) +static bool nsico_redraw(struct content *c, struct content_redraw_data *data, + const struct rect *clip) { nsico_content *ico = (nsico_content *) c; - struct bmp_image *bmp = ico_find(ico->ico, width, height); + struct bmp_image *bmp = ico_find(ico->ico, data->width, data->height); bitmap_flags_t flags = BITMAPF_NONE; if (!bmp->decoded) @@ -172,12 +170,13 @@ static bool nsico_redraw(struct content *c, int x, int y, c->bitmap = bmp->bitmap; - if (repeat_x) + if (data->repeat_x) flags |= BITMAPF_REPEAT_X; - if (repeat_y) + if (data->repeat_y) flags |= BITMAPF_REPEAT_Y; - return plot.bitmap(x, y, width, height, c->bitmap, background_colour, flags); + return plot.bitmap(data->x, data->y, data->width, data->height, + c->bitmap, data->background_colour, flags); } -- cgit v1.2.3