move image content handlers to accomodate core build changes

Makefile

@@ -585,9 +585,6 @@ include frontends/Makefile
 # Content sources
 include content/Makefile
 
-# Content fetchers sources
-include content/fetchers/Makefile
-
 # CSS sources
 include css/Makefile
 
@@ -606,9 +603,6 @@ include desktop/Makefile
 # Javascript source
 include javascript/Makefile
 
-# Image content handler sources
-include image/Makefile
-
 # S_COMMON are sources common to all builds
 S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS)	$(S_RENDER) $(S_UTILS) \
 	$(S_HTTP) $(S_DESKTOP) $(S_JAVASCRIPT)

content/Makefile

@@ -9,3 +9,9 @@ ifeq ($(NETSURF_FS_BACKING_STORE),YES)
 endif
 
 S_CONTENT := $(addprefix content/,$(S_CONTENT))
+
+# Content fetchers sources
+include content/fetchers/Makefile
+
+# Content handlers
+include content/handlers/Makefile

content/content.c

@@ -32,8 +32,8 @@
 #include "desktop/knockout.h"
 #include "desktop/gui_internal.h"
 #include "desktop/browser.h"
-#include "image/bitmap.h"
 
+#include "content/handlers/image/bitmap.h"
 #include "content/content_protected.h"
 #include "content/content_debug.h"
 #include "content/hlcache.h"

content/fetchers/about.c

@@ -41,7 +41,7 @@
 #include "content/fetchers.h"
 #include "content/fetchers/about.h"
 #include "content/content_type.h"
-#include "image/image_cache.h"
+#include "content/handlers/image/image_cache.h"
 
 
 struct fetch_about_context;

content/handlers/Makefile

@@ -0,0 +1,4 @@
+# Image content handler sources
+include content/handlers/image/Makefile
+
+S_IMAGE := $(addprefix content/handlers/,$(S_IMAGE))

content/handlers/image/bmp.c

@@ -32,8 +32,8 @@
 #include "desktop/gui_internal.h"
 #include "desktop/plotters.h"
 
