netsurf: branch master updated. af2d9e8906d1d439c0c4319298843c40047dd256

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/af2d9e8906d1d439c0c43... ...commit http://git.netsurf-browser.org/netsurf.git/commit/af2d9e8906d1d439c0c4319... ...tree http://git.netsurf-browser.org/netsurf.git/tree/af2d9e8906d1d439c0c431929... The branch, master has been updated via af2d9e8906d1d439c0c4319298843c40047dd256 (commit) from 528d9315ef2335196b8e571573a4c7b1f1556683 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/af2d9e8906d1d439c0c... commit af2d9e8906d1d439c0c4319298843c40047dd256 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Dispose the DT object once we've finished converting it to a bitmap. diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c index e9b0f45..280028c 100644 --- a/amiga/dt_picture.c +++ b/amiga/dt_picture.c @@ -1,5 +1,5 @@ /* - * Copyright 2011 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * Copyright 2011 - 2012 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -176,8 +176,9 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) struct bitmap *bitmap; unsigned int bm_flags = BITMAP_NEW; int bm_format = PBPAFMT_RGBA; + struct amiga_dt_picture_content *adt = (struct amiga_dt_picture_content *)c; - if(dto = amiga_dt_picture_newdtobject((struct amiga_dt_picture_content *)c)) + if(dto = amiga_dt_picture_newdtobject(adt)) { bitmap = bitmap_create(c->width, c->height, bm_flags); if (!bitmap) { @@ -193,6 +194,9 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) 0, 0, c->width, c->height); bitmap_set_opaque(bitmap, bitmap_test_opaque(bitmap)); + + DisposeDTObject(dto); + adt->dto = NULL; } else return NULL; ----------------------------------------------------------------------- Summary of changes: amiga/dt_picture.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c index e9b0f45..280028c 100644 --- a/amiga/dt_picture.c +++ b/amiga/dt_picture.c @@ -1,5 +1,5 @@ /* - * Copyright 2011 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * Copyright 2011 - 2012 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -176,8 +176,9 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) struct bitmap *bitmap; unsigned int bm_flags = BITMAP_NEW; int bm_format = PBPAFMT_RGBA; + struct amiga_dt_picture_content *adt = (struct amiga_dt_picture_content *)c; - if(dto = amiga_dt_picture_newdtobject((struct amiga_dt_picture_content *)c)) + if(dto = amiga_dt_picture_newdtobject(adt)) { bitmap = bitmap_create(c->width, c->height, bm_flags); if (!bitmap) { @@ -193,6 +194,9 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) 0, 0, c->width, c->height); bitmap_set_opaque(bitmap, bitmap_test_opaque(bitmap)); + + DisposeDTObject(dto); + adt->dto = NULL; } else return NULL; -- NetSurf Browser