Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/937446b95beb40f9f641e... ...commit http://git.netsurf-browser.org/netsurf.git/commit/937446b95beb40f9f641ee2... ...tree http://git.netsurf-browser.org/netsurf.git/tree/937446b95beb40f9f641ee27b... The branch, master has been updated via 937446b95beb40f9f641ee27bffbeb24509cbc73 (commit) from 84ec9c2b2a8884c7bdb7e0fa461c8b2d9c495cb3 (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=937446b95beb40f9f64... commit 937446b95beb40f9f641ee27bffbeb24509cbc73 Author: Rob Kendrick <rjek(a)netsurf-browser.org&gt; Commit: Rob Kendrick <rjek(a)netsurf-browser.org&gt; Allow drag-and-drop loading of WebP images on RISC OS diff --git a/frontends/riscos/filetype.c b/frontends/riscos/filetype.c index 73651cd..d752141 100644 --- a/frontends/riscos/filetype.c +++ b/frontends/riscos/filetype.c @@ -39,6 +39,7 @@ static const struct type_entry type_map[] = { {0x188, "application/x-shockwave-flash"}, {0x695, "image/gif"}, {0x69c, "image/x-ms-bmp"}, + {0xa66, "image/webp"}, {0xaad, "image/svg+xml"}, {0xaff, "image/x-drawfile"}, {0xb60, "image/png"}, @@ -269,6 +270,7 @@ int ro_content_native_type(struct hlcache_handle *c) case FILETYPE_BMP: /* bmp */ case FILETYPE_ICO: /* ico */ case FILETYPE_PNG: /* png */ + case FILETYPE_WEBP: /* webp */ case 0xff9: /* sprite */ return osfile_TYPE_SPRITE; case FILETYPE_SVG: /* svg */ diff --git a/frontends/riscos/filetype.h b/frontends/riscos/filetype.h index 4c45e7b..b9fca4d 100644 --- a/frontends/riscos/filetype.h +++ b/frontends/riscos/filetype.h @@ -67,6 +67,9 @@ #ifndef FILETYPE_SVG #define FILETYPE_SVG 0xaad #endif +#ifndef FILETYPE_WEBP +#define FILETYPE_WEBP 0xa66 +#endif /** * Determine the MIME type of a local file. diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index b0eb232..cc12eac 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -827,6 +827,7 @@ static void ro_msg_dataload(wimp_message *message) case osfile_TYPE_TEXT: case FILETYPE_ARTWORKS: case FILETYPE_SVG: + case FILETYPE_WEBP: /* display the actual file */ error = netsurf_path_to_nsurl(message->data.data_xfer.file_name, &url); break; @@ -929,7 +930,8 @@ static void ro_msg_datasave(wimp_message *message) case osfile_TYPE_SPRITE: case osfile_TYPE_TEXT: case FILETYPE_ARTWORKS: - case FILETYPE_SVG: { + case FILETYPE_SVG: + case FILETYPE_WEBP: { os_error *error; dataxfer->your_ref = dataxfer->my_ref; ----------------------------------------------------------------------- Summary of changes: frontends/riscos/filetype.c | 2 ++ frontends/riscos/filetype.h | 3 +++ frontends/riscos/gui.c | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontends/riscos/filetype.c b/frontends/riscos/filetype.c index 73651cd..d752141 100644 --- a/frontends/riscos/filetype.c +++ b/frontends/riscos/filetype.c @@ -39,6 +39,7 @@ static const struct type_entry type_map[] = { {0x188, "application/x-shockwave-flash"}, {0x695, "image/gif"}, {0x69c, "image/x-ms-bmp"}, + {0xa66, "image/webp"}, {0xaad, "image/svg+xml"}, {0xaff, "image/x-drawfile"}, {0xb60, "image/png"}, @@ -269,6 +270,7 @@ int ro_content_native_type(struct hlcache_handle *c) case FILETYPE_BMP: /* bmp */ case FILETYPE_ICO: /* ico */ case FILETYPE_PNG: /* png */ + case FILETYPE_WEBP: /* webp */ case 0xff9: /* sprite */ return osfile_TYPE_SPRITE; case FILETYPE_SVG: /* svg */ diff --git a/frontends/riscos/filetype.h b/frontends/riscos/filetype.h index 4c45e7b..b9fca4d 100644 --- a/frontends/riscos/filetype.h +++ b/frontends/riscos/filetype.h @@ -67,6 +67,9 @@ #ifndef FILETYPE_SVG #define FILETYPE_SVG 0xaad #endif +#ifndef FILETYPE_WEBP +#define FILETYPE_WEBP 0xa66 +#endif /** * Determine the MIME type of a local file. diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index b0eb232..cc12eac 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -827,6 +827,7 @@ static void ro_msg_dataload(wimp_message *message) case osfile_TYPE_TEXT: case FILETYPE_ARTWORKS: case FILETYPE_SVG: + case FILETYPE_WEBP: /* display the actual file */ error = netsurf_path_to_nsurl(message->data.data_xfer.file_name, &url); break; @@ -929,7 +930,8 @@ static void ro_msg_datasave(wimp_message *message) case osfile_TYPE_SPRITE: case osfile_TYPE_TEXT: case FILETYPE_ARTWORKS: - case FILETYPE_SVG: { + case FILETYPE_SVG: + case FILETYPE_WEBP: { os_error *error; dataxfer->your_ref = dataxfer->my_ref; -- NetSurf Browser