summaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorJohn Tytgat <joty@netsurf-browser.org>2008-09-28 22:37:13 +0000
committerJohn Tytgat <joty@netsurf-browser.org>2008-09-28 22:37:13 +0000
commit2d1481fafc6fd98c5ca8fc46562b725441a0f594 (patch)
treee28954b7171a739df009d87e8a33c35e2d1c7dc6 /image
parentf0926760125501228b2b506c92e8e2bf6fdd83e6 (diff)
downloadnetsurf-2d1481fafc6fd98c5ca8fc46562b725441a0f594.tar.gz
netsurf-2d1481fafc6fd98c5ca8fc46562b725441a0f594.tar.bz2
'unsigned long' -> 'colour' where it made sense.
svn path=/trunk/netsurf/; revision=5459
Diffstat (limited to 'image')
-rw-r--r--image/bmp.c4
-rw-r--r--image/bmp.h4
-rw-r--r--image/gif.c4
-rw-r--r--image/gif.h4
-rw-r--r--image/ico.c4
-rw-r--r--image/ico.h4
-rw-r--r--image/jpeg.c4
-rw-r--r--image/jpeg.h4
-rw-r--r--image/mng.c4
-rw-r--r--image/mng.h4
-rw-r--r--image/png.c4
-rw-r--r--image/png.h4
-rw-r--r--image/rsvg.c4
-rw-r--r--image/rsvg.h4
-rw-r--r--image/svg.c2
-rw-r--r--image/svg.h2
16 files changed, 30 insertions, 30 deletions
diff --git a/image/bmp.c b/image/bmp.c
index 12ba78261..408eb5861 100644
--- a/image/bmp.c
+++ b/image/bmp.c
@@ -114,7 +114,7 @@ bool nsbmp_convert(struct content *c, int iwidth, int iheight)
bool nsbmp_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)
{
if (!c->data.bmp.bmp->decoded)
@@ -129,7 +129,7 @@ bool nsbmp_redraw(struct content *c, int x, int y,
bool nsbmp_redraw_tiled(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,
bool repeat_x, bool repeat_y)
{
diff --git a/image/bmp.h b/image/bmp.h
index 5bb044785..905f9b40f 100644
--- a/image/bmp.h
+++ b/image/bmp.h
@@ -46,11 +46,11 @@ void nsbmp_destroy(struct content *c);
bool nsbmp_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);
bool nsbmp_redraw_tiled(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,
bool repeat_x, bool repeat_y);
void *nsbmp_bitmap_create(int width, int height, unsigned int bmp_state);
diff --git a/image/gif.c b/image/gif.c
index 08e16d84e..a353d2e9c 100644
--- a/image/gif.c
+++ b/image/gif.c
@@ -154,7 +154,7 @@ void nsgif_invalidate(void *bitmap, void *private_word)
bool nsgif_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)
{
if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame)
if (nsgif_get_frame(c) != GIF_OK)
@@ -168,7 +168,7 @@ bool nsgif_redraw(struct content *c, int x, int y,
bool nsgif_redraw_tiled(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,
bool repeat_x, bool repeat_y)
{
if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame)
diff --git a/image/gif.h b/image/gif.h
index 3be974f9e..571818ea2 100644
--- a/image/gif.h
+++ b/image/gif.h
@@ -43,11 +43,11 @@ void nsgif_destroy(struct content *c);
bool nsgif_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);
bool nsgif_redraw_tiled(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,
bool repeat_x, bool repeat_y);
void *nsgif_bitmap_create(int width, int height);
diff --git a/image/ico.c b/image/ico.c
index aaa889eca..fba45a942 100644
--- a/image/ico.c
+++ b/image/ico.c
@@ -101,7 +101,7 @@ bool nsico_convert(struct content *c, int iwidth, int iheight)
bool nsico_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)
{
struct bmp_image *bmp = ico_find(c->data.ico.ico, width, height);
if (!bmp->decoded)
@@ -116,7 +116,7 @@ bool nsico_redraw(struct content *c, int x, int y,
bool nsico_redraw_tiled(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,
bool repeat_x, bool repeat_y)
{
struct bmp_image *bmp = ico_find(c->data.ico.ico, width, height);
diff --git a/image/ico.h b/image/ico.h
index 886b8654b..435981470 100644
--- a/image/ico.h
+++ b/image/ico.h
@@ -41,11 +41,11 @@ void nsico_destroy(struct content *c);
bool nsico_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);
bool nsico_redraw_tiled(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,
bool repeat_x, bool repeat_y);
#endif /* WITH_BMP */
diff --git a/image/jpeg.c b/image/jpeg.c
index 7fc0b02e8..8ed0ee299 100644
--- a/image/jpeg.c
+++ b/image/jpeg.c
@@ -236,7 +236,7 @@ void nsjpeg_term_source(j_decompress_ptr cinfo)
bool nsjpeg_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)
{
return plot.bitmap(x, y, width, height,
c->bitmap, background_colour, c);
@@ -250,7 +250,7 @@ bool nsjpeg_redraw(struct content *c, int x, int y,
bool nsjpeg_redraw_tiled(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,
bool repeat_x, bool repeat_y)
{
return plot.bitmap_tile(x, y, width, height,
diff --git a/image/jpeg.h b/image/jpeg.h
index ffe040943..ec2a4ecc1 100644
--- a/image/jpeg.h
+++ b/image/jpeg.h
@@ -40,11 +40,11 @@ void nsjpeg_destroy(struct content *c);
bool nsjpeg_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);
bool nsjpeg_redraw_tiled(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,
bool repeat_x, bool repeat_y);
#endif /* WITH_JPEG */
diff --git a/image/mng.c b/image/mng.c
index 6daf662ea..42d542ade 100644
--- a/image/mng.c
+++ b/image/mng.c
@@ -495,7 +495,7 @@ void nsmng_destroy(struct content *c) {
bool nsmng_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)
{
bool ret;
@@ -522,7 +522,7 @@ bool nsmng_redraw(struct content *c, int x, int y,
bool nsmng_redraw_tiled(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,
bool repeat_x, bool repeat_y)
{
bool ret;
diff --git a/image/mng.h b/image/mng.h
index 765919e36..20a0462b0 100644
--- a/image/mng.h
+++ b/image/mng.h
@@ -48,11 +48,11 @@ void nsmng_destroy(struct content *c);
bool nsmng_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);
bool nsmng_redraw_tiled(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,
bool repeat_x, bool repeat_y);
#endif /* WITH_MNG */
diff --git a/image/png.c b/image/png.c
index 31a9048df..e67253790 100644
--- a/image/png.c
+++ b/image/png.c
@@ -266,7 +266,7 @@ void nspng_destroy(struct content *c)
bool nspng_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)
{
if (c->bitmap != NULL) {
return plot.bitmap(x, y, width, height, c->bitmap,
@@ -278,7 +278,7 @@ bool nspng_redraw(struct content *c, int x, int y,
bool nspng_redraw_tiled(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,
bool repeat_x, bool repeat_y)
{
if (c->bitmap != NULL) {
diff --git a/image/png.h b/image/png.h
index 00f41adf3..1e241ebcd 100644
--- a/image/png.h
+++ b/image/png.h
@@ -46,10 +46,10 @@ void nspng_destroy(struct content *c);
bool nspng_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);
bool nspng_redraw_tiled(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,
bool repeat_x, bool repeat_y);
#endif
diff --git a/image/rsvg.c b/image/rsvg.c
index c25870aa9..fe9ce648e 100644
--- a/image/rsvg.c
+++ b/image/rsvg.c
@@ -180,7 +180,7 @@ bool rsvg_convert(struct content *c, int iwidth, int iheight)
bool rsvg_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)
{
plot.bitmap(x, y, width, height, c->bitmap, background_colour, c);
return true;
@@ -188,7 +188,7 @@ bool rsvg_redraw(struct content *c, int x, int y, int width, int height,
bool rsvg_redraw_tiled(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,
bool repeat_x, bool repeat_y)
{
return true;
diff --git a/image/rsvg.h b/image/rsvg.h
index 77f5dcfcb..d271c7aaa 100644
--- a/image/rsvg.h
+++ b/image/rsvg.h
@@ -47,11 +47,11 @@ void rsvg_destroy(struct content *c);
bool rsvg_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);
bool rsvg_redraw_tiled(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,
bool repeat_x, bool repeat_y);
#endif /* WITH_RSVG */
diff --git a/image/svg.c b/image/svg.c
index c15a1892b..a1d0abce5 100644
--- a/image/svg.c
+++ b/image/svg.c
@@ -88,7 +88,7 @@ bool svg_convert(struct content *c, int w, int h)
bool svg_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)
{
float transform[6];
struct svgtiny_diagram *diagram = c->data.svg.diagram;
diff --git a/image/svg.h b/image/svg.h
index 00b628b80..ec9c789c2 100644
--- a/image/svg.h
+++ b/image/svg.h
@@ -38,6 +38,6 @@ void svg_destroy(struct content *c);
bool svg_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);
#endif