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

1 files changed, 14 insertions, 13 deletions

diff --git a/image/bitmap.h b/image/bitmap.h
index c9bd4cdde..4a99de17e 100644
--- a/image/bitmap.h
+++ b/image/bitmap.h
@@ -46,19 +46,20 @@ struct content;
 /** An opaque image. */
 struct bitmap;
 
-struct bitmap *bitmap_create(int width, int height, unsigned int state);
-void bitmap_set_opaque(struct bitmap *bitmap, bool opaque);
-bool bitmap_test_opaque(struct bitmap *bitmap);
-bool bitmap_get_opaque(struct bitmap *bitmap);
-char *bitmap_get_buffer(struct bitmap *bitmap);
-size_t bitmap_get_rowstride(struct bitmap *bitmap);
-void bitmap_destroy(struct bitmap *bitmap);
-bool bitmap_save(struct bitmap *bitmap, const char *path, unsigned flags);
-void bitmap_modified(struct bitmap *bitmap);
-void bitmap_set_suspendable(struct bitmap *bitmap, void *private_word,
-		void (*invalidate)(struct bitmap *bitmap, void *private_word));
+void *bitmap_create(int width, int height, unsigned int state);
+void bitmap_set_opaque(void *bitmap, bool opaque);
+bool bitmap_test_opaque(void *bitmap);
+bool bitmap_get_opaque(void *bitmap);
+unsigned char *bitmap_get_buffer(void *bitmap);
+size_t bitmap_get_rowstride(void *bitmap);
+size_t bitmap_get_bpp(void *bitmap);
+void bitmap_destroy(void *bitmap);
+bool bitmap_save(void *bitmap, const char *path, unsigned flags);
+void bitmap_modified(void *bitmap);
+void bitmap_set_suspendable(void *bitmap, void *private_word,
+		void (*invalidate)(void *bitmap, void *private_word));
 
-int bitmap_get_width(struct bitmap *bitmap);
-int bitmap_get_height(struct bitmap *bitmap);
+int bitmap_get_width(void *bitmap);
+int bitmap_get_height(void *bitmap);
 
 #endif