summaryrefslogtreecommitdiff
path: root/content/content.h
diff options
context:
space:
mode:
Diffstat (limited to 'content/content.h')
-rw-r--r--content/content.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/content/content.h b/content/content.h
index 4a28eb442..19d60fe6e 100644
--- a/content/content.h
+++ b/content/content.h
@@ -102,7 +102,7 @@
#include "netsurf/css/css.h"
#include "netsurf/render/html.h"
#ifdef WITH_JPEG
-#include "netsurf/riscos/jpeg.h"
+#include "netsurf/image/jpeg.h"
#endif
#ifdef WITH_GIF
#include "netsurf/riscos/gif.h"
@@ -110,11 +110,8 @@
#ifdef WITH_PLUGIN
#include "netsurf/riscos/plugin.h"
#endif
-#ifdef WITH_PNG
-#include "netsurf/riscos/png.h"
-#endif
#ifdef WITH_MNG
-#include "netsurf/riscos/mng.h"
+#include "netsurf/image/mng.h"
#endif
#ifdef WITH_SPRITE
#include "netsurf/riscos/sprite.h"
@@ -124,6 +121,7 @@
#endif
+struct bitmap;
struct box;
struct browser_window;
struct content;
@@ -208,9 +206,6 @@ struct content {
#ifdef WITH_GIF
struct content_gif_data gif;
#endif
-#ifdef WITH_PNG
- struct content_png_data png;
-#endif
#ifdef WITH_MNG
struct content_mng_data mng;
#endif
@@ -225,6 +220,9 @@ struct content {
#endif
} data;
+ /** Bitmap, for various image contents. */
+ struct bitmap *bitmap;
+
/** This content may be given to new users. Indicates that the content
* was fetched using a simple GET, has not expired, and may be
* shared between users. */