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, 50 insertions, 22 deletions

diff --git a/gtk/gtk_bitmap.c b/gtk/gtk_bitmap.c
index bf36a94e6..dd62aad26 100644
--- a/gtk/gtk_bitmap.c
+++ b/gtk/gtk_bitmap.c
@@ -54,12 +54,16 @@ struct bitmap {
  * \return an opaque struct bitmap, or NULL on memory exhaustion
  */
 
-struct bitmap *bitmap_create(int width, int height, unsigned int state)
+void *bitmap_create(int width, int height, unsigned int state)
 {
         struct bitmap *bmp = malloc(sizeof(struct bitmap));
 
-	bmp->primary = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8,
-                                      width, height);
+// 	if ((state & BITMAP_OPAQUE) != 0)
+// 		bmp->primary = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false,
+// 					       8, width, height);
+// 	else
+		bmp->primary = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true,
+					       8, width, height);
 
 	/* fill the pixbuf in with 100% transparent black, as the memory
 	 * won't have been cleared.
@@ -76,8 +80,9 @@ struct bitmap *bitmap_create(int width, int height, unsigned int state)
  * \param  bitmap  a bitmap, as returned by bitmap_create()
  * \param  opaque  whether the bitmap should be plotted opaque
  */
-void bitmap_set_opaque(struct bitmap *bitmap, bool opaque)
+void bitmap_set_opaque(void *vbitmap, bool opaque)
 {
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	assert(bitmap);
 /* todo: set bitmap as opaque */
 }
@@ -89,8 +94,9 @@ void bitmap_set_opaque(struct bitmap *bitmap, bool opaque)
  * \param  bitmap  a bitmap, as returned by bitmap_create()
  * \return whether the bitmap is opaque
  */
-bool bitmap_test_opaque(struct bitmap *bitmap)
+bool bitmap_test_opaque(void *vbitmap)
 {
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	assert(bitmap);
 /* todo: test if bitmap as opaque */
 	return false;
@@ -102,8 +108,9 @@ bool bitmap_test_opaque(struct bitmap *bitmap)
  *
  * \param  bitmap  a bitmap, as returned by bitmap_create()
  */
-bool bitmap_get_opaque(struct bitmap *bitmap)
+bool bitmap_get_opaque(void *vbitmap)
 {
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	assert(bitmap);
 /* todo: get whether bitmap is opaque */
 	return false;
@@ -120,10 +127,11 @@ bool bitmap_get_opaque(struct bitmap *bitmap)
  * of rows. The width of a row in bytes is given by bitmap_get_rowstride().
  */
 
-char *bitmap_get_buffer(struct bitmap *bitmap)
+unsigned char *bitmap_get_buffer(void *vbitmap)
 {
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	assert(bitmap);
-	return (char *)gdk_pixbuf_get_pixels(bitmap->primary);
+	return (unsigned char *)gdk_pixbuf_get_pixels(bitmap->primary);
 }
 
 
@@ -134,13 +142,29 @@ char *bitmap_get_buffer(struct bitmap *bitmap)
  * \return width of a pixel row in the bitmap
  */
 
-size_t bitmap_get_rowstride(struct bitmap *bitmap)
+size_t bitmap_get_rowstride(void *vbitmap)
 {
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	assert(bitmap);
 	return gdk_pixbuf_get_rowstride(bitmap->primary);
 }
 
 
+/**
+ * Find the bytes per pixel of a bitmap
+ *
+ * \param  bitmap  a bitmap, as returned by bitmap_create()
+ * \return bytes per pixel
+ */
+
+size_t bitmap_get_bpp(void *vbitmap)
+{
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
+	assert(bitmap);
+	return 4;
+}
+
+
 static void
 gtk_bitmap_free_pretiles(struct bitmap *bitmap)
 {
@@ -157,8 +181,9 @@ gtk_bitmap_free_pretiles(struct bitmap *bitmap)
  * \param  bitmap  a bitmap, as returned by bitmap_create()
  */
 
-void bitmap_destroy(struct bitmap *bitmap)
+void bitmap_destroy(void *vbitmap)
 {
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	assert(bitmap);
         gtk_bitmap_free_pretiles(bitmap);
 	g_object_unref(bitmap->primary);
@@ -175,8 +200,9 @@ void bitmap_destroy(struct bitmap *bitmap)
  * \return true on success, false on error and error reported
  */
 
-bool bitmap_save(struct bitmap *bitmap, const char *path, unsigned flags)
+bool bitmap_save(void *vbitmap, const char *path, unsigned flags)
 {
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	GError *err = NULL;
 
 	gdk_pixbuf_save(bitmap->primary, path, "png", &err, NULL);
@@ -194,7 +220,8 @@ bool bitmap_save(struct bitmap *bitmap, const char *path, unsigned flags)
  *
  * \param  bitmap  a bitmap, as returned by bitmap_create()
  */
-void bitmap_modified(struct bitmap *bitmap) {
+void bitmap_modified(void *vbitmap) {
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
         gtk_bitmap_free_pretiles(bitmap);
 }
 
@@ -202,20 +229,21 @@ void bitmap_modified(struct bitmap *bitmap) {
 /**
  * The bitmap image can be suspended.
  *
- * \param  bitmap  	a bitmap, as returned by bitmap_create()
- * \param  private_word	a private word to be returned later
- * \param  suspend	the function to be called upon suspension
- * \param  resume	the function to be called when resuming
+ * \param  bitmap  		a bitmap, as returned by bitmap_create()
+ * \param  private_word		a private word to be returned later
+ * \param  invalidate		the function to be called upon suspension
  */
-void bitmap_set_suspendable(struct bitmap *bitmap, void *private_word,
-		void (*invalidate)(struct bitmap *bitmap, void *private_word)) {
+void bitmap_set_suspendable(void *vbitmap, void *private_word,
+		void (*invalidate)(void *vbitmap, void *private_word)) {
 }
 
-int bitmap_get_width(struct bitmap *bitmap){
+int bitmap_get_width(void *vbitmap){
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	return gdk_pixbuf_get_width(bitmap->primary);
 }
 
-int bitmap_get_height(struct bitmap *bitmap){
+int bitmap_get_height(void *vbitmap){
+	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	return gdk_pixbuf_get_height(bitmap->primary);
 }
 
@@ -259,9 +287,9 @@ gtk_bitmap_generate_pretile(GdkPixbuf *primary, int repeat_x, int repeat_y)
  * \param  bitmap  a bitmap, as returned by bitmap_create()
  */
 GdkPixbuf *
-gtk_bitmap_get_primary(struct bitmap* bitmap)
+gtk_bitmap_get_primary(struct bitmap *bitmap)
 {
-  return bitmap->primary;
+	return bitmap->primary;
 }
 
 /**