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, 13 insertions, 10 deletions

diff --git a/image/ico.c b/image/ico.c
index b7e8d923c..d5977a829 100644
--- a/image/ico.c
+++ b/image/ico.c
@@ -23,11 +23,11 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <libnsbmp.h>
 #include "utils/config.h"
 #include "content/content.h"
 #include "desktop/plotters.h"
 #include "image/bitmap.h"
-#include "image/bmpread.h"
 #include "image/ico.h"
 #include "utils/log.h"
 #include "utils/messages.h"
@@ -35,13 +35,16 @@
 
 bool nsico_create(struct content *c, const char *params[]) {
 	union content_msg_data msg_data;
+	extern bmp_bitmap_callback_vt bmp_bitmap_callbacks;	/**< external structure containing
+								*  bitmap callback functions */
 
-	c->data.ico.ico = calloc(sizeof(struct ico_collection), 1);
+	c->data.ico.ico = calloc(sizeof(ico_collection), 1);
 	if (!c->data.ico.ico) {
 		msg_data.error = messages_get("NoMemory");
 		content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
 		return false;
 	}
+	ico_collection_create(c->data.ico.ico, &bmp_bitmap_callbacks);
 	return true;
 }
 
@@ -49,16 +52,14 @@ bool nsico_create(struct content *c, const char *params[]) {
 bool nsico_convert(struct content *c, int iwidth, int iheight) {
 	struct bmp_image *bmp;
 	bmp_result res;
-	struct ico_collection *ico;
+	ico_collection *ico;
 	union content_msg_data msg_data;
 
-	/* set our source data */
+	/* set the ico data */
 	ico = c->data.ico.ico;
-	ico->ico_data = (unsigned char *) c->source_data;
-	ico->buffer_size = c->source_size;
 
-	/* analyse the BMP */
-	res = ico_analyse(ico);
+	/* analyse the ico */
+	res = ico_analyse(ico, c->source_size, (unsigned char *) c->source_data);
 	switch (res) {
 		case BMP_OK:
 			break;
@@ -99,7 +100,8 @@ bool nsico_redraw(struct content *c, int x, int y,
 		float scale, unsigned long background_colour) {
 	struct bmp_image *bmp = ico_find(c->data.ico.ico, width, height);
 	if (!bmp->decoded)
-	  	bmp_decode(bmp);
+	  	if (bmp_decode(bmp) != BMP_OK)
+			return false;
 	c->bitmap = bmp->bitmap;
 	return plot.bitmap(x, y, width, height, c->bitmap,
 			background_colour, c);
@@ -113,7 +115,8 @@ bool nsico_redraw_tiled(struct content *c, int x, int y,
 		bool repeat_x, bool repeat_y) {
 	struct bmp_image *bmp = ico_find(c->data.ico.ico, width, height);
 	if (!bmp->decoded)
-	  	bmp_decode(bmp);
+	  	if (bmp_decode(bmp) != BMP_OK)
+			return false;
 	c->bitmap = bmp->bitmap;
 	return plot.bitmap_tile(x, y, width, height, c->bitmap,
 			background_colour, repeat_x, repeat_y, c);