diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:02:42 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:02:42 +0000 |
commit | 2c6f2f4ef5a50c36676308f6663c0d21edc6aa70 (patch) | |
tree | 069ac9707f3ab227a9054f1d6866eb5916782c75 /frontends/amiga/icon.c | |
parent | a8bd2af7103bca7145f8c566ec46f27e2be8d182 (diff) | |
download | netsurf-2c6f2f4ef5a50c36676308f6663c0d21edc6aa70.tar.gz netsurf-2c6f2f4ef5a50c36676308f6663c0d21edc6aa70.tar.bz2 |
More allocvec/malloc changes
Diffstat (limited to 'frontends/amiga/icon.c')
-rw-r--r-- | frontends/amiga/icon.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c index bd79a5502..c9fc6fd8b 100644 --- a/frontends/amiga/icon.c +++ b/frontends/amiga/icon.c @@ -49,7 +49,6 @@ #include "amiga/os3support.h" #include "amiga/bitmap.h" #include "amiga/icon.h" -#include "amiga/memory.h" #define THUMBNAIL_WIDTH 100 /* Icon sizes for thumbnails, usually the same as */ #define THUMBNAIL_HEIGHT 86 /* WIDTH/HEIGHT in desktop/thumbnail.c */ @@ -239,7 +238,7 @@ bool amiga_icon_convert(struct content *c) if(dobj) FreeDiskObject(dobj); if(format==IDFMT_PALETTEMAPPED) - FreeVec(imagebufptr); + free(imagebufptr); return true; } @@ -326,7 +325,7 @@ static ULONG *amiga_icon_convertcolouricon32(UBYTE *icondata, ULONG width, ULONG if (alpha==0) alpha=0xff; - argbicon = (ULONG *)AllocVecTagList(width*height*4, NULL); + argbicon = (ULONG *)malloc(width * height * 4); if (!argbicon) return(NULL); cmap=GetColorMap(pals1); @@ -485,8 +484,8 @@ void amiga_icon_superimpose_favicon(char *path, struct hlcache_handle *icon, cha if(format == IDFMT_PALETTEMAPPED) { /* Free the 32-bit data we created */ - FreeVec(icondata1); - FreeVec(icondata2); + free(icondata1); + free(icondata2); } } @@ -501,7 +500,7 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm) { bitmap = ami_bitmap_get_native(bm, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, NULL); - icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL); + icondata = malloc(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT); ami_bitmap_set_icondata(bm, icondata); if(bitmap) { @@ -543,6 +542,6 @@ void amiga_icon_free(struct DiskObject *dobj) struct bitmap *bm = dobj->do_Gadget.UserData; FreeDiskObject(dobj); - if(bm) FreeVec(ami_bitmap_get_icondata(bm)); + if(bm) free(ami_bitmap_get_icondata(bm)); } |