From b7bb766e95a3ffb552784ae40bac76db4651d5d9 Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Fri, 16 Jul 2004 19:47:03 +0000 Subject: [project @ 2004-07-16 19:47:02 by rjw] Fix for hotlist menu selection. Interface for MNG/JNG display. svn path=/import/netsurf/; revision=1083 --- content/content.c | 18 ++++++++++++++++++ content/content.h | 6 ++++++ content/content_type.h | 4 ++++ 3 files changed, 28 insertions(+) (limited to 'content') diff --git a/content/content.c b/content/content.c index dacb46df8..d7dd52515 100644 --- a/content/content.c +++ b/content/content.c @@ -30,6 +30,9 @@ #ifdef WITH_PNG #include "netsurf/riscos/png.h" #endif +#ifdef WITH_MNG +#include "netsurf/riscos/mng.h" +#endif #ifdef WITH_GIF #include "netsurf/riscos/gif.h" #endif @@ -73,6 +76,14 @@ static const struct mime_entry mime_map[] = { #ifdef WITH_PNG {"image/png", CONTENT_PNG}, #endif +#ifdef WITH_MNG + {"image/jng", CONTENT_JNG}, + {"image/x-jng", CONTENT_JNG}, + {"image/mng", CONTENT_MNG}, + {"image/x-mng", CONTENT_MNG}, + {"video/mng", CONTENT_MNG}, + {"video/x-mng", CONTENT_MNG}, +#endif #ifdef WITH_DRAW {"image/x-drawfile", CONTENT_DRAW}, #endif @@ -98,6 +109,9 @@ const char *content_type_name[] = { #ifdef WITH_PNG "PNG", #endif +#ifdef WITH_MNG + "MNG", +#endif #ifdef WITH_SPRITE "SPRITE", #endif @@ -162,6 +176,10 @@ static const struct handler_entry handler_map[] = { {nspng_create, nspng_process_data, nspng_convert, 0, nspng_destroy, 0, nspng_redraw, 0, 0, 0}, #endif +#ifdef WITH_MNG + {nsmng_create, nsmng_process_data, nsmng_convert, + 0, nsmng_destroy, 0, nsmng_redraw, 0, 0, 0}, +#endif #ifdef WITH_SPRITE {sprite_create, sprite_process_data, sprite_convert, 0, sprite_destroy, 0, sprite_redraw, 0, 0, 0}, diff --git a/content/content.h b/content/content.h index 09d59be45..e441e6b36 100644 --- a/content/content.h +++ b/content/content.h @@ -110,6 +110,9 @@ #ifdef WITH_PNG #include "netsurf/riscos/png.h" #endif +#ifdef WITH_MNG +#include "netsurf/riscos/mng.h" +#endif #ifdef WITH_SPRITE #include "netsurf/riscos/sprite.h" #endif @@ -200,6 +203,9 @@ struct content { #ifdef WITH_PNG struct content_png_data png; #endif +#ifdef WITH_MNG + struct content_mng_data mng; +#endif #ifdef WITH_SPRITE struct content_sprite_data sprite; #endif diff --git a/content/content_type.h b/content/content_type.h index 39d2b9f13..661a116a8 100644 --- a/content/content_type.h +++ b/content/content_type.h @@ -31,6 +31,10 @@ typedef enum { #ifdef WITH_PNG CONTENT_PNG, #endif +#ifdef WITH_MNG + CONTENT_JNG, + CONTENT_MNG, +#endif #ifdef WITH_SPRITE CONTENT_SPRITE, #endif -- cgit v1.2.3