From ff480312fee43925e692c8798daad5ef2f722800 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 3 Oct 2013 21:07:29 +0100 Subject: Remove BITMAP_READY flag. --- image/bitmap.h | 1 - riscos/bitmap.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/image/bitmap.h b/image/bitmap.h index 614e8b6c6..256e977ab 100644 --- a/image/bitmap.h +++ b/image/bitmap.h @@ -60,7 +60,6 @@ #define BITMAP_OPAQUE (1 << 0) /** image is opaque */ #define BITMAP_MODIFIED (1 << 1) /** buffer has been modified */ #define BITMAP_CLEAR_MEMORY (1 << 2) /** memory should be wiped */ -#define BITMAP_READY (1 << 3) /** fully initialised */ #define BITMAP_SAVE_FULL_ALPHA (1 << 0) /** save with full alpha channel (if not opaque) */ diff --git a/riscos/bitmap.c b/riscos/bitmap.c index 60b0345d0..abb21ea50 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -77,7 +77,6 @@ static bool bitmap_initialise(struct bitmap *bitmap) if (!bitmap->sprite_area) return false; - bitmap->state |= BITMAP_READY; /* area control block */ sprite_area = bitmap->sprite_area; @@ -314,7 +313,7 @@ unsigned char *bitmap_get_buffer(void *vbitmap) assert(bitmap); /* dynamically create the buffer */ - if (!(bitmap->state & BITMAP_READY)) { + if (bitmap->sprite_area == NULL) { if (!bitmap_initialise(bitmap)) return NULL; } -- cgit v1.2.3