From 33107b160f09bbb301791759b83d772c820c4813 Mon Sep 17 00:00:00 2001 From: James Bursa Date: Tue, 12 Aug 2008 03:49:34 +0000 Subject: Merged revisions 4345-4346,4350-4351,4389,4391,4395,4401-4403,4423,4485-4486 via svnmerge from svn://semichrome.net/branches/dynis/netsurf ........ r4345 | dynis | 2008-06-15 18:37:23 -0500 (Sun, 15 Jun 2008) | 1 line Move NetSurf's gifread.h to libnsgif ........ r4346 | dynis | 2008-06-15 18:38:38 -0500 (Sun, 15 Jun 2008) | 1 line Remove NetSurf's gifread.c (replaced by libnsgif) ........ r4350 | dynis | 2008-06-15 18:57:17 -0500 (Sun, 15 Jun 2008) | 1 line Added references to libnsgif where necessary; corrected function calls where callbacks were implemented ........ r4351 | dynis | 2008-06-15 19:00:33 -0500 (Sun, 15 Jun 2008) | 1 line Updated Makefile to compile with libnsgif ........ r4389 | dynis | 2008-06-18 13:58:51 -0500 (Wed, 18 Jun 2008) | 1 line Altered bitmap callback table name for gif images to avoid ambiguity when bmp image library is created ........ r4391 | dynis | 2008-06-18 14:08:39 -0500 (Wed, 18 Jun 2008) | 1 line Updated netsurf branch to use new bitmap callback table structure name that was altered in libnsgif ........ r4395 | dynis | 2008-06-18 14:54:51 -0500 (Wed, 18 Jun 2008) | 1 line Corrected param comments for bitmap_set_suspendable() ........ r4401 | dynis | 2008-06-18 18:39:50 -0500 (Wed, 18 Jun 2008) | 1 line Added references to libnsbmp where necessary; corrected function calls where callbacks were implemented ........ r4402 | dynis | 2008-06-18 18:40:47 -0500 (Wed, 18 Jun 2008) | 1 line Updated Makefile to compile with libnsbmp ........ r4403 | dynis | 2008-06-18 18:41:53 -0500 (Wed, 18 Jun 2008) | 1 line Remove NetSurf's bmpread.c and bmpread.h (replaced by libnsbmp) ........ r4423 | dynis | 2008-06-22 14:21:30 -0500 (Sun, 22 Jun 2008) | 1 line Correct a silly mistake in nsbmp_bitmap_create ........ r4485 | dynis | 2008-07-01 04:13:48 -0500 (Tue, 01 Jul 2008) | 1 line Integrated the latest versions of libnsgif and libnsbmp into NetSurf ........ r4486 | dynis | 2008-07-01 05:27:10 -0500 (Tue, 01 Jul 2008) | 1 line Altered bitmap functions to receive void pointers for proper utilisation of libnsgif and libnsbmp ........ svn path=/trunk/netsurf/; revision=5071 --- image/bmp.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'image/bmp.h') diff --git a/image/bmp.h b/image/bmp.h index bd761eb95..1c0e9a8c7 100644 --- a/image/bmp.h +++ b/image/bmp.h @@ -1,5 +1,6 @@ /* * Copyright 2006 Richard Wilson + * Copyright 2008 Sean Fox * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -23,12 +24,14 @@ #ifdef WITH_BMP #include -#include "image/bmpread.h" +#include +#include "image/bitmap.h" struct content; +struct bitmap; struct content_bmp_data { - struct bmp_image *bmp; /** BMP image data */ + bmp_image *bmp; /** BMP image data */ }; bool nsbmp_create(struct content *c, const char *params[]); @@ -43,6 +46,7 @@ bool nsbmp_redraw_tiled(struct content *c, int x, int y, int clip_x0, int clip_y0, int clip_x1, int clip_y1, float scale, unsigned long background_colour, bool repeat_x, bool repeat_y); +void *nsbmp_bitmap_create(int width, int height, unsigned int bmp_state); #endif /* WITH_BMP */ -- cgit v1.2.3