diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 22:01:25 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 22:01:25 +0000 |
| commit | 3ab8032f1679c2a3526ccd458eb130c0d0f917bc (patch) | |
| tree | 7411a9e07adfb98dd03df5cac60209925b6230a7 /frontends/amiga/font_bullet.c | |
| parent | faf4c1fb6012941134046db14370f60748184b05 (diff) | |
| parent | eab6c0c99e29e10a3ac409b8de7c0e39ef918358 (diff) | |
| download | netsurf-3ab8032f1679c2a3526ccd458eb130c0d0f917bc.tar.gz netsurf-3ab8032f1679c2a3526ccd458eb130c0d0f917bc.tar.bz2 | |
Merge branch 'chris/malloc'
This replaces most instances of AllocVec/FreeVec in the Amiga frontend code with malloc/free, to enable OS3 to get full benefit from the clib2 slab allocator.
Diffstat (limited to 'frontends/amiga/font_bullet.c')
| -rw-r--r-- | frontends/amiga/font_bullet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c index bb0adb5d0..fd41c29a2 100644 --- a/frontends/amiga/font_bullet.c +++ b/frontends/amiga/font_bullet.c @@ -363,7 +363,7 @@ static struct ami_font_cache_node *ami_font_open(const char *font, bool critical { LOG("Requested font not found: %s", font); if(critical == true) amiga_warn_user("CompError", font); - FreeVec(nodedata); + free(nodedata); return NULL; } @@ -601,7 +601,7 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPo TAG_DONE); #else /* On OS3 the glyph needs to be in chip RAM */ - void *chip_glyph = AllocVec(glyph->glm_BMModulo * glyph->glm_BMRows, MEMF_CHIP); + void *chip_glyph = ami_memory_chip_alloc(glyph->glm_BMModulo * glyph->glm_BMRows); if(chip_glyph != NULL) { CopyMem(glyphbm, chip_glyph, glyph->glm_BMModulo * glyph->glm_BMRows); @@ -612,7 +612,7 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPo y - glyph->glm_Y0 + glyph->glm_BlackTop, glyph->glm_BlackWidth, glyph->glm_BlackHeight); - FreeVec(chip_glyph); + ami_memory_chip_free(chip_glyph); } #endif } |