From f42ed976e5e4c59b25250ad106527ac7b4447f68 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Mon, 14 Feb 2011 19:17:08 +0000 Subject: Constify svn path=/trunk/netsurf/; revision=11680 --- image/bmp.c | 4 ++-- image/bmp.h | 4 ++-- image/gif.c | 4 ++-- image/gif.h | 4 ++-- image/ico.c | 4 ++-- image/ico.h | 4 ++-- image/jpeg.c | 4 ++-- image/jpeg.h | 4 ++-- image/mng.c | 4 ++-- image/mng.h | 4 ++-- image/nssprite.c | 2 +- image/nssprite.h | 2 +- image/png.c | 4 ++-- image/png.h | 4 ++-- image/rsvg.c | 2 +- image/rsvg.h | 6 +----- image/svg.c | 2 +- image/svg.h | 2 +- image/webp.c | 2 +- image/webp.h | 2 +- 20 files changed, 32 insertions(+), 36 deletions(-) (limited to 'image') diff --git a/image/bmp.c b/image/bmp.c index b5487a3b8..f40cfb06c 100644 --- a/image/bmp.c +++ b/image/bmp.c @@ -117,7 +117,7 @@ bool nsbmp_convert(struct content *c) bool nsbmp_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { @@ -131,7 +131,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, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/bmp.h b/image/bmp.h index b1d689d2a..cb386f6d1 100644 --- a/image/bmp.h +++ b/image/bmp.h @@ -46,10 +46,10 @@ bool nsbmp_create(struct content *c, const struct http_parameter *params); bool nsbmp_convert(struct content *c); void nsbmp_destroy(struct content *c); bool nsbmp_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsbmp_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsbmp_clone(const struct content *old, struct content *new_content); diff --git a/image/gif.c b/image/gif.c index 8745942cd..94cba25f1 100644 --- a/image/gif.c +++ b/image/gif.c @@ -152,7 +152,7 @@ void nsgif_invalidate(void *bitmap, void *private_word) } bool nsgif_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame) @@ -167,7 +167,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, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/gif.h b/image/gif.h index 27b2385cf..a9f16d489 100644 --- a/image/gif.h +++ b/image/gif.h @@ -43,10 +43,10 @@ bool nsgif_create(struct content *c, const struct http_parameter *params); bool nsgif_convert(struct content *c); void nsgif_destroy(struct content *c); bool nsgif_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsgif_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsgif_clone(const struct content *old, struct content *new_content); diff --git a/image/ico.c b/image/ico.c index e1e3d2939..f147bad08 100644 --- a/image/ico.c +++ b/image/ico.c @@ -105,7 +105,7 @@ bool nsico_convert(struct content *c) } bool nsico_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { struct bmp_image *bmp = ico_find(c->data.ico.ico, width, height); @@ -139,7 +139,7 @@ bool nsico_set_bitmap_from_size(hlcache_handle *h, int width, int height) } bool nsico_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/ico.h b/image/ico.h index 16db54e94..666c22371 100644 --- a/image/ico.h +++ b/image/ico.h @@ -42,10 +42,10 @@ bool nsico_create(struct content *c, const struct http_parameter *params); bool nsico_convert(struct content *c); void nsico_destroy(struct content *c); bool nsico_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsico_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsico_clone(const struct content *old, struct content *new_content); diff --git a/image/jpeg.c b/image/jpeg.c index f247243ea..4d7aa32f7 100644 --- a/image/jpeg.c +++ b/image/jpeg.c @@ -244,7 +244,7 @@ void nsjpeg_term_source(j_decompress_ptr cinfo) */ bool nsjpeg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { return plot.bitmap(x, y, width, height, @@ -257,7 +257,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, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/jpeg.h b/image/jpeg.h index c484ec890..70bae4a6b 100644 --- a/image/jpeg.h +++ b/image/jpeg.h @@ -39,10 +39,10 @@ struct content_jpeg_data { bool nsjpeg_convert(struct content *c); void nsjpeg_destroy(struct content *c); bool nsjpeg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsjpeg_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsjpeg_clone(const struct content *old, struct content *new_content); diff --git a/image/mng.c b/image/mng.c index d360b4c1a..4ebba304d 100644 --- a/image/mng.c +++ b/image/mng.c @@ -524,7 +524,7 @@ void nsmng_destroy(struct content *c) bool nsmng_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { bool ret; @@ -550,7 +550,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, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/mng.h b/image/mng.h index eaf92968d..5835fef96 100644 --- a/image/mng.h +++ b/image/mng.h @@ -47,10 +47,10 @@ bool nsmng_process_data(struct content *c, const char *data, unsigned int size); bool nsmng_convert(struct content *c); void nsmng_destroy(struct content *c); bool nsmng_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsmng_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsmng_clone(const struct content *old, struct content *new_content); diff --git a/image/nssprite.c b/image/nssprite.c index df1cdbe36..7bff6e0f7 100644 --- a/image/nssprite.c +++ b/image/nssprite.c @@ -136,7 +136,7 @@ void nssprite_destroy(struct content *c) */ bool nssprite_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { return plot.bitmap(x, y, width, height, diff --git a/image/nssprite.h b/image/nssprite.h index 800defd42..3b69108cd 100644 --- a/image/nssprite.h +++ b/image/nssprite.h @@ -38,7 +38,7 @@ struct content_nssprite_data { bool nssprite_convert(struct content *c); void nssprite_destroy(struct content *c); bool nssprite_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nssprite_clone(const struct content *old, struct content *new_content); diff --git a/image/png.c b/image/png.c index 246b6d4ff..cbad15029 100644 --- a/image/png.c +++ b/image/png.c @@ -305,7 +305,7 @@ void nspng_destroy(struct content *c) bool nspng_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { assert(c->bitmap != NULL); @@ -315,7 +315,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, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/png.h b/image/png.h index 3e6e157be..fb9efcfd4 100644 --- a/image/png.h +++ b/image/png.h @@ -48,10 +48,10 @@ bool nspng_process_data(struct content *c, const char *data, unsigned int size); bool nspng_convert(struct content *c); void nspng_destroy(struct content *c); bool nspng_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nspng_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nspng_clone(const struct content *old, struct content *new_content); diff --git a/image/rsvg.c b/image/rsvg.c index 31feb498f..7f88d82ad 100644 --- a/image/rsvg.c +++ b/image/rsvg.c @@ -181,7 +181,7 @@ bool rsvg_convert(struct content *c) } bool rsvg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { plot.bitmap(x, y, width, height, c->bitmap, background_colour, BITMAPF_NONE); diff --git a/image/rsvg.h b/image/rsvg.h index 78a853c89..90b4ba8f3 100644 --- a/image/rsvg.h +++ b/image/rsvg.h @@ -48,12 +48,8 @@ bool rsvg_process_data(struct content *c, const char *data, unsigned int size); bool rsvg_convert(struct content *c); void rsvg_destroy(struct content *c); bool rsvg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); -bool rsvg_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, - float scale, colour background_colour, - bool repeat_x, bool repeat_y); bool rsvg_clone(const struct content *old, struct content *new_content); #endif /* WITH_RSVG */ diff --git a/image/svg.c b/image/svg.c index 26112b13c..43675faae 100644 --- a/image/svg.c +++ b/image/svg.c @@ -107,7 +107,7 @@ void svg_reformat(struct content *c, int width, int height) */ bool svg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { float transform[6]; diff --git a/image/svg.h b/image/svg.h index 9ce8093e6..d836cb310 100644 --- a/image/svg.h +++ b/image/svg.h @@ -40,7 +40,7 @@ bool svg_convert(struct content *c); void svg_destroy(struct content *c); void svg_reformat(struct content *c, int width, int height); bool svg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool svg_clone(const struct content *old, struct content *new_content); diff --git a/image/webp.c b/image/webp.c index 671ea5195..e4375637f 100644 --- a/image/webp.c +++ b/image/webp.c @@ -130,7 +130,7 @@ void webp_destroy(struct content *c) */ bool webp_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { return plot.bitmap(x, y, width, height, diff --git a/image/webp.h b/image/webp.h index acd449cbf..a89713ac3 100644 --- a/image/webp.h +++ b/image/webp.h @@ -38,7 +38,7 @@ struct content_webp_data { bool webp_convert(struct content *c); void webp_destroy(struct content *c); bool webp_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool webp_clone(const struct content *old, struct content *new_content); -- cgit v1.2.3