move bitmap API header to core include directory

content/content.c

@@ -33,7 +33,7 @@
 #include "desktop/gui_internal.h"
 #include "desktop/browser.h"
 
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "content/content_protected.h"
 #include "content/content_debug.h"
 #include "content/hlcache.h"

content/handlers/image/bmp.c

@@ -31,8 +31,8 @@
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
 #include "desktop/plotters.h"
+#include "netsurf/bitmap.h"
 
-#include "bitmap.h"
 #include "bmp.h"
 
 /** bmp context. */

content/handlers/image/gif.c

@@ -42,9 +42,9 @@
 #include "content/content_protected.h"
 #include "desktop/gui_misc.h"
 #include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
 
 #include "image.h"
-#include "bitmap.h"
 #include "gif.h"
 
 typedef struct nsgif_content {

content/handlers/image/ico.c

@@ -29,9 +29,9 @@
 #include "utils/messages.h"
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
 
 #include "image.h"
-#include "bitmap.h"
 #include "ico.h"
 
 typedef struct nsico_content {

content/handlers/image/image.c

@@ -25,8 +25,8 @@
 #include "content/content.h"
 #include "desktop/plotters.h"
 #include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
 
-#include "bitmap.h"
 #include "bmp.h"
 #include "gif.h"
 #include "ico.h"

content/handlers/image/image_cache.c

@@ -28,8 +28,8 @@
 #include "content/content_protected.h"
 #include "desktop/gui_misc.h"
 #include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
 
-#include "bitmap.h"
 #include "image_cache.h"
 #include "image.h"
 

content/handlers/image/jpeg.c

@@ -32,9 +32,9 @@
 #include "utils/messages.h"
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
 
 #include "image_cache.h"
-#include "bitmap.h"
 
 #define JPEG_INTERNAL_OPTIONS
 #include "jpeglib.h"

content/handlers/image/nssprite.c

@@ -31,8 +31,8 @@
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
 #include "desktop/plotters.h"
+#include "netsurf/bitmap.h"
 
-#include "bitmap.h"
 #include "nssprite.h"
 
 typedef struct nssprite_content {

content/handlers/image/png.c

@@ -27,9 +27,9 @@
 #include "utils/messages.h"
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
 
 #include "image_cache.h"
-#include "bitmap.h"
 #include "png.h"
 
 /* accommodate for old versions of libpng (beware security holes!) */

content/handlers/image/rsvg.c

@@ -44,8 +44,8 @@
 #include "content/content_protected.h"
 #include "desktop/plotters.h"
 #include "desktop/gui_internal.h"
+#include "netsurf/bitmap.h"
 
-#include "bitmap.h"
 #include "rsvg.h"
 
 typedef struct rsvg_content {

content/urldb.c

@@ -104,7 +104,7 @@
 #include "utils/utils.h"
 #include "utils/bloom.h"
 #include "utils/time.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/gui_internal.h"
 

desktop/browser_history.c

@@ -34,7 +34,7 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 
 #include "desktop/gui_layout.h"
 #include "desktop/gui_internal.h"

desktop/gui_factory.c

@@ -23,7 +23,7 @@
 #include "utils/config.h"
 #include "utils/errors.h"
 #include "utils/file.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "content/hlcache.h"
 #include "content/backing_store.h"
 

desktop/knockout.c

@@ -69,7 +69,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "content/content.h"
 
 #include "desktop/gui_internal.h"

desktop/save_pdf.c

@@ -60,7 +60,7 @@
 #include "utils/useragent.h"
 #include "content/hlcache.h"
 #include "utils/nsoption.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 
 #include "desktop/plotters.h"
 #include "desktop/print.h"

desktop/treeview.c

@@ -23,7 +23,7 @@
  */
 
 #include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "content/hlcache.h"
 #include "content/handlers/css/utils.h"
 

frontends/amiga/bitmap.c

@@ -50,7 +50,7 @@
 #include "content/hlcache.h"
 #include "desktop/mouse.h"
 #include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 
 #include "amiga/gui.h"
 #include "amiga/bitmap.h"

frontends/amiga/dt_anim.c

@@ -39,7 +39,7 @@
 #include "utils/messages.h"
 #include "content/content_protected.h"
 #include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 
 #include "amiga/bitmap.h"
 #include "amiga/filetype.h"

frontends/amiga/dt_picture.c

@@ -35,7 +35,7 @@
 #include "utils/messages.h"
 #include "content/content_protected.h"
 #include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "content/handlers/image/image_cache.h"
 
 #include "amiga/bitmap.h"

frontends/amiga/icon.c

@@ -42,7 +42,7 @@
 #include "utils/utils.h"
 #include "utils/file.h"
 #include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "content/content_protected.h"
 
 #include "amiga/os3support.h"

frontends/atari/bitmap.c

@@ -24,7 +24,7 @@
 
 #include "utils/nsoption.h"
 #include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "desktop/mouse.h"
 
 #include "atari/bitmap.h"

frontends/atari/plot/plot.c

@@ -29,7 +29,7 @@
 #include "utils/log.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "desktop/plotters.h"
 #include "desktop/mouse.h"
 

frontends/beos/bitmap.cpp

@@ -42,7 +42,7 @@ extern "C" {
 #include "content/urldb.h"
 #include "desktop/plotters.h"
 #include "desktop/browser.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 }
 
 #include "beos/bitmap.h"

frontends/cocoa/apple_image.m

@@ -22,7 +22,7 @@
 
 #include "utils/config.h"
 #include "content/content_protected.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "desktop/plotters.h"
 #include "utils/utils.h"
 

frontends/cocoa/bitmap.m

@@ -25,7 +25,7 @@
 
 #import "desktop/browser.h"
 #import "desktop/plotters.h"
-#import "content/handlers/image/bitmap.h"
+#import "netsurf/bitmap.h"
 #import "content/urldb.h"
 #import "content/content.h"
 

frontends/framebuffer/bitmap.c

@@ -30,7 +30,7 @@
 
 #include "utils/log.h"
 #include "utils/utils.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "desktop/plotters.h"
 #include "content/content.h"
 

frontends/framebuffer/framebuffer.c

@@ -33,7 +33,7 @@
 #include "utils/utf8.h"
 #include "desktop/browser.h"
 #include "desktop/plotters.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/gtk/bitmap.c

@@ -33,7 +33,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "content/content.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "desktop/plotters.h"
 
 #include "gtk/scaffolding.h"

frontends/monkey/bitmap.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 
 #include "monkey/bitmap.h"
 

frontends/riscos/bitmap.c

@@ -45,7 +45,7 @@
 #include "utils/messages.h"
 #include "desktop/plotters.h"
 #include "content/content.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 
 #include "riscos/gui.h"
 #include "riscos/image.h"

frontends/riscos/save.c

@@ -49,7 +49,7 @@
 #include "desktop/save_complete.h"
 #include "desktop/save_text.h"
 #include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "render/form.h"
 
 #include "riscos/bitmap.h"

frontends/riscos/window.c

@@ -65,7 +65,7 @@
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
 #include "desktop/gui_window.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "render/form.h"
 
 #include "riscos/bitmap.h"

frontends/windows/bitmap.c

@@ -30,7 +30,7 @@
 #include <windows.h>
 
 #include "utils/log.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "desktop/plotters.h"
 #include "content/content.h"
 

include/netsurf/bitmap.h

@@ -51,8 +51,8 @@
  *    }
  */
 
-#ifndef _NETSURF_IMAGE_BITMAP_H_
+#ifndef _NETSURF_BITMAP_H_
-#define _NETSURF_IMAGE_BITMAP_H_
+#define _NETSURF_BITMAP_H_
 
 #define BITMAP_NEW		0
 #define BITMAP_OPAQUE		(1 << 0) /**< image is opaque */

render/html.c

@@ -46,7 +46,7 @@
 #include "desktop/selection.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "javascript/js.h"
 #include "desktop/browser.h"
 #include "desktop/gui_utf8.h"

render/html_redraw.c

@@ -48,7 +48,7 @@
 #include "desktop/print.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "desktop/gui_layout.h"
 #include "desktop/gui_internal.h"
 

test/urldbtest.c

@@ -30,7 +30,7 @@
 #include <curl/curl.h>
 
 #include "utils/errors.h"
-#include "content/handlers/image/bitmap.h"
+#include "netsurf/bitmap.h"
 #include "content/content.h"
 #include "content/urldb.h"
 #include "desktop/cookie_manager.h"