From 2348b134924e8b24fba02f068a16c6fb308af88a Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 31 Aug 2011 12:12:41 +0000 Subject: refactor bitmap out of generic content structure svn path=/trunk/netsurf/; revision=12686 --- image/png.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'image/png.c') diff --git a/image/png.c b/image/png.c index 4f1d18720..66826bb3d 100644 --- a/image/png.c +++ b/image/png.c @@ -331,8 +331,6 @@ static bool nspng_convert(struct content *c) bitmap_set_opaque(png_c->bitmap, bitmap_test_opaque(png_c->bitmap)); bitmap_modified(png_c->bitmap); - c->bitmap = png_c->bitmap; /* this needs to go */ - content_set_ready(c); content_set_done(c); content_set_status(c, ""); @@ -413,6 +411,13 @@ static nserror nspng_clone(const struct content *old_c, struct content **new_c) return NSERROR_OK; } +static void *nspng_get_internal(const struct content *c, void *context) +{ + nspng_content *png_c = (nspng_content *) c; + + return png_c->bitmap; +} + static content_type nspng_content_type(lwc_string *mime_type) { return CONTENT_IMAGE; @@ -425,6 +430,7 @@ static const content_handler nspng_content_handler = { .destroy = nspng_destroy, .redraw = nspng_redraw, .clone = nspng_clone, + .get_internal = nspng_get_internal, .type = nspng_content_type, .no_share = false, }; -- cgit v1.2.3