From da4a9313f1260531ec3dde07b32c122f120f695c Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Sat, 25 Feb 2006 18:51:51 +0000 Subject: [project @ 2006-02-25 18:50:34 by rjw] Support for BMP files svn path=/import/netsurf/; revision=2095 --- riscos/filetype.c | 7 ++++--- riscos/gui.c | 5 +++++ riscos/save.c | 5 +++++ riscos/window.c | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) (limited to 'riscos') diff --git a/riscos/filetype.c b/riscos/filetype.c index 08228d6a5..89be38e99 100644 --- a/riscos/filetype.c +++ b/riscos/filetype.c @@ -237,16 +237,17 @@ int ro_content_filetype_from_type(content_type type) { #ifdef WITH_MNG case CONTENT_JNG: return 0xf78; case CONTENT_MNG: return 0xf84; + case CONTENT_PNG: return 0xb60; #endif #ifdef WITH_JPEG case CONTENT_JPEG: return 0xc85; #endif -#ifdef WITH_PNG - case CONTENT_PNG: return 0xb60; -#endif #ifdef WITH_GIF case CONTENT_GIF: return 0x695; #endif +#ifdef WITH_BMP + case CONTENT_BMP: return 0x69c; +#endif #ifdef WITH_SPRITE case CONTENT_SPRITE: return 0xff9; #endif diff --git a/riscos/gui.c b/riscos/gui.c index 5d58e8e36..23897a629 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -109,6 +109,9 @@ #ifndef FILETYPE_GIF #define FILETYPE_GIF 0x695 #endif +#ifndef FILETYPE_BMP +#define FILETYPE_BMP 0x69c +#endif #ifndef FILETYPE_PNG #define FILETYPE_PNG 0xb60 #endif @@ -1492,6 +1495,7 @@ void ro_msg_dataload(wimp_message *message) case FILETYPE_CSS: case FILETYPE_MNG: case FILETYPE_GIF: + case FILETYPE_BMP: case osfile_TYPE_DRAW: case FILETYPE_PNG: case FILETYPE_JPEG: @@ -1779,6 +1783,7 @@ void ro_msg_datasave(wimp_message *message) case FILETYPE_CSS: case FILETYPE_MNG: case FILETYPE_GIF: + case FILETYPE_BMP: case osfile_TYPE_DRAW: case FILETYPE_PNG: case FILETYPE_JPEG: diff --git a/riscos/save.c b/riscos/save.c index e288150a6..ac2e2267a 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -812,6 +812,11 @@ void ro_gui_save_object_native(struct content *c, char *path) case CONTENT_GIF: bitmap_save(c->bitmap, path); break; +#endif +#ifdef WITH_BMP + case CONTENT_BMP: + bitmap_save(c->bitmap, path); + break; #endif default: break; diff --git a/riscos/window.c b/riscos/window.c index 00d6e3eea..386e4d984 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -496,6 +496,9 @@ void ro_gui_window_redraw(struct gui_window *g, wimp_draw *redraw) #ifdef WITH_GIF case CONTENT_GIF: #endif +#ifdef WITH_BMP + case CONTENT_BMP: +#endif #ifdef WITH_MNG case CONTENT_JNG: case CONTENT_MNG: -- cgit v1.2.3