summaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-10-14 20:03:18 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-10-14 20:03:18 +0100
commitd88a8399371dad124136b4e12b9e7b7156ad3c69 (patch)
tree4fd3c0299efaf00d905045532aa8a45cb63b2c12 /image
parentdbed8312c8b21ac4efaebee5b646a37a0c398b55 (diff)
downloadnetsurf-d88a8399371dad124136b4e12b9e7b7156ad3c69.tar.gz
netsurf-d88a8399371dad124136b4e12b9e7b7156ad3c69.tar.bz2
Remove suspension of bmp/gif images. It's completely redundant with the convert on demand core image cache.
Diffstat (limited to 'image')
-rw-r--r--image/bitmap.h2
-rw-r--r--image/bmp.c1
-rw-r--r--image/gif.c10
3 files changed, 0 insertions, 13 deletions
diff --git a/image/bitmap.h b/image/bitmap.h
index ee837f5d7..b85d89c83 100644
--- a/image/bitmap.h
+++ b/image/bitmap.h
@@ -81,8 +81,6 @@ size_t bitmap_get_bpp(void *bitmap);
void bitmap_destroy(void *bitmap);
bool bitmap_save(void *bitmap, const char *path, unsigned flags);
void bitmap_modified(void *bitmap);
-void bitmap_set_suspendable(void *bitmap, void *private_word,
- void (*invalidate)(void *bitmap, void *private_word));
int bitmap_get_width(void *bitmap);
int bitmap_get_height(void *bitmap);
diff --git a/image/bmp.c b/image/bmp.c
index 9ca86fd82..c23f9dd54 100644
--- a/image/bmp.c
+++ b/image/bmp.c
@@ -120,7 +120,6 @@ static void *nsbmp_bitmap_create(int width, int height, unsigned int bmp_state)
bmp_bitmap_callback_vt bmp_bitmap_callbacks = {
.bitmap_create = nsbmp_bitmap_create,
.bitmap_destroy = bitmap_destroy,
- .bitmap_set_suspendable = bitmap_set_suspendable,
.bitmap_get_buffer = bitmap_get_buffer,
.bitmap_get_bpp = bitmap_get_bpp
};
diff --git a/image/gif.c b/image/gif.c
index b3781f837..93316e03e 100644
--- a/image/gif.c
+++ b/image/gif.c
@@ -235,13 +235,6 @@ static void nsgif_animate(void *p)
content_broadcast(&gif->base, CONTENT_MSG_REDRAW, data);
}
-static void nsgif_invalidate(void *bitmap, void *private_word)
-{
- struct gif_animation *gif = (struct gif_animation *)private_word;
-
- gif->decoded_frame = -1;
-}
-
static bool nsgif_convert(struct content *c)
{
nsgif_content *gif = (nsgif_content *) c;
@@ -294,9 +287,6 @@ static bool nsgif_convert(struct content *c)
gif->current_frame = 0;
if (gif->gif->frame_count_partial > 1)
schedule(gif->gif->frames[0].frame_delay, nsgif_animate, c);
- else
- bitmap_set_suspendable(gif->gif->frame_image, gif->gif,
- nsgif_invalidate);
/* Exit as a success */
content_set_ready(c);