From 1629c57b9b6a778af3374ee32f136adda089fb09 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 17 Apr 2015 00:12:23 +0100 Subject: fixup risc os sprite image handler to use bitmap operation table --- image/nssprite.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'image') diff --git a/image/nssprite.c b/image/nssprite.c index 5f05c940a..9ec0b9fec 100644 --- a/image/nssprite.c +++ b/image/nssprite.c @@ -21,18 +21,18 @@ * */ -#include -#include +#include #include #include -#include "utils/config.h" + +#include "utils/log.h" +#include "utils/messages.h" #include "content/content_protected.h" +#include "desktop/gui_internal.h" #include "desktop/plotters.h" + #include "image/bitmap.h" #include "image/nssprite.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" typedef struct nssprite_content { struct content base; @@ -113,13 +113,13 @@ static bool nssprite_convert(struct content *c) struct rosprite* sprite = sprite_area->sprites[0]; - nssprite->bitmap = bitmap_create(sprite->width, sprite->height, BITMAP_NEW); + nssprite->bitmap = guit->bitmap->create(sprite->width, sprite->height, BITMAP_NEW); if (!nssprite->bitmap) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; } - uint32_t* imagebuf = (uint32_t *)bitmap_get_buffer(nssprite->bitmap); + uint32_t* imagebuf = (uint32_t *)guit->bitmap->get_buffer(nssprite->bitmap); if (!imagebuf) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); @@ -153,7 +153,7 @@ static bool nssprite_convert(struct content *c) free(title); } - bitmap_modified(nssprite->bitmap); + guit->bitmap->modified(nssprite->bitmap); content_set_ready(c); content_set_done(c); @@ -174,7 +174,7 @@ static void nssprite_destroy(struct content *c) if (nssprite->sprite_area != NULL) rosprite_destroy_sprite_area(nssprite->sprite_area); if (nssprite->bitmap != NULL) - bitmap_destroy(nssprite->bitmap); + guit->bitmap->destroy(nssprite->bitmap); } -- cgit v1.2.3