Merge branches/jmb/content-factory to trunk

svn path=/trunk/netsurf/; revision=12283

1 files changed, 9 insertions, 22 deletions

diff --git a/image/ico.h b/image/ico.h
index 666c22371..5df3bca95 100644
--- a/image/ico.h
+++ b/image/ico.h
@@ -29,28 +29,15 @@
 #include <stdbool.h>
 #include <libnsbmp.h>
 
-struct content;
-struct hlcache_handle;
-struct http_parameter;
-struct rect;
-
-struct content_ico_data {
-	struct ico_collection *ico;	/** ICO collection data */
-};
-
-bool nsico_create(struct content *c, const struct http_parameter *params);
-bool nsico_convert(struct content *c);
-void nsico_destroy(struct content *c);
-bool nsico_redraw(struct content *c, int x, int y,
-		int width, int height, const struct rect *clip,
-		float scale, colour background_colour);
-bool nsico_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 nsico_clone(const struct content *old, struct content *new_content);
-bool nsico_set_bitmap_from_size(struct hlcache_handle *h, 
-		int width, int height);
+#include "utils/errors.h"
+
+nserror nsico_init(void);
+void nsico_fini(void);
+
+#else
+
+#define nsico_init() NSERROR_OK
+#define nsico_fini() ((void) 0)
 
 #endif /* WITH_BMP */