Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/c2ac1a713f7e47742ac60... ...commit http://git.netsurf-browser.org/netsurf.git/commit/c2ac1a713f7e47742ac6001... ...tree http://git.netsurf-browser.org/netsurf.git/tree/c2ac1a713f7e47742ac600199... The branch, master has been updated via c2ac1a713f7e47742ac6001991888f767d15d93f (commit) from 1670dc33afca32e0c1cc7d5ddcf508e9ca1619b2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c2ac1a713f7e47742ac... commit c2ac1a713f7e47742ac6001991888f767d15d93f Author: Michael Drake <michael.drake(a)codethink.co.uk&gt; Commit: Michael Drake <michael.drake(a)codethink.co.uk&gt; Errorcodes: Add SPRITE_ERROR and use it in sprite content handler. diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c index f149350..c9fe1b5 100644 --- a/content/handlers/image/nssprite.c +++ b/content/handlers/image/nssprite.c @@ -165,7 +165,7 @@ ro_sprite_error: if (ctx != NULL) { rosprite_destroy_mem_context(ctx); } - content_broadcast_errorcode(c, NSERROR_UNKNOWN); + content_broadcast_errorcode(c, NSERROR_SPRITE_ERROR); return false; } diff --git a/utils/errors.h b/utils/errors.h index ad8ae42..9a0a9bc 100644 --- a/utils/errors.h +++ b/utils/errors.h @@ -40,6 +40,7 @@ typedef enum { NSERROR_GIF_ERROR, /**< A GIF error occurred */ NSERROR_ICO_ERROR, /**< A ICO error occurred */ NSERROR_PNG_ERROR, /**< A PNG error occurred */ + NSERROR_SPRITE_ERROR, /**< A RISC OS Sprite error occurred */ NSERROR_SVG_ERROR, /**< A SVG error occurred */ NSERROR_BAD_ENCODING, /**< The character set is unknown */ NSERROR_NEED_DATA, /**< More data needed */ diff --git a/utils/messages.c b/utils/messages.c index 0ff90b7..5f94204 100644 --- a/utils/messages.c +++ b/utils/messages.c @@ -370,6 +370,10 @@ const char *messages_get_errorcode(nserror code) /* A PNG error occurred */ return messages_get_ctx("PNGError", messages_hash); + case NSERROR_SPRITE_ERROR: + /* A SVG error occurred */ + return messages_get_ctx("SpriteError", messages_hash); + case NSERROR_SVG_ERROR: /* A SVG error occurred */ return messages_get_ctx("SVGError", messages_hash); ----------------------------------------------------------------------- Summary of changes: content/handlers/image/nssprite.c | 2 +- utils/errors.h | 1 + utils/messages.c | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c index f149350..c9fe1b5 100644 --- a/content/handlers/image/nssprite.c +++ b/content/handlers/image/nssprite.c @@ -165,7 +165,7 @@ ro_sprite_error: if (ctx != NULL) { rosprite_destroy_mem_context(ctx); } - content_broadcast_errorcode(c, NSERROR_UNKNOWN); + content_broadcast_errorcode(c, NSERROR_SPRITE_ERROR); return false; } diff --git a/utils/errors.h b/utils/errors.h index ad8ae42..9a0a9bc 100644 --- a/utils/errors.h +++ b/utils/errors.h @@ -40,6 +40,7 @@ typedef enum { NSERROR_GIF_ERROR, /**< A GIF error occurred */ NSERROR_ICO_ERROR, /**< A ICO error occurred */ NSERROR_PNG_ERROR, /**< A PNG error occurred */ + NSERROR_SPRITE_ERROR, /**< A RISC OS Sprite error occurred */ NSERROR_SVG_ERROR, /**< A SVG error occurred */ NSERROR_BAD_ENCODING, /**< The character set is unknown */ NSERROR_NEED_DATA, /**< More data needed */ diff --git a/utils/messages.c b/utils/messages.c index 0ff90b7..5f94204 100644 --- a/utils/messages.c +++ b/utils/messages.c @@ -370,6 +370,10 @@ const char *messages_get_errorcode(nserror code) /* A PNG error occurred */ return messages_get_ctx("PNGError", messages_hash); + case NSERROR_SPRITE_ERROR: + /* A SVG error occurred */ + return messages_get_ctx("SpriteError", messages_hash); + case NSERROR_SVG_ERROR: /* A SVG error occurred */ return messages_get_ctx("SVGError", messages_hash); -- NetSurf Browser