From 2d1481fafc6fd98c5ca8fc46562b725441a0f594 Mon Sep 17 00:00:00 2001 From: John Tytgat Date: Sun, 28 Sep 2008 22:37:13 +0000 Subject: 'unsigned long' -> 'colour' where it made sense. svn path=/trunk/netsurf/; revision=5459 --- riscos/image.c | 6 +++--- riscos/image.h | 3 ++- riscos/plugin.c | 2 +- riscos/plugin.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'riscos') diff --git a/riscos/image.c b/riscos/image.c index 7826ad7e4..9b3eaa5db 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -30,7 +30,7 @@ static bool image_redraw_tinct(osspriteop_id header, int x, int y, int req_width, int req_height, int width, int height, - unsigned long background_colour, bool repeatx, bool repeaty, + colour background_colour, bool repeatx, bool repeaty, bool alpha, unsigned int tinct_options); static bool image_redraw_os(osspriteop_id header, int x, int y, int req_width, int req_height, int width, int height); @@ -54,7 +54,7 @@ static bool image_redraw_os(osspriteop_id header, int x, int y, */ bool image_redraw(osspriteop_area *area, int x, int y, int req_width, int req_height, int width, int height, - unsigned long background_colour, + colour background_colour, bool repeatx, bool repeaty, bool background, image_type type) { unsigned int tinct_options; @@ -115,7 +115,7 @@ bool image_redraw(osspriteop_area *area, int x, int y, int req_width, */ bool image_redraw_tinct(osspriteop_id header, int x, int y, int req_width, int req_height, int width, int height, - unsigned long background_colour, bool repeatx, bool repeaty, + colour background_colour, bool repeatx, bool repeaty, bool alpha, unsigned int tinct_options) { _kernel_oserror *error; diff --git a/riscos/image.h b/riscos/image.h index 0997b793d..f0bf2fdf9 100644 --- a/riscos/image.h +++ b/riscos/image.h @@ -20,6 +20,7 @@ #define _NETSURF_RISCOS_IMAGE_H_ #include +#include "css/css.h" #include "oslib/osspriteop.h" struct osspriteop_area; @@ -32,7 +33,7 @@ typedef enum { bool image_redraw(osspriteop_area *area, int x, int y, int req_width, int req_height, int width, int height, - unsigned long background_colour, + colour background_colour, bool repeatx, bool repeaty, bool background, image_type type); #endif diff --git a/riscos/plugin.c b/riscos/plugin.c index 1e4279f18..d973e7472 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -250,7 +250,7 @@ void plugin_destroy(struct content *c) bool plugin_redraw(struct content *c, int x, int y, int width, int height, int clip_x0, int clip_y0, int clip_x1, int clip_y1, - float scale, unsigned long background_colour) + float scale, colour background_colour) { /* do nothing */ LOG(("plugin_redraw")); diff --git a/riscos/plugin.h b/riscos/plugin.h index ca73fedc2..39c2d1b3d 100644 --- a/riscos/plugin.h +++ b/riscos/plugin.h @@ -59,7 +59,7 @@ void plugin_destroy(struct content *c); bool plugin_redraw(struct content *c, int x, int y, int width, int height, int clip_x0, int clip_y0, int clip_x1, int clip_y1, - float scale, unsigned long background_colour); + float scale, colour background_colour); void plugin_open(struct content *c, struct browser_window *bw, struct content *page, unsigned int index, struct box *box, struct object_params *params); -- cgit v1.2.3