From e71691bae890040b83cfd54a2d9a1097d5026866 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 6 May 2011 20:40:09 +0000 Subject: Merge branches/jmb/content-factory to trunk svn path=/trunk/netsurf/; revision=12283 --- image/bmp.h | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'image/bmp.h') diff --git a/image/bmp.h b/image/bmp.h index cb386f6d1..885b94344 100644 --- a/image/bmp.h +++ b/image/bmp.h @@ -31,29 +31,15 @@ #include #include "image/bitmap.h" -struct content; -struct bitmap; -struct http_parameter; -struct rect; +extern bmp_bitmap_callback_vt bmp_bitmap_callbacks; /** Only to be used by ICO code. */ -struct content_bmp_data { - bmp_image *bmp; /** BMP image data */ -}; +nserror nsbmp_init(void); +void nsbmp_fini(void); -extern bmp_bitmap_callback_vt bmp_bitmap_callbacks; /** Only to be used by ICO code. */ +#else -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, const struct rect *clip, - float scale, colour background_colour); -bool nsbmp_redraw_tiled(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); -bool nsbmp_clone(const struct content *old, struct content *new_content); -void *nsbmp_bitmap_create(int width, int height, unsigned int bmp_state); +#define nsbmp_init() NSERROR_OK +#define nsbmp_fini() ((void) 0) #endif /* WITH_BMP */ -- cgit v1.2.3