-#include "image/bitmap.h"
-#include "image/bmp.h"
+#include "bitmap.h"
+#include "bmp.h"
 
 /** bmp context. */
 typedef struct nsbmp_content {

content/handlers/image/gif.c

@@ -43,9 +43,9 @@
 #include "desktop/gui_misc.h"
 #include "desktop/gui_internal.h"
 
-#include "image/image.h"
-#include "image/bitmap.h"
-#include "image/gif.h"
+#include "image.h"
+#include "bitmap.h"
+#include "gif.h"
 
 typedef struct nsgif_content {
 	struct content base;

content/handlers/image/ico.c

@@ -30,9 +30,9 @@
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
 
-#include "image/image.h"
-#include "image/bitmap.h"
-#include "image/ico.h"
+#include "image.h"
+#include "bitmap.h"
+#include "ico.h"
 
 typedef struct nsico_content {
 	struct content base;

content/handlers/image/image.c

@@ -26,16 +26,16 @@
 #include "desktop/plotters.h"
 #include "desktop/gui_internal.h"
 
-#include "image/bitmap.h"
-#include "image/bmp.h"
-#include "image/gif.h"
-#include "image/ico.h"
-#include "image/jpeg.h"
-#include "image/nssprite.h"
-#include "image/png.h"
-#include "image/rsvg.h"
-#include "image/svg.h"
-#include "image/image.h"
+#include "bitmap.h"
+#include "bmp.h"
+#include "gif.h"
+#include "ico.h"
+#include "jpeg.h"
+#include "nssprite.h"
+#include "png.h"
+#include "rsvg.h"
+#include "svg.h"
+#include "image.h"
 
 /**
  * Initialise image content handlers

content/handlers/image/image_cache.c

@@ -29,9 +29,9 @@
 #include "desktop/gui_misc.h"
 #include "desktop/gui_internal.h"
 
-#include "image/bitmap.h"
-#include "image/image_cache.h"
-#include "image/image.h"
+#include "bitmap.h"
+#include "image_cache.h"
+#include "image.h"
 
 /** Age of an entry within the cache
  *

content/handlers/image/jpeg.c

@@ -33,12 +33,12 @@
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
 
-#include "image/image_cache.h"
-#include "image/bitmap.h"
+#include "image_cache.h"
+#include "bitmap.h"
 
 #define JPEG_INTERNAL_OPTIONS
 #include "jpeglib.h"
-#include "image/jpeg.h"
+#include "jpeg.h"
 
 /** absolute minimum size of a jpeg below which it is not even worth
  * trying to read header data

content/handlers/image/nssprite.c

@@ -32,8 +32,8 @@
 #include "desktop/gui_internal.h"
 #include "desktop/plotters.h"
 
-#include "image/bitmap.h"
-#include "image/nssprite.h"
+#include "bitmap.h"
+#include "nssprite.h"
 
 typedef struct nssprite_content {
 	struct content base;

content/handlers/image/png.c

@@ -28,9 +28,9 @@
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
 
-#include "image/image_cache.h"
-#include "image/bitmap.h"
-#include "image/png.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

@@ -45,8 +45,8 @@
 #include "desktop/plotters.h"
 #include "desktop/gui_internal.h"
 
-#include "image/bitmap.h"
-#include "image/rsvg.h"
+#include "bitmap.h"
+#include "rsvg.h"
 
 typedef struct rsvg_content {
 	struct content base;

content/handlers/image/svg.c

@@ -32,7 +32,7 @@
 #include "css/css.h"
 #include "desktop/plotters.h"
 
-#include "image/svg.h"
+#include "svg.h"
 
 typedef struct svg_content {
 	struct content base;

content/handlers/image/video.c

@@ -20,7 +20,8 @@
 
 #include "content/content_factory.h"
 #include "content/content_protected.h"
-#include "image/video.h"
+
+#include "video.h"
 
 typedef struct nsvideo_content {
 	struct content base;

content/urldb.c

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

desktop/browser_history.c

@@ -35,7 +35,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "css/css.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
 #include "content/content.h"
 
 #include "desktop/gui_internal.h"

desktop/netsurf.c

@@ -38,8 +38,8 @@
 #include "content/mimesniff.h"
 #include "content/urldb.h"
 #include "css/css.h"
-#include "image/image.h"
-#include "image/image_cache.h"
+#include "content/handlers/image/image.h"
+#include "content/handlers/image/image_cache.h"
 #include "javascript/js.h"
 #include "render/html.h"
 #include "render/textplain.h"

desktop/save_pdf.c

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

desktop/treeview.c

@@ -24,7 +24,7 @@
 
 #include "utils/log.h"
 #include "css/utils.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
 #include "content/hlcache.h"
 
 #include "desktop/system_colour.h"

frontends/amiga/bitmap.c

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

frontends/amiga/download.c

@@ -54,7 +54,7 @@
 #include "desktop/mouse.h"
 #include "desktop/gui_window.h"
 #include "desktop/gui_download.h"
-#include "image/ico.h"
+#include "content/handlers/image/ico.h"
 
 #include "amiga/gui.h"
 #include "amiga/download.h"

frontends/amiga/dt_anim.c

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

frontends/amiga/dt_picture.c

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

frontends/amiga/gui.c

@@ -100,7 +100,7 @@
 #include "content/fetchers.h"
 #include "content/fetchers/resource.h"
 #include "content/urldb.h"
-#include "image/ico.h"
+#include "content/handlers/image/ico.h"
 #include "desktop/browser_history.h"
 #include "desktop/browser.h"
 #include "desktop/hotlist.h"

frontends/amiga/icon.c

@@ -42,7 +42,7 @@
 #include "utils/utils.h"
 #include "utils/file.h"
 #include "desktop/plotters.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
 #include "desktop/plotters.h"
 #include "utils/utils.h"
 

frontends/framebuffer/bitmap.c

@@ -30,7 +30,7 @@
 
 #include "utils/log.h"
 #include "utils/utils.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
 #include "desktop/plotters.h"
 #include "content/content.h"
 

render/html.c

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

render/html_redraw.c

@@ -49,7 +49,7 @@
 #include "desktop/print.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
-#include "image/bitmap.h"
+#include "content/handlers/image/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 "image/bitmap.h"
+#include "content/handlers/image/bitmap.h"
 #include "content/content.h"
 #include "content/urldb.h"
 #include "desktop/cookie_manager.h"