diff options
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/filetype.c | 3 | ||||
| -rw-r--r-- | riscos/gui.c | 5 | ||||
| -rw-r--r-- | riscos/save.c | 1 | ||||
| -rw-r--r-- | riscos/window.c | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/riscos/filetype.c b/riscos/filetype.c index 89be38e99..a763e46f8 100644 --- a/riscos/filetype.c +++ b/riscos/filetype.c @@ -23,8 +23,10 @@ struct type_entry { char mime_type[40]; }; static const struct type_entry type_map[] = { + {0x132, "image/ico"}, {0x188, "application/x-shockwave-flash"}, {0x695, "image/gif"}, + {0x69c, "image/x-ms-bmp"}, {0xaff, "image/x-drawfile"}, {0xb60, "image/png"}, {0xc85, "image/jpeg"}, @@ -247,6 +249,7 @@ int ro_content_filetype_from_type(content_type type) { #endif #ifdef WITH_BMP case CONTENT_BMP: return 0x69c; + case CONTENT_ICO: return 0x132; #endif #ifdef WITH_SPRITE case CONTENT_SPRITE: return 0xff9; diff --git a/riscos/gui.c b/riscos/gui.c index 23897a629..c09b00375 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -112,6 +112,9 @@ #ifndef FILETYPE_BMP #define FILETYPE_BMP 0x69c #endif +#ifndef FILETYPE_ICO +#define FILETYPE_ICO 0x132 +#endif #ifndef FILETYPE_PNG #define FILETYPE_PNG 0xb60 #endif @@ -1496,6 +1499,7 @@ void ro_msg_dataload(wimp_message *message) case FILETYPE_MNG: case FILETYPE_GIF: case FILETYPE_BMP: + case FILETYPE_ICO: case osfile_TYPE_DRAW: case FILETYPE_PNG: case FILETYPE_JPEG: @@ -1784,6 +1788,7 @@ void ro_msg_datasave(wimp_message *message) case FILETYPE_MNG: case FILETYPE_GIF: case FILETYPE_BMP: + case FILETYPE_ICO: case osfile_TYPE_DRAW: case FILETYPE_PNG: case FILETYPE_JPEG: diff --git a/riscos/save.c b/riscos/save.c index ac2e2267a..d184d5641 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -815,6 +815,7 @@ void ro_gui_save_object_native(struct content *c, char *path) #endif #ifdef WITH_BMP case CONTENT_BMP: + case CONTENT_ICO: bitmap_save(c->bitmap, path); break; #endif diff --git a/riscos/window.c b/riscos/window.c index 386e4d984..9ba7d02a4 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -498,6 +498,7 @@ void ro_gui_window_redraw(struct gui_window *g, wimp_draw *redraw) #endif #ifdef WITH_BMP case CONTENT_BMP: + case CONTENT_ICO: #endif #ifdef WITH_MNG case CONTENT_JNG: |