summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorSven Weidauer <sven.weidauer@gmail.com>2011-03-05 09:49:15 +0000
committerSven Weidauer <sven.weidauer@gmail.com>2011-03-05 09:49:15 +0000
commit208b98bb44b986e62ff0f80b7e50c9da3e12cb8f (patch)
tree83620f97ee05ddf3a4852607e465b2c1ae114175 /render
parent323d5f3ba1b8ea700215616e42a5fb158ee7006f (diff)
downloadnetsurf-208b98bb44b986e62ff0f80b7e50c9da3e12cb8f.tar.gz
netsurf-208b98bb44b986e62ff0f80b7e50c9da3e12cb8f.tar.bz2
Created content handler CONTENT_APPLE_IMAGE for Mac OS X that can handle all image file formats supported by Apples ImageIO framework. Right now used only for JPEG to get rid of libjpeg dependency.
svn path=/trunk/netsurf/; revision=11911
Diffstat (limited to 'render')
-rw-r--r--render/box.c3
-rw-r--r--render/box_construct.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/render/box.c b/render/box.c
index 275079978..fa579aff8 100644
--- a/render/box.c
+++ b/render/box.c
@@ -1176,6 +1176,9 @@ bool box_duplicate_main_tree(struct box *box, struct content *c, int *count)
#if defined(WITH_NS_SVG) || defined(WITH_RSVG)
content_get_type(box->object) == CONTENT_SVG ||
#endif
+#ifdef WITH_APPLE_IMAGE
+ content_get_type(box->object) == CONTENT_APPLE_IMAGE ||
+#endif
false))
box->object = NULL;
diff --git a/render/box_construct.c b/render/box_construct.c
index d99e5deec..44fcb54b1 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -87,6 +87,9 @@ static const content_type image_types[] = {
#ifdef WITH_AMIGA_ICON
CONTENT_AMIGA_ICON,
#endif
+#ifdef WITH_APPLE_IMAGE
+ CONTENT_APPLE_IMAGE,
+#endif
CONTENT_UNKNOWN };
/* the strings are not important, since we just compare the pointers */