diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:12:31 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:12:31 +0000 |
| commit | 4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432 (patch) | |
| tree | 2b7be1c59b057b4c3dbc763291c5ad63ec7f3828 /frontends/amiga/bitmap.c | |
| parent | 2c6f2f4ef5a50c36676308f6663c0d21edc6aa70 (diff) | |
| parent | faf4c1fb6012941134046db14370f60748184b05 (diff) | |
| download | netsurf-4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432.tar.gz netsurf-4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/malloc
Conflicts:
frontends/amiga/icon.c
Diffstat (limited to 'frontends/amiga/bitmap.c')
| -rw-r--r-- | frontends/amiga/bitmap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index d612abf05..bb4bfc6b9 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -730,14 +730,15 @@ void ami_bitmap_set_title(struct bitmap *bm, const char *title) bm->title = strdup(title); } -ULONG *ami_bitmap_get_icondata(struct bitmap *bm) +void ami_bitmap_set_icondata(struct bitmap *bm, ULONG *icondata) { - return bm->icondata; + bm->icondata = icondata; } -void ami_bitmap_set_icondata(struct bitmap *bm, ULONG *icondata) +void ami_bitmap_free_icondata(struct bitmap *bm) { - bm->icondata = icondata; + if(bm->icondata) FreeVec(bm->icondata); + bm->icondata = NULL; } bool ami_bitmap_is_nativebm(struct bitmap *bm, struct BitMap *nbm) |